Vytvořená agenda Služby. Servisní třídy agendy Materiál byly přesunuty

do balíku reqsubjects. 
closes #106

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)

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> {
+
+}

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 {
+
+}

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 {
+
+}

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 "";
+	}
+
+}

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;

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;

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> {
+
+}

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 {
+
+}

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;

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> {

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() {
+
+	}
+
+}

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());
+	}
+
+}