From 5747b101936f8713ed57512632b4e1ebb0344f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 6 Jan 2010 22:55:32 +0100 Subject: [PATCH] ItEr42S17CUGravacionModelosUnidadesTraballoItEr41S20: AssignedMaterialsToOrderElementModel only needs to be provided with the order element --- .../org/navalplanner/web/orders/OrderCRUDController.java | 3 ++- .../navalplanner/web/orders/OrderElementController.java | 2 +- .../AssignedMaterialsToOrderElementController.java | 5 ++--- .../materials/AssignedMaterialsToOrderElementModel.java | 8 ++------ .../materials/IAssignedMaterialsToOrderElementModel.java | 3 +-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java index d0a30a732..d79136cb2 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java @@ -421,7 +421,8 @@ public class OrderCRUDController extends GenericForwardComposer { manageOrderElementAdvancesController.openWindow(orderElementModel); assignedLabelsController.openWindow(orderElementModel); assignedCriterionRequirementController.openWindow(orderElementModel); - assignedMaterialsController.openWindow(orderElementModel); + assignedMaterialsController.openWindow(orderElementModel + .getOrderElement()); assignedTaskQualityFormController.openWindow(orderElementModel); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java index e128fd663..328d9430f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java @@ -147,7 +147,7 @@ public class OrderElementController extends GenericForwardComposer { manageOrderElementAdvancesController.openWindow(model); assignedLabelsController.openWindow(model); assignedCriterionRequirementController.openWindow(model); - assignedMaterialsController.openWindow(model); + assignedMaterialsController.openWindow(model.getOrderElement()); assignedTaskQualityFormsController.openWindow(model); try { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java index a7e229e91..1e9191668 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java @@ -37,7 +37,6 @@ import org.navalplanner.business.materials.entities.MaterialAssignment; import org.navalplanner.business.materials.entities.MaterialCategory; import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.web.common.Util; -import org.navalplanner.web.orders.IOrderElementModel; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.SuspendNotAllowedException; @@ -93,8 +92,8 @@ public class AssignedMaterialsToOrderElementController extends comp.setVariable("assignedMaterialsController", this, true); } - public void openWindow(IOrderElementModel orderElementModel) { - assignedMaterialsToOrderElementModel.initEdit(orderElementModel); + public void openWindow(OrderElement orderElement) { + assignedMaterialsToOrderElementModel.initEdit(orderElement); prepareCategoriesTree(); prepareAllCategoriesTree(); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementModel.java index 2713bb420..51eb587aa 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementModel.java @@ -33,7 +33,6 @@ import org.navalplanner.business.materials.entities.MaterialAssignment; import org.navalplanner.business.materials.entities.MaterialCategory; import org.navalplanner.business.orders.daos.IOrderElementDAO; import org.navalplanner.business.orders.entities.OrderElement; -import org.navalplanner.web.orders.IOrderElementModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; @@ -59,8 +58,6 @@ public class AssignedMaterialsToOrderElementModel implements @Autowired private IOrderElementDAO orderElementDAO; - private IOrderElementModel orderElementModel; - private OrderElement orderElement; private MutableTreeModel materialCategories = MutableTreeModel @@ -73,9 +70,8 @@ public class AssignedMaterialsToOrderElementModel implements @Override @Transactional(readOnly = true) - public void initEdit(IOrderElementModel orderElementModel) { - this.orderElementModel = orderElementModel; - this.orderElement = this.orderElementModel.getOrderElement(); + public void initEdit(OrderElement orderElement) { + this.orderElement = orderElement; orderElementDAO.reattach(this.orderElement); materialCategories = MutableTreeModel.create(MaterialCategory.class); initializeMaterialAssigments(this.orderElement.getMaterialAssignments()); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/IAssignedMaterialsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/IAssignedMaterialsToOrderElementModel.java index ab17f763d..1cbcac82c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/IAssignedMaterialsToOrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/IAssignedMaterialsToOrderElementModel.java @@ -27,7 +27,6 @@ import org.navalplanner.business.materials.entities.Material; import org.navalplanner.business.materials.entities.MaterialAssignment; import org.navalplanner.business.materials.entities.MaterialCategory; import org.navalplanner.business.orders.entities.OrderElement; -import org.navalplanner.web.orders.IOrderElementModel; import org.zkoss.zul.TreeModel; @@ -88,7 +87,7 @@ public interface IAssignedMaterialsToOrderElementModel { */ double getUnits(MaterialCategory materialCategory); - void initEdit(IOrderElementModel orderElementModel); + void initEdit(OrderElement orderElement); void removeMaterialAssignment(MaterialAssignment materialAssignment);