diff --git a/bin b/bin deleted file mode 160000 index b2dde2e..0000000 --- a/bin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b2dde2ed03a1519e54cfa045d2ca1cf02983b66e diff --git a/diagrams/BorderGuard.xml b/diagrams/BorderGuard.xml index b8d1ab5..3afc442 100644 --- a/diagrams/BorderGuard.xml +++ b/diagrams/BorderGuard.xml @@ -1,4 +1,5 @@ - + + itcollege.team09.entities.AdminYksus 193 diff --git a/pom.xml b/pom.xml index 077dced..eb4ff21 100644 --- a/pom.xml +++ b/pom.xml @@ -1,564 +1,566 @@ - - 4.0.0 - itcollege.team09 - BorderGuard - war - 0.1.0.BUILD-SNAPSHOT - BorderGuard - - 1.1.5.RELEASE - 3.0.5.RELEASE - 1.6.11 - 1.6.1 - UTF-8 - 3.0.5.RELEASE - - - - spring-maven-release - Spring Maven Release Repository - http://maven.springframework.org/release - - - spring-maven-milestone - Spring Maven Milestone Repository - http://maven.springframework.org/milestone - - - spring-roo-repository - Spring Roo Repository - http://spring-roo-repository.springsource.org/release - - - JBoss Repo - https://repository.jboss.org/nexus/content/repositories/releases - JBoss Repo - - - - - spring-maven-release - Spring Maven Release Repository - http://maven.springframework.org/release - - - spring-maven-milestone - Spring Maven Milestone Repository - http://maven.springframework.org/milestone - - - spring-roo-repository - Spring Roo Repository - http://spring-roo-repository.springsource.org/release - - - - - - junit - junit - 4.8.2 - test - - - log4j - log4j - 1.2.16 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - org.aspectj - aspectjrt - ${aspectj.version} - - - org.aspectj - aspectjweaver - ${aspectj.version} - - - javax.servlet - servlet-api - 2.5 - provided - - - net.sf.flexjson - flexjson - 2.1 - - - - org.springframework.roo - org.springframework.roo.annotations - ${roo.version} - provided - - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-test - ${spring.version} - test - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-aspects - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.hsqldb - hsqldb - 1.8.0.10 - - - - org.hibernate - hibernate-core - 3.6.4.Final - - - - org.hibernate - hibernate-entitymanager - 3.6.4.Final - - - - cglib - cglib - - - dom4j - dom4j - - - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.0.Final - - - - org.hibernate - hibernate-validator - 4.1.0.Final - - - - javax.xml.bind - jaxb-api - - - com.sun.xml.bind - jaxb-impl - - - - - javax.validation - validation-api - 1.0.0.GA - - - - cglib - cglib-nodep - 2.2 - - - - javax.transaction - jta - 1.1 - - - - org.springframework - spring-jdbc - ${spring.version} - - - - org.springframework - spring-orm - ${spring.version} - - - - commons-pool - commons-pool - 1.5.4 - - - - commons-logging - commons-logging - - - - - commons-dbcp - commons-dbcp - 1.3 - - - - commons-logging - commons-logging - - - commons-pool - commons-pool - - - xerces - xerces - - - xerces - xercesImpl - - - xml-apis - xml-apis - - - - - org.springframework - spring-web - ${spring.version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${spring.version} - - - - commons-logging - commons-logging - - - - - org.springframework.webflow - spring-js-resources - 2.2.1.RELEASE - - - - commons-digester - commons-digester - 2.0 - - - - commons-logging - commons-logging - - - - - commons-fileupload - commons-fileupload - 1.2.1 - - - - commons-logging - commons-logging - - - - - javax.servlet.jsp.jstl - jstl-api - 1.2 - - - - org.glassfish.web - jstl-impl - 1.2 - - - - javax.el - el-api - 1.0 - provided - - - - joda-time - joda-time - 1.6 - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - - commons-codec - commons-codec - 1.4 - - - - org.apache.tiles - tiles-core - 2.2.1 - - - - commons-logging - commons-logging - - - - - org.apache.tiles - tiles-jsp - 2.2.1 - - - org.springframework.security - spring-security-core - ${spring-security.version} - - - - commons-logging - commons-logging - - - - - org.springframework.security - spring-security-config - ${spring-security.version} - - - - commons-logging - commons-logging - - - - - org.springframework.security - spring-security-web - ${spring-security.version} - - - - org.springframework.security - spring-security-taglibs - ${spring-security.version} - - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - UTF-8 - - - - org.codehaus.mojo - aspectj-maven-plugin - 1.2 - - - - org.aspectj - aspectjrt - ${aspectj.version} - - - org.aspectj - aspectjtools - ${aspectj.version} - - - - - - compile - test-compile - - - - - true - - - org.springframework - spring-aspects - - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - UTF-8 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.8 - - false - true - - **/*_Roo_* - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2.1 - - - jar-with-dependencies - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.6 - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.7 - - true - false - 2.0 - - - org.eclipse.ajdt.core.ajbuilder - - org.springframework.aspects - - - - org.springframework.ide.eclipse.core.springbuilder - - - - org.eclipse.ajdt.ui.ajnature - com.springsource.sts.roo.core.nature - org.springframework.ide.eclipse.core.springnature - - - - - org.apache.maven.plugins - maven-idea-plugin - 2.2 - - true - true - - - - org.codehaus.mojo - tomcat-maven-plugin - 1.1 - - - org.mortbay.jetty - jetty-maven-plugin - 7.4.2.v20110526 - - - /${project.name} - - - - - + + 4.0.0 + itcollege.team09 + BorderGuard + war + 0.1.0.BUILD-SNAPSHOT + BorderGuard + + 1.1.5.RELEASE + 3.0.5.RELEASE + 1.6.11 + 1.6.1 + UTF-8 + 3.0.5.RELEASE + + + + spring-maven-release + Spring Maven Release Repository + http://maven.springframework.org/release + + + spring-maven-milestone + Spring Maven Milestone Repository + http://maven.springframework.org/milestone + + + spring-roo-repository + Spring Roo Repository + http://spring-roo-repository.springsource.org/release + + + JBoss Repo + https://repository.jboss.org/nexus/content/repositories/releases + JBoss Repo + + + + + spring-maven-release + Spring Maven Release Repository + http://maven.springframework.org/release + + + spring-maven-milestone + Spring Maven Milestone Repository + http://maven.springframework.org/milestone + + + spring-roo-repository + Spring Roo Repository + http://spring-roo-repository.springsource.org/release + + + + + + junit + junit + 4.8.2 + test + + + log4j + log4j + 1.2.16 + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + javax.servlet + servlet-api + 2.5 + provided + + + net.sf.flexjson + flexjson + 2.1 + + + + org.springframework.roo + org.springframework.roo.annotations + ${roo.version} + provided + + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-test + ${spring.version} + test + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-aspects + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + + + org.hsqldb + hsqldb + 1.8.0.10 + + + + org.hibernate + hibernate-core + 3.6.4.Final + + + + org.hibernate + hibernate-entitymanager + 3.6.4.Final + + + + cglib + cglib + + + dom4j + dom4j + + + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.0.Final + + + + org.hibernate + hibernate-validator + 4.1.0.Final + + + + javax.xml.bind + jaxb-api + + + com.sun.xml.bind + jaxb-impl + + + + + javax.validation + validation-api + 1.0.0.GA + + + + cglib + cglib-nodep + 2.2 + + + + javax.transaction + jta + 1.1 + + + + org.springframework + spring-jdbc + ${spring.version} + + + + org.springframework + spring-orm + ${spring.version} + + + + commons-pool + commons-pool + 1.5.4 + + + + commons-logging + commons-logging + + + + + commons-dbcp + commons-dbcp + 1.3 + + + + commons-logging + commons-logging + + + commons-pool + commons-pool + + + xerces + xerces + + + xerces + xercesImpl + + + xml-apis + xml-apis + + + + + org.springframework + spring-web + ${spring.version} + + + + commons-logging + commons-logging + + + + + org.springframework + spring-webmvc + ${spring.version} + + + + commons-logging + commons-logging + + + + + org.springframework.webflow + spring-js-resources + 2.2.1.RELEASE + + + + commons-digester + commons-digester + 2.0 + + + + commons-logging + commons-logging + + + + + commons-fileupload + commons-fileupload + 1.2.1 + + + + commons-logging + commons-logging + + + + + javax.servlet.jsp.jstl + jstl-api + 1.2 + + + + org.glassfish.web + jstl-impl + 1.2 + + + + javax.el + el-api + 1.0 + provided + + + + joda-time + joda-time + 1.6 + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + + commons-codec + commons-codec + 1.4 + + + + org.apache.tiles + tiles-core + 2.2.1 + + + + commons-logging + commons-logging + + + + + org.apache.tiles + tiles-jsp + 2.2.1 + + + org.springframework.security + spring-security-core + ${spring-security.version} + + + + commons-logging + commons-logging + + + + + org.springframework.security + spring-security-config + ${spring-security.version} + + + + commons-logging + commons-logging + + + + + org.springframework.security + spring-security-web + ${spring-security.version} + + + + org.springframework.security + spring-security-taglibs + ${spring-security.version} + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + UTF-8 + + + + org.codehaus.mojo + aspectj-maven-plugin + 1.2 + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + + + + compile + test-compile + + + + + true + + + org.springframework + spring-aspects + + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + UTF-8 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.8 + + false + true + + **/*_Roo_* + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2.1 + + + jar-with-dependencies + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.6 + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.7 + + true + false + 2.0 + + + org.eclipse.ajdt.core.ajbuilder + + org.springframework.aspects + + + + org.springframework.ide.eclipse.core.springbuilder + + + + org.eclipse.ajdt.ui.ajnature + com.springsource.sts.roo.core.nature + org.springframework.ide.eclipse.core.springnature + + + + + org.apache.maven.plugins + maven-idea-plugin + 2.2 + + true + true + + + + org.codehaus.mojo + tomcat-maven-plugin + 1.1 + + + org.mortbay.jetty + jetty-maven-plugin + 7.4.2.v20110526 + + + /${project.name} + + + + + diff --git a/src/main/java/itcollege/team09/entities/AdminAlluvus.java b/src/main/java/itcollege/team09/entities/AdminAlluvus.java index aefc8dc..632c279 100644 --- a/src/main/java/itcollege/team09/entities/AdminAlluvus.java +++ b/src/main/java/itcollege/team09/entities/AdminAlluvus.java @@ -62,16 +62,5 @@ public Date getKuni() { public void setKuni(Date kuni) { this.kuni = kuni; } - - public static List findAllAdminAlluvuses() { - List items = entityManager().createQuery("SELECT o FROM AdminAlluvus o", AdminAlluvus.class).getResultList(); - for (int i = items.size() - 1; i >= 0; i--) - { - AdminAlluvus item = (AdminAlluvus) items.get(i); - if (!itcollege.team09.helpers.Helper.IsSurrogateDate(item.getSuletud())){ - items.remove(i); - } - } - return items; - } + } diff --git a/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_Entity.aj index 007f659..6a75342 100644 --- a/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_Entity.aj @@ -13,6 +13,10 @@ privileged aspect AdminAlluvus_Roo_Entity { return entityManager().createQuery("SELECT COUNT(o) FROM AdminAlluvus o", Long.class).getSingleResult(); } + public static List AdminAlluvus.findAllAdminAlluvuses() { + return entityManager().createQuery("SELECT o FROM AdminAlluvus o", AdminAlluvus.class).getResultList(); + } + public static AdminAlluvus AdminAlluvus.findAdminAlluvus(Long id) { if (id == null) return null; return entityManager().find(AdminAlluvus.class, id); diff --git a/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_ToString.aj b/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_ToString.aj index 6e69f44..a5efd80 100644 --- a/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_ToString.aj +++ b/src/main/java/itcollege/team09/entities/AdminAlluvus_Roo_ToString.aj @@ -12,10 +12,15 @@ privileged aspect AdminAlluvus_Roo_ToString { sb.append("Adminyksus: ").append(getAdminyksus()).append(", "); sb.append("Alamadminyksus: ").append(getAlamadminyksus()).append(", "); sb.append("Alates: ").append(getAlates()).append(", "); + sb.append("Avaja: ").append(getAvaja()).append(", "); + sb.append("Avatud: ").append(getAvatud()).append(", "); sb.append("Id: ").append(getId()).append(", "); sb.append("Kommentaar: ").append(getKommentaar()).append(", "); sb.append("Kuni: ").append(getKuni()).append(", "); + sb.append("Muudetud: ").append(getMuudetud()).append(", "); + sb.append("Muutja: ").append(getMuutja()).append(", "); sb.append("Suletud: ").append(getSuletud()).append(", "); + sb.append("Sulgeja: ").append(getSulgeja()).append(", "); sb.append("Version: ").append(getVersion()); return sb.toString(); } diff --git a/src/main/java/itcollege/team09/entities/AdminYksus.java b/src/main/java/itcollege/team09/entities/AdminYksus.java index d0938b1..b671704 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksus.java +++ b/src/main/java/itcollege/team09/entities/AdminYksus.java @@ -105,16 +105,5 @@ public AdminYksuseLiik getAdminYksuseLiik() { public void setAdminYksuseLiik(AdminYksuseLiik param) { this.adminYksuseLiik = param; } - - public static List findAllAdminYksuses() { - List items = entityManager().createQuery("SELECT o FROM AdminYksus o", AdminYksus.class).getResultList(); - for (int i = items.size() - 1; i >= 0; i--) - { - AdminYksus item = (AdminYksus) items.get(i); - if (!itcollege.team09.helpers.Helper.IsSurrogateDate(item.getSuletud())){ - items.remove(i); - } - } - return items; - } + } diff --git a/src/main/java/itcollege/team09/entities/AdminYksus_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/AdminYksus_Roo_Entity.aj index b653b44..f9176a1 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksus_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/AdminYksus_Roo_Entity.aj @@ -13,6 +13,10 @@ privileged aspect AdminYksus_Roo_Entity { return entityManager().createQuery("SELECT COUNT(o) FROM AdminYksus o", Long.class).getSingleResult(); } + public static List AdminYksus.findAllAdminYksuses() { + return entityManager().createQuery("SELECT o FROM AdminYksus o", AdminYksus.class).getResultList(); + } + public static AdminYksus AdminYksus.findAdminYksus(Long id) { if (id == null) return null; return entityManager().find(AdminYksus.class, id); diff --git a/src/main/java/itcollege/team09/entities/AdminYksus_Roo_ToString.aj b/src/main/java/itcollege/team09/entities/AdminYksus_Roo_ToString.aj index 0696657..dca1430 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksus_Roo_ToString.aj +++ b/src/main/java/itcollege/team09/entities/AdminYksus_Roo_ToString.aj @@ -12,12 +12,17 @@ privileged aspect AdminYksus_Roo_ToString { sb.append("AdminYksuseLiik: ").append(getAdminYksuseLiik()).append(", "); sb.append("Alamadminyksused: ").append(getAlamadminyksused() == null ? "null" : getAlamadminyksused().size()).append(", "); sb.append("Alates: ").append(getAlates()).append(", "); + sb.append("Avaja: ").append(getAvaja()).append(", "); + sb.append("Avatud: ").append(getAvatud()).append(", "); sb.append("Id: ").append(getId()).append(", "); sb.append("Kommentaar: ").append(getKommentaar()).append(", "); sb.append("Kood: ").append(getKood()).append(", "); sb.append("Kuni: ").append(getKuni()).append(", "); + sb.append("Muudetud: ").append(getMuudetud()).append(", "); + sb.append("Muutja: ").append(getMuutja()).append(", "); sb.append("Nimetus: ").append(getNimetus()).append(", "); sb.append("Suletud: ").append(getSuletud()).append(", "); + sb.append("Sulgeja: ").append(getSulgeja()).append(", "); sb.append("Vaeosad: ").append(getVaeosad() == null ? "null" : getVaeosad().size()).append(", "); sb.append("Version: ").append(getVersion()).append(", "); sb.append("Ylemadminyksused: ").append(getYlemadminyksused() == null ? "null" : getYlemadminyksused().size()); diff --git a/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java b/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java index 98f6f5f..c6b6999 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java +++ b/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java @@ -1,8 +1,7 @@ package itcollege.team09.entities; -import java.io.Serializable; + import java.util.Date; -import java.util.List; import javax.persistence.Entity; import javax.persistence.OneToMany; @@ -19,7 +18,7 @@ @Entity @RooToString @RooEntity -public class AdminYksuseLiik extends Piirivalve implements Serializable { +public class AdminYksuseLiik extends Piirivalve { /** * @@ -96,15 +95,6 @@ public void setAdminyksused(Collection param) { this.adminyksused = param; } - public static List findAllAdminYksuseLiiks() { - List items = entityManager().createQuery("SELECT o FROM AdminYksuseLiik o", AdminYksuseLiik.class).getResultList(); - for (int i = items.size() - 1; i >= 0; i--) - { - AdminYksuseLiik item = (AdminYksuseLiik) items.get(i); - if (!itcollege.team09.helpers.Helper.IsSurrogateDate(item.getSuletud())){ - items.remove(i); - } - } - return items; - } + + } diff --git a/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_Entity.aj index 9e4d3c9..e1c99fb 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_Entity.aj @@ -13,6 +13,10 @@ privileged aspect AdminYksuseLiik_Roo_Entity { return entityManager().createQuery("SELECT COUNT(o) FROM AdminYksuseLiik o", Long.class).getSingleResult(); } + public static List AdminYksuseLiik.findAllAdminYksuseLiiks() { + return entityManager().createQuery("SELECT o FROM AdminYksuseLiik o", AdminYksuseLiik.class).getResultList(); + } + public static AdminYksuseLiik AdminYksuseLiik.findAdminYksuseLiik(Long id) { if (id == null) return null; return entityManager().find(AdminYksuseLiik.class, id); diff --git a/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_ToString.aj b/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_ToString.aj index adf0b46..b004f59 100644 --- a/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_ToString.aj +++ b/src/main/java/itcollege/team09/entities/AdminYksuseLiik_Roo_ToString.aj @@ -12,12 +12,17 @@ privileged aspect AdminYksuseLiik_Roo_ToString { sb.append("Adminyksused: ").append(getAdminyksused() == null ? "null" : getAdminyksused().size()).append(", "); sb.append("Alamyksused: ").append(getAlamyksused() == null ? "null" : getAlamyksused().size()).append(", "); sb.append("Alates: ").append(getAlates()).append(", "); + sb.append("Avaja: ").append(getAvaja()).append(", "); + sb.append("Avatud: ").append(getAvatud()).append(", "); sb.append("Id: ").append(getId()).append(", "); sb.append("Kommentaar: ").append(getKommentaar()).append(", "); sb.append("Kood: ").append(getKood()).append(", "); sb.append("Kuni: ").append(getKuni()).append(", "); + sb.append("Muudetud: ").append(getMuudetud()).append(", "); + sb.append("Muutja: ").append(getMuutja()).append(", "); sb.append("Nimetus: ").append(getNimetus()).append(", "); sb.append("Suletud: ").append(getSuletud()).append(", "); + sb.append("Sulgeja: ").append(getSulgeja()).append(", "); sb.append("Version: ").append(getVersion()).append(", "); sb.append("Ylemyksused: ").append(getYlemyksused() == null ? "null" : getYlemyksused().size()); return sb.toString(); diff --git a/src/main/java/itcollege/team09/entities/Piirivalve.java b/src/main/java/itcollege/team09/entities/Piirivalve.java index 0df5c03..1959d30 100644 --- a/src/main/java/itcollege/team09/entities/Piirivalve.java +++ b/src/main/java/itcollege/team09/entities/Piirivalve.java @@ -1,7 +1,6 @@ package itcollege.team09.entities; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; import javax.persistence.GeneratedValue; @@ -24,7 +23,6 @@ @MappedSuperclass @RooToString -@Transactional @RooEntity(mappedSuperclass = true) public abstract class Piirivalve { @@ -48,6 +46,7 @@ public abstract class Piirivalve { protected Date suletud; + public Long getId() { return id; } @@ -66,44 +65,83 @@ public void setKommentaar(String kommentaar) { @PrePersist public void recordCreated() { String user = GetUser(); - - this.avaja = user; - this.muutja = user; - this.sulgeja = user; - - this.avatud = new Date(); - this.muudetud = new Date(); - try { - this.suletud = new SimpleDateFormat("yyyy-MM-dd").parse("9999-12-31"); - } catch (ParseException e) { - e.printStackTrace(); - } + setAvaja(user); + setMuutja(user); + setAvatud(new Date()); + setMuudetud(new Date()); + setSuletud(maxDate()); } @PreUpdate public void recordModified() { - this.muutja = GetUser(); - this.muudetud = new Date(); + setSulgeja(GetUser()); + setMuutja(GetUser()); + setMuudetud(new Date()); } - +/* @PreRemove public void preventRemove() { throw new SecurityException("Removing of data is prohibited!"); } - - @Transactional +*/ +/* @Transactional public void remove() { this.sulgeja = GetUser(); this.suletud = new Date(); - } + }*/ + private String GetUser() { + String username; Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - return auth.getName(); + username = auth.getName(); + return username; } - + + Date maxDate(){ + + Calendar rightNow = Calendar.getInstance(); + rightNow.set(Calendar.YEAR, 9999); + rightNow.set(Calendar.MONTH, 11); + rightNow.set(Calendar.DAY_OF_MONTH, 31); + + return rightNow.getTime(); + } public Date getSuletud() { return suletud; } + public void setSuletud(Date suletud) { + this.suletud = suletud; + } + public String getAvaja() { + return avaja; + } + public void setAvaja(String avaja) { + this.avaja = avaja; + } + public Date getAvatud() { + return avatud; + } + public void setAvatud(Date avatud) { + this.avatud = avatud; + } + public String getMuutja() { + return muutja; + } + public void setMuutja(String muutja) { + this.muutja = muutja; + } + public Date getMuudetud() { + return muudetud; + } + public void setMuudetud(Date muudetud) { + this.muudetud = muudetud; + } + public String getSulgeja() { + return sulgeja; + } + public void setSulgeja(String sulgeja) { + this.sulgeja = sulgeja; + } } diff --git a/src/main/java/itcollege/team09/entities/Piirivalve_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/Piirivalve_Roo_Entity.aj index adf2576..36c7de6 100644 --- a/src/main/java/itcollege/team09/entities/Piirivalve_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/Piirivalve_Roo_Entity.aj @@ -36,6 +36,17 @@ privileged aspect Piirivalve_Roo_Entity { this.entityManager.persist(this); } + @Transactional + public void Piirivalve.remove() { + if (this.entityManager == null) this.entityManager = entityManager(); + if (this.entityManager.contains(this)) { + this.entityManager.remove(this); + } else { + Piirivalve attached = Piirivalve.findPiirivalve(this.id); + this.entityManager.remove(attached); + } + } + @Transactional public void Piirivalve.flush() { if (this.entityManager == null) this.entityManager = entityManager(); diff --git a/src/main/java/itcollege/team09/entities/Piirivalve_Roo_ToString.aj b/src/main/java/itcollege/team09/entities/Piirivalve_Roo_ToString.aj index dcbece8..c9c0d5a 100644 --- a/src/main/java/itcollege/team09/entities/Piirivalve_Roo_ToString.aj +++ b/src/main/java/itcollege/team09/entities/Piirivalve_Roo_ToString.aj @@ -9,9 +9,14 @@ privileged aspect Piirivalve_Roo_ToString { public String Piirivalve.toString() { StringBuilder sb = new StringBuilder(); + sb.append("Avaja: ").append(getAvaja()).append(", "); + sb.append("Avatud: ").append(getAvatud()).append(", "); sb.append("Id: ").append(getId()).append(", "); sb.append("Kommentaar: ").append(getKommentaar()).append(", "); + sb.append("Muudetud: ").append(getMuudetud()).append(", "); + sb.append("Muutja: ").append(getMuutja()).append(", "); sb.append("Suletud: ").append(getSuletud()).append(", "); + sb.append("Sulgeja: ").append(getSulgeja()).append(", "); sb.append("Version: ").append(getVersion()); return sb.toString(); } diff --git a/src/main/java/itcollege/team09/entities/Vaeosa.java b/src/main/java/itcollege/team09/entities/Vaeosa.java index 8ceaebb..a0ad124 100644 --- a/src/main/java/itcollege/team09/entities/Vaeosa.java +++ b/src/main/java/itcollege/team09/entities/Vaeosa.java @@ -97,17 +97,5 @@ public Collection getAlamvaeosad() { public void setVaeosaAlluvus_2(Collection param) { this.alamvaeosad = param; } - - - public static List findAllVaeosas() { - List items = entityManager().createQuery("SELECT o FROM Vaeosa o", Vaeosa.class).getResultList(); - for (int i = items.size() - 1; i >= 0; i--) - { - Vaeosa item = (Vaeosa) items.get(i); - if (!itcollege.team09.helpers.Helper.IsSurrogateDate(item.getSuletud())){ - items.remove(i); - } - } - return items; - } + } diff --git a/src/main/java/itcollege/team09/entities/VaeosaAlluvus.java b/src/main/java/itcollege/team09/entities/VaeosaAlluvus.java index 962bc2c..c80410f 100644 --- a/src/main/java/itcollege/team09/entities/VaeosaAlluvus.java +++ b/src/main/java/itcollege/team09/entities/VaeosaAlluvus.java @@ -63,17 +63,5 @@ public Vaeosa getAlamvaeosa() { public void setAlamvaeosa(Vaeosa param) { this.alamvaeosa = param; } - - - public static List findAllVaeosaAlluvuses() { - List items = entityManager().createQuery("SELECT o FROM VaeosaAlluvus o", VaeosaAlluvus.class).getResultList(); - for (int i = items.size() - 1; i >= 0; i--) - { - VaeosaAlluvus item = (VaeosaAlluvus) items.get(i); - if (!itcollege.team09.helpers.Helper.IsSurrogateDate(item.getSuletud())){ - items.remove(i); - } - } - return items; - } + } diff --git a/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_Entity.aj index 098547e..ae10084 100644 --- a/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_Entity.aj @@ -13,6 +13,10 @@ privileged aspect VaeosaAlluvus_Roo_Entity { return entityManager().createQuery("SELECT COUNT(o) FROM VaeosaAlluvus o", Long.class).getSingleResult(); } + public static List VaeosaAlluvus.findAllVaeosaAlluvuses() { + return entityManager().createQuery("SELECT o FROM VaeosaAlluvus o", VaeosaAlluvus.class).getResultList(); + } + public static VaeosaAlluvus VaeosaAlluvus.findVaeosaAlluvus(Long id) { if (id == null) return null; return entityManager().find(VaeosaAlluvus.class, id); diff --git a/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_ToString.aj b/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_ToString.aj index 9ca295d..868ce61 100644 --- a/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_ToString.aj +++ b/src/main/java/itcollege/team09/entities/VaeosaAlluvus_Roo_ToString.aj @@ -11,10 +11,15 @@ privileged aspect VaeosaAlluvus_Roo_ToString { StringBuilder sb = new StringBuilder(); sb.append("Alamvaeosa: ").append(getAlamvaeosa()).append(", "); sb.append("Alates: ").append(getAlates()).append(", "); + sb.append("Avaja: ").append(getAvaja()).append(", "); + sb.append("Avatud: ").append(getAvatud()).append(", "); sb.append("Id: ").append(getId()).append(", "); sb.append("Kommentaar: ").append(getKommentaar()).append(", "); sb.append("Kuni: ").append(getKuni()).append(", "); + sb.append("Muudetud: ").append(getMuudetud()).append(", "); + sb.append("Muutja: ").append(getMuutja()).append(", "); sb.append("Suletud: ").append(getSuletud()).append(", "); + sb.append("Sulgeja: ").append(getSulgeja()).append(", "); sb.append("Vaeosa: ").append(getVaeosa()).append(", "); sb.append("Version: ").append(getVersion()); return sb.toString(); diff --git a/src/main/java/itcollege/team09/entities/Vaeosa_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/Vaeosa_Roo_Entity.aj index b020016..8db4278 100644 --- a/src/main/java/itcollege/team09/entities/Vaeosa_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/Vaeosa_Roo_Entity.aj @@ -13,6 +13,10 @@ privileged aspect Vaeosa_Roo_Entity { return entityManager().createQuery("SELECT COUNT(o) FROM Vaeosa o", Long.class).getSingleResult(); } + public static List Vaeosa.findAllVaeosas() { + return entityManager().createQuery("SELECT o FROM Vaeosa o", Vaeosa.class).getResultList(); + } + public static Vaeosa Vaeosa.findVaeosa(Long id) { if (id == null) return null; return entityManager().find(Vaeosa.class, id); diff --git a/src/main/java/itcollege/team09/entities/Vaeosa_Roo_ToString.aj b/src/main/java/itcollege/team09/entities/Vaeosa_Roo_ToString.aj index bc72042..1f36ffe 100644 --- a/src/main/java/itcollege/team09/entities/Vaeosa_Roo_ToString.aj +++ b/src/main/java/itcollege/team09/entities/Vaeosa_Roo_ToString.aj @@ -12,12 +12,17 @@ privileged aspect Vaeosa_Roo_ToString { sb.append("AdminYksus: ").append(getAdminYksus()).append(", "); sb.append("Alamvaeosad: ").append(getAlamvaeosad() == null ? "null" : getAlamvaeosad().size()).append(", "); sb.append("Alates: ").append(getAlates()).append(", "); + sb.append("Avaja: ").append(getAvaja()).append(", "); + sb.append("Avatud: ").append(getAvatud()).append(", "); sb.append("Id: ").append(getId()).append(", "); sb.append("Kommentaar: ").append(getKommentaar()).append(", "); sb.append("Kood: ").append(getKood()).append(", "); sb.append("Kuni: ").append(getKuni()).append(", "); + sb.append("Muudetud: ").append(getMuudetud()).append(", "); + sb.append("Muutja: ").append(getMuutja()).append(", "); sb.append("Nimetus: ").append(getNimetus()).append(", "); sb.append("Suletud: ").append(getSuletud()).append(", "); + sb.append("Sulgeja: ").append(getSulgeja()).append(", "); sb.append("Version: ").append(getVersion()).append(", "); sb.append("Ylemvaeosad: ").append(getYlemvaeosad() == null ? "null" : getYlemvaeosad().size()); return sb.toString(); diff --git a/src/main/java/itcollege/team09/entities/VoimalikAlluvus.java b/src/main/java/itcollege/team09/entities/VoimalikAlluvus.java index c3accb4..4469ae8 100644 --- a/src/main/java/itcollege/team09/entities/VoimalikAlluvus.java +++ b/src/main/java/itcollege/team09/entities/VoimalikAlluvus.java @@ -63,18 +63,5 @@ public AdminYksuseLiik getAlamyksus() { public void setAlamyksus(AdminYksuseLiik param) { this.alamyksus = param; } - - - public static List findAllVoimalikAlluvuses() { - List items = entityManager().createQuery("SELECT o FROM VoimalikAlluvus o", VoimalikAlluvus.class).getResultList(); - for (int i = items.size() - 1; i >= 0; i--) - { - VoimalikAlluvus item = (VoimalikAlluvus) items.get(i); - if (!itcollege.team09.helpers.Helper.IsSurrogateDate(item.getSuletud())){ - items.remove(i); - } - } - return items; - } - + } diff --git a/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_Entity.aj b/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_Entity.aj index 25ba5b9..51d1ee4 100644 --- a/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_Entity.aj +++ b/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_Entity.aj @@ -13,6 +13,10 @@ privileged aspect VoimalikAlluvus_Roo_Entity { return entityManager().createQuery("SELECT COUNT(o) FROM VoimalikAlluvus o", Long.class).getSingleResult(); } + public static List VoimalikAlluvus.findAllVoimalikAlluvuses() { + return entityManager().createQuery("SELECT o FROM VoimalikAlluvus o", VoimalikAlluvus.class).getResultList(); + } + public static VoimalikAlluvus VoimalikAlluvus.findVoimalikAlluvus(Long id) { if (id == null) return null; return entityManager().find(VoimalikAlluvus.class, id); diff --git a/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_ToString.aj b/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_ToString.aj index 0b5dd10..2f76204 100644 --- a/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_ToString.aj +++ b/src/main/java/itcollege/team09/entities/VoimalikAlluvus_Roo_ToString.aj @@ -11,10 +11,15 @@ privileged aspect VoimalikAlluvus_Roo_ToString { StringBuilder sb = new StringBuilder(); sb.append("Alamyksus: ").append(getAlamyksus()).append(", "); sb.append("Alates: ").append(getAlates()).append(", "); + sb.append("Avaja: ").append(getAvaja()).append(", "); + sb.append("Avatud: ").append(getAvatud()).append(", "); sb.append("Id: ").append(getId()).append(", "); sb.append("Kommentaar: ").append(getKommentaar()).append(", "); sb.append("Kuni: ").append(getKuni()).append(", "); + sb.append("Muudetud: ").append(getMuudetud()).append(", "); + sb.append("Muutja: ").append(getMuutja()).append(", "); sb.append("Suletud: ").append(getSuletud()).append(", "); + sb.append("Sulgeja: ").append(getSulgeja()).append(", "); sb.append("Version: ").append(getVersion()).append(", "); sb.append("Yksuseliik: ").append(getYksuseliik()); return sb.toString(); diff --git a/src/main/java/itcollege/team09/helpers/Helper.java b/src/main/java/itcollege/team09/helpers/Helper.java deleted file mode 100644 index 47b6fa0..0000000 --- a/src/main/java/itcollege/team09/helpers/Helper.java +++ /dev/null @@ -1,111 +0,0 @@ -package itcollege.team09.helpers; - -import itcollege.team09.entities.AdminYksus; -import itcollege.team09.entities.AdminYksuseLiik; -import itcollege.team09.entities.Vaeosa; -import itcollege.team09.entities.VaeosaAlluvus; -import itcollege.team09.entities.VoimalikAlluvus; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; - -import org.springframework.beans.factory.annotation.Configurable; -import org.springframework.roo.addon.javabean.RooJavaBean; - -@Configurable -@RooJavaBean -public class Helper { - - @PersistenceContext - EntityManager entityManager; - public static final EntityManager entityManager() { - EntityManager em = new Helper().entityManager; - if (em == null) throw new IllegalStateException("Entity manager has not been injected"); - return em; - } - - public Helper() {} - -/* - @SuppressWarnings("unchecked") - public static List PuurisOlevadKarud(Long id) { - if (id == null) return null; - Query q = entityManager().createQuery( - "SELECT o FROM Bear o WHERE cage = :cage"); - q.setParameter("cage", Cage.findCage(id)); - return q.getResultList(); - } - */ - - /** - * Vaeosa - */ - public static List getAlluvadVaeosad(Vaeosa v){ - TypedQuery q = entityManager().createQuery( - "SELECT o.alamvaeosa FROM VaeosaAlluvus o WHERE o.vaeosa = :vaeosa", Vaeosa.class); - q.setParameter("vaeosa", v); - - return q.getResultList(); - } - - public static List getYlemVaeosad(Vaeosa v){ - TypedQuery q = entityManager().createQuery( - "SELECT o FROM VaeosaAlluvus o WHERE o.alamvaeosa = :vaeosa", VaeosaAlluvus.class); - q.setParameter("vaeosa", v); - - return q.getResultList(); - } - - /** - * AdminYksuse liik - */ - public static List getAdminYksuseLiigiAlluvad(AdminYksuseLiik a){ - TypedQuery q = entityManager().createQuery( - "SELECT o.alamyksus FROM VoimalikAlluvus o WHERE o.yksuseliik = :adminYksuseLiik", AdminYksuseLiik.class); - q.setParameter("adminYksuseLiik", a); - - return q.getResultList(); - } - - public static List getAdminYksuseLiigiYlemad(AdminYksuseLiik a){ - TypedQuery q = entityManager().createQuery( - "SELECT o FROM VoimalikAlluvus o WHERE o.alamyksus = :adminYksuseLiik", VoimalikAlluvus.class); - q.setParameter("adminYksuseLiik", a); - - return q.getResultList(); - } - - /** - * Adminyksus - */ - public static List getAdminYksuseAlluvad(AdminYksus a){ - TypedQuery q = entityManager().createQuery( - "SELECT o.alamadminyksus FROM AdminAlluvus o WHERE o.adminyksus = :adminYksus", AdminYksus.class); - q.setParameter("adminYksus", a); - - return q.getResultList(); - } - - public static boolean IsSurrogateDate(Date date){ - SimpleDateFormat simpleDateformatYear = new SimpleDateFormat("yyyy"); - SimpleDateFormat simpleDateformatMonth = new SimpleDateFormat("MM"); - SimpleDateFormat simpleDateformatDay = new SimpleDateFormat("d"); - - String year = simpleDateformatYear.format(date); - String month = simpleDateformatMonth.format(date); - String day = simpleDateformatDay.format(date); - - // System.out.println("Testing IsSurrogateDate YEAR:" + year + " Month:" + month + " Day:" +day); - if(year.equals("9999") && month.equals("12") && day.equals("31")){ - return true; - }else{ - return false; - } - - } -} diff --git a/src/main/java/itcollege/team09/helpers/Helper_Roo_JavaBean.aj b/src/main/java/itcollege/team09/helpers/Helper_Roo_JavaBean.aj deleted file mode 100644 index 087816a..0000000 --- a/src/main/java/itcollege/team09/helpers/Helper_Roo_JavaBean.aj +++ /dev/null @@ -1,18 +0,0 @@ -// WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO. -// You may push code into the target .java compilation unit if you wish to edit any member(s). - -package itcollege.team09.helpers; - -import javax.persistence.EntityManager; - -privileged aspect Helper_Roo_JavaBean { - - public EntityManager Helper.getEntityManager() { - return this.entityManager; - } - - public void Helper.setEntityManager(EntityManager entityManager) { - this.entityManager = entityManager; - } - -} diff --git a/src/main/java/itcollege/team09/web/AdminAlluvusController_Roo_Controller.aj b/src/main/java/itcollege/team09/web/AdminAlluvusController_Roo_Controller.aj index 6c56208..7554008 100644 --- a/src/main/java/itcollege/team09/web/AdminAlluvusController_Roo_Controller.aj +++ b/src/main/java/itcollege/team09/web/AdminAlluvusController_Roo_Controller.aj @@ -94,6 +94,9 @@ privileged aspect AdminAlluvusController_Roo_Controller { } void AdminAlluvusController.addDateTimeFormatPatterns(Model uiModel) { + uiModel.addAttribute("adminAlluvus_suletud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminAlluvus_avatud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminAlluvus_muudetud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("adminAlluvus_alates_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("adminAlluvus_kuni_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); } diff --git a/src/main/java/itcollege/team09/web/AdminYksusController.java b/src/main/java/itcollege/team09/web/AdminYksusController.java index d1a059a..08aa944 100644 --- a/src/main/java/itcollege/team09/web/AdminYksusController.java +++ b/src/main/java/itcollege/team09/web/AdminYksusController.java @@ -5,7 +5,6 @@ import itcollege.team09.entities.AdminYksus; import itcollege.team09.entities.AdminYksuseLiik; -import itcollege.team09.helpers.Helper; import org.springframework.roo.addon.web.mvc.controller.RooWebScaffold; import org.springframework.stereotype.Controller; @@ -20,7 +19,7 @@ @Controller public class AdminYksusController { - @RequestMapping(method = RequestMethod.PUT) +/* @RequestMapping(method = RequestMethod.PUT) public String update(@Valid AdminYksus adminYksus, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { if (bindingResult.hasErrors()) { uiModel.addAttribute("adminYksus", adminYksus); @@ -38,5 +37,5 @@ public String updateForm(@PathVariable("id") Long id, Model uiModel) { uiModel.addAttribute("alluvadAdminYksused", Helper.getAdminYksuseAlluvad(AdminYksus.findAdminYksus(id))); addDateTimeFormatPatterns(uiModel); return "adminyksuses/update"; - } + }*/ } diff --git a/src/main/java/itcollege/team09/web/AdminYksusController_Roo_Controller.aj b/src/main/java/itcollege/team09/web/AdminYksusController_Roo_Controller.aj index ca7a46a..9374516 100644 --- a/src/main/java/itcollege/team09/web/AdminYksusController_Roo_Controller.aj +++ b/src/main/java/itcollege/team09/web/AdminYksusController_Roo_Controller.aj @@ -69,6 +69,25 @@ privileged aspect AdminYksusController_Roo_Controller { return "adminyksuses/list"; } + @RequestMapping(method = RequestMethod.PUT) + public String AdminYksusController.update(@Valid AdminYksus adminYksus, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { + if (bindingResult.hasErrors()) { + uiModel.addAttribute("adminYksus", adminYksus); + addDateTimeFormatPatterns(uiModel); + return "adminyksuses/update"; + } + uiModel.asMap().clear(); + adminYksus.merge(); + return "redirect:/adminyksuses/" + encodeUrlPathSegment(adminYksus.getId().toString(), httpServletRequest); + } + + @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET) + public String AdminYksusController.updateForm(@PathVariable("id") Long id, Model uiModel) { + uiModel.addAttribute("adminYksus", AdminYksus.findAdminYksus(id)); + addDateTimeFormatPatterns(uiModel); + return "adminyksuses/update"; + } + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) public String AdminYksusController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) { AdminYksus.findAdminYksus(id).remove(); @@ -99,6 +118,9 @@ privileged aspect AdminYksusController_Roo_Controller { } void AdminYksusController.addDateTimeFormatPatterns(Model uiModel) { + uiModel.addAttribute("adminYksus_suletud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminYksus_avatud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminYksus_muudetud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("adminYksus_alates_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("adminYksus_kuni_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); } diff --git a/src/main/java/itcollege/team09/web/AdminYksuseLiigiRedaktor.java b/src/main/java/itcollege/team09/web/AdminYksuseLiigiRedaktor.java new file mode 100644 index 0000000..ee49c44 --- /dev/null +++ b/src/main/java/itcollege/team09/web/AdminYksuseLiigiRedaktor.java @@ -0,0 +1,99 @@ +package itcollege.team09.web; + +import itcollege.team09.entities.AdminYksuseLiik; +import itcollege.team09.entities.VoimalikAlluvus; + +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.joda.time.format.DateTimeFormat; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.util.UriUtils; +import org.springframework.web.util.WebUtils; + +@RequestMapping("/adminyksuseliigiredaktor/**") +@Controller +public class AdminYksuseLiigiRedaktor { + + //kui pealehel ollaks esimest korda + @RequestMapping + public String index(@RequestParam(required = false) Long liigiID,Model uiModel) { + //kui siia formi tullakse esimest korda + createForm(liigiID,uiModel); + return "adminyksuseliigiredaktor/index"; + } + @RequestMapping(params = "form", method = RequestMethod.GET) + public String createForm(@ModelAttribute("liigiID") Long liigiID, Model uiModel) { + //"liigiID" saadab siia + //Voimalik_alluvusController + //meetodist 'public String create(..)' + + + if(liigiID != null){//kui siia formi tullakse alluvaid loomast + //na:ita samu andmeid uuesti + + AdminYksuseLiik alluvategaLiik = AdminYksuseLiik.findAdminYksuseLiik(liigiID); + AdminYksuseLiik u = new AdminYksuseLiik(); + u = alluvategaLiik; //see ta:idab textboxid endiste andmetega + + uiModel.addAttribute("tagasiLiik", u); + uiModel.addAttribute("alluvategaLiik", alluvategaLiik); + + //seda ion vaja va:a:rtuseks, et kuvada olemasolevaid alluvusi + AdminYksuseLiik valitudLiik = AdminYksuseLiik.findAdminYksuseLiik(liigiID); + uiModel.addAttribute("valitudLiik", valitudLiik); + uiModel.addAttribute("voimalikudAlluvad", annaV6imalikualluvuseList(valitudLiik)); + + } + uiModel.addAttribute("adminYksuseLiik", new AdminYksuseLiik()); + addDateTimeFormatPatterns(uiModel); + return "adminyksuseliigiredaktor/index"; + } + + + void addDateTimeFormatPatterns(Model uiModel) { + uiModel.addAttribute("adminYksuseLiik_suletud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminYksuseLiik_avatud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminYksuseLiik_muudetud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminYksuseLiik_alates_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminYksuseLiik_kuni_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + } + + //seda kasutatakse Allub: va:lja dropboxi jaoks + @ModelAttribute("riigi_admin_yksuse_liiks_piiks") + public Collection populateAdminYksuseLiiks() { + return AdminYksuseLiik.findAllAdminYksuseLiiks(); + } + + public List annaV6imalikualluvuseList(AdminYksuseLiik ylemLiik){ + VoimalikAlluvus v6i = null; + List vaList = new ArrayList(); + for(VoimalikAlluvus va : VoimalikAlluvus.findAllVoimalikAlluvuses()){ + if(va.getYksuseliik()== ylemLiik){ + v6i = va; + vaList.add(v6i); + } + } + return vaList; + } +/* //admin.liigi olemasolevad alluvad + //@ModelAttribute("JubaOlemasOlevadAlluvad") + List annaOlOlAlluvad(AdminYksuseLiik valitudLiik ){ + OlemasOlevadAlluvad ooaall = OlemasOlevadAlluvad.findAlluvadForAdminLiik(valitudLiik); + List ololAlluvad = ooaall.getLiikItems(); + return ololAlluvad; + }*/ +} diff --git a/src/main/java/itcollege/team09/web/AdminYksuseLiikController.java b/src/main/java/itcollege/team09/web/AdminYksuseLiikController.java index f9d94d5..a6fb2f3 100644 --- a/src/main/java/itcollege/team09/web/AdminYksuseLiikController.java +++ b/src/main/java/itcollege/team09/web/AdminYksuseLiikController.java @@ -1,43 +1,172 @@ package itcollege.team09.web; +import java.io.Serializable; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import itcollege.team09.entities.AdminYksuseLiik; import itcollege.team09.entities.Vaeosa; -import itcollege.team09.helpers.Helper; +import itcollege.team09.entities.VoimalikAlluvus; +import org.joda.time.format.DateTimeFormat; +import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.roo.addon.web.mvc.controller.RooWebScaffold; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @RooWebScaffold(path = "adminyksuseliiks", formBackingObject = AdminYksuseLiik.class) @RequestMapping("/adminyksuseliiks") @Controller -public class AdminYksuseLiikController { +public class AdminYksuseLiikController{ - @RequestMapping(method = RequestMethod.PUT) - public String update(@Valid AdminYksuseLiik adminYksuseLiik, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { - if (bindingResult.hasErrors()) { - uiModel.addAttribute("adminYksuseLiik", adminYksuseLiik); + //v6rdlemiseks eemalda-nupu ajutine nimi + String realEemalda =""; + +// public static Date parseStr(String s){ +// DateFormat f = new SimpleDateFormat("M-"); +// try { +// return f.parse(s); +// } catch (ParseException e) { +// return null; +// } +// } +// + + @RequestMapping(method = RequestMethod.POST) + public String create(@Valid AdminYksuseLiik liik, + BindingResult bindingResult, Model uiModel, + HttpServletRequest httpServletRequest) { + + Collection coll = AdminYksuseLiik.findAllAdminYksuseLiiks(); + //List coll = AdminYksuseLiik.findAllAdminYksuseLiiks(); + boolean liikOnBaasis = false; + String liigiId=""; + String nupunimi = searchButtonName(httpServletRequest); +// Date alates = parseStr(httpServletRequest.getParameterValues("alates")[0]); +// Date kuni = parseStr(httpServletRequest.getParameterValues("kuni")[0]); +// liik.setAlates(new Date()); +// liik.setKuni(new Date()); + AdminYksuseLiik lisatavAlluv = new AdminYksuseLiik(); + + if (bindingResult.hasErrors()) { + uiModel.addAttribute("riigi_admin_yksuse_liik", liik); addDateTimeFormatPatterns(uiModel); - return "adminyksuseliiks/update"; + return "redirect:/adminyksuseliigiredaktor/index"; } - uiModel.asMap().clear(); - adminYksuseLiik.merge(); - return "redirect:/adminyksuseliiks/" + encodeUrlPathSegment(adminYksuseLiik.getId().toString(), httpServletRequest); - } - - @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET) - public String updateForm(@PathVariable("id") Long id, Model uiModel) { - uiModel.addAttribute("adminYksuseLiik", AdminYksuseLiik.findAdminYksuseLiik(id)); - uiModel.addAttribute("voimalikudAlluvused", Helper.getAdminYksuseLiigiAlluvad(AdminYksuseLiik.findAdminYksuseLiik(id))); - uiModel.addAttribute("voimalikudYlemad", Helper.getAdminYksuseLiigiYlemad(AdminYksuseLiik.findAdminYksuseLiik(id))); - addDateTimeFormatPatterns(uiModel); - return "adminyksuseliiks/update"; - } + + //kui siukse nimega liik on baasis olemas ja ta pole suletud, + //siis seda uuesti ei salvestata, + //vaid minnakse kohe alluvaid valima + String nimetus = httpServletRequest.getParameterValues("nimetus")[0]; + for(AdminYksuseLiik l : coll){ + if(l.getNimetus().equalsIgnoreCase(nimetus)){ + if(l.getSuletud().after(new Date())){ + uiModel.asMap().clear(); + liikOnBaasis = true; + liigiId = l.getId().toString(); + lisatavAlluv = l; + lisatavAlluv.recordCreated(); + } + } + } + + //see on uus liik, salvesta baasi + if(!liikOnBaasis){ + liik.recordCreated(); + uiModel.asMap().clear(); + liik.persist(); + liigiId = liik.getId().toString(); + lisatavAlluv = liik; + } + + //kui vajutati lisa-nuppu + if(nupunimi.equalsIgnoreCase("lisa")){ + return "redirect:/voimalikalluvuses"+"?form&liigiID=" + liigiId; + }//kui vajutati salvesta-nuppu + else if(nupunimi.equalsIgnoreCase("salvesta") || nupunimi.equalsIgnoreCase("salvesta2")){ + + //kysi riikuestilt valitud ylemusyksuse(dropdown boksist) id baasis + String[] bossiIDlist = httpServletRequest.getParameterValues("ylemyksused"); + String bossiID = bossiIDlist[0]; + Long bossiLong = Long.valueOf(bossiID); + //suhte ylemliik + AdminYksuseLiik boss = AdminYksuseLiik.findAdminYksuseLiik(bossiLong); + + ////uus alluvusuhe + VoimalikAlluvus v6imalik = new VoimalikAlluvus(); + //ma:a:ra ylemus + v6imalik.setYksuseliik(boss); + //ma:a:ra alluv + v6imalik.setAlamyksus(lisatavAlluv); + //kommentaar + String komm = httpServletRequest.getParameterValues("kommentaar")[0]; + v6imalik.setKommentaar(komm); + + //lisa baasi + //uiModel.asMap().clear(); + v6imalik.persist(); + + return "redirect:/adminyksuseliigiredaktor/index"; + }//kui vajutati eemalda-nuppu + else if(nupunimi.equalsIgnoreCase("lisa")){ + return "redirect:/voimalikalluvuses"+"?form&liigiID=" + liigiId; + } + else if(nupunimi.equalsIgnoreCase("eemalda")){ + //v6imaliku alluvuse id sulgemiseks + String vIdstr = this.realEemalda.substring("eemalda".length()); + Long vId = Long.valueOf(vIdstr); + VoimalikAlluvus vaEemaldatav = VoimalikAlluvus.findVoimalikAlluvus(vId); + vaEemaldatav.setSuletud(new Date()); + uiModel.asMap().clear(); + vaEemaldatav.merge(); + + return "redirect:/adminyksuseliigiredaktor/index?liigiID=" + liigiId; + } + else + return "redirect:/voimalikalluvuses"; + } + + //minu elupa:a:stja, keda ma kolm na:dalat otsisin: + // http://stackoverflow.com/questions/2025280/have-multiple-submit-buttons-in-a-form-and-determine-which-was-pressed-in-a-cont + String searchButtonName(final HttpServletRequest request) { + String buttonName = ""; + @SuppressWarnings("unchecked") + Map paramMap = request.getParameterMap(); + if (!paramMap.isEmpty()) { + for (Map.Entry entry : paramMap.entrySet()) { + /* Search for the button name as given in + the 'value' attribute for the input tag */ + if ("Lisa".equals(entry.getValue()[0]) || + "Salvesta".equals(entry.getValue()[0]) || + "Salvesta2".equals(entry.getValue()[0])){ + buttonName = entry.getKey(); + break; + } + } + for (Map.Entry entry : paramMap.entrySet()) { + /* Search for the button name as given in + the 'value' attribute for the input tag */ + if ("Eemalda".equals(entry.getValue()[0])){ + this.realEemalda = entry.getKey(); + buttonName = "eemalda"; + break; + } + } + } + return buttonName; + } + } diff --git a/src/main/java/itcollege/team09/web/AdminYksuseLiikController_Roo_Controller.aj b/src/main/java/itcollege/team09/web/AdminYksuseLiikController_Roo_Controller.aj index 9f80495..c491be8 100644 --- a/src/main/java/itcollege/team09/web/AdminYksuseLiikController_Roo_Controller.aj +++ b/src/main/java/itcollege/team09/web/AdminYksuseLiikController_Roo_Controller.aj @@ -27,18 +27,6 @@ import org.springframework.web.util.WebUtils; privileged aspect AdminYksuseLiikController_Roo_Controller { - @RequestMapping(method = RequestMethod.POST) - public String AdminYksuseLiikController.create(@Valid AdminYksuseLiik adminYksuseLiik, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { - if (bindingResult.hasErrors()) { - uiModel.addAttribute("adminYksuseLiik", adminYksuseLiik); - addDateTimeFormatPatterns(uiModel); - return "adminyksuseliiks/create"; - } - uiModel.asMap().clear(); - adminYksuseLiik.persist(); - return "redirect:/adminyksuseliiks/" + encodeUrlPathSegment(adminYksuseLiik.getId().toString(), httpServletRequest); - } - @RequestMapping(params = "form", method = RequestMethod.GET) public String AdminYksuseLiikController.createForm(Model uiModel) { uiModel.addAttribute("adminYksuseLiik", new AdminYksuseLiik()); @@ -68,6 +56,25 @@ privileged aspect AdminYksuseLiikController_Roo_Controller { return "adminyksuseliiks/list"; } + @RequestMapping(method = RequestMethod.PUT) + public String AdminYksuseLiikController.update(@Valid AdminYksuseLiik adminYksuseLiik, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { + if (bindingResult.hasErrors()) { + uiModel.addAttribute("adminYksuseLiik", adminYksuseLiik); + addDateTimeFormatPatterns(uiModel); + return "adminyksuseliiks/update"; + } + uiModel.asMap().clear(); + adminYksuseLiik.merge(); + return "redirect:/adminyksuseliiks/" + encodeUrlPathSegment(adminYksuseLiik.getId().toString(), httpServletRequest); + } + + @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET) + public String AdminYksuseLiikController.updateForm(@PathVariable("id") Long id, Model uiModel) { + uiModel.addAttribute("adminYksuseLiik", AdminYksuseLiik.findAdminYksuseLiik(id)); + addDateTimeFormatPatterns(uiModel); + return "adminyksuseliiks/update"; + } + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) public String AdminYksuseLiikController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) { AdminYksuseLiik.findAdminYksuseLiik(id).remove(); @@ -93,6 +100,9 @@ privileged aspect AdminYksuseLiikController_Roo_Controller { } void AdminYksuseLiikController.addDateTimeFormatPatterns(Model uiModel) { + uiModel.addAttribute("adminYksuseLiik_suletud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminYksuseLiik_avatud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("adminYksuseLiik_muudetud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("adminYksuseLiik_alates_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("adminYksuseLiik_kuni_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); } diff --git a/src/main/java/itcollege/team09/web/VaeosaAlluvusController_Roo_Controller.aj b/src/main/java/itcollege/team09/web/VaeosaAlluvusController_Roo_Controller.aj index cfea3b0..b2f46f0 100644 --- a/src/main/java/itcollege/team09/web/VaeosaAlluvusController_Roo_Controller.aj +++ b/src/main/java/itcollege/team09/web/VaeosaAlluvusController_Roo_Controller.aj @@ -106,6 +106,9 @@ privileged aspect VaeosaAlluvusController_Roo_Controller { } void VaeosaAlluvusController.addDateTimeFormatPatterns(Model uiModel) { + uiModel.addAttribute("vaeosaAlluvus_suletud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("vaeosaAlluvus_avatud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("vaeosaAlluvus_muudetud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("vaeosaAlluvus_alates_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("vaeosaAlluvus_kuni_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); } diff --git a/src/main/java/itcollege/team09/web/VaeosaController.java b/src/main/java/itcollege/team09/web/VaeosaController.java index 510f51a..2f6d4ad 100644 --- a/src/main/java/itcollege/team09/web/VaeosaController.java +++ b/src/main/java/itcollege/team09/web/VaeosaController.java @@ -4,7 +4,6 @@ import javax.validation.Valid; import itcollege.team09.entities.Vaeosa; -import itcollege.team09.helpers.Helper; import org.springframework.roo.addon.web.mvc.controller.RooWebScaffold; import org.springframework.stereotype.Controller; @@ -18,7 +17,7 @@ @RequestMapping("/vaeosas") @Controller public class VaeosaController { - +/* @RequestMapping(method = RequestMethod.PUT) public String update(@Valid Vaeosa vaeosa, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { @@ -48,5 +47,7 @@ public String updatePopup(@PathVariable("id") Long id, Model uiModel) { uiModel.addAttribute("vaeosa", Vaeosa.findVaeosa(id)); addDateTimeFormatPatterns(uiModel); return "vaeosas/popup"; - } + } + + */ } diff --git a/src/main/java/itcollege/team09/web/VaeosaController_Roo_Controller.aj b/src/main/java/itcollege/team09/web/VaeosaController_Roo_Controller.aj index 640245d..b3c1707 100644 --- a/src/main/java/itcollege/team09/web/VaeosaController_Roo_Controller.aj +++ b/src/main/java/itcollege/team09/web/VaeosaController_Roo_Controller.aj @@ -68,6 +68,25 @@ privileged aspect VaeosaController_Roo_Controller { return "vaeosas/list"; } + @RequestMapping(method = RequestMethod.PUT) + public String VaeosaController.update(@Valid Vaeosa vaeosa, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { + if (bindingResult.hasErrors()) { + uiModel.addAttribute("vaeosa", vaeosa); + addDateTimeFormatPatterns(uiModel); + return "vaeosas/update"; + } + uiModel.asMap().clear(); + vaeosa.merge(); + return "redirect:/vaeosas/" + encodeUrlPathSegment(vaeosa.getId().toString(), httpServletRequest); + } + + @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET) + public String VaeosaController.updateForm(@PathVariable("id") Long id, Model uiModel) { + uiModel.addAttribute("vaeosa", Vaeosa.findVaeosa(id)); + addDateTimeFormatPatterns(uiModel); + return "vaeosas/update"; + } + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) public String VaeosaController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) { Vaeosa.findVaeosa(id).remove(); @@ -93,6 +112,9 @@ privileged aspect VaeosaController_Roo_Controller { } void VaeosaController.addDateTimeFormatPatterns(Model uiModel) { + uiModel.addAttribute("vaeosa_suletud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("vaeosa_avatud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("vaeosa_muudetud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("vaeosa_alates_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("vaeosa_kuni_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); } diff --git a/src/main/java/itcollege/team09/web/VoimalikAlluvusController.java b/src/main/java/itcollege/team09/web/VoimalikAlluvusController.java index eb0534f..4af8d2a 100644 --- a/src/main/java/itcollege/team09/web/VoimalikAlluvusController.java +++ b/src/main/java/itcollege/team09/web/VoimalikAlluvusController.java @@ -1,12 +1,93 @@ package itcollege.team09.web; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; + +import itcollege.team09.entities.AdminYksuseLiik; import itcollege.team09.entities.VoimalikAlluvus; import org.springframework.roo.addon.web.mvc.controller.RooWebScaffold; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; @RooWebScaffold(path = "voimalikalluvuses", formBackingObject = VoimalikAlluvus.class) @RequestMapping("/voimalikalluvuses") @Controller public class VoimalikAlluvusController { + + //see controller peab loomiseks saama ylemusyksuse liigi id, + //et see liik oleks ylemusena automaatselt ma:a:ratud + @RequestMapping(params = "form", method = RequestMethod.GET) + //liigiID saadab siia klass + //Riigi_admin_yksuse_liikController create-meetodist + public String createForm(@RequestParam(required = false) Long liigiID, Model uiModel) { + VoimalikAlluvus va = new VoimalikAlluvus(); + if(liigiID != null){ + va.setYksuseliik(AdminYksuseLiik.findAdminYksuseLiik(liigiID)); + //seda ion vaja va:a:rtuseks, et kuvada olemasolevaid alluvusi + AdminYksuseLiik valitudLiik = AdminYksuseLiik.findAdminYksuseLiik(liigiID); + uiModel.addAttribute("valitudLiik", valitudLiik); + //alluvate kuvamiseks redaktoris + uiModel.addAttribute("voimalikudAlluvad", annaV6imalikualluvuseList(valitudLiik)); + //uiModel.addAttribute("alluvadAdminYksysed", annaOlOlAlluvad(valitudLiik)); + } + uiModel.addAttribute("voimalik_alluvus", va); + addDateTimeFormatPatterns(uiModel); + return "voimalikalluvuses/create"; + } + + @RequestMapping(method = RequestMethod.POST) + public String create(@Valid VoimalikAlluvus voimalik_alluvus, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { + if (bindingResult.hasErrors()) { + uiModel.addAttribute("voimalik_alluvus", voimalik_alluvus); + addDateTimeFormatPatterns(uiModel); + return "voimalikalluvuses/create"; + } + uiModel.asMap().clear(); + voimalik_alluvus.persist(); + Long vaIDEE = voimalik_alluvus.getYksuseliik().getId(); + //seda attributi kasutada saab + //klassi AdminYksuseLiigiRedaktor meetodi createForm parameetrina!!! + uiModel.addAttribute("liigiID", vaIDEE); + //liigiID ilmub aadressireale + return "redirect:/adminyksuseliigiredaktor/index?liigiID=" + encodeUrlPathSegment(voimalik_alluvus.getYksuseliik().getId().toString(), httpServletRequest); + + } + +/* + //admin.liigi olemasolevad alluvad + //@ModelAttribute("JubaOlemasOlevadAlluvad") + List annaOlOlAlluvad(Riigi_admin_yksuse_liik valitudLiik ){ + OlemasOlevadAlluvad ooaall = OlemasOlevadAlluvad.findAlluvadForAdminLiik(valitudLiik); + List ololAlluvad = ooaall.getLiikItems(); + return ololAlluvad; + } + */ + public List annaV6imalikualluvuseList(AdminYksuseLiik ylemLiik){ + VoimalikAlluvus v6i = null; + List vaList = new ArrayList(); + for(VoimalikAlluvus va : VoimalikAlluvus.findAllVoimalikAlluvuses()){ + if(va.getYksuseliik()== ylemLiik){ + //Ƥra nƤita suletud alluvaid + //eilse kuup saamine + Calendar rightNow = Calendar.getInstance(); + rightNow.add(Calendar.DATE, +1); + Date homme = rightNow.getTime(); + if(!(va.getSuletud().before(homme))){ + v6i = va; + vaList.add(v6i); + } + } + } + return vaList; + } + } diff --git a/src/main/java/itcollege/team09/web/VoimalikAlluvusController_Roo_Controller.aj b/src/main/java/itcollege/team09/web/VoimalikAlluvusController_Roo_Controller.aj index a9fdfd1..d38532f 100644 --- a/src/main/java/itcollege/team09/web/VoimalikAlluvusController_Roo_Controller.aj +++ b/src/main/java/itcollege/team09/web/VoimalikAlluvusController_Roo_Controller.aj @@ -26,25 +26,6 @@ import org.springframework.web.util.WebUtils; privileged aspect VoimalikAlluvusController_Roo_Controller { - @RequestMapping(method = RequestMethod.POST) - public String VoimalikAlluvusController.create(@Valid VoimalikAlluvus voimalikAlluvus, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) { - if (bindingResult.hasErrors()) { - uiModel.addAttribute("voimalikAlluvus", voimalikAlluvus); - addDateTimeFormatPatterns(uiModel); - return "voimalikalluvuses/create"; - } - uiModel.asMap().clear(); - voimalikAlluvus.persist(); - return "redirect:/voimalikalluvuses/" + encodeUrlPathSegment(voimalikAlluvus.getId().toString(), httpServletRequest); - } - - @RequestMapping(params = "form", method = RequestMethod.GET) - public String VoimalikAlluvusController.createForm(Model uiModel) { - uiModel.addAttribute("voimalikAlluvus", new VoimalikAlluvus()); - addDateTimeFormatPatterns(uiModel); - return "voimalikalluvuses/create"; - } - @RequestMapping(value = "/{id}", method = RequestMethod.GET) public String VoimalikAlluvusController.show(@PathVariable("id") Long id, Model uiModel) { addDateTimeFormatPatterns(uiModel); @@ -106,6 +87,9 @@ privileged aspect VoimalikAlluvusController_Roo_Controller { } void VoimalikAlluvusController.addDateTimeFormatPatterns(Model uiModel) { + uiModel.addAttribute("voimalikAlluvus_suletud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("voimalikAlluvus_avatud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); + uiModel.addAttribute("voimalikAlluvus_muudetud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("voimalikAlluvus_alates_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); uiModel.addAttribute("voimalikAlluvus_kuni_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale())); } diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 6eaccf7..875291b 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -2,6 +2,7 @@ org.hibernate.ejb.HibernatePersistence + diff --git a/src/main/resources/META-INF/spring/applicationContext-security.xml b/src/main/resources/META-INF/spring/applicationContext-security.xml index 487435c..884adf0 100644 --- a/src/main/resources/META-INF/spring/applicationContext-security.xml +++ b/src/main/resources/META-INF/spring/applicationContext-security.xml @@ -1,41 +1,46 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/META-INF/spring/applicationContext.xml b/src/main/resources/META-INF/spring/applicationContext.xml index 4dac453..17ca582 100644 --- a/src/main/resources/META-INF/spring/applicationContext.xml +++ b/src/main/resources/META-INF/spring/applicationContext.xml @@ -1,70 +1,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/itcollege/team09/entities/AdminAlluvus_.java b/src/main/resources/itcollege/team09/entities/AdminAlluvus_.java new file mode 100644 index 0000000..932d69c --- /dev/null +++ b/src/main/resources/itcollege/team09/entities/AdminAlluvus_.java @@ -0,0 +1,15 @@ +package itcollege.team09.entities; + +import java.util.Date; +import javax.annotation.Generated; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; + +@Generated(value="Dali", date="2011-12-19T17:55:40.671+0200") +@StaticMetamodel(AdminAlluvus.class) +public class AdminAlluvus_ extends Piirivalve_ { + public static volatile SingularAttribute alates; + public static volatile SingularAttribute kuni; + public static volatile SingularAttribute adminyksus; + public static volatile SingularAttribute alamadminyksus; +} diff --git a/src/main/resources/itcollege/team09/entities/AdminYksus_.java b/src/main/resources/itcollege/team09/entities/AdminYksus_.java new file mode 100644 index 0000000..5ddb17f --- /dev/null +++ b/src/main/resources/itcollege/team09/entities/AdminYksus_.java @@ -0,0 +1,20 @@ +package itcollege.team09.entities; + +import java.util.Date; +import javax.annotation.Generated; +import javax.persistence.metamodel.CollectionAttribute; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; + +@Generated(value="Dali", date="2011-12-19T17:55:40.703+0200") +@StaticMetamodel(AdminYksus.class) +public class AdminYksus_ extends Piirivalve_ { + public static volatile SingularAttribute kood; + public static volatile SingularAttribute nimetus; + public static volatile SingularAttribute alates; + public static volatile SingularAttribute kuni; + public static volatile CollectionAttribute vaeosad; + public static volatile CollectionAttribute ylemadminyksused; + public static volatile CollectionAttribute alamadminyksused; + public static volatile SingularAttribute adminYksuseLiik; +} diff --git a/src/main/resources/itcollege/team09/entities/AdminYksuseLiik_.java b/src/main/resources/itcollege/team09/entities/AdminYksuseLiik_.java new file mode 100644 index 0000000..3d55c91 --- /dev/null +++ b/src/main/resources/itcollege/team09/entities/AdminYksuseLiik_.java @@ -0,0 +1,19 @@ +package itcollege.team09.entities; + +import java.util.Date; +import javax.annotation.Generated; +import javax.persistence.metamodel.CollectionAttribute; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; + +@Generated(value="Dali", date="2011-12-19T17:55:40.703+0200") +@StaticMetamodel(AdminYksuseLiik.class) +public class AdminYksuseLiik_ extends Piirivalve_ { + public static volatile SingularAttribute kood; + public static volatile SingularAttribute nimetus; + public static volatile SingularAttribute alates; + public static volatile SingularAttribute kuni; + public static volatile CollectionAttribute ylemyksused; + public static volatile CollectionAttribute alamyksused; + public static volatile CollectionAttribute adminyksused; +} diff --git a/src/main/resources/itcollege/team09/entities/Piirivalve_.java b/src/main/resources/itcollege/team09/entities/Piirivalve_.java new file mode 100644 index 0000000..4932438 --- /dev/null +++ b/src/main/resources/itcollege/team09/entities/Piirivalve_.java @@ -0,0 +1,19 @@ +package itcollege.team09.entities; + +import java.util.Date; +import javax.annotation.Generated; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; + +@Generated(value="Dali", date="2011-12-19T17:55:40.703+0200") +@StaticMetamodel(Piirivalve.class) +public class Piirivalve_ { + public static volatile SingularAttribute id; + public static volatile SingularAttribute kommentaar; + public static volatile SingularAttribute avaja; + public static volatile SingularAttribute avatud; + public static volatile SingularAttribute muutja; + public static volatile SingularAttribute muudetud; + public static volatile SingularAttribute sulgeja; + public static volatile SingularAttribute suletud; +} diff --git a/src/main/resources/itcollege/team09/entities/VaeosaAlluvus_.java b/src/main/resources/itcollege/team09/entities/VaeosaAlluvus_.java new file mode 100644 index 0000000..2411a2b --- /dev/null +++ b/src/main/resources/itcollege/team09/entities/VaeosaAlluvus_.java @@ -0,0 +1,15 @@ +package itcollege.team09.entities; + +import java.util.Date; +import javax.annotation.Generated; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; + +@Generated(value="Dali", date="2011-12-19T17:55:40.703+0200") +@StaticMetamodel(VaeosaAlluvus.class) +public class VaeosaAlluvus_ extends Piirivalve_ { + public static volatile SingularAttribute alates; + public static volatile SingularAttribute kuni; + public static volatile SingularAttribute vaeosa; + public static volatile SingularAttribute alamvaeosa; +} diff --git a/src/main/resources/itcollege/team09/entities/Vaeosa_.java b/src/main/resources/itcollege/team09/entities/Vaeosa_.java new file mode 100644 index 0000000..57064ef --- /dev/null +++ b/src/main/resources/itcollege/team09/entities/Vaeosa_.java @@ -0,0 +1,19 @@ +package itcollege.team09.entities; + +import java.util.Date; +import javax.annotation.Generated; +import javax.persistence.metamodel.CollectionAttribute; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; + +@Generated(value="Dali", date="2011-12-19T17:55:40.703+0200") +@StaticMetamodel(Vaeosa.class) +public class Vaeosa_ extends Piirivalve_ { + public static volatile SingularAttribute kood; + public static volatile SingularAttribute nimetus; + public static volatile SingularAttribute alates; + public static volatile SingularAttribute kuni; + public static volatile SingularAttribute adminYksus; + public static volatile CollectionAttribute ylemvaeosad; + public static volatile CollectionAttribute alamvaeosad; +} diff --git a/src/main/resources/itcollege/team09/entities/VoimalikAlluvus_.java b/src/main/resources/itcollege/team09/entities/VoimalikAlluvus_.java new file mode 100644 index 0000000..052e6fc --- /dev/null +++ b/src/main/resources/itcollege/team09/entities/VoimalikAlluvus_.java @@ -0,0 +1,15 @@ +package itcollege.team09.entities; + +import java.util.Date; +import javax.annotation.Generated; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; + +@Generated(value="Dali", date="2011-12-19T17:55:40.703+0200") +@StaticMetamodel(VoimalikAlluvus.class) +public class VoimalikAlluvus_ extends Piirivalve_ { + public static volatile SingularAttribute alates; + public static volatile SingularAttribute kuni; + public static volatile SingularAttribute yksuseliik; + public static volatile SingularAttribute alamyksus; +} diff --git a/src/main/webapp/WEB-INF/i18n/application.properties b/src/main/webapp/WEB-INF/i18n/application.properties index 4ce177c..598c371 100644 --- a/src/main/webapp/WEB-INF/i18n/application.properties +++ b/src/main/webapp/WEB-INF/i18n/application.properties @@ -1,27 +1,38 @@ -#Updated at Sun Dec 18 12:59:18 EET 2011 -#Sun Dec 18 12:59:18 EET 2011 +#Updated at Mon Dec 19 11:02:54 EET 2011 +#Mon Dec 19 11:02:54 EET 2011 application_name=BorderGuard +label_adminyksuseliigiredaktor_index=Admin Yksuse Liigi Redaktor View label_itcollege_team09_entities_adminalluvus=Admin Alluvus label_itcollege_team09_entities_adminalluvus_adminyksus=Adminyksus label_itcollege_team09_entities_adminalluvus_alamadminyksus=Alamadminyksus label_itcollege_team09_entities_adminalluvus_alates=Alates +label_itcollege_team09_entities_adminalluvus_avaja=Avaja +label_itcollege_team09_entities_adminalluvus_avatud=Avatud label_itcollege_team09_entities_adminalluvus_id=Id label_itcollege_team09_entities_adminalluvus_kommentaar=Kommentaar label_itcollege_team09_entities_adminalluvus_kuni=Kuni +label_itcollege_team09_entities_adminalluvus_muudetud=Muudetud +label_itcollege_team09_entities_adminalluvus_muutja=Muutja label_itcollege_team09_entities_adminalluvus_plural=Admin Alluvuses label_itcollege_team09_entities_adminalluvus_suletud=Suletud +label_itcollege_team09_entities_adminalluvus_sulgeja=Sulgeja label_itcollege_team09_entities_adminalluvus_version=Version label_itcollege_team09_entities_adminyksus=Admin Yksus label_itcollege_team09_entities_adminyksus_adminyksuseliik=Admin Yksuse Liik label_itcollege_team09_entities_adminyksus_alamadminyksused=Alamadminyksused label_itcollege_team09_entities_adminyksus_alates=Alates +label_itcollege_team09_entities_adminyksus_avaja=Avaja +label_itcollege_team09_entities_adminyksus_avatud=Avatud label_itcollege_team09_entities_adminyksus_id=Id label_itcollege_team09_entities_adminyksus_kommentaar=Kommentaar label_itcollege_team09_entities_adminyksus_kood=Kood label_itcollege_team09_entities_adminyksus_kuni=Kuni +label_itcollege_team09_entities_adminyksus_muudetud=Muudetud +label_itcollege_team09_entities_adminyksus_muutja=Muutja label_itcollege_team09_entities_adminyksus_nimetus=Nimetus label_itcollege_team09_entities_adminyksus_plural=Admin Yksuses label_itcollege_team09_entities_adminyksus_suletud=Suletud +label_itcollege_team09_entities_adminyksus_sulgeja=Sulgeja label_itcollege_team09_entities_adminyksus_vaeosad=Vaeosad label_itcollege_team09_entities_adminyksus_version=Version label_itcollege_team09_entities_adminyksus_ylemadminyksused=Ylemadminyksused @@ -29,46 +40,66 @@ label_itcollege_team09_entities_adminyksuseliik=Admin Yksuse Liik label_itcollege_team09_entities_adminyksuseliik_adminyksused=Adminyksused label_itcollege_team09_entities_adminyksuseliik_alamyksused=Alamyksused label_itcollege_team09_entities_adminyksuseliik_alates=Alates +label_itcollege_team09_entities_adminyksuseliik_avaja=Avaja +label_itcollege_team09_entities_adminyksuseliik_avatud=Avatud label_itcollege_team09_entities_adminyksuseliik_id=Id label_itcollege_team09_entities_adminyksuseliik_kommentaar=Kommentaar label_itcollege_team09_entities_adminyksuseliik_kood=Kood label_itcollege_team09_entities_adminyksuseliik_kuni=Kuni +label_itcollege_team09_entities_adminyksuseliik_muudetud=Muudetud +label_itcollege_team09_entities_adminyksuseliik_muutja=Muutja label_itcollege_team09_entities_adminyksuseliik_nimetus=Nimetus label_itcollege_team09_entities_adminyksuseliik_plural=Admin Yksuse Liiks label_itcollege_team09_entities_adminyksuseliik_suletud=Suletud +label_itcollege_team09_entities_adminyksuseliik_sulgeja=Sulgeja label_itcollege_team09_entities_adminyksuseliik_version=Version label_itcollege_team09_entities_adminyksuseliik_ylemyksused=Ylemyksused label_itcollege_team09_entities_vaeosa=Vaeosa label_itcollege_team09_entities_vaeosa_adminyksus=Admin Yksus label_itcollege_team09_entities_vaeosa_alamvaeosad=Alamvaeosad label_itcollege_team09_entities_vaeosa_alates=Alates +label_itcollege_team09_entities_vaeosa_avaja=Avaja +label_itcollege_team09_entities_vaeosa_avatud=Avatud label_itcollege_team09_entities_vaeosa_id=Id label_itcollege_team09_entities_vaeosa_kommentaar=Kommentaar label_itcollege_team09_entities_vaeosa_kood=Kood label_itcollege_team09_entities_vaeosa_kuni=Kuni +label_itcollege_team09_entities_vaeosa_muudetud=Muudetud +label_itcollege_team09_entities_vaeosa_muutja=Muutja label_itcollege_team09_entities_vaeosa_nimetus=Nimetus label_itcollege_team09_entities_vaeosa_plural=Vaeosas label_itcollege_team09_entities_vaeosa_suletud=Suletud +label_itcollege_team09_entities_vaeosa_sulgeja=Sulgeja label_itcollege_team09_entities_vaeosa_version=Version label_itcollege_team09_entities_vaeosa_ylemvaeosad=Ylemvaeosad label_itcollege_team09_entities_vaeosaalluvus=Vaeosa Alluvus label_itcollege_team09_entities_vaeosaalluvus_alamvaeosa=Alamvaeosa label_itcollege_team09_entities_vaeosaalluvus_alates=Alates +label_itcollege_team09_entities_vaeosaalluvus_avaja=Avaja +label_itcollege_team09_entities_vaeosaalluvus_avatud=Avatud label_itcollege_team09_entities_vaeosaalluvus_id=Id label_itcollege_team09_entities_vaeosaalluvus_kommentaar=Kommentaar label_itcollege_team09_entities_vaeosaalluvus_kuni=Kuni +label_itcollege_team09_entities_vaeosaalluvus_muudetud=Muudetud +label_itcollege_team09_entities_vaeosaalluvus_muutja=Muutja label_itcollege_team09_entities_vaeosaalluvus_plural=Vaeosa Alluvuses label_itcollege_team09_entities_vaeosaalluvus_suletud=Suletud +label_itcollege_team09_entities_vaeosaalluvus_sulgeja=Sulgeja label_itcollege_team09_entities_vaeosaalluvus_vaeosa=Vaeosa label_itcollege_team09_entities_vaeosaalluvus_version=Version label_itcollege_team09_entities_voimalikalluvus=Voimalik Alluvus label_itcollege_team09_entities_voimalikalluvus_alamyksus=Alamyksus label_itcollege_team09_entities_voimalikalluvus_alates=Alates +label_itcollege_team09_entities_voimalikalluvus_avaja=Avaja +label_itcollege_team09_entities_voimalikalluvus_avatud=Avatud label_itcollege_team09_entities_voimalikalluvus_id=Id label_itcollege_team09_entities_voimalikalluvus_kommentaar=Kommentaar label_itcollege_team09_entities_voimalikalluvus_kuni=Kuni +label_itcollege_team09_entities_voimalikalluvus_muudetud=Muudetud +label_itcollege_team09_entities_voimalikalluvus_muutja=Muutja label_itcollege_team09_entities_voimalikalluvus_plural=Voimalik Alluvuses label_itcollege_team09_entities_voimalikalluvus_suletud=Suletud +label_itcollege_team09_entities_voimalikalluvus_sulgeja=Sulgeja label_itcollege_team09_entities_voimalikalluvus_version=Version label_itcollege_team09_entities_voimalikalluvus_yksuseliik=Yksuseliik label_popup_index=Pop Up Controller View @@ -89,6 +120,7 @@ menu_item_adminyksus_list_label=Admin Yksuses menu_item_adminyksus_new_label=Admin Yksus menu_item_adminyksuseliik_list_label=Admin Yksuse Liiks menu_item_adminyksuseliik_new_label=Admin Yksuse Liik +menu_item_controller__adminyksuseliigiredaktorindex_id_label=Admin Yksuse Liigi Redaktor View menu_item_controller__popupindex_id_label=Pop Up Controller View menu_item_controller__testdataindex_id_label=Test Data Controller View menu_item_vaeosa_list_label=Vaeosas diff --git a/src/main/webapp/WEB-INF/layouts/default.jspx b/src/main/webapp/WEB-INF/layouts/default.jspx index b045bc0..5b1de2f 100644 --- a/src/main/webapp/WEB-INF/layouts/default.jspx +++ b/src/main/webapp/WEB-INF/layouts/default.jspx @@ -1,28 +1,34 @@ - - - - - - - - - - - - - - - <spring:message code="welcome_h3" arguments="${app_name}" /> - - - -
- - -
- - -
+ + + + + + + + + + + + + + +<spring:message code="welcome_h3" arguments="${app_name}" /> + + + +
+ + +
+ +
- +
+ diff --git a/src/main/webapp/WEB-INF/layouts/layouts.xml b/src/main/webapp/WEB-INF/layouts/layouts.xml index 3c9d6d4..053edbf 100644 --- a/src/main/webapp/WEB-INF/layouts/layouts.xml +++ b/src/main/webapp/WEB-INF/layouts/layouts.xml @@ -5,15 +5,15 @@ - - - - - + + + + + - - - - + + + + diff --git a/src/main/webapp/WEB-INF/spring/webmvc-config.xml b/src/main/webapp/WEB-INF/spring/webmvc-config.xml index 59f7dc8..4e01f9f 100644 --- a/src/main/webapp/WEB-INF/spring/webmvc-config.xml +++ b/src/main/webapp/WEB-INF/spring/webmvc-config.xml @@ -1,54 +1,79 @@ - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - + - - + + dataAccessFailure @@ -58,20 +83,26 @@ - + - - - - - - - - /WEB-INF/layouts/layouts.xml - - /WEB-INF/views/**/views.xml - - - - + + + + + + + + /WEB-INF/layouts/layouts.xml + + /WEB-INF/views/**/views.xml + + + + diff --git a/src/main/webapp/WEB-INF/tags/customForm/create.tagx b/src/main/webapp/WEB-INF/tags/customForm/create.tagx index ef74243..058c1e0 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/create.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/create.tagx @@ -1,32 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - + + +
+ + + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/dependency.tagx b/src/main/webapp/WEB-INF/tags/customForm/dependency.tagx index 4888a12..ec64d80 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/dependency.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/dependency.tagx @@ -1,25 +1,48 @@ - - + + - - - - - - + + + + + + - - - - - - - - -

