From 07d78ba3f1021daff2bb4478764c7c174195a622 Mon Sep 17 00:00:00 2001
From: Franta Pribyl <pribyl.franta@gmail.com>
Date: Wed, 13 Aug 2014 10:33:06 +0200
Subject: [PATCH] =?UTF-8?q?Sjednoceny=20po=C5=BEadavky=20na=20objedn=C3=A1?=
 =?UTF-8?q?vky=20s=20po=C5=BEadavky=20na=20cestovn=C3=AD=20p=C5=99=C3=ADka?=
 =?UTF-8?q?z.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #115
---
 .../ui/requirement/RequirementForm.java       |   2 +-
 src/main/webapp/app/mainMenu.zul              |   4 +-
 .../{requirements => main}/approveStatus.zul  |   6 +-
 .../main/orders/requirements/reqListMyAll.zul |   2 +-
 .../orders/requirements/reqListMyCenters.zul  |   2 +-
 .../requirements/reqListMyWorkgroups.zul      |   2 +-
 .../selectitems => main}/selectItems.zul      |   0
 .../webapp/{ => main}/trips/bill/index.zul    |   0
 .../{ => main}/trips/bill/tripBillForm.zul    |   0
 .../{ => main}/trips/bill/tripBillGrid.zul    |   2 +-
 .../webapp/main/trips/requirements/index.zul  |  10 +
 .../main/trips/requirements/reqListMy.zul     | 127 +++++++++++++
 .../main/trips/requirements/reqListMyAll.zul  | 176 ++++++++++++++++++
 .../trips/requirements/reqListMyCenters.zul   | 154 +++++++++++++++
 .../requirements/reqListMyWorkgroups.zul      | 176 ++++++++++++++++++
 .../trips/requirements}/requirementsForm.zul  |   0
 .../webapp/main/trips/requirements/setup.zul  |  21 +++
 src/main/webapp/requirements/toolbar.zul      |   8 -
 .../requirement/index.zul                     |   0
 .../requirement/requirements.zul              |  86 ++++-----
 .../requirement/requirementsForm.zul          | 167 +++++++++++++++++
 21 files changed, 884 insertions(+), 61 deletions(-)
 rename src/main/webapp/{requirements => main}/approveStatus.zul (80%)
 rename src/main/webapp/{requirements/selectitems => main}/selectItems.zul (100%)
 rename src/main/webapp/{ => main}/trips/bill/index.zul (100%)
 rename src/main/webapp/{ => main}/trips/bill/tripBillForm.zul (100%)
 rename src/main/webapp/{ => main}/trips/bill/tripBillGrid.zul (97%)
 create mode 100644 src/main/webapp/main/trips/requirements/index.zul
 create mode 100644 src/main/webapp/main/trips/requirements/reqListMy.zul
 create mode 100644 src/main/webapp/main/trips/requirements/reqListMyAll.zul
 create mode 100644 src/main/webapp/main/trips/requirements/reqListMyCenters.zul
 create mode 100644 src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul
 rename src/main/webapp/{trips/requirement => main/trips/requirements}/requirementsForm.zul (100%)
 create mode 100644 src/main/webapp/main/trips/requirements/setup.zul
 delete mode 100644 src/main/webapp/requirements/toolbar.zul
 rename src/main/webapp/{trips => trips-delete}/requirement/index.zul (100%)
 rename src/main/webapp/{trips => trips-delete}/requirement/requirements.zul (88%)
 create mode 100644 src/main/webapp/trips-delete/requirement/requirementsForm.zul

diff --git a/src/main/java/info/bukova/isspst/ui/requirement/RequirementForm.java b/src/main/java/info/bukova/isspst/ui/requirement/RequirementForm.java
index ff097c07..403a527c 100644
--- a/src/main/java/info/bukova/isspst/ui/requirement/RequirementForm.java
+++ b/src/main/java/info/bukova/isspst/ui/requirement/RequirementForm.java
@@ -119,7 +119,7 @@ public class RequirementForm extends FormViewModel<Requirement>
 	@Command
 	public void addSelectedItem()
 	{
-		Window window = (Window) Executions.createComponents("/requirements/selectitems/selectItems.zul", null, null);
+		Window window = (Window) Executions.createComponents("/main/selectItems.zul", null, null);
 		window.doModal();
 	}
 
diff --git a/src/main/webapp/app/mainMenu.zul b/src/main/webapp/app/mainMenu.zul
index 11893cf6..f2c63a2f 100644
--- a/src/main/webapp/app/mainMenu.zul
+++ b/src/main/webapp/app/mainMenu.zul
@@ -27,11 +27,11 @@
 				<menuitem
 					image="/img/req-trip-016.png"
 					label="${labels.CurrentRequirements}"
