From 2547134420c4ccc152b8b70a0d979803bbc9f58f Mon Sep 17 00:00:00 2001
From: Franta Pribyl <pribyl.franta@gmail.com>
Date: Fri, 13 Jun 2014 12:06:31 +0200
Subject: [PATCH] =?UTF-8?q?P=C5=99epracov=C3=A1na=20struktura=20hlavn?=
 =?UTF-8?q?=C3=ADho=20menu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/bukova/isspst/ui/NavigationVM.java   |   7 +
 .../WEB-INF/locales/zk-label.properties       |  15 ++
 src/main/webapp/app/navigation.zul            |  37 ++-
 .../addressbook/addrFindResult.zul            |   0
 .../{admin => lists}/addressbook/address.zul  |   0
 .../addressbook/addressbook.zul               | 250 +++++++++---------
 .../{admin => lists}/addressbook/index.zul    |   0
 .../webapp/{ => lists}/buildings/building.zul |   0
 .../{ => lists}/buildings/buildingForm.zul    |   0
 .../webapp/{ => lists}/buildings/index.zul    |   0
 .../webapp/{ => lists}/material/index.zul     |   0
 .../webapp/{ => lists}/material/material.zul  |   0
 .../{ => lists}/material/materialForm.zul     |   0
 src/main/webapp/{ => lists}/munits/index.zul  |   0
 .../webapp/{ => lists}/munits/munitsForm.zul  |   0
 .../webapp/{ => lists}/munits/munitsGrid.zul  |   0
 16 files changed, 171 insertions(+), 138 deletions(-)
 rename src/main/webapp/{admin => lists}/addressbook/addrFindResult.zul (100%)
 rename src/main/webapp/{admin => lists}/addressbook/address.zul (100%)
 rename src/main/webapp/{admin => lists}/addressbook/addressbook.zul (97%)
 rename src/main/webapp/{admin => lists}/addressbook/index.zul (100%)
 rename src/main/webapp/{ => lists}/buildings/building.zul (100%)
 rename src/main/webapp/{ => lists}/buildings/buildingForm.zul (100%)
 rename src/main/webapp/{ => lists}/buildings/index.zul (100%)
 rename src/main/webapp/{ => lists}/material/index.zul (100%)
 rename src/main/webapp/{ => lists}/material/material.zul (100%)
 rename src/main/webapp/{ => lists}/material/materialForm.zul (100%)
 rename src/main/webapp/{ => lists}/munits/index.zul (100%)
 rename src/main/webapp/{ => lists}/munits/munitsForm.zul (100%)
 rename src/main/webapp/{ => lists}/munits/munitsGrid.zul (100%)

diff --git a/src/main/java/info/bukova/isspst/ui/NavigationVM.java b/src/main/java/info/bukova/isspst/ui/NavigationVM.java
index 3c64dc6b..e857a06b 100644
--- a/src/main/java/info/bukova/isspst/ui/NavigationVM.java
+++ b/src/main/java/info/bukova/isspst/ui/NavigationVM.java
@@ -46,4 +46,11 @@ public class NavigationVM {
 		return moduleUrl.contains("passwd");
 	}
 
+	public boolean isLists()	{
+		return moduleUrl.contains("lists");
+	}
+	
+	public boolean isRequirements()	{
+		return moduleUrl.contains("requirements");
+	}
 }
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index 199d4841..b3b5df06 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -1,6 +1,19 @@
 # Default file
 AppName=Objednávkový systém SPŠ Třebíč
 
+MenuRequirements=Požadavky
+MenuOrders=Objednávky
+MenuLists=Seznamy
+MenuSettings=Nastavení
+MenuAdministration=Administrace
+MenuUser=Uživatel
+
+AgendaMyRequirements=Aktuální
+AgendaRequirementsHistory=Ukončené
+
+AgendaMyOrders=Aktuální
+AgendaOrdersHistory=Ukončené
+
 AgendaMUnits=Měrné jednotky
 MUnitsFormTitle=Měrná jednotka
 MUnitsFormCode=Kód
@@ -19,6 +32,8 @@ BuildingsGridColumnCode=Kód
 BuildingsGridColumnName=Název
 BuildingsGridColumnDescription=Popis
 
+AgendaRooms=Místnosti
+
 AgendaRights=Práva
 RightsFormTitle=Práva
 RightsGridRole=Role