- -

- - - + + + + + + + + +

+ +

+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/checkbox.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/checkbox.tagx index 1804424..ca14c33 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/checkbox.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/checkbox.tagx @@ -1,38 +1,56 @@ - - + + - - - - - - + + + + + + - - - - - - ${field} - - - -
- - - - - - - - - - +
+ + + + + + + + + + -
-
- +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/column.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/column.tagx index d0d536d..54ee110 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/column.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/column.tagx @@ -1,63 +1,100 @@ - - + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/datetime.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/datetime.tagx index 9346612..bb58b42 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/datetime.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/datetime.tagx @@ -1,64 +1,105 @@ - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - - - ${field} - - - - - + + + + + + + + ${field} + - -
- - - - - - - -
- - - - - - - - - - - - - - +
+ + + + + + + +
+ + + + + + + + + + + + + + -
-
- +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/display.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/display.tagx index 9c04000..f715d65 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/display.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/display.tagx @@ -1,51 +1,76 @@ - - + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + -
- -
- - - - - - - - - - - - - - - -
-
-
- + + + +
+ +
+ + + + + + + + + + + + + + + +
+
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/editor.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/editor.tagx index 2a2ee38..60ae05e 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/editor.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/editor.tagx @@ -1,45 +1,70 @@ - - + + - - - - - - - - - - + + + + + + + + + + - + - - - + + + - - - + + + - - - - - - ${field} - + + + - -
- - -
-
- +
+ + +
+
+ -
-
- -
-
- +
+
+ +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/input.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/input.tagx index aff5ea1..0b6d806 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/input.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/input.tagx @@ -1,108 +1,160 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${field} - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - ${field_validation} - - - ${field_invalid} - - - ${field_required} - - - - - - -
-
- +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/reference.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/reference.tagx index fa0f364..5cf65c5 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/reference.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/reference.tagx @@ -1,42 +1,63 @@ - - + + - - - - - - - + + + + + + + - + - - - + + + -
- - - - - - - - ${fn:escapeXml(add_message)} - - - - +
+ + + + + ${fn:escapeXml(add_message)} + + + + ( ) -
-
+
+
- + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/select.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/select.tagx index e454985..8109067 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/select.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/select.tagx @@ -1,199 +1,256 @@ - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - + + + - - - + + + - - - + + + - - - - - - ${field} - + + + - - ${itemLabel} - + + ${field} + -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - -
-
- + + ${itemLabel} + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/simple.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/simple.tagx index f8a86f3..cce5106 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/simple.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/simple.tagx @@ -1,35 +1,57 @@ - - + + - - - - - - - - + + + + + + + + - + - - - + + + -
- - - - - - - - - -
-
- +
+ + + + + + + + + +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/table.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/table.tagx index e8972be..dfd9832 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/table.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/table.tagx @@ -1,162 +1,204 @@ - - - + + + - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - ${fn:escapeXml(show_label)} - - - - - - - - - ${fn:escapeXml(update_label)} - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - ${fn:escapeXml(add_message)} - - - - - - - -
+ + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + ${fn:escapeXml(show_label)} + + + ${fn:escapeXml(update_label)} + + + + + + + + + + + + + + + +
+ + + ${fn:escapeXml(add_message)} + + + + + +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/fields/textarea.tagx b/src/main/webapp/WEB-INF/tags/customForm/fields/textarea.tagx index 1b5ba23..fa714ad 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/fields/textarea.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/fields/textarea.tagx @@ -1,47 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${field} - - - -
- - -
- - -
-
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${field} + + + +
+ + +
+ + +
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/find.tagx b/src/main/webapp/WEB-INF/tags/customForm/find.tagx index b12c427..bea158f 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/find.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/find.tagx @@ -1,30 +1,54 @@ - - + + - - - - - - - + + + + + + + - - - - - - - - - - -
- - - -
- - - + + + + + + + + + + +
+ + + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/list.tagx b/src/main/webapp/WEB-INF/tags/customForm/list.tagx index b81d256..99eb08d 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/list.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/list.tagx @@ -1,31 +1,55 @@ - - + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/show.tagx b/src/main/webapp/WEB-INF/tags/customForm/show.tagx index 3178d55..f249b67 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/show.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/show.tagx @@ -1,103 +1,154 @@ - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - ${fn:escapeXml(update_label)} - - - - - - - - - - - - ${fn:escapeXml(create_label)} - - - - - - - - - - ${fn:escapeXml(list_label)} - - - -
- - - - - - - + + + + + +
+ + + + + + + + + + + + + + + + + + + + ${fn:escapeXml(update_label)} + + + + + + + + + ${fn:escapeXml(create_label)} + + + + + + + ${fn:escapeXml(list_label)} + + + +
+ + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/customForm/update.tagx b/src/main/webapp/WEB-INF/tags/customForm/update.tagx index 9fd15dd..7dff835 100644 --- a/src/main/webapp/WEB-INF/tags/customForm/update.tagx +++ b/src/main/webapp/WEB-INF/tags/customForm/update.tagx @@ -1,43 +1,74 @@ - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/create.tagx b/src/main/webapp/WEB-INF/tags/form/create.tagx index ef74243..058c1e0 100644 --- a/src/main/webapp/WEB-INF/tags/form/create.tagx +++ b/src/main/webapp/WEB-INF/tags/form/create.tagx @@ -1,32 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - + + +
+ + + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/createLiik.tagx b/src/main/webapp/WEB-INF/tags/form/createLiik.tagx new file mode 100644 index 0000000..7a4780d --- /dev/null +++ b/src/main/webapp/WEB-INF/tags/form/createLiik.tagx @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/dependency.tagx b/src/main/webapp/WEB-INF/tags/form/dependency.tagx index 4888a12..ec64d80 100644 --- a/src/main/webapp/WEB-INF/tags/form/dependency.tagx +++ b/src/main/webapp/WEB-INF/tags/form/dependency.tagx @@ -1,25 +1,48 @@ - - + + - - - - - - + + + + + + - - - - - - - - -

