Přepracovány styly pro celkový vzhled okna, nastavení rolování gridu.

BigDecimalConverter přesunut do báze...
Odstraněna stará cesta k původním požadavkům.
Nové požadavky připraveny do tabů.

src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMy.java

@@ -0,0 +1,48 @@
+package info.bukova.isspst.ui.main.orders.requirements;
+
+import info.bukova.isspst.data.Requirement;
+import info.bukova.isspst.data.Workgroup;
+import info.bukova.isspst.filters.RequirementFilter;
+import info.bukova.isspst.services.requirement.RequirementService;
+import info.bukova.isspst.services.users.UserService;
+import info.bukova.isspst.services.workgroups.WorkgroupService;
+import info.bukova.isspst.ui.requirement.RequirementSubpage;
+
+import java.util.List;
+
+import org.zkoss.bind.annotation.Init;
+import org.zkoss.zk.ui.select.annotation.WireVariable;
+
+public class ReqListMy extends RequirementSubpage<Requirement>
+{
+
+	@WireVariable
+	private RequirementService requirementService;
+
+	@WireVariable
+	private UserService userService;
+
+	@WireVariable
+	private WorkgroupService workgroupService;
+
+	public List<Workgroup> getCentres()
+	{
+		return workgroupService.getUserCentres(userService.getCurrent());
+	}
+
+	@Init
+	public void init()
+	{
+		super.init();
+		service = requirementService;
+		dataClass = Requirement.class;
+		formZul = "reqForm.zul";
+		dataFilter = new RequirementFilter(getFilterTemplate());
+	}
+
+	@Override
+	protected List<Requirement> getListFromService()
+	{
+		return super.getListFromService();
+	}
+}

src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java

@@ -0,0 +1,48 @@
+package info.bukova.isspst.ui.main.orders.requirements;
+
+import info.bukova.isspst.data.Requirement;
+import info.bukova.isspst.data.Workgroup;
+import info.bukova.isspst.filters.RequirementFilter;
+import info.bukova.isspst.services.requirement.RequirementService;
+import info.bukova.isspst.services.users.UserService;
+import info.bukova.isspst.services.workgroups.WorkgroupService;
+import info.bukova.isspst.ui.requirement.RequirementSubpage;
+
+import java.util.List;
+
+import org.zkoss.bind.annotation.Init;
+import org.zkoss.zk.ui.select.annotation.WireVariable;
+
+public class ReqListMyAll extends RequirementSubpage<Requirement>
+{
+
+	@WireVariable
+	private RequirementService requirementService;
+
+	@WireVariable
+	private UserService userService;
+
+	@WireVariable
+	private WorkgroupService workgroupService;
+
+	public List<Workgroup> getCentres()
+	{
+		return workgroupService.getUserCentres(userService.getCurrent());
+	}
+
+	@Init
+	public void init()
+	{
+		super.init();
+		service = requirementService;
+		dataClass = Requirement.class;
+		formZul = "reqForm.zul";
+		dataFilter = new RequirementFilter(getFilterTemplate());
+	}
+
+	@Override
+	protected List<Requirement> getListFromService()
+	{
+		return super.getListFromService();
+	}
+}

src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java

@@ -0,0 +1,48 @@
+package info.bukova.isspst.ui.main.orders.requirements;
+
+import info.bukova.isspst.data.Requirement;
+import info.bukova.isspst.data.Workgroup;
+import info.bukova.isspst.filters.RequirementFilter;
+import info.bukova.isspst.services.requirement.RequirementService;
+import info.bukova.isspst.services.users.UserService;
+import info.bukova.isspst.services.workgroups.WorkgroupService;
+import info.bukova.isspst.ui.requirement.RequirementSubpage;
+
+import java.util.List;
+
+import org.zkoss.bind.annotation.Init;
+import org.zkoss.zk.ui.select.annotation.WireVariable;
+
+public class ReqListMyCenters extends RequirementSubpage<Requirement>
+{
+
+	@WireVariable
+	private RequirementService requirementService;
+
+	@WireVariable
+	private UserService userService;
+
+	@WireVariable
+	private WorkgroupService workgroupService;
+
+	public List<Workgroup> getCentres()
+	{
+		return workgroupService.getUserCentres(userService.getCurrent());
+	}
+
+	@Init
+	public void init()
+	{
+		super.init();
+		service = requirementService;
+		dataClass = Requirement.class;
+		formZul = "reqForm.zul";
+		dataFilter = new RequirementFilter(getFilterTemplate());
+	}
+
+	@Override
+	protected List<Requirement> getListFromService()
+	{
+		return super.getListFromService();
+	}
+}