diff --git a/src/main/webapp/app/navigation.zul b/src/main/webapp/app/navigation.zul
index 04b3e7c4..205e1dc5 100644
--- a/src/main/webapp/app/navigation.zul
+++ b/src/main/webapp/app/navigation.zul
@@ -6,24 +6,39 @@
 <tabbox mold="accordion" apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('info.bukova.isspst.ui.NavigationVM')">
 	<tabs>
-		<tab id="orders" label="Objednávky" selected="@load(vm.orders)"/>
-		<tab id="settings" label="Nastavení" selected="@load(vm.settings)"/>
-		<tab id="admin" label="Administrace" selected="@load(vm.admin)"/>
-		<tab id="user" label="Uživatel" selected="@load(vm.user)"/>
+		<tab id="requirements" label="${labels.MenuRequirements}" selected="@load(vm.requirements)"/>
+		<tab id="orders" label="${labels.MenuOrders}" selected="@load(vm.orders)"/>
+		<tab id="lists" label="${labels.MenuLists}" selected="@load(vm.lists)"/>
+		<tab id="settings" label="${labels.MenuSettings}" selected="@load(vm.settings)"/>
+		<tab id="admin" label="${labels.MenuAdministration}" selected="@load(vm.admin)"/>
+		<tab id="user" label="${labels.MenuUser}" selected="@load(vm.user)"/>
 	</tabs>
 	<tabpanels hflex="1">
 		<tabpanel>
 			<menubar orient="vertical">
-				<menuitem label="Moje" href="/orders/my" width="120px"/>
-				<menuitem label="Ke schválení" href="/orders/approve"/>
+				<menuitem label="${labels.AgendaMyRequirements}" href="/requirements/actual" />
+				<menuitem label="${labels.AgendaRequirementsHistory}" href="/requirements/history" />
 			</menubar>
 		</tabpanel>
 		<tabpanel>
 			<menubar orient="vertical">
-				<menuitem label="${labels.AgendaMUnits}" href="/munits" disabled="${not sec:isAllGranted('PERM_READ_MUNITS')}" width="120px"/>
+				<menuitem label="${labels.AgendaMyOrders}" href="/orders/actual" />
+				<menuitem label="${labels.AgendaOrdersHistory}" href="/orders/history" />
+			</menubar>
+		</tabpanel>
+		<tabpanel>
+			<menubar orient="vertical">
+				<menuitem label="${labels.AgendaSuppliers}" href="/lists/addressbook" disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}"/>
+				<menuitem label="${labels.AgendaMaterial}" href="/lists/material" disabled="${not sec:isAllGranted('PERM_READ_MATERIAL')}"/>
+				<menuitem label="${labels.AgendaMUnits}" href="/lists/munits" disabled="${not sec:isAllGranted('PERM_READ_MUNITS')}" width="120px"/>
+				<menuitem label="${labels.AgendaBuildings}" href="/lists/buildings" disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
+				<menuitem label="${labels.AgendaRooms}" href="/lists/rooms" disabled="${not sec:isAllGranted('PERM_READ_ROOMS')}" />
+			</menubar>
+		</tabpanel>
+		<tabpanel>
+			<menubar orient="vertical">
+				<menuitem label="Limity částek"/>
 				<menuitem label="E-maily" />
-				<menuitem label="Další"/>
-				<menuitem label="Položka"/>
 			</menubar>
 		</tabpanel>
 		<tabpanel>
@@ -31,10 +46,6 @@
 				<menuitem label="${labels.AgendaUsers}" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}" width="120px"/>
 				<menuitem label="Práva" href="/admin/permissions" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
 				<menuitem label="Střediska" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
-				<menuitem label="${labels.AgendaBuildings}" href="/buildings" disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
-				<menuitem label="Místnosti" href="/admin/users"/>
-				<menuitem label="${labels.AgendaMaterial}" href="/material" disabled="${not sec:isAllGranted('PERM_READ_MATERIAL')}"/>
-				<menuitem label="Dodavatelé" href="/admin/addressbook" disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}"/>
 			</menubar>
 		</tabpanel>
 		<tabpanel>