- -

- - - + + + + + + + + +

+ +

+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx b/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx index 1804424..ca14c33 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/checkbox.tagx @@ -1,38 +1,56 @@ - - + + - - - - - - + + + + + + - - - - - - ${field} - - - -
- - - - - - - - - - +
+ + + + + + + + + + -
-
- +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/column.tagx b/src/main/webapp/WEB-INF/tags/form/fields/column.tagx index d0d536d..54ee110 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/column.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/column.tagx @@ -1,63 +1,100 @@ - - + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx b/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx index 9346612..bb58b42 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx @@ -1,64 +1,105 @@ - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - - - ${field} - - - - - + + + + + + + + ${field} + - -
- - - - - - - -
- - - - - - - - - - - - - - +
+ + + + + + + +
+ + + + + + + + + + + + + + -
-
- +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/display.tagx b/src/main/webapp/WEB-INF/tags/form/fields/display.tagx index 9c04000..f715d65 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/display.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/display.tagx @@ -1,51 +1,76 @@ - - + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + -
- -
- - - - - - - - - - - - - - - -
-
-
- + + + +
+ +
+ + + + + + + + + + + + + + + +
+
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx b/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx index 2a2ee38..60ae05e 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/editor.tagx @@ -1,45 +1,70 @@ - - + + - - - - - - - - - - + + + + + + + + + + - + - - - + + + - - - + + + - - - - - - ${field} - + + + - -
- - -
-
- +
+ + +
+
+ -
-
- -
-
- +
+
+ +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/input.tagx b/src/main/webapp/WEB-INF/tags/form/fields/input.tagx index aff5ea1..0b6d806 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/input.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/input.tagx @@ -1,108 +1,160 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${field} - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - ${field_validation} - - - ${field_invalid} - - - ${field_required} - - - - - - -
-
- + +
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx b/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx index fa0f364..5cf65c5 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/reference.tagx @@ -1,42 +1,63 @@ - - + + - - - - - - - + + + + + + + - + - - - + + + -
- - - - - - - - ${fn:escapeXml(add_message)} - - - - +
+ + + + + ${fn:escapeXml(add_message)} + + + + ( ) -
-
+
+
- + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/select.tagx b/src/main/webapp/WEB-INF/tags/form/fields/select.tagx index e454985..8109067 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/select.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/select.tagx @@ -1,199 +1,256 @@ - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - + + + - - - + + + - - - + + + - - - - - - ${field} - + + + - - ${itemLabel} - + + ${field} + -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - -
-
- + + ${itemLabel} + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx b/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx index f8a86f3..cce5106 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/simple.tagx @@ -1,35 +1,57 @@ - - + + - - - - - - - - + + + + + + + + - + - - - + + + -
- - - - - - - - - -
-
- +
+ + + + + + + + + +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx index e8972be..dfd9832 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/table.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/table.tagx @@ -1,162 +1,204 @@ - - - + + + - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - ${fn:escapeXml(show_label)} - - - - - - - - - ${fn:escapeXml(update_label)} - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - ${fn:escapeXml(add_message)} - - - - - - - -
+ + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + ${fn:escapeXml(show_label)} + + + ${fn:escapeXml(update_label)} + + + + + + + + + + + + + + + +
+ + + ${fn:escapeXml(add_message)} + + + + + +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx b/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx index 1b5ba23..fa714ad 100644 --- a/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx +++ b/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx @@ -1,47 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${field} - - - -
- - -
- - -
-
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${field} + + + +
+ + +
+ + +
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/find.tagx b/src/main/webapp/WEB-INF/tags/form/find.tagx index b12c427..bea158f 100644 --- a/src/main/webapp/WEB-INF/tags/form/find.tagx +++ b/src/main/webapp/WEB-INF/tags/form/find.tagx @@ -1,30 +1,54 @@ - - + + - - - - - - - + + + + + + + - - - - - - - - - - -
- - - -
- - - + + + + + + + + + + +
+ + + +
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/list.tagx b/src/main/webapp/WEB-INF/tags/form/list.tagx index b81d256..99eb08d 100644 --- a/src/main/webapp/WEB-INF/tags/form/list.tagx +++ b/src/main/webapp/WEB-INF/tags/form/list.tagx @@ -1,31 +1,55 @@ - - + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/show.tagx b/src/main/webapp/WEB-INF/tags/form/show.tagx index 3178d55..f249b67 100644 --- a/src/main/webapp/WEB-INF/tags/form/show.tagx +++ b/src/main/webapp/WEB-INF/tags/form/show.tagx @@ -1,103 +1,154 @@ - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - ${fn:escapeXml(update_label)} - - - - - - - - - - - - ${fn:escapeXml(create_label)} - - - - - - - - - - ${fn:escapeXml(list_label)} - - - -
- - - - - - - + + + + + +
+ + + + + + + + + + + + + + + + + + + + ${fn:escapeXml(update_label)} + + + + + + + + + ${fn:escapeXml(create_label)} + + + + + + + ${fn:escapeXml(list_label)} + + + +
+ + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/form/update.tagx b/src/main/webapp/WEB-INF/tags/form/update.tagx index 675c663..429e3c9 100644 --- a/src/main/webapp/WEB-INF/tags/form/update.tagx +++ b/src/main/webapp/WEB-INF/tags/form/update.tagx @@ -1,53 +1,80 @@ - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/menu/category.tagx b/src/main/webapp/WEB-INF/tags/menu/category.tagx index f78f81f..d893660 100644 --- a/src/main/webapp/WEB-INF/tags/menu/category.tagx +++ b/src/main/webapp/WEB-INF/tags/menu/category.tagx @@ -1,17 +1,30 @@ - - - - - - - - + + + + + + + + - + - +

  • @@ -20,6 +33,6 @@

    • - +     \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/menu/item.tagx b/src/main/webapp/WEB-INF/tags/menu/item.tagx index b1768a1..584b284 100644 --- a/src/main/webapp/WEB-INF/tags/menu/item.tagx +++ b/src/main/webapp/WEB-INF/tags/menu/item.tagx @@ -1,29 +1,44 @@ - - + + - - - - - - + + + + + + - + - - - + + + - - - + + + -
  • - - - - -
    • +
  • +
    • -     +     diff --git a/src/main/webapp/WEB-INF/tags/menu/menu.tagx b/src/main/webapp/WEB-INF/tags/menu/menu.tagx index f16269a..ffb64e4 100644 --- a/src/main/webapp/WEB-INF/tags/menu/menu.tagx +++ b/src/main/webapp/WEB-INF/tags/menu/menu.tagx @@ -1,10 +1,18 @@ - - - - - - - + + + + + + +