Požadavky na materiály a služby

- do záložek [Má střediska], [Mé komise] a [Vše] přidán sloupec
[Vytvořil]
- opraveno plnění a filtrování středisek na všech záložkách
- služba userService přesunuta do třídy RequirementSubpage

closes #144

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

@@ -8,28 +8,28 @@
 		<listheader
 			label="${labels.RequirementsGridNumberSerie}"
 			sort="czech(numser)"
-			width="7%" />
+			hflex="7" />
 		<listheader
 			label="${labels.RequirementsGridReqDate}"
 			sort="auto(reqDate)"
-			width="13%" />
+			hflex="13" />
 		<listheader
 			label="${labels.RequirementsGridCenter}"
-			sort="czech(description)"
-			width="10%" />
+			sort="auto(centre)"
+			hflex="15" />
 		<listheader
 			label="${labels.RequirementsGridDeliveryDate}"
 			sort="auto(reqDate)"
-			width="13%" />
+			hflex="13" />
 		<listheader
 			label="${labels.Amount}"
 			sort="auto(sumTotal)"
 			align="right"
-			width="10%" />
+			hflex="10" />
 		<listheader
 			label="${labels.RequirementsGridDescription}"
 			sort="czech(description)"
-			width="60%" />
+			hflex="20" />
 	</listhead>
 	<auxhead
 		sclass="category-center"
@@ -66,10 +66,13 @@
 		<auxheader>
 			<div sclass="find-grid-cell">
 				<combobox
+					ctrlKeys="${labels.HandleComboKeyFilter}"
+					onCtrlKey="@command('handleComboKeyFilter', ctrl=self, keyEvent=event)"
+					onChange="@command('doFilter')"
 					model="@load(vm.centres)"
 					readonly="true"
 					width="100%"
-					selectedItem="@bind(vm.filterTemplate.workgroup)">
+					selectedItem="@bind(vm.filterTemplate.centre)">
 					<template name="model">
 						<comboitem label="@load(each.fullName)" />
 					</template>

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

@@ -10,28 +10,32 @@
 			<listheader
 				label="${labels.RequirementsGridNumberSerie}"
 				sort="czech(numser)"
-				width="7%" />
+				hflex="7" />
 			<listheader
 				label="${labels.RequirementsGridReqDate}"
 				sort="auto(reqDate)"
-				width="13%" />
+				hflex="13" />
 			<listheader
 				label="${labels.RequirementsGridCenter}"
-				sort="czech(description)"
-				width="10%" />
+				sort="auto(centre)"
+				hflex="15" />
 			<listheader
 				label="${labels.RequirementsGridDeliveryDate}"
 				sort="auto(reqDate)"
-				width="13%" />
+				hflex="13" />
 			<listheader
 				label="${labels.Amount}"
 				sort="auto(sumTotal)"
 				align="right"
-				width="10%" />
+				hflex="10" />
 			<listheader
 				label="${labels.RequirementsGridDescription}"
 				sort="czech(description)"
-				width="60%" />
+				hflex="20" />
+			<listheader
+				sort="auto(ownedBy.fullName)"
+				label="${labels.ownedBy}"
+				hflex="15" />
 		</listhead>
 		<auxhead
 			sclass="category-center"
@@ -68,10 +72,13 @@
 			<auxheader>
 				<div sclass="find-grid-cell">
 					<combobox
+						ctrlKeys="${labels.HandleComboKeyFilter}"
+						onCtrlKey="@command('handleComboKeyFilter', ctrl=self, keyEvent=event)"
+						onChange="@command('doFilter')"
 						model="@load(vm.centres)"
 						readonly="true"
 						width="100%"
-						selectedItem="@bind(vm.filterTemplate.workgroup)">
+						selectedItem="@bind(vm.filterTemplate.centre)">
 						<template name="model">
 							<comboitem label="@load(each.fullName)" />
 						</template>
@@ -124,6 +131,27 @@
 					</div>
 				</div>
 			</auxheader>
+			<auxheader>
+				<div zclass="find-grid-cell">
+					<div sclass="find-grid-divtextbox">
+						<combobox
+							ctrlKeys="${labels.HandleComboKeyFilter}"
+							onCtrlKey="@command('handleComboKeyFilter', ctrl=self, keyEvent=event)"
+							onChange="@command('doFilter')"
+							width="100%"
+							selectedItem="@bind(vm.filterTemplate.ownedBy)"
+							model="@load(vm.allUsers)"
+							readonly="true">
+							<template name="model">
+								<comboitem label="@load(each.fullName)" />
+							</template>
+						</combobox>
+					</div>
+					<div sclass="find-grid-img">
+						<image src="/img/funnel.png" />
+					</div>
+				</div>
+			</auxheader>
 		</auxhead>
 		<template name="model">
 			<listitem>
@@ -133,6 +161,7 @@
 				<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
 				<listcell label="@load(each.sumTotal) @converter(vm.bigDecimalConverter)" />
 				<listcell label="@load(each.description)" />
+				<listcell label="@load(each.ownedBy.fullName)" />
 			</listitem>
 		</template>
 	</listbox>

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

@@ -10,28 +10,32 @@
 			<listheader
 				label="${labels.RequirementsGridNumberSerie}"
 				sort="czech(numser)"
-				width="7%" />
+				hflex="7" />
 			<listheader
 				label="${labels.RequirementsGridReqDate}"
 				sort="auto(reqDate)"
-				width="13%" />
+				hflex="13" />
 			<listheader
 				label="${labels.RequirementsGridCenter}"
-				sort="czech(description)"
-				width="10%" />
+				sort="auto(centre)"
+				hflex="15" />
 			<listheader
 				label="${labels.RequirementsGridDeliveryDate}"
 				sort="auto(reqDate)"