src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java

@@ -0,0 +1,48 @@
+package info.bukova.isspst.ui.main.orders.requirements;
+
+import info.bukova.isspst.data.Requirement;
+import info.bukova.isspst.data.Workgroup;
+import info.bukova.isspst.filters.RequirementFilter;
+import info.bukova.isspst.services.requirement.RequirementService;
+import info.bukova.isspst.services.users.UserService;
+import info.bukova.isspst.services.workgroups.WorkgroupService;
+import info.bukova.isspst.ui.requirement.RequirementSubpage;
+
+import java.util.List;
+
+import org.zkoss.bind.annotation.Init;
+import org.zkoss.zk.ui.select.annotation.WireVariable;
+
+public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
+{
+
+	@WireVariable
+	private RequirementService requirementService;
+
+	@WireVariable
+	private UserService userService;
+
+	@WireVariable
+	private WorkgroupService workgroupService;
+
+	public List<Workgroup> getCentres()
+	{
+		return workgroupService.getUserCentres(userService.getCurrent());
+	}
+
+	@Init
+	public void init()
+	{
+		super.init();
+		service = requirementService;
+		dataClass = Requirement.class;
+		formZul = "reqForm.zul";
+		dataFilter = new RequirementFilter(getFilterTemplate());
+	}
+
+	@Override
+	protected List<Requirement> getListFromService()
+	{
+		return super.getListFromService();
+	}
+}

src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java

@@ -2,14 +2,34 @@ package info.bukova.isspst.ui.requirement;
 
 import info.bukova.isspst.data.RequirementBase;
 import info.bukova.isspst.services.requirement.RequirementBaseService;
+import info.bukova.isspst.ui.BigDecimalConverter;
 import info.bukova.isspst.ui.ListViewModel;
 
 import org.zkoss.bind.BindUtils;
 import org.zkoss.bind.annotation.Command;
