From a637a077c007e6fc7d1083468b049a8a44a40a3f Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Mon, 30 Jun 2014 14:27:52 +0200
Subject: [PATCH] =?UTF-8?q?Vytvo=C5=99en=C3=A1=20agenda=20Slu=C5=BEby.=20S?=
 =?UTF-8?q?ervisn=C3=AD=20t=C5=99=C3=ADdy=20agendy=20Materi=C3=A1l=20byly?=
 =?UTF-8?q?=20p=C5=99esunuty=20do=20bal=C3=ADku=20reqsubjects.=20closes=20?=
 =?UTF-8?q?#106?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/info/bukova/isspst/Constants.java    |   5 +-
 .../bukova/isspst/dao/ServiceItemDao.java     |   7 +++
 .../isspst/dao/jpa/ServiceItemDaoJPA.java     |   8 +++
 .../info/bukova/isspst/data/ServiceItem.java  |  10 +++
 .../isspst/filters/ServiceItemFilter.java     |  56 +++++++++++++++++
 .../MaterialService.java                      |   2 +-
 .../MaterialServiceImpl.java                  |   2 +-
 .../reqsubjects/ServiceItemService.java       |   8 +++
 .../reqsubjects/ServiceItemServiceImpl.java   |   9 +++
 .../MaterialForm.java                         |   2 +-
 .../MaterialList.java                         |   4 +-
 .../ui/reqsubjects/ServiceItemForm.java       |  15 +++++
 .../ui/reqsubjects/ServiceItemList.java       |  24 ++++++++
 src/main/resources/hibernate.cfg.xml          |   1 +
 .../WEB-INF/locales/zk-label.properties       |   3 +
 .../webapp/WEB-INF/spring/root-context.xml    |  11 +++-
 src/main/webapp/app/navigation.zul            |   1 +
 src/main/webapp/img/service.png               | Bin 0 -> 3657 bytes
 src/main/webapp/lists/material/material.zul   |   2 +-
 .../webapp/lists/material/materialForm.zul    |   2 +-
 src/main/webapp/lists/service/index.zul       |  10 +++
 src/main/webapp/lists/service/service.zul     |  58 ++++++++++++++++++
 src/main/webapp/lists/service/serviceForm.zul |  36 +++++++++++
 23 files changed, 267 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/info/bukova/isspst/dao/ServiceItemDao.java
 create mode 100644 src/main/java/info/bukova/isspst/dao/jpa/ServiceItemDaoJPA.java
 create mode 100644 src/main/java/info/bukova/isspst/data/ServiceItem.java
 create mode 100644 src/main/java/info/bukova/isspst/filters/ServiceItemFilter.java
 rename src/main/java/info/bukova/isspst/services/{material => reqsubjects}/MaterialService.java (75%)
 rename src/main/java/info/bukova/isspst/services/{material => reqsubjects}/MaterialServiceImpl.java (80%)
 create mode 100644 src/main/java/info/bukova/isspst/services/reqsubjects/ServiceItemService.java
 create mode 100644 src/main/java/info/bukova/isspst/services/reqsubjects/ServiceItemServiceImpl.java
 rename src/main/java/info/bukova/isspst/ui/{material => reqsubjects}/MaterialForm.java (94%)
 rename src/main/java/info/bukova/isspst/ui/{material => reqsubjects}/MaterialList.java (83%)
 create mode 100644 src/main/java/info/bukova/isspst/ui/reqsubjects/ServiceItemForm.java
 create mode 100644 src/main/java/info/bukova/isspst/ui/reqsubjects/ServiceItemList.java
 create mode 100644 src/main/webapp/img/service.png
 create mode 100644 src/main/webapp/lists/service/index.zul
 create mode 100644 src/main/webapp/lists/service/service.zul
 create mode 100644 src/main/webapp/lists/service/serviceForm.zul