-					href="/trips/requirement" />
+					href="/main/trips/requirements/" />
 				<menuitem
 					image="/img/pickup-024.png"
 					label="${labels.TravelOrders}"
-					href="/trips/bill" />
+					href="/main/trips/bill" />
 			</menupopup>
 		</menu>
 		<menuseparator />
diff --git a/src/main/webapp/requirements/approveStatus.zul b/src/main/webapp/main/approveStatus.zul
similarity index 80%
rename from src/main/webapp/requirements/approveStatus.zul
rename to src/main/webapp/main/approveStatus.zul
index df1a13c7..093c02b8 100644
--- a/src/main/webapp/requirements/approveStatus.zul
+++ b/src/main/webapp/main/approveStatus.zul
@@ -2,10 +2,10 @@
 <zk>
 
 	<label value="Stav schválení: "/>
-	<button label="Schválit" onClick="@command('approve')" disabled="@load(not vmSub.canApprove)"/>
-	<vbox children="@load(vmSub.dataBean.workflow)">
+	<button label="Schválit" onClick="@command('approve')" disabled="@load(not vm.canApprove)"/>
+	<vbox children="@load(vm.dataBean.workflow)">
 		<template name="children">
-			<grid model="@load(vmSub.dataBean.authorization)">
+			<grid model="@load(vm.dataBean.authorization)">
 				<columns>
 					<column label="@load(each.role.description)"/>
 					<column label="Datum"/>
diff --git a/src/main/webapp/main/orders/requirements/reqListMyAll.zul b/src/main/webapp/main/orders/requirements/reqListMyAll.zul
index 26db6f00..4eb3bd58 100644
--- a/src/main/webapp/main/orders/requirements/reqListMyAll.zul
+++ b/src/main/webapp/main/orders/requirements/reqListMyAll.zul
@@ -143,7 +143,7 @@
 				</template>
 			</listbox>
 			<div hflex="3">
-				<include src="/requirements/approveStatus.zul" />
+				<include src="/main/approveStatus.zul" />
 			</div>
 		</hbox>
 	</window>
diff --git a/src/main/webapp/main/orders/requirements/reqListMyCenters.zul b/src/main/webapp/main/orders/requirements/reqListMyCenters.zul
index 00253f10..b6aa74ec 100644
--- a/src/main/webapp/main/orders/requirements/reqListMyCenters.zul
+++ b/src/main/webapp/main/orders/requirements/reqListMyCenters.zul
@@ -143,7 +143,7 @@
 				</template>
 			</listbox>
 			<div hflex="3">
-				<include src="/requirements/approveStatus.zul" />
+				<include src="/main/approveStatus.zul" />
 			</div>
 		</hbox>
 	</window>
diff --git a/src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul b/src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul
index e5a9b800..07347d49 100644
--- a/src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul
+++ b/src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul
@@ -143,7 +143,7 @@
 				</template>
 			</listbox>
 			<div hflex="3">
-				<include src="/requirements/approveStatus.zul" />
+				<include src="/main/approveStatus.zul" />
 			</div>
 		</hbox>
 	</window>
diff --git a/src/main/webapp/requirements/selectitems/selectItems.zul b/src/main/webapp/main/selectItems.zul
similarity index 100%
rename from src/main/webapp/requirements/selectitems/selectItems.zul
rename to src/main/webapp/main/selectItems.zul
diff --git a/src/main/webapp/trips/bill/index.zul b/src/main/webapp/main/trips/bill/index.zul
similarity index 100%
rename from src/main/webapp/trips/bill/index.zul
rename to src/main/webapp/main/trips/bill/index.zul
diff --git a/src/main/webapp/trips/bill/tripBillForm.zul b/src/main/webapp/main/trips/bill/tripBillForm.zul
similarity index 100%
rename from src/main/webapp/trips/bill/tripBillForm.zul
rename to src/main/webapp/main/trips/bill/tripBillForm.zul
diff --git a/src/main/webapp/trips/bill/tripBillGrid.zul b/src/main/webapp/main/trips/bill/tripBillGrid.zul
similarity index 97%
rename from src/main/webapp/trips/bill/tripBillGrid.zul
rename to src/main/webapp/main/trips/bill/tripBillGrid.zul
index a4b23a3c..8ddcebf6 100644
--- a/src/main/webapp/trips/bill/tripBillGrid.zul
+++ b/src/main/webapp/main/trips/bill/tripBillGrid.zul
@@ -10,7 +10,7 @@
 			src="/img/pickup-032.png"
 			zclass="form-caption"
 			label="${labels.TravelOrders}" />