+import org.zkoss.bind.annotation.Init;
 import org.zkoss.bind.annotation.NotifyChange;
 
 public class RequirementSubpage<T extends RequirementBase> extends ListViewModel<T> {
 	
+	private BigDecimalConverter bigDecimalConverter;
+
+	public BigDecimalConverter getBigDecimalConverter()
+	{
+		return bigDecimalConverter;
+	}
+
+	public void setBigDecimalConverter(BigDecimalConverter bigDecimalConverter)
+	{
+		this.bigDecimalConverter = bigDecimalConverter;
+	}
+
+	@Init
+	public void init()
+	{
+		this.bigDecimalConverter = new BigDecimalConverter();
+	}
+
 	@SuppressWarnings("unchecked")
 	private RequirementBaseService<T> getReqService()
 	{

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -207,7 +207,10 @@ false=Ne
 Information=Informace
 Requirements=Požadavky
 Orders=Objednávky
+CurrentRequirements=Aktuální požadavky
+ApprovedOrders=Schválené objednávky
 BussinessTrips=Služební cesty
+TravelOrders=Cestovní příkazy
 Lists=Seznamy
 Settings=Nastavení
 Administration=Administrace

src/main/webapp/app/mainMenu.zul

@@ -11,15 +11,28 @@
 			label="${labels.Information}"
 			href="/" />
 		<menuseparator />
+		<menu label="${labels.Orders}">
+			<menupopup>
 				<menuitem
-			label="${labels.Requirements}"
+					image="/img/req-order-016.png"
-			href="/requirements/actual" />
+					label="${labels.CurrentRequirements}"
-		<!-- menuitem
+					href="/main/orders/requirements/" />
-			label="${labels.Orders}"
-			href="/orders/actual" /-->
 				<menuitem
-			label="${labels.BussinessTrips}"
+					label="${labels.ApprovedOrders}"
+					href="" />
+			</menupopup>
+		</menu>
+		<menu label="${labels.BussinessTrips}">
+			<menupopup>
+				<menuitem
+					image="/img/req-trip-016.png"
+					label="${labels.CurrentRequirements}"
 					href="/trips/requirement" />
+				<menuitem
+					label="${labels.TravelOrders}"
+					href="" />
+			</menupopup>
+		</menu>
 		<menuseparator />
 		<menu label="${labels.Lists}">
 			<menupopup>
@@ -40,6 +53,7 @@
 					href="/lists/buildings"
 					disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
 				<menuitem
+					image="/img/tape-measure-016.png"
 					label="${labels.AgendaMUnits}"
 					href="/lists/munits"
 					disabled="${not sec:isAllGranted('PERM_READ_MUNITS')}" />
@@ -48,6 +62,7 @@
 		<menu label="${labels.Settings}">
 			<menupopup>
 				<menuitem
+					image="/img/global-setting-016.png"
 					label="${labels.GlobalSettings}…"
 					onClick="@command('globalSettings')" />
 				<menuitem
@@ -78,6 +93,7 @@
 		<menu label="${labels.User}">
 			<menupopup>
 				<menuitem
+					image=""
 					label="${labels.ChangePassword}…"
 					onClick="@command('passwd')" />
 				<menuitem

src/main/webapp/app/template.zhtml

@@ -41,16 +41,18 @@
 		});
 		</script>
 	
-	<div id="container">
+	<div id="screen">
 		<div id="header">
 			<u:include src="/app/header.zul" />
 		</div>
 		<div id="mainMenu">
 			<u:include src="/app/mainMenu.zul" />
 		</div>
-		<div id="maincolumn">
+		<div id="mainData">
 			<u:include src="${gridZul}" />
 		</div>
-		<div id="footer">Josef Rokos &amp; František Přibyl</div>
+		<div id="footer">
+			Josef Rokos &amp; František Přibyl
+		</div>
 	</div>
 </html>

src/main/webapp/css/page.css

@@ -1,43 +1,69 @@
 html {
 	/*vertical scrollbar allways visible */
-	overflow: -moz-scrollbars-vertical;
+	--overflow: -moz-scrollbars-vertical;
-	overflow-y: scroll;
+	--overflow-y: scroll;
+	
 	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
-#container {
+html, body {
+	height: 100%;
+	margin: 0px 0px 0px 0px;
+	padding: 0px;
+}
+
+#screen {
+	width: 100%;
 	min-height: 100%;
-	position: relative;
-}
-
-#header {
-	width: auto;
-	height: 60px;
-	border: 1px solid #ccc;
-
-}
-
-#navbar {
-	border: 1px solid #ccc;
-}
-
-#maincolumn {
-	padding-top: 5px;
-	padding-bottom: 25px; /* Height of the footer */
 	margin: 0px 0px 0px 0px;
 }
 
-#footer {
+#header {
-	width: 100%;
+	height: 60px;
-	clear: both;
+	padding-top: 5px;
+	padding-bottom: 5px;
+
+	/* při úzkém sloupci gridu neodřádkuje slova podle mezer */
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+#mainMenu {
+	height: 30px;
+	overflow: hidden;
+}
+
+#mainData {
 	position: absolute;
