From eed5bfe2ea4269152025176363d68ed31d1e52d6 Mon Sep 17 00:00:00 2001 From: Nacho Barrientos Date: Mon, 14 Nov 2011 17:43:07 +0100 Subject: [PATCH] Add method to retrieve theoretical progress. FEA: ItEr75S27PerProjectDashboard --- .../org/libreplan/web/dashboard/DashboardController.java | 3 ++- .../java/org/libreplan/web/dashboard/DashboardModel.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java index 2fcb02e97..99b160f88 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java @@ -72,7 +72,8 @@ public class DashboardController extends GenericForwardComposer { String out = dashboardModel.getPercentageOfFinishedTasks().toString() + " " + dashboardModel.getPercentageOfInProgressTasks() + " " + dashboardModel.getPercentageOfReadyToStartTasks() + " " + - dashboardModel.getPercentageOfBlockedTasks(); + dashboardModel.getPercentageOfBlockedTasks() + "\n" + + dashboardModel.getTheoreticalAdvancePercentageByHoursUntilNow(); return out; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardModel.java index 0eb810e1e..4d02c172f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardModel.java @@ -21,6 +21,7 @@ package org.libreplan.web.dashboard; import java.math.BigDecimal; import java.math.MathContext; +import java.util.Date; import java.util.EnumMap; import java.util.Map; @@ -70,6 +71,11 @@ public class DashboardModel { return taskStatusStats.get(TaskStatusEnum.BLOCKED); } + public BigDecimal getTheoreticalAdvancePercentageByHoursUntilNow(){ + BigDecimal ratio = getRootTask().getTheoreticalAdvancePercentageUntilDate(new Date()); + return ratio.multiply(BigDecimal.TEN).multiply(BigDecimal.TEN); + } + private void calculateTaskStatusStatistics() { AccumulateTasksStatusVisitor visitor = new AccumulateTasksStatusVisitor(); TaskElement rootTask = getRootTask();