From 12b814360c9ae43f27902c8661ae0fc72f49a3c9 Mon Sep 17 00:00:00 2001
From: Franta Pribyl <pribyl.franta@gmail.com>
Date: Sun, 25 May 2014 07:00:20 +0200
Subject: [PATCH] =?UTF-8?q?Agenda=20Budovy=20-=20zprovozn=C4=9Bno=20t?=
 =?UTF-8?q?=C5=99=C3=ADd=C4=9Bn=C3=AD=20-=20zprovozn=C4=9Bny=20filtry=20-?=
 =?UTF-8?q?=20textboxy=20filtr=C5=AF=20se=20nyn=C3=AD=20roztahuj=C3=AD=20-?=
 =?UTF-8?q?=20css=20styly=20se=20na=C4=8D=C3=ADtaj=C3=AD=20p=C5=99es=20zk.?=
 =?UTF-8?q?xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/bukova/isspst/ui/BuildingList.java   |  6 ++-
 src/main/webapp/WEB-INF/zk.xml                |  4 ++
 src/main/webapp/buildings/building.zul        | 40 +++++++++++++++++--
 src/main/webapp/buildings/buildingForm.zul    |  5 +--
 src/main/webapp/css/zk-modify.css             | 18 +++++++++
 5 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 src/main/webapp/css/zk-modify.css

diff --git a/src/main/java/info/bukova/isspst/ui/BuildingList.java b/src/main/java/info/bukova/isspst/ui/BuildingList.java
index 6b9d50e9..aadc1384 100644
--- a/src/main/java/info/bukova/isspst/ui/BuildingList.java
+++ b/src/main/java/info/bukova/isspst/ui/BuildingList.java
@@ -1,21 +1,23 @@
 package info.bukova.isspst.ui;
 
 import info.bukova.isspst.data.Building;
+import info.bukova.isspst.filters.BuildingFilter;
 import info.bukova.isspst.services.buildings.BuildingService;
 
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
 
 public class BuildingList extends ListViewModel<Building> {
-	
+
 	@WireVariable
 	private BuildingService buildingService;
-	
+
 	@Init
 	public void init() {
 		service = buildingService;
 		dataClass = Building.class;
 		formZul = "buildingForm.zul";
+		dataFilter = new BuildingFilter(getFilterTemplate());
 	}
 
 }
diff --git a/src/main/webapp/WEB-INF/zk.xml b/src/main/webapp/WEB-INF/zk.xml
index 3eec7dba..987088e0 100644
--- a/src/main/webapp/WEB-INF/zk.xml
+++ b/src/main/webapp/WEB-INF/zk.xml
@@ -23,6 +23,10 @@
         <addon-uri>/WEB-INF/ckez-bind-lang-addon.xml</addon-uri>
     </language-config>
     
+	<desktop-config>
+		<theme-uri>/css/zk-modify.css</theme-uri>
+	</desktop-config>
+    
     <!-- <library-property>
     	<name>org.zkoss.zul.progressbox.position</name>
     	<value>center</value>
diff --git a/src/main/webapp/buildings/building.zul b/src/main/webapp/buildings/building.zul
index ae8e1c7a..c2c583d8 100644
--- a/src/main/webapp/buildings/building.zul
+++ b/src/main/webapp/buildings/building.zul
@@ -3,14 +3,46 @@
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 	<window title="${labels.AgendaBuildings}" border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.BuildingList')">
 
-		<include src="/app/toolbar.zul"/>
+		<include src="/app/toolbar.zul" />
 
 		<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
 			<listhead>
-				<listheader label="${labels.BuildingsGridColumnCode}" width="10%" />
-				<listheader label="${labels.BuildingsGridColumnName}" width="30%" />
-				<listheader label="${labels.BuildingsGridColumnDescription}" width="60%" />
+				<listheader label="${labels.BuildingsGridColumnCode}" sort="auto(code)" onSort="@command('onSort', column='code')" width="10%" />
+				<listheader label="${labels.BuildingsGridColumnName}" sort="auto(name)" onSort="@command('onSort', column='name')" width="30%" />
+				<listheader label="${labels.BuildingsGridColumnDescription}" sort="auto(description)" onSort="@command('onSort', column='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.code)" 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.name)" 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.code)" />
diff --git a/src/main/webapp/buildings/buildingForm.zul b/src/main/webapp/buildings/buildingForm.zul
index 4d96b660..47b41ef8 100644
--- a/src/main/webapp/buildings/buildingForm.zul
+++ b/src/main/webapp/buildings/buildingForm.zul
@@ -1,5 +1,4 @@
 <?page title="${labels.AgendaBuildings}" contentType="text/html;charset=UTF-8"?>
-<!--?link rel="stylesheet" type="text/css" href="/app/page.css"?-->
 <zk>
 	<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.BuildingForm')">
 		<caption src="/img/building.png" zclass="form-caption" label="${labels.FormBuilding}" />
@@ -19,13 +18,13 @@
 					<row>
 						<cell sclass="row-title">${labels.BuildingsFormName} :</cell>
 						<cell>
-							<textbox 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.BuildingsFormDescription} :</cell>
 						<cell>
-							<textbox width="300px" value="@bind(vm.dataBean.description)" />
+							<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
 						</cell>
 					</row>
 				</rows>
diff --git a/src/main/webapp/css/zk-modify.css b/src/main/webapp/css/zk-modify.css
new file mode 100644
index 00000000..84a1f57a
--- /dev/null
+++ b/src/main/webapp/css/zk-modify.css
@@ -0,0 +1,18 @@
+.find-grid-cell {
+	display: table;
+	width: 100%;
+}
+
+.find-grid-img {
+	display: table-cell;
+	width: 20px;
+	text-align: right;
+}
+
+.find-grid-divtextbox {
+	display: table-cell;
+}
+
+.find-grid-textbox {
+	width: 100%;
+}
\ No newline at end of file