-	bottom: 5px;
+	width: 100%;
-	height: 20px; /* Height of the footer */
+	top: 105px;
-	border: 1px solid #ccc;
+	bottom: 25px;
+	
+	overflow: auto;
+
+	margin: 0px 0px 0px 0px;
+	padding: 0px;
+}
+
+#footer {
+	position: absolute;
+	bottom: 0px;
+
+	width: 100%;
+	height: 20px;			/* height of the footer */
+	margin: 0px;
+	padding: 0px;
+	padding-top: 5px;
+
+	border: 0px solid #ccc;
 	text-align: center;
 	vertical-align: center;
 	font-size: 10px;
 	color: gray;
+	
+	/* při úzkém sloupci gridu neodřádkuje slova podle mezer */
+	white-space: nowrap;
+	overflow: hidden;
 }
 
 .form-caption {
@@ -51,3 +77,15 @@ html {
 .form-caption-content {
 	float: left;
 }
+
+.form-caption-image	{
+	padding-right: 5px;
+}
+
+/*
+html, body	{	background-color: red;	}
+#screen		{	background-color: lightgreen;	}
+#mainMenu	{	background-color: yellow;	}
+#mainData	{	background-color: cyan;	}
+#footer		{	background-color: orange;	}
+*/

src/main/webapp/css/zk-modify.css

@@ -37,5 +37,12 @@
 }
 
 .row-title	{
+	/* ve formuláři zarovná u víceřádkových editů label nahoru */
 	vertical-align: top;
 }
+
+.z-listcell-content	{
+	/* při úzkém sloupci gridu neodřádkuje slova podle mezer */
+	white-space: nowrap;
+}
+

src/main/webapp/lists/munits/munitsForm.zul

@@ -1,24 +1,41 @@
 <?page title="${labels.MUnitsFormTitle}" contentType="text/html;charset=UTF-8"?>
 <zk>
-	<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsForm')">
+	<window
-		<caption src="/img/munits.png" zclass="form-caption" label="${labels.MUnitsFormTitle}" />
+		id="editWin"
+		closable="true"
+		border="normal"
+		position="center"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsForm')">
+		<caption
+			src="/img/tape-measure-032.png"
+			zclass="form-caption"
+			label="${labels.MUnitsFormTitle}" />
 		<vlayout>
 			<grid hflex="min">
 				<columns>
-					<column align="right" hflex="min" />
+					<column
+						align="right"
+						hflex="min" />
 					<column />
 				</columns>
 				<rows>
 					<row>
 						<cell sclass="row-title">${labels.MUnitsFormName} :</cell>
 						<cell>
-							<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" />
+							<textbox
+								id="name"
+								width="200px"
+								value="@bind(vm.dataBean.name)" />
 						</cell>
 					</row>
 					<row>
 						<cell sclass="row-title">${labels.MUnitsFormDescription} :</cell>
 						<cell>
-							<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
+							<textbox
+								id="description"
+								width="300px"
+								value="@bind(vm.dataBean.description)" />
 						</cell>
 					</row>
 				</rows>

src/main/webapp/lists/munits/munitsGrid.zul

@@ -1,21 +1,41 @@
 <?page title="${labels.AgendaMUnits}" contentType="text/html;charset=UTF-8"?>
 <zk>
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
-	<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsList')">
+	<window
-		<caption zclass="form-caption" label="${labels.AgendaMUnits}" />
+		vflex="1"
+		border="normal"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsList')">
+		<caption
+			src="/img/tape-measure-032.png"
+			zclass="form-caption"
+			label="${labels.AgendaMUnits}" />
 		<include src="/app/toolbar.zul" />
-
+		<listbox
-		<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
+			vflex="1"
+			model="@load(vm.dataList)"
+			selectedItem="@bind(vm.dataBean)">
 			<listhead menupopup="auto">
-				<listheader label="${labels.MUnitsGridColumnName}" sort="czech(name)" width="30%" />
+				<listheader
-				<listheader label="${labels.MUnitsGridColumnDescription}" sort="czech(description)" width="70%" />
+					label="${labels.MUnitsGridColumnName}"
+					sort="czech(name)"
+					width="30%" />
+				<listheader
+					label="${labels.MUnitsGridColumnDescription}"
+					sort="czech(description)"
+					width="70%" />
 			</listhead>
-
+			<auxhead
-			<auxhead sclass="category-center" visible="@load(vm.filter)">
+				sclass="category-center"
+				visible="@load(vm.filter)">
 				<auxheader>
 					<div sclass="find-grid-cell">
 						<div sclass="find-grid-divtextbox">
-							<textbox value="@bind(vm.filterTemplate.name)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							<textbox
+								value="@bind(vm.filterTemplate.name)"
+								instant="true"
+								onChange="@command('doFilter')"
+								sclass="find-grid-textbox" />
 						</div>
 						<div sclass="find-grid-img">
 							<image src="/img/funnel.png" />
@@ -25,7 +45,11 @@
 				<auxheader>
 					<div sclass="find-grid-cell">
 						<div sclass="find-grid-divtextbox">
-							<textbox value="@bind(vm.filterTemplate.description)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							<textbox
+								value="@bind(vm.filterTemplate.description)"
+								instant="true"
+								onChange="@command('doFilter')"
+								sclass="find-grid-textbox" />
 						</div>
 						<div sclass="find-grid-img">
 							<image src="/img/funnel.png" />
@@ -33,7 +57,6 @@
 					</div>
 				</auxheader>
 			</auxhead>
-
 			<template name="model">
 				<listitem>
 					<listcell label="@load(each.name)" />
@@ -41,6 +64,5 @@
 				</listitem>
 			</template>
 		</listbox>
-
 	</window>
 </zk>

src/main/webapp/main/orders/requirements/index.zul

@@ -2,9 +2,9 @@
 <zk>
 
 <zscript>
-	String gridZul = "requirements.zul";
+	String gridZul = "setup.zul";
 </zscript>
 
-<include src="../../app/template.zhtml"/>
+<include src="/app/template.zhtml"/>
 
 </zk>

src/main/webapp/main/orders/requirements/reqForm.zul

@@ -9,7 +9,7 @@
 		viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementForm')"
 		validationMessages="@id('vmsg')">
 		<caption
-			src="/img/reqact.png"
+			image="/img/req-order-032.png"
 			zclass="form-caption"
 			label="${labels.RequirementsFormTitle}" />
 		<vlayout

src/main/webapp/main/orders/requirements/reqListMy.zul

@@ -1,17 +1,15 @@
-<?page title="${labels.AgendaActRequirements}" contentType="text/html;charset=UTF-8"?>
 <zk>
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 	<window
-		border="normal"
+		vflex="1"
+		border="none"
 		apply="org.zkoss.bind.BindComposer"
-		viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementList')">
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.requirements.ReqListMy')">
-		<caption
-			zclass="form-caption"
-			label="${labels.AgendaActRequirements}" />
 		<include src="/app/toolbar.zul" />
 		<listbox
-			model="@load(vm.dataList)"
+			vflex="1"
-			selectedItem="@bind(vm.dataBean)">
+			selectedItem="@bind(vm.dataBean)"
+			model="@load(vm.dataList)">
 			<listhead menupopup="auto">
 				<listheader
 					label="${labels.RequirementsGridNumberSerie}"

src/main/webapp/main/orders/requirements/reqListMyAll.zul

@@ -0,0 +1,144 @@
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window
+		vflex="1"
+		border="none"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.requirements.ReqListMyAll')">
+		<include src="/main/toolbar.zul" />
+		<listbox
+			vflex="1"
+			selectedItem="@bind(vm.dataBean)"
+			model="@load(vm.dataList)">
+			<listhead menupopup="auto">
+				<listheader
+					label="${labels.RequirementsGridNumberSerie}"
+					sort="czech(numser)"
+					width="7%" />
+				<listheader
+					label="${labels.RequirementsGridReqDate}"
+					sort="auto(reqDate)"
+					width="13%" />
+				<listheader
+					label="${labels.RequirementsGridCenter}"
+					sort="czech(description)"
+					width="10%" />
+				<listheader
+					label="${labels.RequirementsGridDeliveryDate}"
+					sort="auto(reqDate)"
+					width="13%" />
+				<listheader
+					label="${labels.Amount}"
+					sort="auto(sumTotal)"
+					align="right"
+					width="10%" />
+				<listheader
+					label="${labels.RequirementsGridDescription}"
+					sort="czech(description)"
+					width="60%" />
+			</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.numser)"
+								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">
+							<datebox
+								value="@bind(vm.filterTemplate.reqDate)"
+								format="${labels.DateFormat}"
+								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">
+						<combobox
+							model="@load(vm.centres)"
+							readonly="true"
+							width="100%"
+							selectedItem="@bind(vm.filterTemplate.workgroup)">
+							<template name="model">
+								<comboitem label="@load(each.fullName)" />
+							</template>
+						</combobox>
+						<div sclass="find-grid-img">
+							<image src="/img/funnel.png" />
+						</div>
+					</div>
+				</auxheader>
+				<auxheader>
+					<div sclass="find-grid-cell">
+						<div sclass="find-grid-divtextbox">
+							<datebox
+								value="@bind(vm.filterTemplate.deliveryDate)"
+								format="${labels.DateFormat}"
+								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.sumTotal) @converter(vm.bigDecimalConverter)"
+								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.description)"
+								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.numser)" />
+					<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
+					<listcell label="@load(each.workgroup.fullName)" />
+					<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
+					<listcell label="@load(each.sumTotal) @converter(vm.bigDecimalConverter)" />
+					<listcell label="@load(each.description)" />
+				</listitem>
+			</template>
+		</listbox>
+	</window>
+</zk>

