From 8bcfc04c1556fbf490c5df920626422602dac364 Mon Sep 17 00:00:00 2001
From: Franta Pribyl <pribyl.franta@gmail.com>
Date: Sun, 6 Jul 2014 17:35:28 +0200
Subject: [PATCH] =?UTF-8?q?Implementov=C3=A1no=20zad=C3=A1v=C3=A1n=C3=AD?=
 =?UTF-8?q?=20hlavi=C4=8Dek=20Po=C5=BEadavk=C5=AF.=20Implementov=C3=A1na?=
 =?UTF-8?q?=20=C4=8D=C3=ADseln=C3=A1=20=C5=99ada.=20P=C5=99id=C3=A1ny=20me?=
 =?UTF-8?q?tody=20pro=20porovn=C3=A1n=C3=AD=20String=20a=20Date=20pro=20fi?=
 =?UTF-8?q?ltry.=20Upraveno=20logov=C3=A1n=C3=AD=20aplikace=20-=20loguje?=
 =?UTF-8?q?=20se=20a=C5=BE=20=C3=BArove=C5=88=20warning.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs #100
---
 .../info/bukova/isspst/AppInitListener.java   |   2 +-
 .../java/info/bukova/isspst/Constants.java    |   7 +-
 .../info/bukova/isspst/DateTimeUtils.java     |  57 ++++++++++
 .../java/info/bukova/isspst/StringUtils.java  |   6 ++
 .../isspst/filters/RequirementFilter.java     |  12 ++-
 .../isspst/services/AbstractService.java      |  33 ++++++
 .../numberseries/NumberSeriesServiceImpl.java |   4 +-
 .../requirement/RequirementServiceImpl.java   |  26 ++++-
 .../RequirementTypeService.java               |   2 +-
 .../RequirementTypeServiceImpl.java           |   2 +-
 .../ui/requirement/RequirementForm.java       |  62 +++++++++++
 .../RequirementTypesVM.java                   |   4 +-
 src/main/resources/log4j.xml                  |  14 ++-
 .../WEB-INF/locales/zk-label.properties       |  16 ++-
 .../webapp/WEB-INF/spring/root-context.xml    |   5 +-
 src/main/webapp/WEB-INF/zk.xml                |  53 ++++------
 src/main/webapp/img/item-add.png              | Bin 0 -> 1361 bytes
 src/main/webapp/img/item-remove.png           | Bin 0 -> 1658 bytes
 .../requirements/actual/requirements.zul      |  99 +++++++++++++++---
 .../requirements/actual/requirementsForm.zul  |  71 +++++++++++--
 .../webapp/settings/workflow/workflow.zul     |   2 +-
 src/test/resources/log4j.xml                  |  41 --------
 22 files changed, 393 insertions(+), 125 deletions(-)
 create mode 100644 src/main/java/info/bukova/isspst/DateTimeUtils.java
 rename src/main/java/info/bukova/isspst/services/{requirements => requirement}/RequirementTypeService.java (77%)
 rename src/main/java/info/bukova/isspst/services/{requirements => requirement}/RequirementTypeServiceImpl.java (82%)
 rename src/main/java/info/bukova/isspst/ui/{requirements => requirement}/RequirementTypesVM.java (97%)
 create mode 100644 src/main/webapp/img/item-add.png
 create mode 100644 src/main/webapp/img/item-remove.png
 delete mode 100644 src/test/resources/log4j.xml

diff --git a/src/main/java/info/bukova/isspst/AppInitListener.java b/src/main/java/info/bukova/isspst/AppInitListener.java
index 361938c0..5c9ec19c 100644
--- a/src/main/java/info/bukova/isspst/AppInitListener.java
+++ b/src/main/java/info/bukova/isspst/AppInitListener.java
@@ -11,7 +11,7 @@ import info.bukova.isspst.reporting.Report;
 import info.bukova.isspst.reporting.ReportMapping;
 import info.bukova.isspst.reporting.ReportType;
 import info.bukova.isspst.services.numberseries.NumberSeriesService;
-import info.bukova.isspst.services.requirements.RequirementTypeService;
+import info.bukova.isspst.services.requirement.RequirementTypeService;
 import info.bukova.isspst.services.users.PermissionService;
 import info.bukova.isspst.services.users.RoleService;
 import info.bukova.isspst.services.users.UserService;
diff --git a/src/main/java/info/bukova/isspst/Constants.java b/src/main/java/info/bukova/isspst/Constants.java
index 92704251..396a19a4 100644
--- a/src/main/java/info/bukova/isspst/Constants.java
+++ b/src/main/java/info/bukova/isspst/Constants.java
@@ -8,9 +8,10 @@ import info.bukova.isspst.reporting.Report;
 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.requirements.RequirementTypeService;
