From df100622ae9127d0ce6b277e92c6a0273234f775 Mon Sep 17 00:00:00 2001 From: Nacho Barrientos Date: Wed, 2 Nov 2011 17:18:33 +0100 Subject: [PATCH] Refactor attribute names and getters. FEA: ItEr75S27PerProjectDashboard --- .../planner/entities/PlanningData.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/PlanningData.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/PlanningData.java index 6124d1846..18349bc78 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/PlanningData.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/PlanningData.java @@ -56,11 +56,11 @@ public class PlanningData extends BaseEntity { private BigDecimal progressByNumHours; - private BigDecimal theoreticalProgressAllByNumHours; + private BigDecimal theoreticalProgressByNumHoursForAllTasks; - private BigDecimal theoreticalProgressByDuration; + private BigDecimal theoreticalProgressByDurationForCriticalPath; - private BigDecimal theoreticalProgressByNumHours; + private BigDecimal theoreticalProgressByNumHoursForCriticalPath; public PlanningData() { @@ -78,16 +78,16 @@ public class PlanningData extends BaseEntity { return progressByNumHours; } - public BigDecimal getTheoreticalProgressAllByNumHours() { - return theoreticalProgressAllByNumHours; + public BigDecimal getTheoreticalProgressByNumHoursForAllTasks() { + return theoreticalProgressByNumHoursForAllTasks; } - public BigDecimal getTheoreticalProgressByDuration() { - return theoreticalProgressByDuration; + public BigDecimal getTheoreticalProgressByDurationForCriticalPath() { + return theoreticalProgressByDurationForCriticalPath; } - public BigDecimal getTheoreticalProgressByNumHours() { - return theoreticalProgressByNumHours; + public BigDecimal getTheoreticalProgressByNumHoursForCriticalPath() { + return theoreticalProgressByNumHoursForCriticalPath; } private PlanningData(TaskGroup rootTask) { @@ -105,9 +105,9 @@ public class PlanningData extends BaseEntity { progressByNumHours = calculateByNumHours(criticalPath); Date now = new Date(); - theoreticalProgressAllByNumHours = rootTask.getTheoreticalAdvancePercentageUntilDate(now); - theoreticalProgressByDuration = calculateTheoreticalAdvanceByDurationForCriticalPath(criticalPath, now); - theoreticalProgressByNumHours = calculateTheoreticalAdvanceByNumHoursForCriticalPath(criticalPath, now); + theoreticalProgressByNumHoursForAllTasks = rootTask.getTheoreticalAdvancePercentageUntilDate(now); + theoreticalProgressByDurationForCriticalPath = calculateTheoreticalAdvanceByDurationForCriticalPath(criticalPath, now); + theoreticalProgressByNumHoursForCriticalPath = calculateTheoreticalAdvanceByNumHoursForCriticalPath(criticalPath, now); } private BigDecimal calculateByDuration(List criticalPath) {