-		<include src="/requirements/toolbar.zul" />
+		<include src="/main/toolbar.zul" />
 		<listbox
 			vflex="1"
 			model="@load(vm.dataList)"
diff --git a/src/main/webapp/main/trips/requirements/index.zul b/src/main/webapp/main/trips/requirements/index.zul
new file mode 100644
index 00000000..57ae3d87
--- /dev/null
+++ b/src/main/webapp/main/trips/requirements/index.zul
@@ -0,0 +1,10 @@
+<?page title="${labels.AgendaActRequirements}" contentType="text/html;charset=UTF-8"?>
+<zk>
+
+<zscript>
+	String gridZul = "setup.zul";
+</zscript>
+
+<include src="/app/template.zhtml"/>
+
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/main/trips/requirements/reqListMy.zul b/src/main/webapp/main/trips/requirements/reqListMy.zul
new file mode 100644
index 00000000..baa0168f
--- /dev/null
+++ b/src/main/webapp/main/trips/requirements/reqListMy.zul
@@ -0,0 +1,127 @@
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window
+		vflex="1"
+		border="normal"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementList')">
+		<include src="/app/toolbar.zul" />
+		<listbox
+			vflex="1"
+			model="@load(vm.dataList)"
+			selectedItem="@bind(vm.dataBean)"
+			onAfterRender="@command('afterRender')"
+			selectedIndex="@bind(vm.selIndex)">
+			<listhead
+				menupopup="auto"
+				sizable="true">
+				<listheader
+					label="${labels.RequirementsGridNumberSerie}"
+					sort="czech(numser)"
+					width="180px" />
+				<listheader
+					label="${labels.RequirementsGridReqDate}"
+					sort="auto(reqDate)"
+					width="200px" />
+				<listheader
+					label="${labels.RequirementsGridCenter}"
+					sort="auto(centre)" />
+				<listheader
+					label="${labels.RequirementsGridFrom}"
+					sort="czech(from)" />
+				<listheader
+					label="${labels.RequirementsGridTo}"
+					sort="czech(to)" />
+			</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"
+								width="100%" />
+						</div>
+						<div sclass="find-grid-img">
+							<image src="/img/funnel.png" />
+						</div>
+					</div>
+				</auxheader>
+				<auxheader>
+					<div sclass="find-grid-cell">
+						<combobox
+							readonly="true"
+							width="100%"
+							selectedItem="@bind(vm.filterTemplate.centre)"
+							model="@load(vm.myCentres)"
+							onChange="@command('doFilter')">
+							<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">
+							<textbox
+								value="@bind(vm.filterTemplate.from)"
+								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.to)"
+								instant="true"
+								onChange="@command('doFilter')"
+								sclass="find-grid-textbox"
+								width="100%" />
+						</div>
+						<div sclass="find-grid-img">
+							<image src="/img/funnel.png" />
+						</div>
+					</div>
+				</auxheader>
+			</auxhead>
+			<template name="model">
+				<listitem style="@load((each.state eq 'PARTIALLY') ? 'background-color: #fffb90' : ((each.state eq 'APPROVED') ? 'background-color: #afffb5' : ''))">
+					<listcell label="@load(each.numser)" />
+					<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
+					<listcell label="@load(each.centre.fullName)" />
+					<listcell label="@load(each.from)" />
+					<listcell label="@load(each.to)" />
+				</listitem>
+			</template>
+		</listbox>
+	</window>
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/main/trips/requirements/reqListMyAll.zul b/src/main/webapp/main/trips/requirements/reqListMyAll.zul
new file mode 100644
index 00000000..3b8da9d1
--- /dev/null
+++ b/src/main/webapp/main/trips/requirements/reqListMyAll.zul
@@ -0,0 +1,176 @@
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window
+		vflex="1"
+		border="normal"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementListAll')">
+		<include src="/main/toolbar.zul" />
+		<hbox vflex="1">
+			<listbox
+				model="@load(vm.dataList)"
+				selectedItem="@bind(vm.dataBean)"
+				hflex="7"
+				onAfterRender="@command('afterRender')"
+				selectedIndex="@bind(vm.selIndex)"
+				vflex="1">
+				<listhead menupopup="auto">
+					<listheader
+						label="${labels.RequirementsGridNumberSerie}"
+						sort="czech(numser)"
+						width="10%" />
+					<listheader
+						label="${labels.RequirementsGridReqDate}"
+						sort="auto(reqDate)"
+						width="13%" />
+					<listheader
+						label="${labels.RequirementsGridCenter}"
+						sort="auto(centre)"
+						width="10%" />
+					<listheader
+						label="${labels.RequirementsGridWorkgroup}"
+						sort="auto(workgroup)"
+						width="10%" />
+					<listheader
+						label="${labels.RequirementsGridFrom}"
+						sort="czech(from)"
+						width="30%" />
+					<listheader
+						label="${labels.RequirementsGridTo}"
+						sort="czech(to)"
+						width="30%" />
+					<listheader
+						label="${labels.RequirementsGridOwnedBy}"
+						sort="auto(ownedBy)"
+						width="20%" />
+				</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"
+									width="100%" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+					<auxheader>
+						<div sclass="find-grid-cell">
+							<combobox
+								readonly="true"
+								width="100%"
+								selectedItem="@bind(vm.filterTemplate.centre)"
+								model="@load(vm.allCentres)"
+								onChange="@command('doFilter')">
+								<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">
+							<combobox
+								readonly="true"
+								width="100%"
+								selectedItem="@bind(vm.filterTemplate.workgroup)"
+								model="@load(vm.allWorkgroups)"
+								onChange="@command('doFilter')">
+								<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">
+								<textbox
+									value="@bind(vm.filterTemplate.from)"
+									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.to)"
+									instant="true"
+									onChange="@command('doFilter')"
+									sclass="find-grid-textbox"
+									width="100%" />
+							</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.ownedBy.lastName)"
+									instant="true"
+									onChange="@command('doFilter')"
+									sclass="find-grid-textbox"
+									width="100%" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+				</auxhead>
+				<template name="model">
+					<listitem style="@load((each.state eq 'PARTIALLY') ? 'background-color: #fffb90' : ((each.state eq 'APPROVED') ? 'background-color: #afffb5' : ''))">
+						<listcell label="@load(each.numser)" />
+						<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
+						<listcell label="@load(each.centre.fullName)" />
+						<listcell label="@load(each.workgroup.fullName)" />
+						<listcell label="@load(each.from)" />
+						<listcell label="@load(each.to)" />
+						<listcell label="@load(each.ownedBy)" />
+					</listitem>
+				</template>
+			</listbox>
+			<div hflex="3">
+				<include src="/main/approveStatus.zul" />
+			</div>
+		</hbox>
+	</window>
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/main/trips/requirements/reqListMyCenters.zul b/src/main/webapp/main/trips/requirements/reqListMyCenters.zul
new file mode 100644
index 00000000..6c9fd8a6
--- /dev/null
+++ b/src/main/webapp/main/trips/requirements/reqListMyCenters.zul
@@ -0,0 +1,154 @@
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window
+		vflex="1"
+		border="normal"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementListCentre')">
+		<include src="/main/toolbar.zul" />
+		<hbox vflex="1">
+			<listbox
+				model="@load(vm.dataList)"
+				selectedItem="@bind(vm.dataBean)"
+				hflex="7"
+				onAfterRender="@command('afterRender')"
+				selectedIndex="@bind(vm.selIndex)"
+				vflex="1">
+				<listhead menupopup="auto">
+					<listheader
+						label="${labels.RequirementsGridNumberSerie}"
+						sort="czech(numser)"
+						width="10%" />
+					<listheader
+						label="${labels.RequirementsGridReqDate}"
+						sort="auto(reqDate)"
+						width="13%" />
+					<listheader
+						label="${labels.RequirementsGridCenter}"
+						sort="auto(centre)"
+						width="10%" />
+					<listheader
+						label="${labels.RequirementsGridFrom}"
+						sort="auto(from)"
+						width="40%" />
+					<listheader
+						label="${labels.RequirementsGridTo}"
+						sort="czech(to)"
+						width="40%" />
+					<listheader
+						label="${labels.RequirementsGridOwnedBy}"
+						sort="auto(ownedBy)"
+						width="20%" />
+				</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"
+									width="100%" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+					<auxheader>
+						<div sclass="find-grid-cell">
+							<combobox
+								readonly="true"
+								width="100%"
+								selectedItem="@bind(vm.filterTemplate.centre)"
+								model="@load(vm.myCentres)"
+								onChange="@command('doFilter')">
+								<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">
+								<textbox
+									value="@bind(vm.filterTemplate.from)"
+									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.to)"
+									instant="true"
+									onChange="@command('doFilter')"
+									sclass="find-grid-textbox"
+									width="100%" />
+							</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.ownedBy.lastName)"
+									instant="true"
+									onChange="@command('doFilter')"
+									sclass="find-grid-textbox"
+									width="100%" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+				</auxhead>
+				<template name="model">
+					<listitem style="@load((each.state eq 'PARTIALLY') ? 'background-color: #fffb90' : ((each.state eq 'APPROVED') ? 'background-color: #afffb5' : ''))">
+						<listcell label="@load(each.numser)" />
+						<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
+						<listcell label="@load(each.centre.fullName)" />
+						<listcell label="@load(each.from)" />
+						<listcell label="@load(each.to)" />
+						<listcell label="@load(each.ownedBy)" />
+					</listitem>
+				</template>
+			</listbox>
+			<div hflex="3">
+				<include src="/main/approveStatus.zul" />
+			</div>
+		</hbox>
+	</window>
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul b/src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul
new file mode 100644
index 00000000..6db716c9
--- /dev/null
+++ b/src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul
@@ -0,0 +1,176 @@
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window
+		vflex="1"
+		border="normal"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementListWorkgroup')">
+		<include src="/main/toolbar.zul" />
+		<hbox vflex="1">
+			<listbox
+				model="@load(vm.dataList)"
+				selectedItem="@bind(vm.dataBean)"
+				hflex="7"
+				onAfterRender="@command('afterRender')"
+				selectedIndex="@bind(vm.selIndex)"
+				vflex="1">
+				<listhead menupopup="auto">
+					<listheader
+						label="${labels.RequirementsGridNumberSerie}"
+						sort="czech(numser)"
+						width="10%" />
+					<listheader
+						label="${labels.RequirementsGridReqDate}"
+						sort="auto(reqDate)"
+						width="13%" />
+					<listheader
+						label="${labels.RequirementsGridCenter}"
+						sort="auto(centre)"
+						width="10%" />
+					<listheader
+						label="${labels.RequirementsGridWorkgroup}"
+						sort="auto(workgroup)"
+						width="10%" />
+					<listheader
+						label="${labels.RequirementsGridFrom}"
+						sort="czech(from)"
+						width="30%" />
+					<listheader
+						label="${labels.RequirementsGridTo}"
+						sort="czech(to)"
+						width="30%" />
+					<listheader
+						label="${labels.RequirementsGridOwnedBy}"
+						sort="auto(ownedBy)"
+						width="20%" />
+				</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"
+									width="100%" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+					<auxheader>
+						<div sclass="find-grid-cell">
+							<combobox
+								readonly="true"
+								width="100%"
+								selectedItem="@bind(vm.filterTemplate.centre)"
+								model="@load(vm.myCentres)"
+								onChange="@command('doFilter')">
+								<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">
+							<combobox
+								readonly="true"
+								width="100%"
+								selectedItem="@bind(vm.filterTemplate.workgroup)"
+								model="@load(vm.myWorkgroups)"
+								onChange="@command('doFilter')">
+								<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">
+								<textbox
+									value="@bind(vm.filterTemplate.from)"
+									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.to)"
+									instant="true"
+									onChange="@command('doFilter')"
+									sclass="find-grid-textbox"
+									width="100%" />
+							</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.ownedBy.lastName)"
+									instant="true"
+									onChange="@command('doFilter')"
+									sclass="find-grid-textbox"
+									width="100%" />
+							</div>
+							<div sclass="find-grid-img">
+								<image src="/img/funnel.png" />
+							</div>
+						</div>
+					</auxheader>
+				</auxhead>
+				<template name="model">
+					<listitem style="@load((each.state eq 'PARTIALLY') ? 'background-color: #fffb90' : ((each.state eq 'APPROVED') ? 'background-color: #afffb5' : ''))">
+						<listcell label="@load(each.numser)" />
+						<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
+						<listcell label="@load(each.centre.fullName)" />
+						<listcell label="@load(each.workgroup.fullName)" />
+						<listcell label="@load(each.from)" />
+						<listcell label="@load(each.to)" />
+						<listcell label="@load(each.ownedBy)" />
+					</listitem>
+				</template>
+			</listbox>
+			<div hflex="3">
+				<include src="/main/approveStatus.zul" />
+			</div>
+		</hbox>
+	</window>
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/trips/requirement/requirementsForm.zul b/src/main/webapp/main/trips/requirements/requirementsForm.zul
similarity index 100%
rename from src/main/webapp/trips/requirement/requirementsForm.zul
rename to src/main/webapp/main/trips/requirements/requirementsForm.zul
diff --git a/src/main/webapp/main/trips/requirements/setup.zul b/src/main/webapp/main/trips/requirements/setup.zul
new file mode 100644
index 00000000..7dc0aa38
--- /dev/null
+++ b/src/main/webapp/main/trips/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/trips/requirements/reqListMy.zul";
+	String gridMyCenters = "/main/trips/requirements/reqListMyCenters.zul";
+	String gridMyWorkgroups = "/main/trips/requirements/reqListMyWorkgroups.zul";
+	String gridAll = "/main/trips/requirements/reqListMyAll.zul";
+</zscript>
+	<window
+		vflex="1"
+		border="normal">
+		<caption
+			image="/img/req-trip-032.png"
+			zclass="form-caption"
+			label="${labels.AgendaActRequirements}" />
+		<include
+			vflex="1"
+			src="/main/tabPanels.zul" />
+	</window>
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/requirements/toolbar.zul b/src/main/webapp/requirements/toolbar.zul
deleted file mode 100644
index 8da490e0..00000000
--- a/src/main/webapp/requirements/toolbar.zul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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 vmSub.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>
\ No newline at end of file
diff --git a/src/main/webapp/trips/requirement/index.zul b/src/main/webapp/trips-delete/requirement/index.zul
similarity index 100%
rename from src/main/webapp/trips/requirement/index.zul
rename to src/main/webapp/trips-delete/requirement/index.zul
diff --git a/src/main/webapp/trips/requirement/requirements.zul b/src/main/webapp/trips-delete/requirement/requirements.zul
similarity index 88%
rename from src/main/webapp/trips/requirement/requirements.zul
rename to src/main/webapp/trips-delete/requirement/requirements.zul
index 55e0294b..6a16d070 100644
--- a/src/main/webapp/trips/requirement/requirements.zul
+++ b/src/main/webapp/trips-delete/requirement/requirements.zul
@@ -142,17 +142,17 @@
 				</tabpanel>
 				
 				<tabpanel apply="org.zkoss.bind.BindComposer" 