+import info.bukova.isspst.services.munits.MUnitService;
+import info.bukova.isspst.services.requirement.RequirementService;
+import info.bukova.isspst.services.requirement.RequirementTypeService;
 import info.bukova.isspst.services.users.RoleService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
@@ -68,7 +69,7 @@ public class Constants {
 		new Module(MOD_MUNITS, "Měrné jednotky", MUnitService.class),
 		new Module(MOD_MATERIAL, "Materiál", MaterialService.class),
 		new Module(MOD_WORKGROUPS, "Pracovní skupiny", WorkgroupService.class),
-		new Module(MOD_REQUIREMENTS, "Požadavky", null),
+		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/DateTimeUtils.java b/src/main/java/info/bukova/isspst/DateTimeUtils.java
new file mode 100644
index 00000000..884c5bf7
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/DateTimeUtils.java
@@ -0,0 +1,57 @@
+package info.bukova.isspst;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import org.apache.commons.lang.time.DateUtils;
+
+public class DateTimeUtils
+{
+	public static Date getDate(Date value)
+	{
+		if (value == null)
+		{
+			return value;
+		}
+		
+		// Keep date - truncate time
+		return DateUtils.truncate(value, Calendar.DAY_OF_MONTH);
+	}
+	
+	public static boolean isEqualByDate(Date d1, Date d2)
+	{
+		if (d1 != null && d2 != null)
+		{
+			d1 = DateTimeUtils.getDate(d1);
+			d2 = DateTimeUtils.getDate(d2);
+			boolean equals = (d1.compareTo(d2) == 0);
+			return equals;
+		}
+		
+		return false;
+	}
+	
+	public static boolean isEqualByDateForFilter(Date value, Date search)
+	{
+		if (search == null)
+		{
+			return true;
+		}
+		else if (value != null)
+		{
+			return DateTimeUtils.isEqualByDate(value, search);
+		}
+		
+		return false;
+	}
+
+	public static Date getCurrDateTime()
+	{
+		return new Date();
+	}
+
+	public static Date getCurrDate()
+	{
+		return DateTimeUtils.getDate(DateTimeUtils.getCurrDateTime());
+	}
+}
diff --git a/src/main/java/info/bukova/isspst/StringUtils.java b/src/main/java/info/bukova/isspst/StringUtils.java
index d3b8bcf2..f3728dfd 100644
--- a/src/main/java/info/bukova/isspst/StringUtils.java
+++ b/src/main/java/info/bukova/isspst/StringUtils.java
@@ -44,4 +44,10 @@ public class StringUtils {
 		return Labels.getLabel("Db" + key);
 	}
 	
+	public static boolean isEqualForFilter(String value, String search)
+	{
+		value = StringUtils.nullStr(value).toLowerCase();
+		search = StringUtils.nullStr(search).toLowerCase();
+		return value.contains(search);
+	}
 }
diff --git a/src/main/java/info/bukova/isspst/filters/RequirementFilter.java b/src/main/java/info/bukova/isspst/filters/RequirementFilter.java
index a8663e2b..6a6296dd 100644
--- a/src/main/java/info/bukova/isspst/filters/RequirementFilter.java
+++ b/src/main/java/info/bukova/isspst/filters/RequirementFilter.java
@@ -1,6 +1,7 @@
 package info.bukova.isspst.filters;
 
-import static info.bukova.isspst.StringUtils.nullStr;
+import info.bukova.isspst.DateTimeUtils;
+import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.Requirement;
 
 import org.hamcrest.Description;
@@ -37,10 +38,11 @@ public class RequirementFilter implements Filter<Requirement>
 		@Override
 		public boolean matchesSafely(Requirement item)
 		{
-			return nullStr(item.getNumser()).toLowerCase().contains(nullStr(condition.getNumser()).toLowerCase())
-					&& item.getReqDate().equals(condition.getReqDate())
-					&& item.getDeliveryDate().equals(condition.getDeliveryDate())
-					&& nullStr(item.getDescription()).toLowerCase().contains(nullStr(condition.getDescription()).toLowerCase());
+			boolean foundNumser = StringUtils.isEqualForFilter(item.getNumser(), condition.getNumser());
+			boolean foundReqDate = DateTimeUtils.isEqualByDateForFilter(item.getReqDate(), condition.getReqDate());
+			boolean foundDescription = StringUtils.isEqualForFilter(item.getDescription(), condition.getDescription());
+			boolean foundDeliveryDate = DateTimeUtils.isEqualByDateForFilter(item.getDeliveryDate(), condition.getDeliveryDate());
+			return foundNumser && foundReqDate && foundDescription && foundDeliveryDate;
 		}
 
 		@Factory
