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

src/main/java/info/bukova/isspst/Constants.java

@@ -7,6 +7,7 @@ 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.users.RoleService;
 import info.bukova.isspst.services.users.UserService;
 
@@ -51,12 +52,14 @@ public class Constants {
 	public final static String MOD_ADDRESSBOOK = "ADDRESSBOOK";
 	public final static String MOD_BUILDINGS = "BUILDINGS";
 	public final static String MOD_MUNITS = "MUNITS";
+	public final static String MOD_MATERIAL = "MATERIAL";
 	public final static Module MODULES[] = {
 		  new Module(MOD_USERS, "Uživatelé", UserService.class)
 		, new Module(MOD_PERMISSIONS, "Práva", RoleService.class)
 		, new Module(MOD_ADDRESSBOOK, "Dodavatelé", AdbService.class)
 		, new Module(MOD_BUILDINGS, "Budovy", BuildingService.class)
 		, new Module(MOD_MUNITS, "Měrné jednotky", MUnitService.class)
+		, new Module(MOD_MATERIAL, "Materiál", MaterialService.class)
 		};
 	
 	public final static String DYNAMIC_REPORT_NAME = "Tabulková sestava";

src/main/java/info/bukova/isspst/dao/MaterialDao.java

@@ -0,0 +1,7 @@
+package info.bukova.isspst.dao;
+
+import info.bukova.isspst.data.Material;
+
+public interface MaterialDao extends BaseDao<Material> {
+
+}

src/main/java/info/bukova/isspst/dao/jpa/MaterialDaoJPA.java

@@ -0,0 +1,14 @@
+package info.bukova.isspst.dao.jpa;
+
+import info.bukova.isspst.dao.MaterialDao;
+import info.bukova.isspst.data.Material;
+
+public class MaterialDaoJPA extends BaseDaoJPA<Material> implements MaterialDao {
+
+	@Override
+	public String getEntityName() {
+		return Material.class.getSimpleName();
+	}
+
+
+}

src/main/java/info/bukova/isspst/data/Material.java

@@ -0,0 +1,12 @@
+package info.bukova.isspst.data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="MATERIAL")
+public class Material extends RequestSubject {
+	
+	
+
+}

src/main/java/info/bukova/isspst/data/RequestSubject.java

@@ -0,0 +1,43 @@
+package info.bukova.isspst.data;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+@MappedSuperclass
+public class RequestSubject extends BaseData {
+
+	@Column(name = "CODE", unique = true)
+	private String code;
+	@Column(name = "NAME")
+	private String name;
+	@Column(name = "DESCRIPTION")
+	private String description;
+
+	@NotEmpty(message = "{MaterialFormCodeConstr}")
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+}

src/main/java/info/bukova/isspst/filters/MaterialFilter.java

@@ -0,0 +1,56 @@
+package info.bukova.isspst.filters;
+
+import static info.bukova.isspst.StringUtils.nullStr;
+import info.bukova.isspst.data.Material;
+
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+public class MaterialFilter implements Filter<Material> {
+	
+	private Material condMaterial;
+	
+	public MaterialFilter(Material condMaterial) {
+		this.condMaterial = condMaterial;
+	}
+
+	private static class MaterialMatcher extends TypeSafeMatcher<Material> {
+
+		private Material condMaterial;
+		
+		public MaterialMatcher(Material cond) {
+			this.condMaterial = cond;
+		}
+		
+		@Override
+		public void describeTo(Description desc) {
+			desc.appendText("material matches");
+		}
+
+		@Override
+		public boolean matchesSafely(Material item) {
+			return nullStr(item.getCode()).toLowerCase().contains(nullStr(condMaterial.getCode()).toLowerCase()) 
+					&& nullStr(item.getName()).toLowerCase().contains(nullStr(condMaterial.getName()).toLowerCase())
+					&& nullStr(item.getDescription()).toLowerCase().contains(nullStr(condMaterial.getDescription()).toLowerCase());
+		}
+		
+		@Factory
+		public static Matcher<Material> matchBuilding(Material material) {
+			return new MaterialMatcher(material);
+		}
+	}
+	
+	@Override
+	public MaterialMatcher matcher() {
+		return new MaterialMatcher(condMaterial);
+	}
+
+	@Override
+	public String queryString() {
+		// TODO query string
+		return "";
+	}
+
+}

src/main/java/info/bukova/isspst/services/material/MaterialService.java

@@ -0,0 +1,8 @@
+package info.bukova.isspst.services.material;
+
+import info.bukova.isspst.data.Material;
+import info.bukova.isspst.services.Service;
+
+public interface MaterialService extends Service<Material> {
+
+}

src/main/java/info/bukova/isspst/services/material/MaterialServiceImpl.java

@@ -0,0 +1,9 @@
+package info.bukova.isspst.services.material;
+
+import info.bukova.isspst.data.Material;
+import info.bukova.isspst.services.AbstractOwnedService;
+
+public class MaterialServiceImpl extends AbstractOwnedService<Material>
+		implements MaterialService {
+
+}

src/main/java/info/bukova/isspst/ui/material/MaterialForm.java

@@ -0,0 +1,15 @@
+package info.bukova.isspst.ui.material;
+
+import org.zkoss.bind.annotation.Init;
+
+import info.bukova.isspst.data.Material;
+import info.bukova.isspst.ui.FormViewModel;
+
+public class MaterialForm extends FormViewModel<Material> {
+	
+	@Init(superclass = true)
+	public void init() {
+		
+	}
+
+}

src/main/java/info/bukova/isspst/ui/material/MaterialList.java

@@ -0,0 +1,24 @@
+package info.bukova.isspst.ui.material;
+
+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.ui.ListViewModel;
+
+public class MaterialList extends ListViewModel<Material> {
+	
+	@WireVariable
+	private MaterialService materialService;
+	
+	@Init
+	public void init() {
+		service = materialService;
+		dataClass = Material.class;
+		formZul = "materialForm.zul";
+		dataFilter = new MaterialFilter(getFilterTemplate());
+	}
+
+}