From 1f1f0536751f130d30cbf547efba9f02c43a3c8f Mon Sep 17 00:00:00 2001 From: Franta Pribyl Date: Mon, 12 May 2014 08:36:00 +0200 Subject: [PATCH] =?UTF-8?q?P=C5=99id=C3=A1na=20agenda=20Budovy.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/bukova/isspst/dao/BuildingDao.java | 7 + .../bukova/isspst/dao/jpa/BuildingDaoJPA.java | 12 ++ .../info/bukova/isspst/data/Building.java | 121 ++++++++++++++++++ .../isspst/services/BuildingService.java | 7 + .../isspst/services/BuildingServiceImpl.java | 7 + .../info/bukova/isspst/ui/BuildingForm.java | 14 ++ .../info/bukova/isspst/ui/BuildingList.java | 21 +++ src/main/resources/hibernate.cfg.xml | 1 + .../webapp/WEB-INF/spring/root-context.xml | 4 +- src/main/webapp/WEB-INF/zk-label.properties | 21 +++ src/main/webapp/app/navigation.zul | 2 +- src/main/webapp/app/page.css | 28 +++- src/main/webapp/buildings/building.zul | 30 +++++ src/main/webapp/buildings/buildingForm.zul | 42 ++++++ src/main/webapp/buildings/index.zul | 10 ++ src/main/webapp/img/building.png | Bin 0 -> 5615 bytes 16 files changed, 320 insertions(+), 7 deletions(-) create mode 100644 src/main/java/info/bukova/isspst/dao/BuildingDao.java create mode 100644 src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java create mode 100644 src/main/java/info/bukova/isspst/data/Building.java create mode 100644 src/main/java/info/bukova/isspst/services/BuildingService.java create mode 100644 src/main/java/info/bukova/isspst/services/BuildingServiceImpl.java create mode 100644 src/main/java/info/bukova/isspst/ui/BuildingForm.java create mode 100644 src/main/java/info/bukova/isspst/ui/BuildingList.java create mode 100644 src/main/webapp/WEB-INF/zk-label.properties create mode 100644 src/main/webapp/buildings/building.zul create mode 100644 src/main/webapp/buildings/buildingForm.zul create mode 100644 src/main/webapp/buildings/index.zul create mode 100644 src/main/webapp/img/building.png diff --git a/src/main/java/info/bukova/isspst/dao/BuildingDao.java b/src/main/java/info/bukova/isspst/dao/BuildingDao.java new file mode 100644 index 00000000..85b20608 --- /dev/null +++ b/src/main/java/info/bukova/isspst/dao/BuildingDao.java @@ -0,0 +1,7 @@ +package info.bukova.isspst.dao; + +import info.bukova.isspst.data.Building; + +public interface BuildingDao extends BaseDao { + +} \ No newline at end of file diff --git a/src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java b/src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java new file mode 100644 index 00000000..46a84cfe --- /dev/null +++ b/src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java @@ -0,0 +1,12 @@ +package info.bukova.isspst.dao.jpa; + +import info.bukova.isspst.dao.BuildingDao; +import info.bukova.isspst.data.Building; + +public class BuildingDaoJPA extends BaseDaoJPA implements BuildingDao { + + @Override + public String getEntityName() { + return "Building"; + } +} diff --git a/src/main/java/info/bukova/isspst/data/Building.java b/src/main/java/info/bukova/isspst/data/Building.java new file mode 100644 index 00000000..254cabfb --- /dev/null +++ b/src/main/java/info/bukova/isspst/data/Building.java @@ -0,0 +1,121 @@ +package info.bukova.isspst.data; + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name="BUILDING") +public class Building implements DataModel { + + @Id + @Column(name="ID") + @GeneratedValue + private int id; + + @Column(name="CODE", unique=true) + private String code; + + @Column(name="NAME") + private String name; + + @Column(name="DESCRIPTION") + private String description; + + /** + * @return the id + */ + public int getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(int id) { + this.id = id; + } + + /** + * @return the code + */ + 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; + } + + @Override + public void setCreated(Date created) { + // TODO Auto-generated method stub + + } + + @Override + public Date getCreated() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setModified(Date modified) { + // TODO Auto-generated method stub + + } + + @Override + public Date getModified() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isValid() { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setValid(boolean valid) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/main/java/info/bukova/isspst/services/BuildingService.java b/src/main/java/info/bukova/isspst/services/BuildingService.java new file mode 100644 index 00000000..919c30d3 --- /dev/null +++ b/src/main/java/info/bukova/isspst/services/BuildingService.java @@ -0,0 +1,7 @@ +package info.bukova.isspst.services; + +import info.bukova.isspst.data.Building; + +public interface BuildingService extends Service { + +} diff --git a/src/main/java/info/bukova/isspst/services/BuildingServiceImpl.java b/src/main/java/info/bukova/isspst/services/BuildingServiceImpl.java new file mode 100644 index 00000000..57abc7fe --- /dev/null +++ b/src/main/java/info/bukova/isspst/services/BuildingServiceImpl.java @@ -0,0 +1,7 @@ +package info.bukova.isspst.services; + +import info.bukova.isspst.data.Building; + +public class BuildingServiceImpl extends AbstractService implements BuildingService{ + +} diff --git a/src/main/java/info/bukova/isspst/ui/BuildingForm.java b/src/main/java/info/bukova/isspst/ui/BuildingForm.java new file mode 100644 index 00000000..8f2d0907 --- /dev/null +++ b/src/main/java/info/bukova/isspst/ui/BuildingForm.java @@ -0,0 +1,14 @@ +package info.bukova.isspst.ui; + +import info.bukova.isspst.data.Building; + +import org.zkoss.bind.annotation.Init; + +public class BuildingForm extends FormViewModel { + + @Init(superclass = true) + public void init() { + + } + +} diff --git a/src/main/java/info/bukova/isspst/ui/BuildingList.java b/src/main/java/info/bukova/isspst/ui/BuildingList.java new file mode 100644 index 00000000..94ffe808 --- /dev/null +++ b/src/main/java/info/bukova/isspst/ui/BuildingList.java @@ -0,0 +1,21 @@ +package info.bukova.isspst.ui; + +import info.bukova.isspst.data.Building; +import info.bukova.isspst.services.BuildingService; + +import org.zkoss.bind.annotation.Init; +import org.zkoss.zk.ui.select.annotation.WireVariable; + +public class BuildingList extends ListViewModel { + + @WireVariable + private BuildingService buildingService; + + @Init + public void init() { + service = buildingService; + dataClass = Building.class; + formZul = "buildingForm.zul"; + } + +} diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml index 76d3d2d2..848e7cb8 100644 --- a/src/main/resources/hibernate.cfg.xml +++ b/src/main/resources/hibernate.cfg.xml @@ -7,5 +7,6 @@ + \ 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 39249fd2..2e95a6b7 100644 --- a/src/main/webapp/WEB-INF/spring/root-context.xml +++ b/src/main/webapp/WEB-INF/spring/root-context.xml @@ -89,12 +89,12 @@ - + - + diff --git a/src/main/webapp/WEB-INF/zk-label.properties b/src/main/webapp/WEB-INF/zk-label.properties new file mode 100644 index 00000000..a072d70c --- /dev/null +++ b/src/main/webapp/WEB-INF/zk-label.properties @@ -0,0 +1,21 @@ +# Default file +AgendaBuildings=Budovy + +BuildingsFormCode=Kód +BuildingsFormCodeConstr=Zadejte kód budovy... +BuildingsFormName=Název +BuildingsFormDescription=Popis + +BuildingsGridColumnCode=Kód +BuildingsGridColumnName=Název +BuildingsGridColumnDescription=Popis + +ButtonStorno=Storno +ButtonSave=Uložit + +FormBuilding=Budova + +ToolbarRecNew=Nový záznam +ToolbarRecEdit=Úprava aktuálního záznamu +ToolbarRecDelete=Odstranit aktuální záznam +ToolbarRecFilter=Filtr záznamů diff --git a/src/main/webapp/app/navigation.zul b/src/main/webapp/app/navigation.zul index 33b140ac..bf76c9fe 100644 --- a/src/main/webapp/app/navigation.zul +++ b/src/main/webapp/app/navigation.zul @@ -29,7 +29,7 @@ - + diff --git a/src/main/webapp/app/page.css b/src/main/webapp/app/page.css index 9996d2b4..2e9c8328 100644 --- a/src/main/webapp/app/page.css +++ b/src/main/webapp/app/page.css @@ -1,10 +1,15 @@ -body { +/*body { font-family: sans-serif; +}*/ + +#container { + min-height:100%; + position:relative; } #header{ width: auto; - height:70px; + height:40px; border: 1px solid #ccc; padding:10px; } @@ -23,15 +28,30 @@ body { #maincolumn{ padding:10px; + padding-bottom:20px; /* Height of the footer */ margin: 0px 0px 0px 160px; - border: 1px solid #ccc; } #footer{ clear:both; - width:auto; + position:absolute; + bottom:0; + width:100%; + height:20px; /* Height of the footer */ + border: 1px solid #ccc; } + +.form-caption { + --1overflow:hidden; + font-weight: bold; + font-size: 20px; +} +/*aaa*/ +.form-caption-content { + float:left; +} + /* a:link,a:visited { font-size: 12px; diff --git a/src/main/webapp/buildings/building.zul b/src/main/webapp/buildings/building.zul new file mode 100644 index 00000000..e34c7d24 --- /dev/null +++ b/src/main/webapp/buildings/building.zul @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/buildings/buildingForm.zul b/src/main/webapp/buildings/buildingForm.zul new file mode 100644 index 00000000..45fd5834 --- /dev/null +++ b/src/main/webapp/buildings/buildingForm.zul @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + ${labels.BuildingsFormCode} : + + + + + + ${labels.BuildingsFormName} : + + + + + + ${labels.BuildingsFormDescription} : + + + + + + + +
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/buildings/index.zul b/src/main/webapp/buildings/index.zul new file mode 100644 index 00000000..d0cb3c94 --- /dev/null +++ b/src/main/webapp/buildings/index.zul @@ -0,0 +1,10 @@ + + + + + String gridZul = "building.zul"; + + + + + \ No newline at end of file diff --git a/src/main/webapp/img/building.png b/src/main/webapp/img/building.png new file mode 100644 index 0000000000000000000000000000000000000000..95b75a95a98ff25f0b37bc5716a4e54ea536946f GIT binary patch literal 5615 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 JPDHLkV1m;5?acrH literal 0 HcmV?d00001