From c76d379f1aedd4f54aa9d066428fd53953d30a5f Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 28 Dec 2009 08:46:33 +0100 Subject: [PATCH] ItEr40S22CUProcuraOrganizacionsTraballoItEr32S10: Modified work report behaviour to take into account that order elements code is now unique. --- .../orders/daos/IOrderElementDAO.java | 10 ------- .../business/orders/daos/OrderElementDAO.java | 12 -------- .../test/orders/daos/OrderElementDAOTest.java | 30 ------------------- .../web/workreports/IWorkReportModel.java | 9 ------ .../workreports/WorkReportCRUDController.java | 13 ++------ .../web/workreports/WorkReportModel.java | 18 +---------- 6 files changed, 3 insertions(+), 89 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/IOrderElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/IOrderElementDAO.java index c3560b639..b01211a12 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/IOrderElementDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/IOrderElementDAO.java @@ -59,16 +59,6 @@ public interface IOrderElementDAO extends IGenericDAO { public List findParent( OrderElement orderElement); - /** - * Returns the unique code that distinguishes an OrderElement (unique path - * from root to OrderElement) - * - * @param orderElement must be attached - * @return - */ - public String getDistinguishedCode(OrderElement orderElement) - throws InstanceNotFoundException; - /** * Returns the number of assigned hours for an {@link OrderElement} * diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java index 255c1d077..9fd670cce 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java @@ -96,18 +96,6 @@ public class OrderElementDAO extends GenericDAOHibernate return ((List) c.list()); } - public String getDistinguishedCode(OrderElement orderElement) - throws InstanceNotFoundException { - String code = orderElement.getCode(); - - while (orderElement.getParent() != null) { - OrderElement parent = find(orderElement.getParent().getId()); - code = parent.getCode() + "-" + code; - orderElement = parent; - } - return code; - } - @Override @Transactional(readOnly = true) public int getAssignedHours(OrderElement orderElement) { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderElementDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderElementDAOTest.java index 018e36d62..623f3416f 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderElementDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderElementDAOTest.java @@ -170,36 +170,6 @@ public class OrderElementDAOTest { assertFalse(list.isEmpty()); } - @Test - public void testFindDistinguishedCode() { - // Create OrderLineGroupLine - OrderLineGroup orderLineGroup = createValidOrderLineGroup(); - orderElementDAO.save(orderLineGroup); - orderLineGroup.setCode(((Long) orderLineGroup.getId()).toString()); - orderElementDAO.save(orderLineGroup); - - // Create OrderLineGroup - OrderLine orderLine = createValidOrderLine(); - orderElementDAO.save(orderLine); - orderLine.setCode(((Long) orderLine.getId()).toString()); - orderLineGroup.add(orderLine); - orderElementDAO.save(orderLine); - - try { - String distinguishedCode = orderElementDAO - .getDistinguishedCode(orderLine); - String code = orderLine.getCode(); - OrderElement orderElement = orderLine; - while (orderElement.getParent() != null) { - code = orderLine.getParent().getCode() + "-" + code; - orderElement = orderElement.getParent(); - } - assertTrue(distinguishedCode.equals(code)); - } catch (InstanceNotFoundException e) { - - } - } - @Test public void testSaveOrderLineWithAdvanceAssignments() throws DuplicateValueTrueReportGlobalAdvanceException, diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java index 484798951..dd59694e1 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/IWorkReportModel.java @@ -76,15 +76,6 @@ public interface IWorkReportModel { */ Worker findWorker(String nif) throws InstanceNotFoundException; - /** - * Returns distinguished code for {@link OrderElement} - * - * @param orderElement - * @return - */ - String getDistinguishedCode(OrderElement orderElement) - throws InstanceNotFoundException; - /** * Gets the current {@link WorkReport}. * diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java index cc95220ff..c99526876 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java @@ -741,12 +741,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements @Override public String get() { if (workReportLine.getOrderElement() != null) { - try { - return workReportModel - .getDistinguishedCode(workReportLine - .getOrderElement()); - } catch (InstanceNotFoundException e) { - } + return workReportLine.getOrderElement().getCode(); } return ""; } @@ -1063,11 +1058,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements public String getCodeOrderElement() { if ((getWorkReport() != null) && (getWorkReport().getOrderElement() != null)) { - try { - return workReportModel.getDistinguishedCode(getWorkReport() - .getOrderElement()); - } catch (InstanceNotFoundException e) { - } + return getWorkReport().getOrderElement().getCode(); } return null; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java index ff7b7c23e..c15c65561 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java @@ -220,17 +220,7 @@ public class WorkReportModel implements IWorkReportModel { @Transactional public OrderElement findOrderElement(String orderCode) throws InstanceNotFoundException { - String[] parts = orderCode.split("-"); - - OrderElement parent = orderElementDAO.findUniqueByCodeAndParent(null, - parts[0]); - for (int i = 1; i < parts.length && parent != null; i++) { - OrderElement child = orderElementDAO.findUniqueByCodeAndParent( - parent, parts[i]); - parent = child; - } - - return parent; + return orderElementDAO.findUniqueByCode(orderCode); } @Override @@ -278,12 +268,6 @@ public class WorkReportModel implements IWorkReportModel { return editing; } - @Override - @Transactional(readOnly = true) - public String getDistinguishedCode(OrderElement orderElement) throws InstanceNotFoundException { - return orderElementDAO.getDistinguishedCode(orderElement); - } - @Override public WorkReportLine addWorkReportLine() { WorkReportLine workReportLine = WorkReportLine.create();