Skip to content

Max Mecklin / Moya

Go to a project
Commit c31db398 by Riku Silvola
Options

menu order and foodwave list

1 parent e748081d
Inline Side-by-side
Showing with 7 additions and 7 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java
...@@ -202,8 +202,8 @@ public class MenuBean implements MenuBeanLocal { ...@@ -202,8 +202,8 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation foodnavi = adminnavi.addPage(null, null); MenuNavigation foodnavi = adminnavi.addPage(null, null);
foodnavi.setKey("topnavi.foodwave"); foodnavi.setKey("topnavi.foodwave");
foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/listTemplates"), ShopPermission.MANAGE_FOODWAVES);
foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/createTemplate"), ShopPermission.MANAGE_FOODWAVES); foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/createTemplate"), ShopPermission.MANAGE_FOODWAVES);
foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/listTemplates"), ShopPermission.MANAGE_FOODWAVES);
foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/editTemplate"), ShopPermission.MANAGE_FOODWAVES).setVisible(false); foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/editTemplate"), ShopPermission.MANAGE_FOODWAVES).setVisible(false);
foodnavi.addPage(menuitemfacade.findOrCreate("/foodmanager/listFoodwaves"), ShopPermission.MANAGE_FOODWAVES); foodnavi.addPage(menuitemfacade.findOrCreate("/foodmanager/listFoodwaves"), ShopPermission.MANAGE_FOODWAVES);
......
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<h:outputText value="${i18n['foodWave.time']}" /> <h:outputText value="${i18n['foodWave.time']}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.time.time}"> <h:outputText value="#{foodwave.time.time}">
<f:convertDateTime pattern="hh:mm d/M/yy" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column>
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -199,7 +199,7 @@ food = Food ...@@ -199,7 +199,7 @@ food = Food
foodWave.accountevents = Accountevents foodWave.accountevents = Accountevents
foodWave.billLines = Pending Online Payments foodWave.billLines = Pending Online Payments
foodWave.description = Description foodWave.description = Description
foodWave.list = FoodWave Listing foodWave.list = Active Foodwaves
foodWave.name = Foodwave foodWave.name = Foodwave
foodWave.orders = Amount of Orders foodWave.orders = Amount of Orders
foodWave.paid = Paid foodWave.paid = Paid
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -197,13 +197,13 @@ food = Ruoka ...@@ -197,13 +197,13 @@ food = Ruoka
foodWave.accountevents = Maksetut tilaukset foodWave.accountevents = Maksetut tilaukset
foodWave.billLines = Maksamattomat Verkkomaksut foodWave.billLines = Maksamattomat Verkkomaksut
foodWave.description = Kuvaus foodWave.description = Kuvaus
foodWave.list = Ruokatilausten listaus foodWave.list = Aktiviset ruokatilaukset
foodWave.name = Ruokatilaus foodWave.name = Ruokatilaus
foodWave.orders = Tilausten M\u00E4\u00E4r\u00E4 foodWave.orders = Tilausten M\u00E4\u00E4r\u00E4
foodWave.paid = Maksettuja foodWave.paid = Maksettuja
foodWave.show = N\u00E4yt\u00E4 foodWave.show = N\u00E4yt\u00E4
foodWave.template.name = Template foodWave.template.name = Tilauspohja
foodWave.template.waves = Foodwaves foodWave.template.waves = Ruokatilaus
foodWave.templatename = Valitse tuotteet foodWave.templatename = Valitse tuotteet
foodWave.time = Aika foodWave.time = Aika
foodWave.totalReserved = Yhteens\u00E4 foodWave.totalReserved = Yhteens\u00E4
...@@ -228,7 +228,7 @@ foodwaveTemplate.name = Nimi ...@@ -228,7 +228,7 @@ foodwaveTemplate.name = Nimi
foodwavetemplate.actions = Toimet foodwavetemplate.actions = Toimet
foodwavetemplate.addproduct = Lis\u00E4\u00E4 foodwavetemplate.addproduct = Lis\u00E4\u00E4
foodwavetemplate.basicinfo = Templeitti foodwavetemplate.basicinfo = Tilauspohja
foodwavetemplate.createFoodwave = Luo ruokatilaus foodwavetemplate.createFoodwave = Luo ruokatilaus
foodwavetemplate.createwave = Luo tilauspohja foodwavetemplate.createwave = Luo tilauspohja
foodwavetemplate.description = Kuvaus foodwavetemplate.description = Kuvaus
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!