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

Fixed problems in the algorithm when having criteria both on requirements and hours group

Browse source 
FEA: ItEr77S17AutomaticBudgeting
This commit is contained in:
Lorenzo Tilve Álvaro 2013-06-19 12:20:49 +02:00
parent 2ccb291570
commit 629f235823
1 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
View file

@ -1706,23 +1706,14 @@ public abstract class OrderElement extends IntegrationEntity implements
}
public BigDecimal getResourcesBudget() {
BigDecimal result = new BigDecimal(0);
Configuration configuration = Registry.getConfigurationDAO()
.getConfiguration();
if (configuration == null) {
return result;
}
if (configuration.isEnabledAutomaticBudget()) {
result = Registry.getTransactionService().runOnReadOnlyTransaction(
new IOnTransaction<BigDecimal>() {
return Registry.getTransactionService().runOnReadOnlyTransaction(
new IOnTransaction<BigDecimal>() {
@Override
public BigDecimal execute() {
return calculateBudgetFromCriteriaAndCostCategories();
}
});
}
return result;
@Override
public BigDecimal execute() {
return calculateBudgetFromCriteriaAndCostCategories();
}
});
}
public BigDecimal calculateBudgetFromCriteriaAndCostCategories() {
@ -1740,19 +1731,6 @@ public abstract class OrderElement extends IntegrationEntity implements
BigDecimal costPerHour = new BigDecimal(0);
BigDecimal hours = new BigDecimal(0);
for (CriterionRequirement requirement : getCriterionRequirements()) {
hours = new BigDecimal(getWorkHours());
if (requirement.getCriterion().getCostCategory() != null) {
IHourCostDAO hourCostDAO = Registry.getHourCostDAO();
costPerHour = hourCostDAO.getPriceCostFromCriterionAndType(
requirement.getCriterion().getCostCategory(),
typeofWorkHours);
totalBudget = totalBudget.add(costPerHour.multiply(hours));
}
}
for (HoursGroup hoursGroup : getHoursGroups()) {
hours = new BigDecimal(hoursGroup.getWorkingHours());
@ -1769,6 +1747,10 @@ public abstract class OrderElement extends IntegrationEntity implements
}
totalBudget = totalBudget.add(costPerHour.multiply(hours));
}
if (hoursGroup.getCriterionRequirements().size() > 1) {
totalBudget = totalBudget.divide(new BigDecimal(hoursGroup
.getCriterionRequirements().size()));
}
}
return totalBudget;