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

project-margins-and-status: added methods to calculate the workhours and budget with the specified margin for the project

Browse source
This commit is contained in:
miciele Ghiorghis 2013-06-19 16:44:40 +02:00 • committed by Oscar Gonzalez Fernandez
parent ef9d021b3f
commit 9f15fecaea
1 changed files with 56 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,6 @@ import org.libreplan.business.common.Registry;
import org.libreplan.business.common.daos.IIntegrationEntityDAO;
import org.libreplan.business.common.entities.Configuration;
import org.libreplan.business.common.entities.PredefinedConnectorProperties;
import org.libreplan.business.common.exceptions.InstanceNotFoundException;
import org.libreplan.business.common.exceptions.ValidationException;
import org.libreplan.business.costcategories.daos.IHourCostDAO;
import org.libreplan.business.costcategories.entities.CostCategory;
@ -73,7 +72,6 @@ import org.libreplan.business.qualityforms.entities.TaskQualityForm;
import org.libreplan.business.requirements.entities.CriterionRequirement;
import org.libreplan.business.requirements.entities.DirectCriterionRequirement;
import org.libreplan.business.requirements.entities.IndirectCriterionRequirement;
import org.libreplan.business.resources.daos.ICriterionDAO;
import org.libreplan.business.resources.entities.Criterion;
import org.libreplan.business.scenarios.entities.OrderVersion;
import org.libreplan.business.scenarios.entities.Scenario;
@ -1700,7 +1698,6 @@ public abstract class OrderElement extends IntegrationEntity implements
return false;
}
public BigDecimal getTotalBudget() {
return getBudget().add(getResourcesBudget());
}
@ -1760,4 +1757,60 @@ public abstract class OrderElement extends IntegrationEntity implements
return totalBudget;
}
/**
* Returns with margin calculated hours for this orderElement
*/
public EffortDuration getWithMarginCalculatedHours() {
return calculateWorkHoursWithMargin();
}
/**
* Calculates the work hours with the margin {@link Order#getHoursMargin()}
* for this orderElement
*
* @return calculated work hours
*/
private EffortDuration calculateWorkHoursWithMargin() {
BigDecimal margin = this.getOrder().getHoursMargin() != null ? new BigDecimal(
this.getOrder().getHoursMargin()).setScale(2) : BigDecimal.ZERO;
BigDecimal hundred = new BigDecimal(100);
BigDecimal estimatedHours = new BigDecimal(getWorkHours()).setScale(2);
BigDecimal marginHours = estimatedHours.multiply(margin).divide(
hundred, 2,
BigDecimal.ROUND_HALF_EVEN);
BigDecimal result = estimatedHours.add(marginHours);
return EffortDuration.fromHoursAsBigDecimal(result);
}
/**
* Returns with margin calculated budget for this orderElement
*/
public BigDecimal getWithMarginCalculatedBudget() {
return calculateBudgetWithMargin();
}
/**
* Calculates the budget with the margin {@link Order#getBudgetMargin()} for
* this orderElement
*
* @return calculated budget
*/
private BigDecimal calculateBudgetWithMargin() {
BigDecimal margin = this.getOrder().getBudgetMargin() != null ? new BigDecimal(
this.getOrder().getBudgetMargin()) : BigDecimal.ZERO;
BigDecimal hundred = new BigDecimal(100);
BigDecimal budget = getBudget();
BigDecimal marginBudget = budget.multiply(margin).divide(hundred, 2,
BigDecimal.ROUND_HALF_EVEN);
return budget.add(marginBudget);
}
}