RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr47S04ValidacionEProbasFuncionaisItEr46S04 : Refactoring the assigned hours controller and assigned hours model.

Browse source
This commit is contained in:
Susana Montes Pedreira 2010-02-12 15:23:06 +01:00 • committed by Javier Moran Rua
parent a8bf7efceb
commit 83b7bcfe7c
7 changed files with 51 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java → navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedHoursToOrderElementController.java
View file

@ -34,48 +34,49 @@ import org.zkoss.zul.Vbox;
* Controller for show the asigned hours of the selected order element<br />
* @author Susana Montes Pedreria <smontes@wirelessgalicia.com>
*/
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<WorkReportLine> 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);

28
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java → navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedHoursToOrderElementModel.java
View file

@ -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<WorkReportLine> 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<WorkReportLine>();
}
this.asignedDirectHours = 0;
this.assignedDirectHours = 0;
this.listWRL = workReportLineDAO.findByOrderElement(orderElement);
Iterator<WorkReportLine> 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

8
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAsignedHoursToOrderElementModel.java → navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedHoursToOrderElementModel.java
View file

@ -28,11 +28,11 @@ import org.navalplanner.business.workreports.entities.WorkReportLine;
/**
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
*/
public interface IAsignedHoursToOrderElementModel{
public interface IAssignedHoursToOrderElementModel{
public List<WorkReportLine> 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();

8
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
View file

@ -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);

13
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -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);

2
navalplanner-webapp/src/main/webapp/orders/_edition.zul
View file

@ -38,7 +38,7 @@
<tab id="tabOrderElements" label="${i18n:_('Order elements')}"
onSelect = "controller.setupOrderElementTreeController();"/>
<tab id="tabAssignedHours" label="${i18n:_('Assigned hours')}"
onSelect = "controller.setupAsignedHoursToOrderElementController();"/>
onSelect = "controller.setupAssignedHoursToOrderElementController();"/>
<tab id="tabAdvances" label="${i18n:_('Advances')}"
onSelect = "controller.setupManageOrderElementAdvancesController();"/>
<tab id="tabLabels" label="${i18n:_('Label')}"

16
navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul
View file

@ -19,14 +19,14 @@
-->
<vbox id="${arg.id}"
apply="org.navalplanner.web.orders.AsignedHoursToOrderElementController">
apply="org.navalplanner.web.orders.AssignedHoursToOrderElementController">
<!-- Direct imputation -->
<vbox>
<panel title="${i18n:_('Direct imputation')}">
<panelchildren>
<grid style="border:0px" height="100%"
model="@{asignedHoursToOrderElementController.workReportLines}"
model="@{assignedHoursToOrderElementController.workReportLines}"
mold="paging" pageSize="10">
<columns>
<column label="${i18n:_('Date')}" />
@ -52,7 +52,7 @@
<row>
<label value="${i18n:_('Total')}:" />
<label
value="@{asignedHoursToOrderElementController.totalAsignedDirectHours}" />
value="@{assignedHoursToOrderElementController.totalAssignedDirectHours}" />
</row>
</rows>
</grid>
@ -73,12 +73,12 @@
<label
value="${i18n:_('Order lines imputation')}:" />
<label id="totalIDC"
value="@{asignedHoursToOrderElementController.hoursChildren}" />
value="@{assignedHoursToOrderElementController.hoursChildren}" />
</row>
<row>
<label value="${i18n:_('Total')}:" />
<label id="addtotal"
value="@{asignedHoursToOrderElementController.totalAsignedHours}" />
value="@{assignedHoursToOrderElementController.totalAssignedHours}" />
</row>
</rows>
</grid>
@ -108,19 +108,19 @@
<label
value="${i18n:_('Budget hours')}:" />
<label
value="@{asignedHoursToOrderElementController.estimatedHours}" />
value="@{assignedHoursToOrderElementController.estimatedHours}" />
</row>
<row>
<label
value="${i18n:_('Imputed hours')}:" />
<label
value="@{asignedHoursToOrderElementController.totalAsignedHours}" />
value="@{assignedHoursToOrderElementController.totalAssignedHours}" />
</row>
</rows>
</grid>
<hbox id="Percentage">
<label
value="@{asignedHoursToOrderElementController.progressWork}" />
value="@{assignedHoursToOrderElementController.progressWork}" />
<label value="${i18n:_('%')}" />
<progressmeter id="hoursProgressBar" />
<progressmeter