Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 2614d907 by Riku Silvola
Options

create list edit templates

1 parent 00cde394
Inline Side-by-side
Showing with 20 additions and 19 deletions
code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml
...@@ -23,11 +23,10 @@ ...@@ -23,11 +23,10 @@
<ui:define name="content"> <ui:define name="content">
<h:form> <h:form>
<p:wizard> <!-- <p:wizard>
<p:tab id="basicinfo" title="#{i18n['foodwavetemplate.basicinfo']}"> <p:tab id="basicinfo" title="#{i18n['foodwavetemplate.basicinfo']}"> -->
<h:panelGrid columns="3"> <h:panelGrid columns="3">
<h:outputLabel for="name" <h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
value="#{i18n['foodwavetemplate.name']}" />
<h:inputText id="name" value="#{foodWaveView.template.name}" <h:inputText id="name" value="#{foodWaveView.template.name}"
required="true" requiredMessage="Name required" /> required="true" requiredMessage="Name required" />
<h:message for="name" /> <h:message for="name" />
...@@ -39,9 +38,9 @@ ...@@ -39,9 +38,9 @@
requiredMessage="Description required" /> requiredMessage="Description required" />
<h:message for="description" /> <h:message for="description" />
</h:panelGrid> </h:panelGrid>
</p:tab> <!-- </p:tab>
<p:tab id="selectproducts" <p:tab id="selectproducts"
title="#{i18n['foodwavetemplate.selectproducts']}"> title="#{i18n['foodwavetemplate.selectproducts']}"> -->
<h:messages /> <h:messages />
<h:panelGrid columns="4"> <h:panelGrid columns="4">
...@@ -114,10 +113,12 @@ ...@@ -114,10 +113,12 @@
</p:dataTable> </p:dataTable>
<h:commandButton action="#{foodWaveView.saveTemplate()}" <h:commandButton action="#{foodWaveView.saveTemplate()}"
value="#{i18n['foodwavetemplate.savetemplate']}" /> value="#{i18n['foodwavetemplate.savetemplate']}">
</p:tab> <f:param value="#{foodWaveView.templateId}" name="id" />
</h:commandButton>>
<!-- </p:tab> -->
</p:wizard> <!-- </p:wizard> -->
</h:form> </h:form>
......
code/LanBortalWeb/WebContent/foodadmin/editTemplate.xhtml
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
<ui:composition <ui:composition
template="/layout/#{sessionHandler.layout}/template.xhtml"> template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="id" value="#{foodWaveView.templateId}" />
<f:event type="preRenderView" <f:event type="preRenderView"
listener="#{foodWaveView.initEditTemplate()}" /> listener="#{foodWaveView.initEditTemplate()}" />
<f:viewParam name="id" value="#{foodWaveView.templateId}" />
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
</h:panelGrid> </h:panelGrid>
<h:selectOneMenu value="#{foodWaveView.currentProduct}" <h:selectOneMenu value="#{foodWaveView.currentProduct}"
converter="#{productConverter}"> converter="#{productConverter}">
<f:selectItems value="#{foodWaveView.products}" var="product" itemLabel="#{product.name}"></f:selectItems> <f:selectItems value="#{foodWaveView.products}" var="product"
itemLabel="#{product.name}"></f:selectItems>
</h:selectOneMenu> </h:selectOneMenu>
<p:commandButton value="#{i18n['foodwavetemplate.addproduct']}" <p:commandButton value="#{i18n['foodwavetemplate.addproduct']}"
actionListener="#{foodWaveView.addProductToTemplate}" actionListener="#{foodWaveView.addProductToTemplate}"
...@@ -68,7 +69,8 @@ ...@@ -68,7 +69,8 @@
update="productTable" /> update="productTable" />
</h:panelGrid> </h:panelGrid>
--> <p:dataTable name="productTable" id="productTable" -->
<p:dataTable name="productTable" id="productTable"
value="#{foodWaveView.template.products}" var="product" value="#{foodWaveView.template.products}" var="product"
editable="true"> editable="true">
<p:column headerText="#{i18n['foodwavetemplate.productname']}"> <p:column headerText="#{i18n['foodwavetemplate.productname']}">
...@@ -118,8 +120,11 @@ ...@@ -118,8 +120,11 @@
</p:column> </p:column>
</p:dataTable> </p:dataTable>
<h:commandButton action="#{foodWaveView.saveTemplate()}" <h:commandButton action="#{foodWaveView.saveTemplate()}"
value="#{i18n['foodwavetemplate.savetemplate']}" /> <!-- --> value="#{i18n['foodwavetemplate.savetemplate']}" />
<!-- -->
</p:panel> </p:panel>
</h:form>
<h:form>
<p:panel header="#{i18n['foodwavetemplate.createwave']}"> <p:panel header="#{i18n['foodwavetemplate.createwave']}">
<h:panelGrid columns="3"> <h:panelGrid columns="3">
<h:outputLabel for="waveName" <h:outputLabel for="waveName"
...@@ -145,11 +150,6 @@ ...@@ -145,11 +150,6 @@
value="#{i18n['foodwavetemplate.createFoodwave']}" /> value="#{i18n['foodwavetemplate.createFoodwave']}" />
</p:panel> </p:panel>
</h:form> </h:form>
<ui:fragment>
</ui:fragment>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
......
code/LanBortalWeb/WebContent/foodadmin/listTemplates.xhtml
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</h:column> </h:column>
<h:column> <h:column>
<h:link value="LOL" outcome="/foodadmin/editTemplate"> <h:link value="LOL" outcome="/foodadmin/editTemplate">
<f:param value="#{foodwaveTemplate.id}" name="id"/> <f:param value="#{foodWaveView.templateId}" name="id"/>
</h:link> </h:link>
</h:column> </h:column>
</h:dataTable> </h:dataTable>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!