diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementController.java index 681b1580a..8713261c7 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementController.java @@ -24,6 +24,8 @@ package org.libreplan.web.orders; import java.math.BigDecimal; import java.util.List; +import org.libreplan.business.common.Registry; +import org.libreplan.business.common.daos.ConfigurationDAO; import org.libreplan.business.expensesheet.entities.ExpenseSheetLine; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.reports.dtos.WorkReportLineDTO; @@ -104,6 +106,14 @@ public class AssignedHoursToOrderElementController extends return assignedHoursToOrderElementModel.getBudget(); } + public BigDecimal getResourcesBudget() { + return assignedHoursToOrderElementModel.getResourcesBudget(); + } + + public BigDecimal getTotalBudget() { + return assignedHoursToOrderElementModel.getTotalBudget(); + } + public BigDecimal getMoneyCost() { return assignedHoursToOrderElementModel.getMoneyCost(); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementModel.java index 73c630a77..2a8513eb7 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedHoursToOrderElementModel.java @@ -30,6 +30,8 @@ import java.util.List; import org.apache.commons.lang.Validate; import org.joda.time.LocalDate; +import org.libreplan.business.common.Registry; +import org.libreplan.business.common.daos.ConfigurationDAO; import org.libreplan.business.expensesheet.daos.IExpenseSheetLineDAO; import org.libreplan.business.expensesheet.entities.ExpenseSheetLine; import org.libreplan.business.expensesheet.entities.ExpenseSheetLineComparator; @@ -242,6 +244,24 @@ public class AssignedHoursToOrderElementModel implements IAssignedHoursToOrderEl return orderElement.getBudget(); } + @Override + @Transactional(readOnly = true) + public BigDecimal getTotalBudget() { + if (orderElement == null) { + return BigDecimal.ZERO; + } + return getBudget().add(getResourcesBudget()); + } + + @Override + @Transactional(readOnly = true) + public BigDecimal getResourcesBudget() { + if (orderElement == null) { + return BigDecimal.ZERO; + } + return orderElement.getResourcesBudget(); + } + @Override @Transactional(readOnly = true) public BigDecimal getMoneyCost() { @@ -292,9 +312,8 @@ public class AssignedHoursToOrderElementModel implements IAssignedHoursToOrderEl return BigDecimal.ZERO; } return MoneyCostCalculator.getMoneyCostProportion( - moneyCostCalculator.getTotalMoneyCost(orderElement), orderElement.getBudget()) - .multiply( - new BigDecimal(100)); + moneyCostCalculator.getTotalMoneyCost(orderElement), + orderElement.getTotalBudget()).multiply(new BigDecimal(100)); } @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/IAssignedHoursToOrderElementModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/IAssignedHoursToOrderElementModel.java index 3b2862164..dd243f775 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/IAssignedHoursToOrderElementModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/IAssignedHoursToOrderElementModel.java @@ -64,4 +64,8 @@ public interface IAssignedHoursToOrderElementModel{ public BigDecimal getCostOfHours(); + public BigDecimal getTotalBudget(); + + public BigDecimal getResourcesBudget(); + } diff --git a/libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul b/libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul index 07b2a3572..71837f626 100644 --- a/libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul +++ b/libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul @@ -199,7 +199,7 @@ - + @@ -208,15 +208,39 @@ - + +