diff --git a/src/main/webapp/admin/addressbook/addrFindResult.zul b/src/main/webapp/lists/addressbook/addrFindResult.zul
similarity index 100%
rename from src/main/webapp/admin/addressbook/addrFindResult.zul
rename to src/main/webapp/lists/addressbook/addrFindResult.zul
diff --git a/src/main/webapp/admin/addressbook/address.zul b/src/main/webapp/lists/addressbook/address.zul
similarity index 100%
rename from src/main/webapp/admin/addressbook/address.zul
rename to src/main/webapp/lists/addressbook/address.zul
diff --git a/src/main/webapp/admin/addressbook/addressbook.zul b/src/main/webapp/lists/addressbook/addressbook.zul
similarity index 97%
rename from src/main/webapp/admin/addressbook/addressbook.zul
rename to src/main/webapp/lists/addressbook/addressbook.zul
index 112721b8..9247c8f6 100644
--- a/src/main/webapp/admin/addressbook/addressbook.zul
+++ b/src/main/webapp/lists/addressbook/addressbook.zul
@@ -1,126 +1,126 @@
-<?page title="${labels.AgendaSuppliers}" contentType="text/html;charset=UTF-8"?>
-<zk>
-	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
-	<window border="normal" apply="org.zkoss.bind.BindComposer" height="570px" viewModel="@id('vm') @init('info.bukova.isspst.ui.addressbook.AddressList')">
-		<caption zclass="form-caption" label="${labels.AgendaSuppliers}" />
-		<include src="/app/toolbar.zul" />
-
-		<hbox width="100%">
-			<listbox id="dataGrid" model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" onAfterRender="@command('afterRender')" selectedIndex="@load(vm.selIndex)" hflex="6" height="480px">
-				<listhead vflex="true" menupopup="auto">
-					<listheader label="${labels.SuppliersGridColumnCompany}" sort="czech(company)" />
-					<listheader label="${labels.SuppliersGridColumnIC}" sort="auto(ic)" width="100px" />
-					<listheader label="${labels.SuppliersGridColumnContact}" sort="czech(contactName)" />
-					<listheader label="${labels.SuppliersGridColumnStreet}" sort="czech(street)" />
-					<listheader label="${labels.SuppliersGridColumnNo}" sort="czech(houseNumber)" width="80px" />
-					<listheader label="${labels.SuppliersGridColumnCity}" sort="czech(city)" />
-				</listhead>
-
-				<auxhead sclass="category-center" visible="@load(vm.filter)">
-					<auxheader>
-						<div sclass="find-grid-cell">
-							<div sclass="find-grid-divtextbox">
-								<textbox value="@bind(vm.filterTemplate.company)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
-							</div>
-							<div sclass="find-grid-img">
-								<image src="/img/funnel.png" />
-							</div>
-						</div>
-					</auxheader>
-					<auxheader>
-						<div sclass="find-grid-cell">
-							<div sclass="find-grid-divtextbox">
-								<textbox value="@bind(vm.filterTemplate.ic)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
-							</div>
-							<div sclass="find-grid-img">
-								<image src="/img/funnel.png" />
-							</div>
-						</div>
-					</auxheader>
-					<auxheader>
-						<div sclass="find-grid-cell">
-							<div sclass="find-grid-divtextbox">
-								<textbox value="@bind(vm.filterTemplate.contactName)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
-							</div>
-							<div sclass="find-grid-img">
-								<image src="/img/funnel.png" />
-							</div>
-						</div>
-					</auxheader>
-					<auxheader>
-						<div sclass="find-grid-cell">
-							<div sclass="find-grid-divtextbox">
-								<textbox value="@bind(vm.filterTemplate.street)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
-							</div>
-							<div sclass="find-grid-img">
-								<image src="/img/funnel.png" />
-							</div>
-						</div>
-					</auxheader>
-					<auxheader>
-						<div sclass="find-grid-cell">
-							<div sclass="find-grid-divtextbox">
-								<textbox value="@bind(vm.filterTemplate.houseNumber)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
-							</div>
-							<div sclass="find-grid-img">
-								<image src="/img/funnel.png" />
-							</div>
-						</div>
-					</auxheader>
-					<auxheader>
-						<div sclass="find-grid-cell">
-							<div sclass="find-grid-divtextbox">
-								<textbox value="@bind(vm.filterTemplate.city)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
-							</div>
-							<div sclass="find-grid-img">
-								<image src="/img/funnel.png" />
-							</div>
-						</div>
-					</auxheader>
-				</auxhead>
-
-				<template name="model">
-					<listitem>
-						<listcell label="@load(each.company)" />
-						<listcell label="@load(each.ic)" />
-						<listcell label="@load(each.contactName)" />
-						<listcell label="@load(each.street)" />
-						<listcell label="@load(each.houseNumber)" />
-						<listcell label="@load(each.city)" />
-					</listitem>
-				</template>
-			</listbox>
-
-			<div hflex="4">
-				<label value="${labels.SuppliersGridColumnDetail}:" sclass="bold" />
-				<grid visible="@load(vm.dataBean ne null)" hflex="1">
-					<columns>
-						<column hflex="min" />
-						<column />
-					</columns>
-					<rows>
-						<row>
-							<label value="${labels.SuppliersGridColumnDepartment}" />
-							<label value="@load(vm.dataBean.department)" />
-						</row>
-						<row>
-							<label value="${labels.SuppliersGridColumnPhone}" />
-							<label value="@load(vm.dataBean.phone)" />
-						</row>
-						<row>
-							<label value="${labels.SuppliersGridColumnEmail}" />
-							<label value="@load(vm.dataBean.email)" />
-						</row>
-						<row>
-							<label value="${labels.SuppliersGridColumnWWW}" />
-							<label value="@load(vm.dataBean.web)" />
-						</row>
-					</rows>
-				</grid>
-				<label value="${labels.SuppliersGridColumnNote}:" visible="@load(not empty vm.dataBean.description)" sclass="bold" />
-				<html style="font-family:arial,sans-serif;font-size:12px;" content="@load(vm.dataBean.description)" />
-				<mapa address="@load((empty vm.dataBean.street ? vm.dataBean.city : vm.dataBean.street).concat(' ').concat(vm.dataBean.houseNumber).concat(', ').concat(vm.dataBean.city))" width="100%" height="300px" visible="@load(vm.dataBean ne null)" />
-			</div>
-		</hbox>
-	</window>
+<?page title="${labels.AgendaSuppliers}" contentType="text/html;charset=UTF-8"?>
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window border="normal" apply="org.zkoss.bind.BindComposer" height="570px" viewModel="@id('vm') @init('info.bukova.isspst.ui.addressbook.AddressList')">
+		<caption zclass="form-caption" label="${labels.AgendaSuppliers}" />
+		<include src="/app/toolbar.zul" />
+
+		<hbox width="100%">
+			<listbox id="dataGrid" model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" onAfterRender="@command('afterRender')" selectedIndex="@load(vm.selIndex)" hflex="6" height="480px">
+				<listhead vflex="true" menupopup="auto">
+					<listheader label="${labels.SuppliersGridColumnCompany}" sort="czech(company)" />
+					<listheader label="${labels.SuppliersGridColumnIC}" sort="auto(ic)" width="100px" />
+					<listheader label="${labels.SuppliersGridColumnContact}" sort="czech(contactName)" />
+					<listheader label="${labels.SuppliersGridColumnStreet}" sort="czech(street)" />
+					<listheader label="${labels.SuppliersGridColumnNo}" sort="czech(houseNumber)" width="80px" />
+					<listheader label="${labels.SuppliersGridColumnCity}" sort="czech(city)" />
+				</listhead>
+
+				<auxhead sclass="category-center" visible="@load(vm.filter)">
+					<auxheader>
+						<div sclass="find-grid-cell">
+							<div sclass="find-grid-divtextbox">
+								<textbox value="@bind(vm.filterTemplate.company)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+					<auxheader>
+						<div sclass="find-grid-cell">
+							<div sclass="find-grid-divtextbox">
+								<textbox value="@bind(vm.filterTemplate.ic)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+					<auxheader>
+						<div sclass="find-grid-cell">
+							<div sclass="find-grid-divtextbox">
+								<textbox value="@bind(vm.filterTemplate.contactName)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+					<auxheader>
+						<div sclass="find-grid-cell">
+							<div sclass="find-grid-divtextbox">
+								<textbox value="@bind(vm.filterTemplate.street)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+					<auxheader>
+						<div sclass="find-grid-cell">
+							<div sclass="find-grid-divtextbox">
+								<textbox value="@bind(vm.filterTemplate.houseNumber)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+					<auxheader>
+						<div sclass="find-grid-cell">
+							<div sclass="find-grid-divtextbox">
+								<textbox value="@bind(vm.filterTemplate.city)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+				</auxhead>
+
+				<template name="model">
+					<listitem>
+						<listcell label="@load(each.company)" />
+						<listcell label="@load(each.ic)" />
+						<listcell label="@load(each.contactName)" />
+						<listcell label="@load(each.street)" />
+						<listcell label="@load(each.houseNumber)" />
+						<listcell label="@load(each.city)" />
+					</listitem>
+				</template>
+			</listbox>
+
+			<div hflex="4">
+				<label value="${labels.SuppliersGridColumnDetail}:" sclass="bold" />
+				<grid visible="@load(vm.dataBean ne null)" hflex="1">
+					<columns>
+						<column hflex="min" />
+						<column />
+					</columns>
+					<rows>
+						<row>
+							<label value="${labels.SuppliersGridColumnDepartment}" />
+							<label value="@load(vm.dataBean.department)" />
+						</row>
+						<row>
+							<label value="${labels.SuppliersGridColumnPhone}" />
+							<label value="@load(vm.dataBean.phone)" />
+						</row>
+						<row>
+							<label value="${labels.SuppliersGridColumnEmail}" />
+							<label value="@load(vm.dataBean.email)" />
+						</row>
+						<row>
+							<label value="${labels.SuppliersGridColumnWWW}" />
+							<label value="@load(vm.dataBean.web)" />
+						</row>
+					</rows>
+				</grid>
+				<label value="${labels.SuppliersGridColumnNote}:" visible="@load(not empty vm.dataBean.description)" sclass="bold" />
+				<html style="font-family:arial,sans-serif;font-size:12px;" content="@load(vm.dataBean.description)" />
+				<mapa address="@load((empty vm.dataBean.street ? vm.dataBean.city : vm.dataBean.street).concat(' ').concat(vm.dataBean.houseNumber).concat(', ').concat(vm.dataBean.city))" width="100%" height="300px" visible="@load(vm.dataBean ne null)" />
+			</div>
+		</hbox>
+	</window>
 </zk>