-					viewModel="@id('vmSub') @init('info.bukova.isspst.ui.requirement.TripRequirementListCentre')"
+					viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementListCentre')"
 					vflex="1">
 					<include src="/requirements/toolbar.zul"/>
 				
 					<hbox vflex="1">					
 					<listbox
-						model="@load(vmSub.dataList)"
-						selectedItem="@bind(vmSub.dataBean)"
+						model="@load(vm.dataList)"
+						selectedItem="@bind(vm.dataBean)"
 						hflex="7"
 						onAfterRender="@command('afterRender')"
-						selectedIndex="@bind(vmSub.selIndex)"
+						selectedIndex="@bind(vm.selIndex)"
 						vflex="1">
 						<listhead menupopup="auto">
 							<listheader
@@ -182,12 +182,12 @@
 						</listhead>
 						<auxhead
 							sclass="category-center"
-							visible="@load(vmSub.filter)">
+							visible="@load(vm.filter)">
 							<auxheader>
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.numser)"
+											value="@bind(vm.filterTemplate.numser)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox" />
@@ -201,7 +201,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<datebox
-											value="@bind(vmSub.filterTemplate.reqDate)"
+											value="@bind(vm.filterTemplate.reqDate)"
 											format="${labels.DateFormat}"
 											instant="true"
 											onChange="@command('doFilter')"