diff --git a/src/main/java/info/bukova/isspst/services/AbstractService.java b/src/main/java/info/bukova/isspst/services/AbstractService.java
index b0fbb427..32c8d7b4 100644
--- a/src/main/java/info/bukova/isspst/services/AbstractService.java
+++ b/src/main/java/info/bukova/isspst/services/AbstractService.java
@@ -5,8 +5,10 @@ import info.bukova.isspst.Constants;
 import info.bukova.isspst.Module;
 import info.bukova.isspst.dao.BaseDao;
 import info.bukova.isspst.data.DataModel;
+import info.bukova.isspst.data.NumberSeries;
 import info.bukova.isspst.filters.Filter;
 import info.bukova.isspst.reporting.Report;
+import info.bukova.isspst.services.numberseries.NumberSeriesService;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -25,7 +27,20 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 
 	protected BaseDao<T> dao;
 	private Validator validator;
+
+	private NumberSeriesService numberSeriesService;
 	
+
+	public NumberSeriesService getNumberSeriesService()
+	{
+		return numberSeriesService;
+	}
+
+	public void setNumberSeriesService(NumberSeriesService numberSeriesService)
+	{
+		this.numberSeriesService = numberSeriesService;
+	}
+
 	public void setDao(BaseDao<T> dao) {
 		this.dao = dao;
 	}
@@ -150,4 +165,22 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 		}
 	}
 
+	protected String getNumberSerie()
+	{
+		String currentNumber = "";
+		
+		if (numberSeriesService != null)
+		{
+			String moduleName = this.getModule().getId();
+			NumberSeries ns = numberSeriesService.getNumberSerie(moduleName);
+			
+			if (ns != null)
+			{
+				currentNumber = ns.getCurrentNumber();
+				numberSeriesService.increase(ns);
+			}
+		}
+		
+		return currentNumber;
+	}
 }
diff --git a/src/main/java/info/bukova/isspst/services/numberseries/NumberSeriesServiceImpl.java b/src/main/java/info/bukova/isspst/services/numberseries/NumberSeriesServiceImpl.java
index e38ecb54..fc275425 100644
--- a/src/main/java/info/bukova/isspst/services/numberseries/NumberSeriesServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/numberseries/NumberSeriesServiceImpl.java
@@ -1,10 +1,10 @@
 package info.bukova.isspst.services.numberseries;
 
-import org.springframework.transaction.annotation.Transactional;
-
 import info.bukova.isspst.data.NumberSeries;
 import info.bukova.isspst.services.AbstractService;
 
