From a310a438cb7e4d9c45f16fea2cd09c7e85e686dc Mon Sep 17 00:00:00 2001 From: Franta Pribyl Date: Fri, 6 Jun 2014 19:04:09 +0200 Subject: [PATCH] =?UTF-8?q?Vytvo=C5=99en=C3=A1=20agenda=20M=C4=9Brn=C3=A9?= =?UTF-8?q?=20jednotky.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes #90 --- .../java/info/bukova/isspst/Constants.java | 13 ++-- .../java/info/bukova/isspst/dao/MUnitDao.java | 7 ++ .../bukova/isspst/dao/jpa/MUnitDaoJPA.java | 12 ++++ .../java/info/bukova/isspst/data/MUnit.java | 67 ++++++++++++++++++ .../bukova/isspst/filters/MUnitFilter.java | 56 +++++++++++++++ .../isspst/services/munits/MUnitService.java | 8 +++ .../services/munits/MUnitServiceImpl.java | 8 +++ .../ui/{ => buildings}/BuildingForm.java | 3 +- .../ui/{ => buildings}/BuildingList.java | 3 +- .../bukova/isspst/ui/munits/MUnitsForm.java | 14 ++++ .../bukova/isspst/ui/munits/MUnitsList.java | 23 ++++++ .../resources/ValidationMessages.properties | 3 +- src/main/resources/hibernate.cfg.xml | 1 + .../ckez-bind-lang-addon.xml | 0 .../{ => lang-addons}/mapa-lang-addon.xml | 0 .../webapp/WEB-INF/spring/root-context.xml | 10 +++ src/main/webapp/WEB-INF/zk-label.properties | 9 +++ src/main/webapp/WEB-INF/zk.xml | 4 +- src/main/webapp/app/navigation.zul | 5 +- src/main/webapp/buildings/building.zul | 2 +- src/main/webapp/buildings/buildingForm.zul | 2 +- src/main/webapp/img/munits.png | Bin 0 -> 3117 bytes src/main/webapp/munits/index.zul | 10 +++ src/main/webapp/munits/munitsForm.zul | 35 +++++++++ src/main/webapp/munits/munitsGrid.zul | 58 +++++++++++++++ 25 files changed, 339 insertions(+), 14 deletions(-) create mode 100644 src/main/java/info/bukova/isspst/dao/MUnitDao.java create mode 100644 src/main/java/info/bukova/isspst/dao/jpa/MUnitDaoJPA.java create mode 100644 src/main/java/info/bukova/isspst/data/MUnit.java create mode 100644 src/main/java/info/bukova/isspst/filters/MUnitFilter.java create mode 100644 src/main/java/info/bukova/isspst/services/munits/MUnitService.java create mode 100644 src/main/java/info/bukova/isspst/services/munits/MUnitServiceImpl.java rename src/main/java/info/bukova/isspst/ui/{ => buildings}/BuildingForm.java (70%) rename src/main/java/info/bukova/isspst/ui/{ => buildings}/BuildingList.java (86%) create mode 100644 src/main/java/info/bukova/isspst/ui/munits/MUnitsForm.java create mode 100644 src/main/java/info/bukova/isspst/ui/munits/MUnitsList.java rename src/main/webapp/WEB-INF/{ => lang-addons}/ckez-bind-lang-addon.xml (100%) rename src/main/webapp/WEB-INF/{ => lang-addons}/mapa-lang-addon.xml (100%) create mode 100644 src/main/webapp/img/munits.png create mode 100644 src/main/webapp/munits/index.zul create mode 100644 src/main/webapp/munits/munitsForm.zul create mode 100644 src/main/webapp/munits/munitsGrid.zul diff --git a/src/main/java/info/bukova/isspst/Constants.java b/src/main/java/info/bukova/isspst/Constants.java index 3c88315f..e1f6f665 100644 --- a/src/main/java/info/bukova/isspst/Constants.java +++ b/src/main/java/info/bukova/isspst/Constants.java @@ -6,6 +6,7 @@ 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.users.RoleService; import info.bukova.isspst.services.users.UserService; @@ -49,12 +50,14 @@ public class Constants { public final static String MOD_PERMISSIONS = "PERMISSIONS"; public final static String MOD_ADDRESSBOOK = "ADDRESSBOOK"; public final static String MOD_BUILDINGS = "BUILDINGS"; + public final static String MOD_MUNITS = "MUNITS"; 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_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) + }; public final static String DYNAMIC_REPORT_NAME = "Tabulková sestava"; public final static ReportMapping REPORTS[] = { diff --git a/src/main/java/info/bukova/isspst/dao/MUnitDao.java b/src/main/java/info/bukova/isspst/dao/MUnitDao.java new file mode 100644 index 00000000..833b406f --- /dev/null +++ b/src/main/java/info/bukova/isspst/dao/MUnitDao.java @@ -0,0 +1,7 @@ +package info.bukova.isspst.dao; + +import info.bukova.isspst.data.MUnit; + +public interface MUnitDao extends BaseDao { + +} \ No newline at end of file diff --git a/src/main/java/info/bukova/isspst/dao/jpa/MUnitDaoJPA.java b/src/main/java/info/bukova/isspst/dao/jpa/MUnitDaoJPA.java new file mode 100644 index 00000000..d91e95ac --- /dev/null +++ b/src/main/java/info/bukova/isspst/dao/jpa/MUnitDaoJPA.java @@ -0,0 +1,12 @@ +package info.bukova.isspst.dao.jpa; + +import info.bukova.isspst.dao.MUnitDao; +import info.bukova.isspst.data.MUnit; + +public class MUnitDaoJPA extends BaseDaoJPA implements MUnitDao { + + @Override + public String getEntityName() { + return "MUnit"; + } +} diff --git a/src/main/java/info/bukova/isspst/data/MUnit.java b/src/main/java/info/bukova/isspst/data/MUnit.java new file mode 100644 index 00000000..8cdb5da9 --- /dev/null +++ b/src/main/java/info/bukova/isspst/data/MUnit.java @@ -0,0 +1,67 @@ +package info.bukova.isspst.data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +import org.hibernate.validator.constraints.NotBlank; + +@Entity +@Table(name = "MUNIT") +public class MUnit extends BaseData implements DataModel { + + @Column(name = "CODE", unique = true) + private String code; + + @Column(name = "NAME") + private String name; + + @Column(name = "DESCRIPTION") + private String description; + + /** + * @return the code + */ + @NotBlank(message = "{MUnitsFormCodeConstr}") + public String getCode() { + return code; + } + + /** + * @param code + * the code to set + */ + public void setCode(String code) { + this.code = code; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name + * the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the description + */ + public String getDescription() { + return description; + } + + /** + * @param description + * the description to set + */ + public void setDescription(String description) { + this.description = description; + } +} diff --git a/src/main/java/info/bukova/isspst/filters/MUnitFilter.java b/src/main/java/info/bukova/isspst/filters/MUnitFilter.java new file mode 100644 index 00000000..55857dd2 --- /dev/null +++ b/src/main/java/info/bukova/isspst/filters/MUnitFilter.java @@ -0,0 +1,56 @@ +package info.bukova.isspst.filters; + +import static info.bukova.isspst.StringUtils.nullStr; +import info.bukova.isspst.data.MUnit; + +import org.hamcrest.Description; +import org.hamcrest.Factory; +import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeMatcher; + +public class MUnitFilter implements Filter { + + private MUnit condMUnit; + + public MUnitFilter(MUnit condMUnit) { + this.condMUnit = condMUnit; + } + + private static class MUnitMatcher extends TypeSafeMatcher { + + private MUnit condMUnit; + + public MUnitMatcher(MUnit cond) { + this.condMUnit = cond; + } + + @Override + public void describeTo(Description desc) { + desc.appendText("munits matches"); + } + + @Override + public boolean matchesSafely(MUnit item) { + return nullStr(item.getCode()).toLowerCase().contains(nullStr(condMUnit.getCode()).toLowerCase()) + && nullStr(item.getName()).toLowerCase().contains(nullStr(condMUnit.getName()).toLowerCase()) + && nullStr(item.getDescription()).toLowerCase().contains(nullStr(condMUnit.getDescription()).toLowerCase()); + } + + @Factory + public static Matcher matchMUnit(MUnit munit) { + return new MUnitMatcher(munit); + } + } + + @Override + public MUnitMatcher matcher() { + return new MUnitMatcher(condMUnit); + } + + @Override + public String queryString() { + // TODO query string + return ""; + } + +} diff --git a/src/main/java/info/bukova/isspst/services/munits/MUnitService.java b/src/main/java/info/bukova/isspst/services/munits/MUnitService.java new file mode 100644 index 00000000..7b8d2947 --- /dev/null +++ b/src/main/java/info/bukova/isspst/services/munits/MUnitService.java @@ -0,0 +1,8 @@ +package info.bukova.isspst.services.munits; + +import info.bukova.isspst.data.MUnit; +import info.bukova.isspst.services.Service; + +public interface MUnitService extends Service { + +} diff --git a/src/main/java/info/bukova/isspst/services/munits/MUnitServiceImpl.java b/src/main/java/info/bukova/isspst/services/munits/MUnitServiceImpl.java new file mode 100644 index 00000000..e929663d --- /dev/null +++ b/src/main/java/info/bukova/isspst/services/munits/MUnitServiceImpl.java @@ -0,0 +1,8 @@ +package info.bukova.isspst.services.munits; + +import info.bukova.isspst.data.MUnit; +import info.bukova.isspst.services.AbstractService; + +public class MUnitServiceImpl extends AbstractService implements MUnitService{ + +} diff --git a/src/main/java/info/bukova/isspst/ui/BuildingForm.java b/src/main/java/info/bukova/isspst/ui/buildings/BuildingForm.java similarity index 70% rename from src/main/java/info/bukova/isspst/ui/BuildingForm.java rename to src/main/java/info/bukova/isspst/ui/buildings/BuildingForm.java index 8f2d0907..d0a4c0de 100644 --- a/src/main/java/info/bukova/isspst/ui/BuildingForm.java +++ b/src/main/java/info/bukova/isspst/ui/buildings/BuildingForm.java @@ -1,6 +1,7 @@ -package info.bukova.isspst.ui; +package info.bukova.isspst.ui.buildings; import info.bukova.isspst.data.Building; +import info.bukova.isspst.ui.FormViewModel; import org.zkoss.bind.annotation.Init; diff --git a/src/main/java/info/bukova/isspst/ui/BuildingList.java b/src/main/java/info/bukova/isspst/ui/buildings/BuildingList.java similarity index 86% rename from src/main/java/info/bukova/isspst/ui/BuildingList.java rename to src/main/java/info/bukova/isspst/ui/buildings/BuildingList.java index aadc1384..73233a03 100644 --- a/src/main/java/info/bukova/isspst/ui/BuildingList.java +++ b/src/main/java/info/bukova/isspst/ui/buildings/BuildingList.java @@ -1,8 +1,9 @@ -package info.bukova.isspst.ui; +package info.bukova.isspst.ui.buildings; import info.bukova.isspst.data.Building; import info.bukova.isspst.filters.BuildingFilter; import info.bukova.isspst.services.buildings.BuildingService; +import info.bukova.isspst.ui.ListViewModel; import org.zkoss.bind.annotation.Init; import org.zkoss.zk.ui.select.annotation.WireVariable; diff --git a/src/main/java/info/bukova/isspst/ui/munits/MUnitsForm.java b/src/main/java/info/bukova/isspst/ui/munits/MUnitsForm.java new file mode 100644 index 00000000..bac42f0a --- /dev/null +++ b/src/main/java/info/bukova/isspst/ui/munits/MUnitsForm.java @@ -0,0 +1,14 @@ +package info.bukova.isspst.ui.munits; + +import info.bukova.isspst.data.MUnit; +import info.bukova.isspst.ui.FormViewModel; + +import org.zkoss.bind.annotation.Init; + +public class MUnitsForm extends FormViewModel { + + @Init(superclass = true) + public void init() { + + } +} diff --git a/src/main/java/info/bukova/isspst/ui/munits/MUnitsList.java b/src/main/java/info/bukova/isspst/ui/munits/MUnitsList.java new file mode 100644 index 00000000..3217ee08 --- /dev/null +++ b/src/main/java/info/bukova/isspst/ui/munits/MUnitsList.java @@ -0,0 +1,23 @@ +package info.bukova.isspst.ui.munits; + +import info.bukova.isspst.data.MUnit; +import info.bukova.isspst.filters.MUnitFilter; +import info.bukova.isspst.services.munits.MUnitService; +import info.bukova.isspst.ui.ListViewModel; + +import org.zkoss.bind.annotation.Init; +import org.zkoss.zk.ui.select.annotation.WireVariable; + +public class MUnitsList extends ListViewModel { + + @WireVariable + private MUnitService munitService; + + @Init + public void init() { + service = munitService; + dataClass = MUnit.class; + formZul = "munitsForm.zul"; + dataFilter = new MUnitFilter(getFilterTemplate()); + } +} diff --git a/src/main/resources/ValidationMessages.properties b/src/main/resources/ValidationMessages.properties index ebe76fac..7f627910 100644 --- a/src/main/resources/ValidationMessages.properties +++ b/src/main/resources/ValidationMessages.properties @@ -1 +1,2 @@ -BuildingsFormCodeConstr=Zadejte k\u00f3d budovy... \ No newline at end of file +BuildingsFormCodeConstr=Zadejte k\u00f3d budovy... +MUnitsFormCodeConstr=Zadejte k\u00f3d m\u011brn\u00e9 jednotky... \ No newline at end of file diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml index a50d30e6..5136da4b 100644 --- a/src/main/resources/hibernate.cfg.xml +++ b/src/main/resources/hibernate.cfg.xml @@ -11,5 +11,6 @@ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/ckez-bind-lang-addon.xml b/src/main/webapp/WEB-INF/lang-addons/ckez-bind-lang-addon.xml similarity index 100% rename from src/main/webapp/WEB-INF/ckez-bind-lang-addon.xml rename to src/main/webapp/WEB-INF/lang-addons/ckez-bind-lang-addon.xml diff --git a/src/main/webapp/WEB-INF/mapa-lang-addon.xml b/src/main/webapp/WEB-INF/lang-addons/mapa-lang-addon.xml similarity index 100% rename from src/main/webapp/WEB-INF/mapa-lang-addon.xml rename to src/main/webapp/WEB-INF/lang-addons/mapa-lang-addon.xml diff --git a/src/main/webapp/WEB-INF/spring/root-context.xml b/src/main/webapp/WEB-INF/spring/root-context.xml index d49e645c..13b4dbb6 100644 --- a/src/main/webapp/WEB-INF/spring/root-context.xml +++ b/src/main/webapp/WEB-INF/spring/root-context.xml @@ -66,6 +66,7 @@ + @@ -107,6 +108,10 @@ + + + + @@ -132,6 +137,11 @@ + + + + + diff --git a/src/main/webapp/WEB-INF/zk-label.properties b/src/main/webapp/WEB-INF/zk-label.properties index 19c972fd..a7461dcf 100644 --- a/src/main/webapp/WEB-INF/zk-label.properties +++ b/src/main/webapp/WEB-INF/zk-label.properties @@ -1,6 +1,15 @@ # Default file AppName=Objednávkový systém SPŠ Třebíč +AgendaMUnits=Měrné jednotky +MUnitsFormTitle=Měrná jednotka +MUnitsFormCode=Kód +MUnitsFormName=Název +MUnitsFormDescription=Popis +MUnitsGridColumnCode=Kód +MUnitsGridColumnName=Název +MUnitsGridColumnDescription=Popis + AgendaBuildings=Budovy BuildingsFormTitle=Budova BuildingsFormCode=Kód diff --git a/src/main/webapp/WEB-INF/zk.xml b/src/main/webapp/WEB-INF/zk.xml index 57f1355d..1f1e39fb 100644 --- a/src/main/webapp/WEB-INF/zk.xml +++ b/src/main/webapp/WEB-INF/zk.xml @@ -19,8 +19,8 @@ - /WEB-INF/mapa-lang-addon.xml - /WEB-INF/ckez-bind-lang-addon.xml + /WEB-INF/lang-addons/mapa-lang-addon.xml + /WEB-INF/lang-addons/ckez-bind-lang-addon.xml /WEB-INF/lang-addons/CzechSortListheader.xml diff --git a/src/main/webapp/app/navigation.zul b/src/main/webapp/app/navigation.zul index 39cfd208..6b34b174 100644 --- a/src/main/webapp/app/navigation.zul +++ b/src/main/webapp/app/navigation.zul @@ -20,7 +20,8 @@ - + + @@ -30,7 +31,7 @@ - + diff --git a/src/main/webapp/buildings/building.zul b/src/main/webapp/buildings/building.zul index 11e2ac86..de6af063 100644 --- a/src/main/webapp/buildings/building.zul +++ b/src/main/webapp/buildings/building.zul @@ -1,7 +1,7 @@ - + diff --git a/src/main/webapp/buildings/buildingForm.zul b/src/main/webapp/buildings/buildingForm.zul index 72352c31..11bc4d0c 100644 --- a/src/main/webapp/buildings/buildingForm.zul +++ b/src/main/webapp/buildings/buildingForm.zul @@ -1,6 +1,6 @@ - + diff --git a/src/main/webapp/img/munits.png b/src/main/webapp/img/munits.png new file mode 100644 index 0000000000000000000000000000000000000000..bc56ed738239156b073ff693ffb576cc9cef56b6 GIT binary patch literal 3117 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 + + + + String gridZul = "munitsGrid.zul"; + + + + + \ No newline at end of file diff --git a/src/main/webapp/munits/munitsForm.zul b/src/main/webapp/munits/munitsForm.zul new file mode 100644 index 00000000..f76ec269 --- /dev/null +++ b/src/main/webapp/munits/munitsForm.zul @@ -0,0 +1,35 @@ + + + + + + + + + + + + + ${labels.MUnitsFormCode} : + + + + + + ${labels.MUnitsFormName} : + + + + + + ${labels.MUnitsFormDescription} : + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/munits/munitsGrid.zul b/src/main/webapp/munits/munitsGrid.zul new file mode 100644 index 00000000..04947096 --- /dev/null +++ b/src/main/webapp/munits/munitsGrid.zul @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + + + + + + + \ No newline at end of file