@@ -218,8 +218,8 @@
 									<combobox
 										readonly="true"
 										width="100%"
-										selectedItem="@bind(vmSub.filterTemplate.centre)"
-										model="@load(vmSub.myCentres)"
+										selectedItem="@bind(vm.filterTemplate.centre)"
+										model="@load(vm.myCentres)"
 										onChange="@command('doFilter')">
 										<template name="model">
 											<comboitem label="@load(each.fullName)" />
@@ -234,7 +234,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.from)"
+											value="@bind(vm.filterTemplate.from)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox" />
@@ -248,7 +248,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.to)"
+											value="@bind(vm.filterTemplate.to)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox"
@@ -263,7 +263,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.ownedBy.lastName)"
+											value="@bind(vm.filterTemplate.ownedBy.lastName)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox"
@@ -288,23 +288,23 @@
 					</listbox>
 					
 					<div hflex="3">
-						<include src="/requirements/approveStatus.zul"/>
+						<include src="/main/approveStatus.zul"/>
 					</div>
 					
 					</hbox>
 				</tabpanel>
 				
 				<tabpanel apply="org.zkoss.bind.BindComposer"
-					viewModel="@id('vmSub') @init('info.bukova.isspst.ui.requirement.TripRequirementListWorkgroup')"
+					viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementListWorkgroup')"
 					vflex="1">
 					<include src="/requirements/toolbar.zul"/>
 					<hbox vflex="1">
 					<listbox