+import org.springframework.transaction.annotation.Transactional;
+
 public class NumberSeriesServiceImpl extends AbstractService<NumberSeries> implements NumberSeriesService
 {
 	@Transactional
diff --git a/src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java b/src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java
index 4206d5ea..d0e9c52a 100644
--- a/src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java
@@ -1,9 +1,31 @@
 package info.bukova.isspst.services.requirement;
 
 import info.bukova.isspst.data.Requirement;
-import info.bukova.isspst.services.AbstractService;
+import info.bukova.isspst.services.AbstractOwnedService;
 
-public class RequirementServiceImpl extends AbstractService<Requirement> implements RequirementService
+import java.util.Date;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+
+public class RequirementServiceImpl extends AbstractOwnedService<Requirement> implements RequirementService
 {
+	@Override
+	protected Requirement createEntity()
+	{
+		Requirement entity = new Requirement();
+
+		entity.setReqDate(new Date());
+
+		return entity;
+	}
 
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_ADD')")
+	public void add(Requirement entity)
+	{
+		entity.setNumser(this.getNumberSerie());
+		super.add(entity);
+	}
 }
diff --git a/src/main/java/info/bukova/isspst/services/requirements/RequirementTypeService.java b/src/main/java/info/bukova/isspst/services/requirement/RequirementTypeService.java
similarity index 77%
rename from src/main/java/info/bukova/isspst/services/requirements/RequirementTypeService.java
rename to src/main/java/info/bukova/isspst/services/requirement/RequirementTypeService.java
index 53727d34..60fd752e 100644
--- a/src/main/java/info/bukova/isspst/services/requirements/RequirementTypeService.java
+++ b/src/main/java/info/bukova/isspst/services/requirement/RequirementTypeService.java
@@ -1,4 +1,4 @@
-package info.bukova.isspst.services.requirements;
+package info.bukova.isspst.services.requirement;
 
 import info.bukova.isspst.data.RequirementType;
 import info.bukova.isspst.services.Service;
diff --git a/src/main/java/info/bukova/isspst/services/requirements/RequirementTypeServiceImpl.java b/src/main/java/info/bukova/isspst/services/requirement/RequirementTypeServiceImpl.java
similarity index 82%
rename from src/main/java/info/bukova/isspst/services/requirements/RequirementTypeServiceImpl.java
rename to src/main/java/info/bukova/isspst/services/requirement/RequirementTypeServiceImpl.java
index 276d8917..ee7d9ada 100644
--- a/src/main/java/info/bukova/isspst/services/requirements/RequirementTypeServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/requirement/RequirementTypeServiceImpl.java
@@ -1,4 +1,4 @@
-package info.bukova.isspst.services.requirements;
+package info.bukova.isspst.services.requirement;
 
 import info.bukova.isspst.data.RequirementType;
 import info.bukova.isspst.services.AbstractOwnedService;
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 61144417..d2c3646e 100644
--- a/src/main/java/info/bukova/isspst/ui/requirement/RequirementForm.java
+++ b/src/main/java/info/bukova/isspst/ui/requirement/RequirementForm.java
@@ -1,15 +1,77 @@
 package info.bukova.isspst.ui.requirement;
 
 import info.bukova.isspst.data.Requirement;
+import info.bukova.isspst.data.RequirementSubject;
+import info.bukova.isspst.data.Workgroup;
+import info.bukova.isspst.services.requirement.RequirementService;
+import info.bukova.isspst.services.users.UserService;
+import info.bukova.isspst.services.workgroups.WorkgroupService;
 import info.bukova.isspst.ui.FormViewModel;
 
+import java.util.List;
+
+import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.Init;
+import org.zkoss.bind.annotation.NotifyChange;
+import org.zkoss.zk.ui.select.annotation.WireVariable;
 
 public class RequirementForm extends FormViewModel<Requirement>
 {
+	@WireVariable
+	private UserService userService;
+	
+	@WireVariable
+	private WorkgroupService workgroupService;
+
+	public List<Workgroup> getCentres() {
+		return workgroupService.getUserCentres(userService.getCurrent());
+	}
+	@WireVariable
+	private RequirementService requirementService;
+
+	private RequirementSubject item;
+
+	private int selItemIndex;
+
 	@Init(superclass = true)
 	public void init()
 	{
+		this.setSelItemIndex(-1);
+	}
+
+	public RequirementSubject getItem()
+	{
+		return item;
+	}
+
+	public void setItem(RequirementSubject item)
+	{
+		this.item = item;
+	}
+
+	public int getSelItemIndex()
+	{
+		return selItemIndex;
+	}
 
+	public void setSelItemIndex(int selItemIndex)
+	{
+		this.selItemIndex = selItemIndex;
+	}
+
+	@Command
+	@NotifyChange({"dataBean", "selItemIndex"})
+	public void addItem() {
+//		RequirementSubject item = new Material();
+//		requirementService.addItem(getDataBean(), item);
+//		selItemIndex = getDataBean().getItems().indexOf(item);
+	}
+/*	
+	@Command
+	@NotifyChange({"dataBean", "selItemIndex"})
+	public void removeItem(@BindingParam("item") RequirementItem item) {
+		requirementService.removeItem(getDataBean(), item);
+		selItemIndex = -1;
 	}
+*/
 }
diff --git a/src/main/java/info/bukova/isspst/ui/requirements/RequirementTypesVM.java b/src/main/java/info/bukova/isspst/ui/requirement/RequirementTypesVM.java
similarity index 97%
rename from src/main/java/info/bukova/isspst/ui/requirements/RequirementTypesVM.java
rename to src/main/java/info/bukova/isspst/ui/requirement/RequirementTypesVM.java
index 0b6807a9..b1506eb0 100644
--- a/src/main/java/info/bukova/isspst/ui/requirements/RequirementTypesVM.java
+++ b/src/main/java/info/bukova/isspst/ui/requirement/RequirementTypesVM.java
@@ -1,10 +1,10 @@
-package info.bukova.isspst.ui.requirements;
+package info.bukova.isspst.ui.requirement;
 
 import info.bukova.isspst.Constants;
 import info.bukova.isspst.data.RequirementType;
 import info.bukova.isspst.data.Role;
 import info.bukova.isspst.data.Workflow;
-import info.bukova.isspst.services.requirements.RequirementTypeService;
+import info.bukova.isspst.services.requirement.RequirementTypeService;
 import info.bukova.isspst.services.users.RoleService;
 
 import java.util.ArrayList;
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
index e4394694..5281aee1 100644
--- a/src/main/resources/log4j.xml
+++ b/src/main/resources/log4j.xml
@@ -12,24 +12,28 @@
 	
 	<!-- Application Loggers -->
 	<logger name="info.bukova.isspst">
-		<level value="info" />
+		<level value="warn" />
 	</logger>
 	
 	<!-- 3rdparty Loggers -->
 	<logger name="org.springframework.core">
-		<level value="info" />
+		<level value="warn" />
 	</logger>
 	
 	<logger name="org.springframework.beans">
-		<level value="info" />
+		<level value="warn" />
 	</logger>
 	
 	<logger name="org.springframework.context">
-		<level value="info" />
+		<level value="warn" />
 	</logger>
 
 	<logger name="org.springframework.web">
-		<level value="info" />
+		<level value="warn" />
+	</logger>
+
+	<logger name="org.hibernate">
+		<level value="warn" />
 	</logger>
 
 	<!-- Root Logger -->
diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties
index f66657a0..9bae6ea5 100644
--- a/src/main/webapp/WEB-INF/locales/zk-label.properties
+++ b/src/main/webapp/WEB-INF/locales/zk-label.properties
@@ -10,7 +10,17 @@ MenuUser=Uživatel
 
 AgendaActRequirements=Aktuální požadavky
 AgendaRequirementsHistory=Ukončené požadavky
-RequirementsFormTitle="Požadavek"
+RequirementsFormTitle=Požadavek
+RequirementsFormNumberSerie=Číslo
+RequirementsFormReqDate=Datum požadavku
+RequirementsFormCenter=Středisko
+RequirementsFormDescription=Popis
+RequirementsFormDeliveryDate=Datum dodání
+RequirementsGridNumberSerie=Číslo
+RequirementsGridReqDate=Datum požadavku
+RequirementsGridCenter=Středisko
+RequirementsGridDescription=Popis
+RequirementsGridDeliveryDate=Datum dodání
 
 AgendaMyOrders=Aktuální
 AgendaOrdersHistory=Ukončené
@@ -141,4 +151,8 @@ DbValidationError=Chyba validace
 
 true=Ano
 false=Ne
+
+DateFormat=dd. MM. yyyy
+
+AddItem=Přidat položku...
  
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/spring/root-context.xml b/src/main/webapp/WEB-INF/spring/root-context.xml
index b503cbbc..7bf44b4d 100644
--- a/src/main/webapp/WEB-INF/spring/root-context.xml
+++ b/src/main/webapp/WEB-INF/spring/root-context.xml
@@ -36,7 +36,7 @@
         <property name="hibernateProperties">
             <props>
                 <prop key="hibernate.dialect">${jdbc.dialect}</prop>
-                <prop key="hibernate.show_sql">true</prop>
+                <prop key="hibernate.show_sql">false</prop>
                 <prop key="hibernate.hbm2ddl.auto">update</prop>
             </props>
         </property>
@@ -202,7 +202,7 @@
 		<property name="validator" ref="validator"/>
 	</bean>
 	
-	<bean id="reqTypeService" class="info.bukova.isspst.services.requirements.RequirementTypeServiceImpl">
+	<bean id="reqTypeService" class="info.bukova.isspst.services.requirement.RequirementTypeServiceImpl">
 		<property name="dao" ref="reqTypeDao"/>
 		<property name="validator" ref="validator"/>
 	</bean>
@@ -210,6 +210,7 @@
 	<bean id="requirementService" class="info.bukova.isspst.services.requirement.RequirementServiceImpl">
 		<property name="dao" ref="requirementDao" />
 		<property name="validator" ref="validator" />
+		<property name="numberSeriesService" ref="numericSeriesService" />
 	</bean>
 
 	<bean id="numericSeriesService" class="info.bukova.isspst.services.numberseries.NumberSeriesServiceImpl">
diff --git a/src/main/webapp/WEB-INF/zk.xml b/src/main/webapp/WEB-INF/zk.xml
index 287ac23d..5eaade67 100644
--- a/src/main/webapp/WEB-INF/zk.xml
+++ b/src/main/webapp/WEB-INF/zk.xml
@@ -1,43 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!DOCTYPE zk.xml>
 <zk>
-	<!-- [Optional]
-	Uncomment if you want to defines the application's name 
-	
-	<preference>
-		<name>org.zkoss.zk.ui.WebApp.name</name>
-		<value>rsfaktura</value>
-	</preference>
-	-->
-	
+	<!-- [Optional] Uncomment if you want to defines the application's name <preference> <name>org.zkoss.zk.ui.WebApp.name</name> <value>rsfaktura</value> </preference> -->
 	<client-config>
-        <debug-js>true</debug-js>
-    </client-config>
-    <library-property>
-        <name>org.zkoss.web.classWebResource.cache</name>
-        <value>false</value>
-    </library-property>
-    
-    <system-config>
-    	<label-location>/WEB-INF/locales/zk-label.properties</label-location>
-    	<label-location>/WEB-INF/locales/columns.properties</label-location>
-    	<label-location>/WEB-INF/locales/validators.properties</label-location>
-    </system-config>
-	
+		<debug-js>true</debug-js>
+	</client-config>
+	<library-property>
+		<name>org.zkoss.web.classWebResource.cache</name>
+		<value>false</value>
+	</library-property>
+	<system-config>
+		<label-location>/WEB-INF/locales/zk-label.properties</label-location>
+		<label-location>/WEB-INF/locales/columns.properties</label-location>
+		<label-location>/WEB-INF/locales/validators.properties</label-location>
+	</system-config>
 	<language-config>
-        <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>
-    </language-config>
-    
+		<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>
+	</language-config>
 	<desktop-config>
 		<theme-uri>/css/zk-modify.css</theme-uri>
 		<theme-uri>/css/form.css</theme-uri>
 		<theme-uri>/css/page.css</theme-uri>
 	</desktop-config>
-    
-    <!-- <library-property>
-    	<name>org.zkoss.zul.progressbox.position</name>
-    	<value>center</value>
-	</library-property> -->
-</zk>
+	<!-- <library-property> <name>org.zkoss.zul.progressbox.position</name> <value>center</value> </library-property> -->
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/img/item-add.png b/src/main/webapp/img/item-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..271ad40fc33c6dfaa1c2e5edbf3d4c33d38a9f80
GIT binary patch
literal 1361
zcmV-X1+MyuP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000EQNkl<ZNK37i`%jZs7{^arE0?yT2o@`d
zg;Jp9rotTPfP$N4rE`?2lgmJGl%U{c1F1lvAOwUd^@b~mLz#n#MJ`%_R?nCq%nNZi
zbuL@B#AR`}@E`EqYqOuVN%tn7yvdvAJ)h^C^E~Ge;>1&6&tPk<Zz|#~fy%@oi8A*_
zilXOfJKKq0UmcP<u$I^N!{^qnho;4pK?RZqr8qU;h&#_G$IXwL`L7<~6%lCz33UUH
zFXG8x^Dup9K-+^#%ss!2sb@AAW_9&03&J|Zw!Gm?-2A5xU;WwS!2WkHiYK(t3`N^q
z76cp@QpK47^#9h5?q@X)EWe*ZN`E*K`y|w5fw)aT!%q0)+%GLK{ao&#_t&FH><vZy
zg;lN#L`{4ea#W1dKQ^H0Nhw1a%s(|@!?_T|b^E(6@G<geP|FG&du%|>d=Y~V$DbIn
z-W-gzpNX9loSi=FtsBxE@oV<8FFC}fZh8*&)N`po??#2y9t*1vi_kK!NBRAH2W=0l
z5PMpJsMCH6v7IYvLQfz~{xXPew#aDC_y*gV?~N@pe~b$q`;$MI&&j%+WvdvgK#VB{
zf@(g5RRZ`N^1|{eAy(8ZLug|l8s<L1-aFY28XuG+p(7k|9TFsT1taOa3~%?zk#31Z
z$qfy<AGP54qsj^M(>e~}HS-iQlWehOq8f(j3RK)GMfuboRNUT;gEM=epWTD1Z%eUv
zHWwu`+fXvQ9sBR(q4xeh)ZW_%!@d2ey?X$4cgykVTqAT>3vpu3h_c)1i#w;{6@=6g
zC98@B^?4PvBMjFV##Gokk%k?1HFBv2`IB2vcq;=%Q(EYzGaVF7YaQQ8rn8}&%)us0
zBKXI6AVz|$k<G}Qh`@Flr6j~al;j|R(wqd<<z%Ral94v5gvOc*?f6^RZdW1arkasx
z9D=f$EF754L&?-O<k-`&VL$<KrvUsDOTlVofz%UduOws3m>iimA{+uasUVAzy48q0
z8G)G2D6GE_$28JLs0UM#$z+p#Jsla>H{#vvu}HH<Ky^*d%rqY9Bd;UXvIg;e5s2)O
zL28yDyhDb}(FCMh!xrDODddDy6E^vnSV=JfcNZ7#1@3U$>E?KQ>~aUc$P>P0-bf#g
z!=|fJsK>&X%o8DNT#1lo5yF`si8|?zb>=|C_XIKBErrq&4AoWHHO*Mqe<$u<!XqCs
zyOB$5WCx+-1BNU@Svf4q$zw0@iaekmUWa$aLb3H`BnrMxLO|Uz_}6<aNLrRrS-US)
zbcpDhZZUo1ivU~FWl8O(VJXk4V}zZ{q8^2AP+f_JW;`6(-^8GJDj8w}Q^H1pbB*>g
z6Dylgw*oE_FNI^XRfZjt(I}oyf~e*-h>U#K1uvFr$<8H+>RE-@Oa4e14TgF&621mL
zeCz)YK@Opu0yab^nI&P$G4Pxa(r!O^*LuR|u&3)YU<S8|%6RZ<_5k|`3mm4_y;=p#
zCW{yW-}MW}ubgkxnu1W+C53wp7kncR@1M~kszDA>y|>Y+N_kmO^bud4-Xfp)@M0)<
zjZ5Lzwj8DXyRp7C)*f0N?E0nuLf$`@%*hxCjpnv;ltPo2Qa@4|Tib2mI+Ojs3m<QS
Th|g4b00000NkvXXu0mjfR?2o|