diff --git a/src/main/java/info/bukova/isspst/Constants.java b/src/main/java/info/bukova/isspst/Constants.java
index 29e08c41..d1455733 100644
--- a/src/main/java/info/bukova/isspst/Constants.java
+++ b/src/main/java/info/bukova/isspst/Constants.java
@@ -9,7 +9,8 @@ import info.bukova.isspst.reporting.ReportMapping;
 import info.bukova.isspst.services.addressbook.AdbService;
 import info.bukova.isspst.services.buildings.BuildingService;
 import info.bukova.isspst.services.munits.MUnitService;
-import info.bukova.isspst.services.material.MaterialService;
+import info.bukova.isspst.services.reqsubjects.MaterialService;
+import info.bukova.isspst.services.reqsubjects.ServiceItemService;
 import info.bukova.isspst.services.requirement.RequirementService;
 import info.bukova.isspst.services.requirements.RequirementTypeService;
 import info.bukova.isspst.services.users.RoleService;
@@ -58,6 +59,7 @@ public class Constants {
 	public final static String MOD_BUILDINGS = "BUILDINGS";
 	public final static String MOD_MUNITS = "MUNITS";
 	public final static String MOD_MATERIAL = "MATERIAL";
+	public final static String MOD_SERVICES = "SERVICES";
 	public final static String MOD_WORKGROUPS = "WORKGROUPS";
 	public final static String MOD_REQUIREMENTS = "REQUIREMENTS";
 	public final static String MOD_WORKFLOW = "WORKFLOW";
@@ -68,6 +70,7 @@ public class Constants {
 		new Module(MOD_BUILDINGS, "Budovy", BuildingService.class),
 		new Module(MOD_MUNITS, "Měrné jednotky", MUnitService.class),
 		new Module(MOD_MATERIAL, "Materiál", MaterialService.class),
+		new Module(MOD_SERVICES, "Služby", ServiceItemService.class),
 		new Module(MOD_WORKGROUPS, "Pracovní skupiny", WorkgroupService.class),
 		new Module(MOD_REQUIREMENTS, "Požadavky", RequirementService.class),
 		new Module(MOD_WORKFLOW, "Procesy schválení", RequirementTypeService.class)
diff --git a/src/main/java/info/bukova/isspst/dao/ServiceItemDao.java b/src/main/java/info/bukova/isspst/dao/ServiceItemDao.java
new file mode 100644
index 00000000..3f81f8aa
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/dao/ServiceItemDao.java
@@ -0,0 +1,7 @@
+package info.bukova.isspst.dao;
+
+import info.bukova.isspst.data.ServiceItem;
+
+public interface ServiceItemDao extends BaseDao<ServiceItem> {
+
+}
diff --git a/src/main/java/info/bukova/isspst/dao/jpa/ServiceItemDaoJPA.java b/src/main/java/info/bukova/isspst/dao/jpa/ServiceItemDaoJPA.java
new file mode 100644
index 00000000..dc18ed76
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/dao/jpa/ServiceItemDaoJPA.java
@@ -0,0 +1,8 @@
+package info.bukova.isspst.dao.jpa;
+
+import info.bukova.isspst.dao.ServiceItemDao;
+import info.bukova.isspst.data.ServiceItem;
+
+public class ServiceItemDaoJPA extends BaseDaoJPA<ServiceItem> implements ServiceItemDao {
+
+}
diff --git a/src/main/java/info/bukova/isspst/data/ServiceItem.java b/src/main/java/info/bukova/isspst/data/ServiceItem.java
new file mode 100644
index 00000000..7ab42142
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/data/ServiceItem.java
@@ -0,0 +1,10 @@
+package info.bukova.isspst.data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "SERVICE")
+public class ServiceItem extends RequirementSubject {
+
+}
diff --git a/src/main/java/info/bukova/isspst/filters/ServiceItemFilter.java b/src/main/java/info/bukova/isspst/filters/ServiceItemFilter.java
new file mode 100644
index 00000000..d12dc3b2
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/filters/ServiceItemFilter.java
@@ -0,0 +1,56 @@
+package info.bukova.isspst.filters;
+
+import static info.bukova.isspst.StringUtils.nullStr;
+import info.bukova.isspst.data.ServiceItem;
+
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+public class ServiceItemFilter implements Filter<ServiceItem> {
+	
+	private ServiceItem condServiceItem;
+	
+	public ServiceItemFilter(ServiceItem condServiceItem) {
+		this.condServiceItem = condServiceItem;
+	}
+
+	private static class ServiceItemMatcher extends TypeSafeMatcher<ServiceItem> {
+
+		private ServiceItem condServiceItem;
+		
+		public ServiceItemMatcher(ServiceItem cond) {
+			this.condServiceItem = cond;
+		}
+		
+		@Override
+		public void describeTo(Description desc) {
+			desc.appendText("material matches");
+		}
+
+		@Override
+		public boolean matchesSafely(ServiceItem item) {
+			return nullStr(item.getCode()).toLowerCase().contains(nullStr(condServiceItem.getCode()).toLowerCase()) 
+					&& nullStr(item.getName()).toLowerCase().contains(nullStr(condServiceItem.getName()).toLowerCase())
+					&& nullStr(item.getDescription()).toLowerCase().contains(nullStr(condServiceItem.getDescription()).toLowerCase());
+		}
+		
+		@Factory
+		public static Matcher<ServiceItem> matchBuilding(ServiceItem material) {
+			return new ServiceItemMatcher(material);
+		}
+	}
+	
+	@Override
+	public ServiceItemMatcher matcher() {
+		return new ServiceItemMatcher(condServiceItem);
+	}
+
+	@Override
+	public String queryString() {
+		// TODO query string
+		return "";
+	}
+
+}
diff --git a/src/main/java/info/bukova/isspst/services/material/MaterialService.java b/src/main/java/info/bukova/isspst/services/reqsubjects/MaterialService.java
similarity index 75%
rename from src/main/java/info/bukova/isspst/services/material/MaterialService.java
rename to src/main/java/info/bukova/isspst/services/reqsubjects/MaterialService.java
index aa40c282..a62f4e2a 100644
--- a/src/main/java/info/bukova/isspst/services/material/MaterialService.java
+++ b/src/main/java/info/bukova/isspst/services/reqsubjects/MaterialService.java
@@ -1,4 +1,4 @@
-package info.bukova.isspst.services.material;
+package info.bukova.isspst.services.reqsubjects;
 
 import info.bukova.isspst.data.Material;
 import info.bukova.isspst.services.Service;
diff --git a/src/main/java/info/bukova/isspst/services/material/MaterialServiceImpl.java b/src/main/java/info/bukova/isspst/services/reqsubjects/MaterialServiceImpl.java
similarity index 80%
rename from src/main/java/info/bukova/isspst/services/material/MaterialServiceImpl.java
rename to src/main/java/info/bukova/isspst/services/reqsubjects/MaterialServiceImpl.java
index 2e9a63e1..1e3e8086 100644
--- a/src/main/java/info/bukova/isspst/services/material/MaterialServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/reqsubjects/MaterialServiceImpl.java
@@ -1,4 +1,4 @@
-package info.bukova.isspst.services.material;
+package info.bukova.isspst.services.reqsubjects;
 
 import info.bukova.isspst.data.Material;
 import info.bukova.isspst.services.AbstractOwnedService;
diff --git a/src/main/java/info/bukova/isspst/services/reqsubjects/ServiceItemService.java b/src/main/java/info/bukova/isspst/services/reqsubjects/ServiceItemService.java
new file mode 100644
index 00000000..a8b2d95c
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/services/reqsubjects/ServiceItemService.java
@@ -0,0 +1,8 @@
+package info.bukova.isspst.services.reqsubjects;
+
+import info.bukova.isspst.data.ServiceItem;
+import info.bukova.isspst.services.Service;
+
+public interface ServiceItemService extends Service<ServiceItem> {
+
+}
diff --git a/src/main/java/info/bukova/isspst/services/reqsubjects/ServiceItemServiceImpl.java b/src/main/java/info/bukova/isspst/services/reqsubjects/ServiceItemServiceImpl.java
new file mode 100644
index 00000000..cc704c86
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/services/reqsubjects/ServiceItemServiceImpl.java
@@ -0,0 +1,9 @@
+package info.bukova.isspst.services.reqsubjects;
+
+import info.bukova.isspst.data.ServiceItem;
+import info.bukova.isspst.services.AbstractOwnedService;
+
+public class ServiceItemServiceImpl extends AbstractOwnedService<ServiceItem> implements
+		ServiceItemService {
+
+}
diff --git a/src/main/java/info/bukova/isspst/ui/material/MaterialForm.java b/src/main/java/info/bukova/isspst/ui/reqsubjects/MaterialForm.java
similarity index 94%
rename from src/main/java/info/bukova/isspst/ui/material/MaterialForm.java
rename to src/main/java/info/bukova/isspst/ui/reqsubjects/MaterialForm.java
index aaf52ee8..3f789bc3 100644
--- a/src/main/java/info/bukova/isspst/ui/material/MaterialForm.java
+++ b/src/main/java/info/bukova/isspst/ui/reqsubjects/MaterialForm.java
@@ -1,4 +1,4 @@
-package info.bukova.isspst.ui.material;
+package info.bukova.isspst.ui.reqsubjects;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/info/bukova/isspst/ui/material/MaterialList.java b/src/main/java/info/bukova/isspst/ui/reqsubjects/MaterialList.java
similarity index 83%
rename from src/main/java/info/bukova/isspst/ui/material/MaterialList.java
rename to src/main/java/info/bukova/isspst/ui/reqsubjects/MaterialList.java
index b2dc9137..ab730b9a 100644
--- a/src/main/java/info/bukova/isspst/ui/material/MaterialList.java
+++ b/src/main/java/info/bukova/isspst/ui/reqsubjects/MaterialList.java
@@ -1,11 +1,11 @@
-package info.bukova.isspst.ui.material;
+package info.bukova.isspst.ui.reqsubjects;
 
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
 
 import info.bukova.isspst.data.Material;
 import info.bukova.isspst.filters.MaterialFilter;
-import info.bukova.isspst.services.material.MaterialService;
+import info.bukova.isspst.services.reqsubjects.MaterialService;
 import info.bukova.isspst.ui.ListViewModel;
 
 public class MaterialList extends ListViewModel<Material> {
diff --git a/src/main/java/info/bukova/isspst/ui/reqsubjects/ServiceItemForm.java b/src/main/java/info/bukova/isspst/ui/reqsubjects/ServiceItemForm.java
new file mode 100644
index 00000000..a956c693
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/ui/reqsubjects/ServiceItemForm.java
@@ -0,0 +1,15 @@
+package info.bukova.isspst.ui.reqsubjects;
+
+import info.bukova.isspst.data.Material;
+import info.bukova.isspst.ui.FormViewModel;
+
+import org.zkoss.bind.annotation.Init;
+
+public class ServiceItemForm extends FormViewModel<Material> {
+	
+	@Init(superclass = true)
+	public void init() {
+
+	}
+
+}
diff --git a/src/main/java/info/bukova/isspst/ui/reqsubjects/ServiceItemList.java b/src/main/java/info/bukova/isspst/ui/reqsubjects/ServiceItemList.java
new file mode 100644
index 00000000..f0298c40
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/ui/reqsubjects/ServiceItemList.java
@@ -0,0 +1,24 @@
+package info.bukova.isspst.ui.reqsubjects;
+
+import info.bukova.isspst.data.ServiceItem;
+import info.bukova.isspst.filters.ServiceItemFilter;
+import info.bukova.isspst.services.reqsubjects.ServiceItemService;
+import info.bukova.isspst.ui.ListViewModel;
+
+import org.zkoss.bind.annotation.Init;
+import org.zkoss.zk.ui.select.annotation.WireVariable;
+
+public class ServiceItemList extends ListViewModel<ServiceItem> {
+	
+	@WireVariable
+	private ServiceItemService serviceItemService;
+	
+	@Init
+	public void init() {
+		service = serviceItemService;
+		dataClass = ServiceItem.class;
+		formZul = "serviceForm.zul";
+		dataFilter = new ServiceItemFilter(getFilterTemplate());
+	}
+
+}
diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
index 3471a052..5b798d77 100644
--- a/src/main/resources/hibernate.cfg.xml
+++ b/src/main/resources/hibernate.cfg.xml
@@ -20,5 +20,6 @@
         <mapping class="info.bukova.isspst.data.Requirement"></mapping>
         <mapping class="info.bukova.isspst.data.Workflow"></mapping>
         <mapping class="info.bukova.isspst.data.RequirementType"></mapping>
+        <mapping class="info.bukova.isspst.data.ServiceItem"></mapping>
     </session-factory>
 </hibernate-configuration>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index f66657a0..946c81e4 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -90,6 +90,9 @@ UsersGridColumnSureName=Příjmení
 AgendaMaterial=Materiál
 MaterialFormTitle=Materiál
 
+AgendaServices=Služby
+ServiceFormTitle=Služba
+
 AgendaWorkgroups=Střediska / komise
 WorkgroupFormTitle=Pracvní skupina
 
diff --git a/src/main/webapp/WEB-INF/spring/root-context.xml b/src/main/webapp/WEB-INF/spring/root-context.xml
index b503cbbc..d4b47b1c 100644
--- a/src/main/webapp/WEB-INF/spring/root-context.xml
+++ b/src/main/webapp/WEB-INF/spring/root-context.xml
@@ -140,6 +140,10 @@
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>
     
+    <bean id="serviceItemDao" class="info.bukova.isspst.dao.jpa.ServiceItemDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+    
     <!-- Business logic -->
     <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
     
@@ -192,7 +196,7 @@
 		<property name="dao" ref="permissionDao"/>
 	</bean>
 	
-	<bean id="materialService" class="info.bukova.isspst.services.material.MaterialServiceImpl">
+	<bean id="materialService" class="info.bukova.isspst.services.reqsubjects.MaterialServiceImpl">
 		<property name="dao" ref="materialDao"/>
 		<property name="validator" ref="validator"/>
 	</bean>
@@ -216,4 +220,9 @@
 		<property name="dao" ref="numericSeriesDao" />
 		<property name="validator" ref="validator" />
 	</bean>
+	
+	<bean id="serviceItemService" class="info.bukova.isspst.services.reqsubjects.ServiceItemServiceImpl">
+		<property name="dao" ref="serviceItemDao" />
+		<property name="validator" ref="validator" />
+	</bean>
 </beans>
diff --git a/src/main/webapp/app/navigation.zul b/src/main/webapp/app/navigation.zul
index ce0b8d81..c115ee0d 100644
--- a/src/main/webapp/app/navigation.zul
+++ b/src/main/webapp/app/navigation.zul
@@ -30,6 +30,7 @@
 			<menubar orient="vertical">
 				<menuitem label="${labels.AgendaSuppliers}" href="/lists/addressbook" disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}"/>
 				<menuitem label="${labels.AgendaMaterial}" href="/lists/material" disabled="${not sec:isAllGranted('PERM_READ_MATERIAL')}"/>
+				<menuitem label="${labels.AgendaServices}" href="/lists/service" disabled="${not sec:isAllGranted('PERM_READ_SERVICES')}"/>
 				<menuitem label="${labels.AgendaMUnits}" href="/lists/munits" disabled="${not sec:isAllGranted('PERM_READ_MUNITS')}" width="120px"/>
 				<menuitem label="${labels.AgendaBuildings}" href="/lists/buildings" disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
 				<menuitem label="${labels.AgendaRooms}" href="/lists/rooms" disabled="${not sec:isAllGranted('PERM_READ_ROOMS')}" />
diff --git a/src/main/webapp/img/service.png b/src/main/webapp/img/service.png
new file mode 100644
index 0000000000000000000000000000000000000000..51bed1a4311c9efa48ec6091699795254cfb4dbb
GIT binary patch
literal 3657
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
bdjRkcGgN@v!Rgzo00000NkvXXu0mjfmnGYn

literal 0
HcmV?d00001

diff --git a/src/main/webapp/lists/material/material.zul b/src/main/webapp/lists/material/material.zul
index cd71cc64..6a135bcb 100644
--- a/src/main/webapp/lists/material/material.zul
+++ b/src/main/webapp/lists/material/material.zul
@@ -1,7 +1,7 @@
 <?page title="${labels.AgendaMaterial}" 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.material.MaterialList')">
+	<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.MaterialList')">
 		<caption zclass="form-caption" label="${labels.AgendaMaterial}" />
 		<include src="/app/toolbar.zul" />
 
diff --git a/src/main/webapp/lists/material/materialForm.zul b/src/main/webapp/lists/material/materialForm.zul
index 356a4a05..54a9321d 100644
--- a/src/main/webapp/lists/material/materialForm.zul
+++ b/src/main/webapp/lists/material/materialForm.zul
@@ -1,7 +1,7 @@
 <?page title="${labels.MaterialFormTitle}" 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.material.MaterialForm')">
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.reqsubjects.MaterialForm')">
 		<caption src="/img/material.png" zclass="form-caption" label="${labels.MaterialFormTitle}" />
 		<vlayout>
 			<grid hflex="min">
diff --git a/src/main/webapp/lists/service/index.zul b/src/main/webapp/lists/service/index.zul
new file mode 100644
index 00000000..e963369b
--- /dev/null
+++ b/src/main/webapp/lists/service/index.zul
@@ -0,0 +1,10 @@
+<?page title="${labels.AgendaServices}" contentType="text/html;charset=UTF-8"?>
+<zk>
+
+<zscript>
+	String gridZul = "service.zul";
+</zscript>
+
+<include src="/app/template.zhtml"/>
+
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/lists/service/service.zul b/src/main/webapp/lists/service/service.zul
new file mode 100644
index 00000000..2e902757
--- /dev/null
+++ b/src/main/webapp/lists/service/service.zul
@@ -0,0 +1,58 @@
+<?page title="${labels.AgendaServices}" 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.reqsubjects.ServiceItemList')">
+		<caption zclass="form-caption" label="${labels.AgendaServices}" />
+		<include src="/app/toolbar.zul" />
+
+		<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" height="500px">
+			<listhead menupopup="auto">
+				<listheader label="${labels.code}" sort="czech(code)" width="10%" />
+				<listheader label="${labels.name}" sort="czech(name)" width="30%" />
+				<listheader label="${labels.description}" 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.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)" />
+					<listcell label="@load(each.name)" />
+					<listcell label="@load(each.description)" />
+				</listitem>
+			</template>
+		</listbox>
+
+	</window>
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/lists/service/serviceForm.zul b/src/main/webapp/lists/service/serviceForm.zul
new file mode 100644
index 00000000..46f44e7b
--- /dev/null
+++ b/src/main/webapp/lists/service/serviceForm.zul
@@ -0,0 +1,36 @@
+<?page title="${labels.ServiceFormTitle}" 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.reqsubjects.ServiceItemForm')">
+		<caption src="/img/service.png" zclass="form-caption" label="${labels.ServiceFormTitle}" />
+		<vlayout>
+			<grid hflex="min">
+				<columns>
+					<column align="right" hflex="min" />
+					<column />
+				</columns>
+				<rows>
+					<row>
+						<cell sclass="row-title">${labels.code} :</cell>
+						<cell>
+							<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.code)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.name} :</cell>
+						<cell>
+							<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.description} :</cell>
+						<cell>
+							<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
+						</cell>
+					</row>
+				</rows>
+			</grid>
+			<include src="/app/formButtons.zul" />
+		</vlayout>
+	</window>
+</zk>
\ No newline at end of file