\ No newline at end of file
diff --git a/src/main/webapp/admin/addressbook/index.zul b/src/main/webapp/lists/addressbook/index.zul
similarity index 100%
rename from src/main/webapp/admin/addressbook/index.zul
rename to src/main/webapp/lists/addressbook/index.zul
diff --git a/src/main/webapp/buildings/building.zul b/src/main/webapp/lists/buildings/building.zul
similarity index 100%
rename from src/main/webapp/buildings/building.zul
rename to src/main/webapp/lists/buildings/building.zul
diff --git a/src/main/webapp/buildings/buildingForm.zul b/src/main/webapp/lists/buildings/buildingForm.zul
similarity index 100%
rename from src/main/webapp/buildings/buildingForm.zul
rename to src/main/webapp/lists/buildings/buildingForm.zul
diff --git a/src/main/webapp/buildings/index.zul b/src/main/webapp/lists/buildings/index.zul
similarity index 100%
rename from src/main/webapp/buildings/index.zul
rename to src/main/webapp/lists/buildings/index.zul
diff --git a/src/main/webapp/material/index.zul b/src/main/webapp/lists/material/index.zul
similarity index 100%
rename from src/main/webapp/material/index.zul
rename to src/main/webapp/lists/material/index.zul
diff --git a/src/main/webapp/material/material.zul b/src/main/webapp/lists/material/material.zul
similarity index 100%
rename from src/main/webapp/material/material.zul
rename to src/main/webapp/lists/material/material.zul
diff --git a/src/main/webapp/material/materialForm.zul b/src/main/webapp/lists/material/materialForm.zul
similarity index 100%
rename from src/main/webapp/material/materialForm.zul
rename to src/main/webapp/lists/material/materialForm.zul
diff --git a/src/main/webapp/munits/index.zul b/src/main/webapp/lists/munits/index.zul
similarity index 100%
rename from src/main/webapp/munits/index.zul
rename to src/main/webapp/lists/munits/index.zul
diff --git a/src/main/webapp/munits/munitsForm.zul b/src/main/webapp/lists/munits/munitsForm.zul
similarity index 100%
rename from src/main/webapp/munits/munitsForm.zul
rename to src/main/webapp/lists/munits/munitsForm.zul
diff --git a/src/main/webapp/munits/munitsGrid.zul b/src/main/webapp/lists/munits/munitsGrid.zul
similarity index 100%
rename from src/main/webapp/munits/munitsGrid.zul
rename to src/main/webapp/lists/munits/munitsGrid.zul