literal 0
HcmV?d00001

diff --git a/src/main/webapp/img/item-remove.png b/src/main/webapp/img/item-remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..1355f25e1fc2b3a29c0d2f871cf634b5fd5bf049
GIT binary patch
literal 1658
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
Eg0?drAOHXW

literal 0
HcmV?d00001

diff --git a/src/main/webapp/requirements/actual/requirements.zul b/src/main/webapp/requirements/actual/requirements.zul
index 5945c28d..9cf94a1e 100644
--- a/src/main/webapp/requirements/actual/requirements.zul
+++ b/src/main/webapp/requirements/actual/requirements.zul
@@ -1,22 +1,50 @@
 <?page title="${labels.AgendaActRequirements}" 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.requirement.RequirementList')">
-		<caption zclass="form-caption" label="${labels.AgendaActRequirements}" />
+	<window
+		border="normal"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementList')">
+		<caption
+			zclass="form-caption"
+			label="${labels.AgendaActRequirements}" />
 		<include src="/app/toolbar.zul" />
-
-		<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
+		<listbox
+			model="@load(vm.dataList)"
+			selectedItem="@bind(vm.dataBean)">
 			<listhead menupopup="auto">
-				<listheader label="${labels.BuildingsGridColumnCode}" sort="czech(numser)" width="10%" />
-				<listheader label="${labels.BuildingsGridColumnName}" sort="auto(reqDate)" width="30%" />
-				<listheader label="${labels.BuildingsGridColumnDescription}" sort="czech(description)" width="60%" />
+				<listheader
+					label="${labels.RequirementsGridNumberSerie}"
+					sort="czech(numser)"
+					width="7%" />
+				<listheader
+					label="${labels.RequirementsGridReqDate}"
+					sort="auto(reqDate)"
+					width="13%" />
+				<listheader
+					label="${labels.RequirementsGridCenter}"
+					sort="czech(description)"
+					width="10%" />
+				<listheader
+					label="${labels.RequirementsGridDescription}"
+					sort="czech(description)"
+					width="70%" />
+				<listheader
+					label="${labels.RequirementsGridDeliveryDate}"
+					sort="auto(reqDate)"
+					width="13%" />
 			</listhead>
