Skip to content

3 Parandust #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ilves wants to merge 3 commits into
base: newbranch
Choose a base branch
from
Open

3 Parandust #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
979b805
Admin junit mudelis ei olnud voimalik kustutada, sai exceptioni - lis…
ilves Dec 11, 2011
729a304
Kustutatud admin junit objekte ei filtreeritud surogaat kuupaeva kasu…
ilves Dec 11, 2011
63dc8e2
Admin junit muutes ja luues dropdonwnides on default hashid, lisasin …
ilves Dec 11, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,25 @@ public void setSubUnitHierarchys(
Collection<AdminUnitHierarchy> 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 long countAdminUnits() {
return entityManager().createQuery("SELECT COUNT(o) FROM AdminUnit o WHERE closedDate > CURDATE()", Long.class).getSingleResult();
}

public static List<AdminUnit> findAllAdminUnits() {
return entityManager().createQuery("SELECT o FROM AdminUnit o WHERE closedDate > CURDATE()", AdminUnit.class).getResultList();
}

public static List<AdminUnit> 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);

Expand Down
12 changes: 0 additions & 12 deletions javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_Entity.aj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> 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> AdminUnit.findAdminUnitEntries(int firstResult, int maxResults) {
return entityManager().createQuery("SELECT o FROM AdminUnit o", AdminUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
}

}
2 changes: 1 addition & 1 deletion javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/create.jspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<field:datetime dateTimePattern="${adminUnit_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_AdminUnit_openedDate" z="EI8oaStS18FMuSYgG3PsdXLWeRw="/>
<field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnit_changedBy" z="ah8risAwM4tMYLGKexRwWbhgbAc="/>
<field:simple field="regiments" id="c_ee_itcollege_example_entities_AdminUnit_regiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Regiment" z="w6a5ToqAdhrK5Nb6x5esmXRFmYk="/>
<field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="9kh9VZnAl8kq0fkQN+hKh8xuPVk="/>
<field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitType" itemValue="id" itemLabel="name" items="${adminunittypes}" path="/adminunittypes" z="user-managed"/>
<field:simple field="adminUnitHierarchys" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Hierarchy" z="mxuRyTcZ5NgNHENvQCHdXxeubE4="/>
<field:simple field="subUnitHierarchys" id="c_ee_itcollege_example_entities_AdminUnit_subUnitHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Hierarchy" z="o0jX17wlU+4SzDqFQMLTZtWy/uc="/>
<field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnit_closedBy" z="pF4d5ZzmduafDT4CrzVzfug9CwQ="/>
Expand Down
2 changes: 1 addition & 1 deletion javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/update.jspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnit_changedBy" z="ah8risAwM4tMYLGKexRwWbhgbAc="/>
<field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnit_closedBy" z="pF4d5ZzmduafDT4CrzVzfug9CwQ="/>
<field:simple field="regiments" id="c_ee_itcollege_example_entities_AdminUnit_regiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Regiment" z="w6a5ToqAdhrK5Nb6x5esmXRFmYk="/>
<field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="9kh9VZnAl8kq0fkQN+hKh8xuPVk="/>
<field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitType" itemValue="id" itemLabel="name" items="${adminunittypes}" path="/adminunittypes" z="user-managed"/>
<field:simple field="adminUnitHierarchys" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Hierarchy" z="mxuRyTcZ5NgNHENvQCHdXxeubE4="/>
<field:simple field="subUnitHierarchys" id="c_ee_itcollege_example_entities_AdminUnit_subUnitHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Hierarchy" z="o0jX17wlU+4SzDqFQMLTZtWy/uc="/>
</form:update>
Expand Down