src/main/webapp/main/orders/requirements/reqListMyCenters.zul

@@ -0,0 +1,144 @@
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window
+		vflex="1"
+		border="none"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.requirements.ReqListMyCenters')">
+		<include src="/main/toolbar.zul" />
+		<listbox
+			vflex="1"
+			selectedItem="@bind(vm.dataBean)"
+			model="@load(vm.dataList)">
+			<listhead menupopup="auto">
+				<listheader
+					label="${labels.RequirementsGridNumberSerie}"
+					sort="czech(numser)"
+					width="7%" />
+				<listheader
+					label="${labels.RequirementsGridReqDate}"
+					sort="auto(reqDate)"
+					width="13%" />
+				<listheader
+					label="${labels.RequirementsGridCenter}"
+					sort="czech(description)"
+					width="10%" />
+				<listheader
+					label="${labels.RequirementsGridDeliveryDate}"
+					sort="auto(reqDate)"
+					width="13%" />
+				<listheader
+					label="${labels.Amount}"
+					sort="auto(sumTotal)"
+					align="right"
+					width="10%" />
+				<listheader
+					label="${labels.RequirementsGridDescription}"
+					sort="czech(description)"
+					width="60%" />
+			</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.numser)"
+								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">
+							<datebox
+								value="@bind(vm.filterTemplate.reqDate)"
+								format="${labels.DateFormat}"
+								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">
+						<combobox
+							model="@load(vm.centres)"
+							readonly="true"
+							width="100%"
+							selectedItem="@bind(vm.filterTemplate.workgroup)">
+							<template name="model">
+								<comboitem label="@load(each.fullName)" />
+							</template>
+						</combobox>
+						<div sclass="find-grid-img">
+							<image src="/img/funnel.png" />
+						</div>
+					</div>
+				</auxheader>
+				<auxheader>
+					<div sclass="find-grid-cell">
+						<div sclass="find-grid-divtextbox">
+							<datebox
+								value="@bind(vm.filterTemplate.deliveryDate)"
+								format="${labels.DateFormat}"
+								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.sumTotal) @converter(vm.bigDecimalConverter)"
+								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.description)"
+								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.numser)" />
+					<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
+					<listcell label="@load(each.workgroup.fullName)" />
+					<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
+					<listcell label="@load(each.sumTotal) @converter(vm.bigDecimalConverter)" />
+					<listcell label="@load(each.description)" />
+				</listitem>
+			</template>
+		</listbox>
+	</window>
+</zk>

