Merge branch 'master' of https://git.bukova.info/repos/git/isspst

src/main/webapp/WEB-INF/lang-addons/BooleanFilterListbox.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE xml>
+<language-addon>
+	<addon-name>BooleanFilterListbox</addon-name>
+	<language-name>xul/html</language-name>
+	<component>
+		<component-name>booleanfilterlistbox</component-name>
+		<extends>listbox</extends>
+		<component-class>info.bukova.isspst.filters.BooleanFilterListbox</component-class>
+	</component>
+</language-addon>

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

@@ -289,6 +289,9 @@ DbValidationError=Chyba validace
 true=Ano
 false=Ne
 
+LabelAll=Vše
+LabelYes=Ano
+LabelNo=Ne
 
 
 Information=Informace
@@ -301,6 +304,7 @@ MaterialRequirements=Požadavky na materiál
 ServiceRequirement=Požadavek na službu
 ServiceRequirements=Požadavky na služby
 ApprovedRequirementItems=Schválené položky požadavků
+Material = Materiál
 
 CurrentRequirements=Aktuální požadavky
 CreatedOrders=Vytvořené objednávky

src/main/webapp/WEB-INF/zk.xml

@@ -18,6 +18,7 @@
 		<addon-uri>/WEB-INF/lang-addons/mapa-lang-addon.xml</addon-uri>
 		<addon-uri>/WEB-INF/lang-addons/ckez-bind-lang-addon.xml</addon-uri>
 		<addon-uri>/WEB-INF/lang-addons/CzechSortListheader.xml</addon-uri>
+		<addon-uri>/WEB-INF/lang-addons/BooleanFilterListbox.xml</addon-uri>
 	</language-config>
 	<desktop-config>
 		<theme-uri>/css/zk-modify.css</theme-uri>

src/main/webapp/main/orders/approved/grid.zul

@@ -32,9 +32,13 @@
 			<listhead menupopup="auto">
 				<listheader width="27" />
 				<listheader
-          hflex="6"
-          sort="czech(requirement.numser)"
-          label="${labels.InvoicingRequirementNumber}" />
+					hflex="4"
+					sort="auto(itemMaterialReal)"
+					label="${labels.Material}" />
+				<listheader
+					hflex="6"
+					sort="czech(requirement.numser)"
+					label="${labels.InvoicingRequirementNumber}" />
 				<listheader
 					hflex="7"
 					sort="czech(code)"
@@ -86,20 +90,25 @@
 			<auxhead visible="@load(vm.filter)">
 				<auxheader />
 				<auxheader>
-          <div sclass="find-grid-cell">
-            <div sclass="find-grid-divtextbox">
-              <textbox
-                value="@bind(vm.filterTemplate.requirement.numser)"
-                instant="true"
-                onChange="@command('doFilter')"
-                maxlength="@load(vm.lengthText)"
-                sclass="find-grid-textbox" />
-            </div>
-            <div sclass="find-grid-img">
-              <image src="/img/funnel.png" />
-            </div>
-          </div>
-        </auxheader>
+					<booleanfilterlistbox
+						selectedItem="@bind(vm.itemMaterial)"
+						onSelect="@command('doFilter')" />
+				</auxheader>
+				<auxheader>
+					<div sclass="find-grid-cell">
+						<div sclass="find-grid-divtextbox">
+							<textbox
+								value="@bind(vm.filterTemplate.requirement.numser)"
+								instant="true"
+								onChange="@command('doFilter')"
+								maxlength="@load(vm.lengthText)"
+								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">
@@ -287,14 +296,15 @@
 			<template name="model">
 				<listitem context="popupMenu">
 					<listcell />
-					<listcell label="@load(each.requirement.numser)"/>
+					<listcell label="@load(each.itemMaterialReal) @converter(vm.standardBoolConverter)" />
+					<listcell label="@load(each.requirement.numser)" />
 					<listcell label="@load(each.code)" />
 					<listcell label="@load(each.name)" />
 					<listcell label="@load(each.textItem)" />
-					<listcell label="@load(each.quantity) @converter(vm.bigDecimalConverter)" />
+					<listcell label="@load(each.quantity) @converter(vm.standardBigDecimalConverter)" />
 					<listcell label="@load(each.munit.name)" />
-					<listcell label="@load(each.unitPrice) @converter(vm.bigDecimalConverter)" />
-					<listcell label="@load(each.total) @converter(vm.bigDecimalConverter)" />
+					<listcell label="@load(each.unitPrice) @converter(vm.standardBigDecimalConverter)" />
+					<listcell label="@load(each.total) @converter(vm.standardBigDecimalConverter)" />
 					<listcell label="@load(each.workgroup.fullName)" />
 					<listcell label="@load(each.centre.fullName)" />
 					<listcell label="@load(each.ownedBy.fullName)" />