-			
-			<auxhead sclass="category-center" visible="@load(vm.filter)">
+			<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" />
+							<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" />
@@ -26,7 +54,42 @@
 				<auxheader>
 					<div sclass="find-grid-cell">
 						<div sclass="find-grid-divtextbox">
-							<datebox value="@bind(vm.filterTemplate.reqDate)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+							<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.workgroup)">
+							<template name="modelW">
+								<comboitem label="@load(each.workgroup.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.description)"
+								instant="true"
+								onChange="@command('doFilter')"
+								sclass="find-grid-textbox" />
 						</div>
 						<div sclass="find-grid-img">
 							<image src="/img/funnel.png" />
@@ -36,7 +99,13 @@
 				<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" />
+							<datebox
+								value="@bind(vm.filterTemplate.deliveryDate)"
+								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" />
@@ -44,15 +113,15 @@
 					</div>
 				</auxheader>
 			</auxhead>
-			
 			<template name="model">
 				<listitem>
 					<listcell label="@load(each.numser)" />
-					<listcell label="@load(each.reqDate)" />
+					<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
+					<listcell label="@load(each.workgroup.fullName)" />
 					<listcell label="@load(each.description)" />
+					<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
 				</listitem>
 			</template>
 		</listbox>
-
 	</window>
 </zk>