src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul

@@ -0,0 +1,144 @@
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window
+		vflex="1"
+		border="none"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.requirements.ReqListMyWorkgroups')">
+		<include src="/main/toolbar.zul" />
+		<listbox
+			vflex="1"
+			selectedItem="@bind(vm.dataBean)"
+			model="@load(vm.dataList)">
+			<listhead menupopup="auto">
+				<listheader
+					label="${labels.RequirementsGridNumberSerie}"
+					sort="czech(numser)"
+					width="7%" />
+				<listheader
+					label="${labels.RequirementsGridReqDate}"
+					sort="auto(reqDate)"
+					width="13%" />
+				<listheader
+					label="${labels.RequirementsGridCenter}"
+					sort="czech(description)"
+					width="10%" />
+				<listheader
+					label="${labels.RequirementsGridDeliveryDate}"
+					sort="auto(reqDate)"
+					width="13%" />
+				<listheader
+					label="${labels.Amount}"
+					sort="auto(sumTotal)"
+					align="right"
+					width="10%" />
+				<listheader
+					label="${labels.RequirementsGridDescription}"
+					sort="czech(description)"
+					width="60%" />
+			</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.numser)"
+								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">
+							<datebox
+								value="@bind(vm.filterTemplate.reqDate)"
+								format="${labels.DateFormat}"
+								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">
+						<combobox
+							model="@load(vm.centres)"
+							readonly="true"
+							width="100%"
+							selectedItem="@bind(vm.filterTemplate.workgroup)">
+							<template name="model">
+								<comboitem label="@load(each.fullName)" />
+							</template>
+						</combobox>
+						<div sclass="find-grid-img">
+							<image src="/img/funnel.png" />
+						</div>
+					</div>
+				</auxheader>
+				<auxheader>
+					<div sclass="find-grid-cell">
+						<div sclass="find-grid-divtextbox">
+							<datebox
+								value="@bind(vm.filterTemplate.deliveryDate)"
+								format="${labels.DateFormat}"
+								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.sumTotal) @converter(vm.bigDecimalConverter)"
+								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.description)"
+								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.numser)" />
+					<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
+					<listcell label="@load(each.workgroup.fullName)" />
+					<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
+					<listcell label="@load(each.sumTotal) @converter(vm.bigDecimalConverter)" />
+					<listcell label="@load(each.description)" />
+				</listitem>
+			</template>
+		</listbox>
+	</window>
+</zk>

