From 83b7bcfe7cf92646ba1fdcfd670afc814eaa9984 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Fri, 12 Feb 2010 15:23:06 +0100 Subject: [PATCH] ItEr47S04ValidacionEProbasFuncionaisItEr46S04 : Refactoring the assigned hours controller and assigned hours model. --- ...ssignedHoursToOrderElementController.java} | 25 +++++++++-------- ... => AssignedHoursToOrderElementModel.java} | 28 +++++++++---------- ...=> IAssignedHoursToOrderElementModel.java} | 8 +++--- .../web/orders/OrderCRUDController.java | 8 +++--- .../web/orders/OrderElementController.java | 13 +++++---- .../src/main/webapp/orders/_edition.zul | 2 +- .../webapp/orders/_listOrderElementHours.zul | 16 +++++------ 7 files changed, 51 insertions(+), 49 deletions(-) rename navalplanner-webapp/src/main/java/org/navalplanner/web/orders/{AsignedHoursToOrderElementController.java => AssignedHoursToOrderElementController.java} (80%) rename navalplanner-webapp/src/main/java/org/navalplanner/web/orders/{AsignedHoursToOrderElementModel.java => AssignedHoursToOrderElementModel.java} (84%) rename navalplanner-webapp/src/main/java/org/navalplanner/web/orders/{IAsignedHoursToOrderElementModel.java => IAssignedHoursToOrderElementModel.java} (87%) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedHoursToOrderElementController.java similarity index 80% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedHoursToOrderElementController.java index 3c2518e6e..31d3ed997 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedHoursToOrderElementController.java @@ -34,48 +34,49 @@ import org.zkoss.zul.Vbox; * Controller for show the asigned hours of the selected order element
* @author Susana Montes Pedreria */ -public class AsignedHoursToOrderElementController extends +public class AssignedHoursToOrderElementController extends GenericForwardComposer { - private IAsignedHoursToOrderElementModel asignedHoursToOrderElementModel; + private IAssignedHoursToOrderElementModel assignedHoursToOrderElementModel; private Vbox orderElementHours; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - comp.setVariable("asignedHoursToOrderElementController", this, true); + comp.setVariable("assignedHoursToOrderElementController", this, true); } public List getWorkReportLines() { - return asignedHoursToOrderElementModel.getWorkReportLines(); + return assignedHoursToOrderElementModel.getWorkReportLines(); } - public int getTotalAsignedDirectHours() { - return asignedHoursToOrderElementModel.getAsignedDirectHours(); + public int getTotalAssignedDirectHours() { + return assignedHoursToOrderElementModel.getAssignedDirectHours(); } - public int getTotalAsignedHours() { - return asignedHoursToOrderElementModel.getTotalAsignedHours(); + public int getTotalAssignedHours() { + return assignedHoursToOrderElementModel.getTotalAssignedHours(); } public int getHoursChildren() { - return asignedHoursToOrderElementModel.getAsignedDirectHoursChildren(); + return assignedHoursToOrderElementModel + .getAssignedDirectHoursChildren(); } public int getEstimatedHours() { - return asignedHoursToOrderElementModel.getEstimatedHours(); + return assignedHoursToOrderElementModel.getEstimatedHours(); } public int getProgressWork() { - return asignedHoursToOrderElementModel.getProgressWork(); + return assignedHoursToOrderElementModel.getProgressWork(); } private IOrderElementModel orderElementModel; public void openWindow(IOrderElementModel orderElementModel) { setOrderElementModel(orderElementModel); - asignedHoursToOrderElementModel.initOrderElement(getOrderElement()); + assignedHoursToOrderElementModel.initOrderElement(getOrderElement()); if (orderElementHours != null) { Util.createBindingsFor(orderElementHours); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedHoursToOrderElementModel.java similarity index 84% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedHoursToOrderElementModel.java index eecb51221..bf172f140 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedHoursToOrderElementModel.java @@ -43,8 +43,8 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Scope(BeanDefinition.SCOPE_PROTOTYPE) -public class AsignedHoursToOrderElementModel implements - IAsignedHoursToOrderElementModel { +public class AssignedHoursToOrderElementModel implements + IAssignedHoursToOrderElementModel { @Autowired private final IWorkReportLineDAO workReportLineDAO; @@ -52,17 +52,17 @@ public class AsignedHoursToOrderElementModel implements @Autowired private IOrderElementDAO orderElementDAO; - private int asignedDirectHours; + private int assignedDirectHours; private OrderElement orderElement; private List listWRL; @Autowired - public AsignedHoursToOrderElementModel(IWorkReportLineDAO workReportLineDAO) { + public AssignedHoursToOrderElementModel(IWorkReportLineDAO workReportLineDAO) { Validate.notNull(workReportLineDAO); this.workReportLineDAO = workReportLineDAO; - this.asignedDirectHours = 0; + this.assignedDirectHours = 0; } @Override @@ -71,7 +71,7 @@ public class AsignedHoursToOrderElementModel implements if (orderElement == null) { return new ArrayList(); } - this.asignedDirectHours = 0; + this.assignedDirectHours = 0; this.listWRL = workReportLineDAO.findByOrderElement(orderElement); Iterator iterador = listWRL.iterator(); while (iterador.hasNext()) { @@ -79,22 +79,22 @@ public class AsignedHoursToOrderElementModel implements w.getResource().getShortDescription(); w.getOrderElement().getWorkHours(); w.getWorkReport().getDate(); - this.asignedDirectHours = this.asignedDirectHours + w.getNumHours(); + this.assignedDirectHours = this.assignedDirectHours + w.getNumHours(); } return listWRL; } @Override - public int getAsignedDirectHours() { + public int getAssignedDirectHours() { if (orderElement == null) { return 0; } - return this.asignedDirectHours; + return this.assignedDirectHours; } @Override @Transactional(readOnly = true) - public int getTotalAsignedHours() { + public int getTotalAssignedHours() { if (orderElement == null) { return 0; } @@ -103,16 +103,16 @@ public class AsignedHoursToOrderElementModel implements @Override @Transactional(readOnly = true) - public int getAsignedDirectHoursChildren() { + public int getAssignedDirectHoursChildren() { if (orderElement == null) { return 0; } if (orderElement.getChildren().isEmpty()) { return 0; } - int asignedDirectChildren = getTotalAsignedHours() - - this.asignedDirectHours; - return asignedDirectChildren; + int assignedDirectChildren = getTotalAssignedHours() + - this.assignedDirectHours; + return assignedDirectChildren; } @Override diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAsignedHoursToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedHoursToOrderElementModel.java similarity index 87% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAsignedHoursToOrderElementModel.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedHoursToOrderElementModel.java index b237b64b4..9abd6ed4c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAsignedHoursToOrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedHoursToOrderElementModel.java @@ -28,11 +28,11 @@ import org.navalplanner.business.workreports.entities.WorkReportLine; /** * @author Susana Montes Pedreira */ -public interface IAsignedHoursToOrderElementModel{ +public interface IAssignedHoursToOrderElementModel{ public List getWorkReportLines(); - public int getAsignedDirectHours(); - public int getTotalAsignedHours(); - public int getAsignedDirectHoursChildren(); + public int getAssignedDirectHours(); + public int getTotalAssignedHours(); + public int getAssignedDirectHoursChildren(); public void initOrderElement(OrderElement orderElement); public int getEstimatedHours(); public int getProgressWork(); 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 4a4aa47ec..b3e8e61ab 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 @@ -298,14 +298,14 @@ public class OrderCRUDController extends GenericForwardComposer { return orderModel.getOrderElementModel(order); } - private AsignedHoursToOrderElementController assignedHoursController; + private AssignedHoursToOrderElementController assignedHoursController; - public void setupAsignedHoursToOrderElementController() throws Exception { + public void setupAssignedHoursToOrderElementController() throws Exception { if (assignedHoursController == null) { Component orderElementHours = editWindow .getFellowIfAny("orderElementHours"); - assignedHoursController = (AsignedHoursToOrderElementController) orderElementHours - .getVariable("asignedHoursToOrderElementController", true); + assignedHoursController = (AssignedHoursToOrderElementController) orderElementHours + .getVariable("assignedHoursToOrderElementController", true); final IOrderElementModel orderElementModel = getOrderElementModel(); assignedHoursController.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 55a935127..3b4350c8e 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 @@ -56,7 +56,7 @@ public class OrderElementController extends GenericForwardComposer { private Component orderElementHours; - private AsignedHoursToOrderElementController asignedHoursToOrderElementController; + private AssignedHoursToOrderElementController assignedHoursToOrderElementController; private Component orderElementAdvances; @@ -81,7 +81,7 @@ public class OrderElementController extends GenericForwardComposer { super.doAfterCompose(comp); comp.setVariable("orderElementController", this, true); setupDetailsOrderElementController(comp); - setupAsignedHoursToOrderElementController(comp); + setupAssignedHoursToOrderElementController(comp); setupManageOrderElementAdvancesController(comp); setupAssignedLabelsToOrderElementController(comp); setupAssignedCriterionRequirementToOrderElementController(comp); @@ -94,9 +94,10 @@ public class OrderElementController extends GenericForwardComposer { orderElementDetails.getVariable("detailsController", true); } - private void setupAsignedHoursToOrderElementController(Component comp) throws Exception{ - asignedHoursToOrderElementController = (AsignedHoursToOrderElementController) - orderElementHours.getVariable("asignedHoursToOrderElementController", true); + private void setupAssignedHoursToOrderElementController(Component comp) throws Exception{ + assignedHoursToOrderElementController = (AssignedHoursToOrderElementController) + orderElementHours + .getVariable("assignedHoursToOrderElementController", true); } private void setupManageOrderElementAdvancesController(Component comp) throws Exception { @@ -144,7 +145,7 @@ public class OrderElementController extends GenericForwardComposer { setOrderElementModel(model); detailsController.openWindow(model); - asignedHoursToOrderElementController.openWindow(model); + assignedHoursToOrderElementController.openWindow(model); manageOrderElementAdvancesController.openWindow(model); assignedLabelsController.openWindow(model); assignedCriterionRequirementController.openWindow(model); diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul index 398594ab1..cd49a1a8f 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul @@ -38,7 +38,7 @@ + onSelect = "controller.setupAssignedHoursToOrderElementController();"/> + apply="org.navalplanner.web.orders.AssignedHoursToOrderElementController"> @@ -52,7 +52,7 @@ @@ -73,12 +73,12 @@