\ No newline at end of file
diff --git a/src/main/webapp/requirements/actual/requirementsForm.zul b/src/main/webapp/requirements/actual/requirementsForm.zul
index 01a57305..958234f0 100644
--- a/src/main/webapp/requirements/actual/requirementsForm.zul
+++ b/src/main/webapp/requirements/actual/requirementsForm.zul
@@ -1,34 +1,87 @@
 <?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.RequirementForm')">
-		<caption src="/img/reqact.png" zclass="form-caption" label="RequirementsFormTitle" />
+	<window
+		id="editWin"
+		closable="true"
+		border="normal"
+		position="center"
+		apply="org.zkoss.bind.BindComposer"
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementForm')">
+		<caption
+			src="/img/reqact.png"
+			zclass="form-caption"
+			label="${labels.RequirementsFormTitle}" />
 		<vlayout>
 			<grid hflex="min">
 				<columns>
-					<column align="right" hflex="min" />
+					<column
+						align="right"
+						hflex="min" />
 					<column />
 				</columns>
 				<rows>
 					<row>
-						<cell sclass="row-title">${labels.BuildingsFormCode} :</cell>
+						<cell sclass="row-title">${labels.RequirementsFormNumberSerie} :</cell>
 						<cell>
-							<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.numser)" />
+							<textbox
+								id="numser"
+								constraint="@load(vm.constriant)"
+								width="200px"
+								value="@bind(vm.dataBean.numser)"
+								readonly="true" />
 						</cell>
 					</row>
 					<row>