-				width="13%" />
+				hflex="13" />
 			<listheader
 				label="${labels.Amount}"
 				sort="auto(sumTotal)"
 				align="right"
-				width="10%" />
+				hflex="10" />
 			<listheader
 				label="${labels.RequirementsGridDescription}"
 				sort="czech(description)"
-				width="60%" />
+				hflex="20" />
+			<listheader
+				sort="auto(ownedBy.fullName)"
+				label="${labels.ownedBy}"
+				hflex="15" />
 		</listhead>
 		<auxhead
 			sclass="category-center"
@@ -68,10 +72,13 @@
 			<auxheader>
 				<div sclass="find-grid-cell">
 					<combobox
+						ctrlKeys="${labels.HandleComboKeyFilter}"
+						onCtrlKey="@command('handleComboKeyFilter', ctrl=self, keyEvent=event)"
+						onChange="@command('doFilter')"
 						model="@load(vm.centres)"
 						readonly="true"
 						width="100%"
-						selectedItem="@bind(vm.filterTemplate.workgroup)">
+						selectedItem="@bind(vm.filterTemplate.centre)">
 						<template name="model">
 							<comboitem label="@load(each.fullName)" />
 						</template>
@@ -124,6 +131,27 @@
 					</div>
 				</div>
 			</auxheader>
+			<auxheader>
+				<div zclass="find-grid-cell">
+					<div sclass="find-grid-divtextbox">
+						<combobox
+							ctrlKeys="${labels.HandleComboKeyFilter}"
+							onCtrlKey="@command('handleComboKeyFilter', ctrl=self, keyEvent=event)"
+							onChange="@command('doFilter')"
+							width="100%"
+							selectedItem="@bind(vm.filterTemplate.ownedBy)"
+							model="@load(vm.allUsers)"
+							readonly="true">
+							<template name="model">
+								<comboitem label="@load(each.fullName)" />
+							</template>
+						</combobox>
+					</div>
+					<div sclass="find-grid-img">
+						<image src="/img/funnel.png" />
+					</div>
+				</div>
+			</auxheader>
 		</auxhead>
 		<template name="model">
 			<listitem>
@@ -133,6 +161,7 @@
 				<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
 				<listcell label="@load(each.sumTotal) @converter(vm.bigDecimalConverter)" />
 				<listcell label="@load(each.description)" />
+				<listcell label="@load(each.ownedBy.fullName)" />
 			</listitem>
 		</template>
 	</listbox>

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

@@ -10,28 +10,32 @@
 			<listheader
 				label="${labels.RequirementsGridNumberSerie}"
 				sort="czech(numser)"
-				width="7%" />
+				hflex="7" />
 			<listheader
 				label="${labels.RequirementsGridReqDate}"
 				sort="auto(reqDate)"
-				width="13%" />
+				hflex="13" />
 			<listheader
 				label="${labels.RequirementsGridCenter}"
-				sort="czech(description)"
-				width="10%" />
+				sort="auto(centre)"
+				hflex="15" />
 			<listheader
 				label="${labels.RequirementsGridDeliveryDate}"
 				sort="auto(reqDate)"
-				width="13%" />
+				hflex="13" />
 			<listheader
 				label="${labels.Amount}"
 				sort="auto(sumTotal)"
 				align="right"
-				width="10%" />
+				hflex="10" />
 			<listheader
 				label="${labels.RequirementsGridDescription}"
 				sort="czech(description)"
-				width="60%" />
+				hflex="20" />
+			<listheader
+				sort="auto(ownedBy.fullName)"
+				label="${labelsownedBy}"
+				hflex="15" />
 		</listhead>
 		<auxhead
 			sclass="category-center"
@@ -68,10 +72,13 @@
 			<auxheader>
 				<div sclass="find-grid-cell">
 					<combobox
+						ctrlKeys="${labels.HandleComboKeyFilter}"
+						onCtrlKey="@command('handleComboKeyFilter', ctrl=self, keyEvent=event)"
+						onChange="@command('doFilter')"
 						model="@load(vm.centres)"
 						readonly="true"
 						width="100%"
-						selectedItem="@bind(vm.filterTemplate.workgroup)">
+						selectedItem="@bind(vm.filterTemplate.centre)">
 						<template name="model">
 							<comboitem label="@load(each.fullName)" />
 						</template>
@@ -124,6 +131,27 @@
 					</div>
 				</div>
 			</auxheader>
+			<auxheader>
+				<div zclass="find-grid-cell">
+					<div sclass="find-grid-divtextbox">
+						<combobox
+							ctrlKeys="${labels.HandleComboKeyFilter}"
+							onCtrlKey="@command('handleComboKeyFilter', ctrl=self, keyEvent=event)"
+							onChange="@command('doFilter')"
+							width="100%"
+							selectedItem="@bind(vm.filterTemplate.ownedBy)"
+							model="@load(vm.allUsers)"
+							readonly="true">
+							<template name="model">
+								<comboitem label="@load(each.fullName)" />
+							</template>
+						</combobox>
+					</div>
+					<div sclass="find-grid-img">
+						<image src="/img/funnel.png" />
+					</div>
+				</div>
+			</auxheader>
 		</auxhead>
 		<template name="model">
 			<listitem>
@@ -133,6 +161,7 @@
 				<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
 				<listcell label="@load(each.sumTotal) @converter(vm.bigDecimalConverter)" />
 				<listcell label="@load(each.description)" />
+				<listcell label="@load(each.ownedBy.fullName)" />
 			</listitem>
 		</template>
 	</listbox>