src/main/webapp/main/orders/requirements/setup.zul

@@ -0,0 +1,21 @@
+<?page title="new page title" contentType="text/html;charset=UTF-8"?>
+<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+<zk>
+	<zscript>
+	String gridMy = "/main/orders/requirements/reqListMy.zul";
+	String gridMyCenters = "/main/orders/requirements/reqListMyCenters.zul";
+	String gridMyWorkgroups = "/main/orders/requirements/reqListMyWorkgroups.zul";
+	String gridAll = "/main/orders/requirements/reqListMyAll.zul";
+</zscript>
+	<window
+		vflex="1"
+		border="normal">
+		<caption
+			image="/img/req-order-032.png"
+			zclass="form-caption"
+			label="${labels.AgendaActRequirements}" />
+		<include
+			vflex="1"
+			src="/main/tabPanels.zul" />
+	</window>
+</zk>

src/main/webapp/main/tabPanels.zul

@@ -0,0 +1,22 @@
+<tabbox vflex="1">
+	<tabs>
+		<tab label="${labels.RequirementsGridMy}" />
+		<tab label="${labels.RequirementsGridMyCentres}" />
+		<tab label="${labels.RequirementsGridMyWorkgroups}" />
+		<tab label="${labels.RequirementsGridAll}" />
+	</tabs>
+	<tabpanels>
+		<tabpanel>
+			<include src="${gridMy}" />
+		</tabpanel>
+		<tabpanel>
+			<include src="${gridMyCenters}" />
+		</tabpanel>
+		<tabpanel>
+			<include src="${gridMyWorkgroups}" />
+		</tabpanel>
+		<tabpanel>
+			<include src="${gridAll}" />
+		</tabpanel>
+	</tabpanels>
+</tabbox>