-						model="@load(vmSub.dataList)"
-						selectedItem="@bind(vmSub.dataBean)"
+						model="@load(vm.dataList)"
+						selectedItem="@bind(vm.dataBean)"
 						hflex="7"
 						onAfterRender="@command('afterRender')"
-						selectedIndex="@bind(vmSub.selIndex)"
+						selectedIndex="@bind(vm.selIndex)"
 						vflex="1">
 						<listhead menupopup="auto">
 							<listheader
@@ -338,12 +338,12 @@
 						</listhead>
 						<auxhead
 							sclass="category-center"
-							visible="@load(vmSub.filter)">
+							visible="@load(vm.filter)">
 							<auxheader>
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.numser)"
+											value="@bind(vm.filterTemplate.numser)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox" />
@@ -357,7 +357,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<datebox
-											value="@bind(vmSub.filterTemplate.reqDate)"
+											value="@bind(vm.filterTemplate.reqDate)"
 											format="${labels.DateFormat}"
 											instant="true"
 											onChange="@command('doFilter')"
@@ -374,8 +374,8 @@
 									<combobox
 										readonly="true"
 										width="100%"
-										selectedItem="@bind(vmSub.filterTemplate.centre)"
-										model="@load(vmSub.myCentres)"
+										selectedItem="@bind(vm.filterTemplate.centre)"
+										model="@load(vm.myCentres)"
 										onChange="@command('doFilter')">
 										<template name="model">
 											<comboitem label="@load(each.fullName)" />
