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

Removed method getTotalChargedHours in SumChargedEffort class

Browse source 
FEA: ItEr75S22WortReportsEffortDuration
This commit is contained in:
Ignacio Diaz Teijido 2011-09-07 09:20:27 +02:00 • committed by Manuel Rego Casasnovas
parent 4a3dc1b14a
commit 2e372141c0
3 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java
View file

@ -151,9 +151,12 @@ public class OrderElementDAO extends IntegrationEntityDAO<OrderElement>
@Override
@Transactional(readOnly = true)
public BigDecimal getHoursAdvancePercentage(OrderElement orderElement) {
final int totalChargedHours = orderElement.getSumChargedEffort() != null ? orderElement
.getSumChargedEffort().getTotalChargedHours() : 0;
BigDecimal assignedHours = new BigDecimal(totalChargedHours).setScale(2);
final EffortDuration totalChargedEffort = orderElement
.getSumChargedEffort() != null ? orderElement
.getSumChargedEffort().getTotalChargedEffort() : EffortDuration
.zero();
BigDecimal assignedHours = totalChargedEffort
.toHoursAsDecimalWithScale(2);
BigDecimal estimatedHours = new BigDecimal(orderElement.getWorkHours())
.setScale(2);

7
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedEffort.java
View file

@ -70,11 +70,4 @@ public class SumChargedEffort extends BaseEntity {
return directChargedEffort.plus(indirectChargedEffort);
}
/**
* @deprecated Use {@link SumChargedEffort#getTotalChargedEffort()} instead
*/
public Integer getTotalChargedHours() {
return getTotalChargedEffort().getHours();
}
}

23
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
View file

@ -474,15 +474,16 @@ public class TaskElementAdapter implements ITaskElementAdapter {
public GanttDate getHoursAdvanceEndDate() {
OrderElement orderElement = taskElement.getOrderElement();
Integer assignedHours = 0;
EffortDuration assignedEffort = EffortDuration.zero();
if (orderElement.getSumChargedEffort() != null) {
assignedHours = orderElement.getSumChargedEffort()
.getTotalChargedHours();
assignedEffort = orderElement.getSumChargedEffort()
.getTotalChargedEffort();
}
GanttDate result = null;
if(!(taskElement instanceof TaskGroup)) {
result = calculateLimitDate(assignedHours);
result = calculateLimitDate(assignedEffort
.toHoursAsDecimalWithScale(2));
}
if (result == null) {
Integer hours = taskElement.getSumOfHoursAllocated();
@ -493,8 +494,9 @@ public class TaskElementAdapter implements ITaskElementAdapter {
return getBeginDate();
}
}
BigDecimal percentage = new BigDecimal(assignedHours)
.setScale(2).divide(new BigDecimal(hours),
BigDecimal percentage = assignedEffort
.toHoursAsDecimalWithScale(2).divide(
new BigDecimal(hours),
RoundingMode.DOWN);
result = calculateLimitDate(percentage);
@ -510,9 +512,12 @@ public class TaskElementAdapter implements ITaskElementAdapter {
return BigDecimal.ZERO;
}
int totalChargedHours = orderElement.getSumChargedEffort() != null ? orderElement
.getSumChargedEffort().getTotalChargedHours() : 0;
BigDecimal assignedHours = new BigDecimal(totalChargedHours).setScale(2);
EffortDuration totalChargedEffort = orderElement
.getSumChargedEffort() != null ? orderElement
.getSumChargedEffort().getTotalChargedEffort()
: EffortDuration.zero();
BigDecimal assignedHours = totalChargedEffort
.toHoursAsDecimalWithScale(2);
BigDecimal estimatedHours = new BigDecimal(taskElement.getSumOfHoursAllocated())
.setScale(2);