From 979b805ef5d55589e12ccbeadb656c8706bc64b2 Mon Sep 17 00:00:00 2001 From: Taavi Ilves Date: Sun, 11 Dec 2011 14:48:47 +0200 Subject: [PATCH 1/3] Admin junit mudelis ei olnud voimalik kustutada, sai exceptioni - lisasin funktsionaalsuse --- .../main/java/ee/itcollege/example/entities/AdminUnit.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java index 72d1788..6bbde28 100644 --- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java +++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java @@ -195,6 +195,13 @@ public void setSubUnitHierarchys( Collection subUnitHierarchys) { this.subUnitHierarchys = subUnitHierarchys; } + + @Transactional + public void remove() { + if (this.entityManager == null) this.entityManager = entityManager(); + setClosedBy((String) SecurityContextHolder.getContext().getAuthentication().getName()); + this.entityManager.createQuery("UPDATE AdminUnit SET closedDate = CURDATE(), closedBy = '" + getClosedBy() + "' WHERE id = " + this.getId()).executeUpdate(); + } /* public static final Date notDeleted = new Date(253402207200000L); From 729a304eb98402c519280d22904e5b362f6e614c Mon Sep 17 00:00:00 2001 From: Taavi Ilves Date: Sun, 11 Dec 2011 14:52:20 +0200 Subject: [PATCH 2/3] Kustutatud admin junit objekte ei filtreeritud surogaat kuupaeva kasutades valja, lisasin tingimused --- .../ee/itcollege/example/entities/AdminUnit.java | 12 ++++++++++++ .../example/entities/AdminUnit_Roo_Entity.aj | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java index 6bbde28..093d546 100644 --- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java +++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java @@ -202,6 +202,18 @@ public void remove() { setClosedBy((String) SecurityContextHolder.getContext().getAuthentication().getName()); this.entityManager.createQuery("UPDATE AdminUnit SET closedDate = CURDATE(), closedBy = '" + getClosedBy() + "' WHERE id = " + this.getId()).executeUpdate(); } + + public static long countAdminUnits() { + return entityManager().createQuery("SELECT COUNT(o) FROM AdminUnit o WHERE closedDate > CURDATE()", Long.class).getSingleResult(); + } + + public static List findAllAdminUnits() { + return entityManager().createQuery("SELECT o FROM AdminUnit o WHERE closedDate > CURDATE()", AdminUnit.class).getResultList(); + } + + public static List findAdminUnitEntries(int firstResult, int maxResults) { + return entityManager().createQuery("SELECT o FROM AdminUnit o WHERE closedDate > CURDATE()", AdminUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); + } /* public static final Date notDeleted = new Date(253402207200000L); diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_Entity.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_Entity.aj index 6e7a6a2..819be88 100644 --- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_Entity.aj +++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_Entity.aj @@ -9,21 +9,9 @@ import java.util.List; privileged aspect AdminUnit_Roo_Entity { - public static long AdminUnit.countAdminUnits() { - return entityManager().createQuery("SELECT COUNT(o) FROM AdminUnit o", Long.class).getSingleResult(); - } - - public static List AdminUnit.findAllAdminUnits() { - return entityManager().createQuery("SELECT o FROM AdminUnit o", AdminUnit.class).getResultList(); - } - public static AdminUnit AdminUnit.findAdminUnit(Long id) { if (id == null) return null; return entityManager().find(AdminUnit.class, id); } - public static List AdminUnit.findAdminUnitEntries(int firstResult, int maxResults) { - return entityManager().createQuery("SELECT o FROM AdminUnit o", AdminUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList(); - } - } From 63dc8e2661db9181a470d5c45f65910f070d51c4 Mon Sep 17 00:00:00 2001 From: Taavi Ilves Date: Sun, 11 Dec 2011 15:02:29 +0200 Subject: [PATCH 3/3] Admin junit muutes ja luues dropdonwnides on default hashid, lisasin nimetused --- .../src/main/webapp/WEB-INF/views/adminunits/create.jspx | 2 +- .../src/main/webapp/WEB-INF/views/adminunits/update.jspx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/create.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/create.jspx index 6b1b85b..e39bf9f 100644 --- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/create.jspx +++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/create.jspx @@ -12,7 +12,7 @@ - + diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/update.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/update.jspx index f56202e..50f0919 100644 --- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/update.jspx +++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/update.jspx @@ -14,7 +14,7 @@ - +