From 5d49d113b1adf0165c034df9ce7b3488c49272ee Mon Sep 17 00:00:00 2001 From: Farruco Sanjurjo Date: Mon, 15 Nov 2010 12:34:24 +0100 Subject: [PATCH] Revert comments that prevented the use of timeplot * All problems have been fixed so it's safe to use it now FEA: ItEr02S03MigracionZK5 --- .../navalplanner/web/planner/order/OrderPlanningModel.java | 4 ++-- .../navalplanner/web/resourceload/ResourceLoadController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 29f34d45f..cf1665e43 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -374,8 +374,8 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { earnedValueChartFiller.calculateValues(planner.getTimeTracker() .getRealInterval()); // avoid adding Timeplot since it has some pending issues - // appendTabpanels(chartComponent, chartLoadTimeplot, - // chartEarnedValueTimeplot, earnedValueChartFiller); + appendTabpanels(chartComponent, chartLoadTimeplot, + chartEarnedValueTimeplot, earnedValueChartFiller); Chart loadChart = setupChart(orderReloaded, new OrderLoadChartFiller( orderReloaded), chartLoadTimeplot, planner); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java index 88442ec13..d28b64d15 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java @@ -516,8 +516,8 @@ public class ResourceLoadController implements Composer { Tabpanels chartTabpanels = new Tabpanels(); Tabpanel loadChartPannel = new Tabpanel(); // avoid adding Timeplot since it has some pending issues - // CompanyPlanningModel.appendLoadChartAndLegend(loadChartPannel, - // buildLoadChart()); + CompanyPlanningModel.appendLoadChartAndLegend(loadChartPannel, + buildLoadChart()); chartTabpanels.appendChild(loadChartPannel); chartComponent.appendChild(chartTabpanels);