@@ -391,8 +391,8 @@
 									<combobox
 										readonly="true"
 										width="100%"
-										selectedItem="@bind(vmSub.filterTemplate.workgroup)"
-										model="@load(vmSub.myWorkgroups)"
+										selectedItem="@bind(vm.filterTemplate.workgroup)"
+										model="@load(vm.myWorkgroups)"
 										onChange="@command('doFilter')">
 										<template name="model">
 											<comboitem label="@load(each.fullName)" />
@@ -407,7 +407,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.from)"
+											value="@bind(vm.filterTemplate.from)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox" />
@@ -421,7 +421,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.to)"
+											value="@bind(vm.filterTemplate.to)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox"
@@ -436,7 +436,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.ownedBy.lastName)"
+											value="@bind(vm.filterTemplate.ownedBy.lastName)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox"
@@ -462,22 +462,22 @@
 					</listbox>
 					
 					<div hflex="3">
-						<include src="/requirements/approveStatus.zul"/>
+						<include src="/main/approveStatus.zul"/>
 					</div>
 					
 					</hbox>
 				</tabpanel>
 				
 				<tabpanel vflex="1" apply="org.zkoss.bind.BindComposer"
-					viewModel="@id('vmSub') @init('info.bukova.isspst.ui.requirement.TripRequirementListAll')">
+					viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementListAll')">
 					<include src="/requirements/toolbar.zul"/>
 					<hbox vflex="1">
 					<listbox
-						model="@load(vmSub.dataList)"
-						selectedItem="@bind(vmSub.dataBean)"
+						model="@load(vm.dataList)"
+						selectedItem="@bind(vm.dataBean)"
 						hflex="7"
 						onAfterRender="@command('afterRender')"
-						selectedIndex="@bind(vmSub.selIndex)"
+						selectedIndex="@bind(vm.selIndex)"
 						vflex="1">
 						<listhead menupopup="auto">
 							<listheader
@@ -511,12 +511,12 @@
 						</listhead>
 						<auxhead
 							sclass="category-center"
-							visible="@load(vmSub.filter)">
+							visible="@load(vm.filter)">
 							<auxheader>
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.numser)"
+											value="@bind(vm.filterTemplate.numser)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox" />
@@ -530,7 +530,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<datebox
-											value="@bind(vmSub.filterTemplate.reqDate)"
+											value="@bind(vm.filterTemplate.reqDate)"
 											format="${labels.DateFormat}"
 											instant="true"
 											onChange="@command('doFilter')"
@@ -547,8 +547,8 @@
 									<combobox
 										readonly="true"
 										width="100%"
-										selectedItem="@bind(vmSub.filterTemplate.centre)"
-										model="@load(vmSub.allCentres)"
+										selectedItem="@bind(vm.filterTemplate.centre)"
+										model="@load(vm.allCentres)"
 										onChange="@command('doFilter')">
 										<template name="model">
 											<comboitem label="@load(each.fullName)" />
@@ -564,8 +564,8 @@
 									<combobox
 										readonly="true"
 										width="100%"
-										selectedItem="@bind(vmSub.filterTemplate.workgroup)"
-										model="@load(vmSub.allWorkgroups)"
+										selectedItem="@bind(vm.filterTemplate.workgroup)"
+										model="@load(vm.allWorkgroups)"
 										onChange="@command('doFilter')">
 										<template name="model">
 											<comboitem label="@load(each.fullName)" />
@@ -580,7 +580,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.from)"
+											value="@bind(vm.filterTemplate.from)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox" />
@@ -594,7 +594,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.to)"
+											value="@bind(vm.filterTemplate.to)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox"
@@ -609,7 +609,7 @@
 								<div sclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
 										<textbox