-						<cell sclass="row-title">${labels.BuildingsFormName} :</cell>
+						<cell sclass="row-title">${labels.RequirementsFormReqDate} :</cell>
 						<cell>
-							<datebox id="name" width="200px" value="@bind(vm.dataBean.reqDate)" />
+							<datebox
+								id="reqDate"
+								width="200px"
+								value="@bind(vm.dataBean.reqDate)"
+								format="${labels.DateFormat}" />
 						</cell>
 					</row>
 					<row>
-						<cell sclass="row-title">${labels.BuildingsFormDescription} :</cell>
+						<cell sclass="row-title">${labels.RequirementsFormCenter} :</cell>
 						<cell>
-							<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
+							<combobox
+								model="@load(vm.centres)"
+								readonly="true"
+								selectedItem="@bind(vm.dataBean.workgroup)">
+								<template name="model">
+									<comboitem label="@load(each.fullName)" />
+								</template>
+							</combobox>
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormDescription} :</cell>
+						<cell>
+							<textbox
+								id="description"
+								width="300px"
+								value="@bind(vm.dataBean.description)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.RequirementsFormDeliveryDate} :</cell>
+						<cell>
+							<datebox
+								id="deliveryDate"
+								width="200px"
+								value="@bind(vm.dataBean.deliveryDate)"
+								format="${labels.DateFormat}" />
 						</cell>
 					</row>
 				</rows>
 			</grid>
+			<hbox>
+				<button
+					image="/img/item-add.png"
+					label="${labels.AddItem}"
+					onClick="@command('addItem')"
+					sclass="nicebutton" />
+			</hbox>
 			<include src="/app/formButtons.zul" />
 		</vlayout>
 	</window>
diff --git a/src/main/webapp/settings/workflow/workflow.zul b/src/main/webapp/settings/workflow/workflow.zul
index e38ab85d..569599c1 100644
--- a/src/main/webapp/settings/workflow/workflow.zul
+++ b/src/main/webapp/settings/workflow/workflow.zul
@@ -1,7 +1,7 @@
 <?page title="${labels.AgendaWorkflow}" contentType="text/html;charset=UTF-8"?>
 <zk>
 <window border="normal" apply="org.zkoss.bind.BindComposer"
-	viewModel="@id('vm') @init('info.bukova.isspst.ui.requirements.RequirementTypesVM')">
+	viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementTypesVM')">
 <caption zclass="form-caption" label="${labels.AgendaWorkflow}" />
 <vbox>
 	<hbox>
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
deleted file mode 100644
index 10476512..00000000
--- a/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<!-- Appenders -->
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
-		</layout>
-	</appender>
-	
-	<!-- Application Loggers -->
-	<logger name="info.bukova.isspst">
-		<level value="info" />
-	</logger>
-	
-	<!-- 3rdparty Loggers -->
-	<logger name="org.springframework.core">
-		<level value="info" />
-	</logger>	
-	
-	<logger name="org.springframework.beans">
-		<level value="info" />
-	</logger>
-	
-	<logger name="org.springframework.context">
-		<level value="info" />
-	</logger>
-
-	<logger name="org.springframework.web">
-		<level value="info" />
-	</logger>
-
-	<!-- Root Logger -->
-	<root>
-		<priority value="info" />
-		<appender-ref ref="console" />
-	</root>
-	
-</log4j:configuration>