src/main/webapp/main/toolbar.zul

@@ -0,0 +1,8 @@
+<?page title="req toolbar" contentType="text/html;charset=UTF-8"?>
+<zk>
+<toolbar>
+	<toolbarbutton image="/img/edit.png" tooltiptext="${labels.ToolbarRecEdit}" id="btnEdit" onClick="@command('edit')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
+	<toolbarbutton image="/img/funnel.png" tooltiptext="${labels.ToolbarRecFilter}" id="btnFilter" onClick="@command('filter')" />
+	<toolbarbutton image="/img/print.png" tooltiptext="${labels.ToolbarPrint}" id="btnPrint" onClick="@command('onPrint')" />
+</toolbar>
+</zk>

src/main/webapp/settings/globalSettings.zul

@@ -1,40 +1,50 @@
-<?page title="EMail" contentType="text/html;charset=UTF-8"?>
+<?page title="${labels.GlobalSettings}" contentType="text/html;charset=UTF-8"?>
 <zk>
-<window id="editWin" border="normal" closable="true" apply="org.zkoss.bind.BindComposer"
+	<window
-viewModel="@id('vm') @init('info.bukova.isspst.ui.settings.GlobalSettingsVM')" width="820px"
+		id="editWin"
-binder="@init(queueName='email')">
+		border="normal"
-<caption src="/img/settings.png" zclass="form-caption" label="${labels.GlobalSettings}" />
+		closable="true"
-
+		apply="org.zkoss.bind.BindComposer"
-	<tabbox orient="vertical" height="500px">
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.settings.GlobalSettingsVM')"
+		width="700px"
+		height="600px"
+		binder="@init(queueName='email')">
+		<caption
+			src="/img/global-setting-032.png"
+			zclass="form-caption"
+			label="${labels.GlobalSettings}" />
+		<tabbox
+			orient="vertical"
+			vflex="1">
 			<tabs width="140px">
-			<tab label="${labels.Requirements}"/>
+				<tab label="${labels.Requirements}" />
-			<tab label="${labels.EMails}"/>
+				<tab label="${labels.EMails}" />
-			<tab label="${labels.ContactInfo }"/>
+				<tab label="${labels.ContactInfo }" />
-			<tab label="${labels.BankInfo}"/>
+				<tab label="${labels.BankInfo}" />
-			<tab label="${labels.TravelOrders}"/>
+				<tab label="${labels.TravelOrders}" />
 			</tabs>
 			<tabpanels>
 				<tabpanel>
 					<div>
-					<checkbox label="${labels.EnableRequirements}" checked="@bind(vm.settings.enableRequirements)"/>
+						<checkbox
+							label="${labels.EnableRequirements}"
+							checked="@bind(vm.settings.enableRequirements)" />
 					</div>
 				</tabpanel>
 				<tabpanel>
-				<include src="/settings/global/email.zul"/>
+					<include src="/settings/global/email.zul" />
 				</tabpanel>
 				<tabpanel>
-				<include src="/settings/global/address.zul"/>
+					<include src="/settings/global/address.zul" />
 				</tabpanel>
 				<tabpanel>
-				<include src="/settings/global/bank.zul"/>
+					<include src="/settings/global/bank.zul" />
 				</tabpanel>
 				<tabpanel>
-				<include src="/settings/global/travelOrders.zul"/>
+					<include src="/settings/global/travelOrders.zul" />
 				</tabpanel>
 			</tabpanels>
 		</tabbox>
-
+		<include src="/app/formButtons.zul" />
-	
+	</window>
-	<include src="/app/formButtons.zul"/>
-</window>
 </zk>