-											value="@bind(vmSub.filterTemplate.ownedBy.lastName)"
+											value="@bind(vm.filterTemplate.ownedBy.lastName)"
 											instant="true"
 											onChange="@command('doFilter')"
 											sclass="find-grid-textbox"
@@ -635,7 +635,7 @@
 					</listbox>
 					
 					<div hflex="3">
-						<include src="/requirements/approveStatus.zul"/>
+						<include src="/main/approveStatus.zul"/>
 					</div>
 					
 					</hbox>
diff --git a/src/main/webapp/trips-delete/requirement/requirementsForm.zul b/src/main/webapp/trips-delete/requirement/requirementsForm.zul
new file mode 100644
index 00000000..cef33b0e
--- /dev/null
+++ b/src/main/webapp/trips-delete/requirement/requirementsForm.zul
@@ -0,0 +1,167 @@
+<?page title="${labels.RequirementsFormTitle}" 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.requirement.TripRequirementForm')">
+		<caption
+			src="/img/reqact.png"
+			zclass="form-caption"
+			label="${labels.RequirementsFormTitle}" />
+		<vlayout form="@id('fx') @load(vm.dataBean) @save(vm.dataBean, before='save') @validator(vm.validator)">
+			<grid hflex="min">
+				<columns>
+					<column
+						align="right"
+						hflex="min" />
+					<column />
+				</columns>
+				<rows>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormNumberSerie} :</cell>
+						<cell>
+							<textbox
+								id="numser"
+								width="200px"
+								value="@bind(fx.numser)"
+								readonly="true" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormReqDate} :</cell>
+						<cell>
+							<datebox
+								id="reqDate"
+								width="200px"
+								value="@bind(fx.reqDate)"
+								format="${labels.DateFormat}" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormCenter} :</cell>
+						<cell>
+							<combobox
+								model="@load(vm.centres)"
+								readonly="true"
+								selectedItem="@bind(fx.centre)">
+								<template name="model">
+									<comboitem label="@load(each.fullName)" />
+								</template>
+							</combobox>
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormFrom} :</cell>
+						<cell>
+							<textbox
+								id="from"
+								width="300px"
+								value="@bind(fx.from)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormStartDateTime} :</cell>
+						<cell>
+							<hbox>
+							<datebox
+								id="tripDate"
+								width="200px"
+								format="medium"
+								value="@bind(fx.tripDate)" />
+							<timebox
+								id="tripTime"
+								width="90px"
+								format="short"
+								value="@bind(fx.tripDate)" />
+								
+							</hbox>
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormTo} :</cell>
+						<cell>
+							<textbox
+								id="to"
+								width="300px"
+								value="@bind(fx.to)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormPurpose} :</cell>
+						<cell>
+							<textbox
+								id="description"
+								width="300px"
+								value="@bind(fx.description)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormEndTravel} :</cell>
+						<cell>
+							<textbox
+								id="end"
+								width="200px"
+								value="@bind(fx.end)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormEndDate} :</cell>
+						<cell>
+							<datebox
+								id="endDate"
+								width="300px"
+								format="medium"
+								value="@bind(fx.endDate)" />
+						</cell>
+					</row>
+				</rows>
+			</grid>
+			<vbox>
+				<label value="${labels.RequirementsFormPassengers}"/>
+				<hbox>
+					<combobox model="@load(vm.users)"
+						autocomplete="true" 
+						selectedItem="@bind(vm.selUser)">
+						<template name="model">
+							<comboitem label="@load(each)"/>
+						</template>
+					</combobox>
+					<button label="${labels.AddItem}" 
+						onClick="@command('addPassanger')"
+						sclass="nicebutton"
+						disabled="@load(vm.selUser eq null)"/>
+				</hbox>
+				<grid model="@load(vm.passengers)" width="700px">
+					<columns>
+						<column/>
+						<column/>
+					</columns>
+					<rows>
+						<template name="model">
+							<row>
+								<label value="@load(each)"/>
+								<button label="${labels.RemoveItem}" 
+									onClick="@command('removePassanger', user=each)"
+									sclass="nicebutton"/>
+							</row>
+						</template>
+					</rows>
+				</grid>
+				<hbox>
+					<label value="${labels.RequirementsFormVehicle}"/>
+					<combobox model="@load(vm.settings.vehicles)" 
+						selectedItem="@bind(fx.vehicle)"
+						readonly="true">
+						<template name="model">
+							<comboitem label="@load(each)"/>
+						</template>
+					</combobox>
+				</hbox>
+			</vbox>
+			<include src="/app/formButtons.zul" />
+		</vlayout>
+	</window>
+</zk>
\ No newline at end of file