diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index 97826cfc9..c29cb2428 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -308,8 +308,9 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { CompanyEarnedValueChartFiller earnedValueChartFiller = new CompanyEarnedValueChartFiller(); earnedValueChartFiller.calculateValues(planner.getTimeTracker() .getRealInterval()); - appendTabpanels(chartComponent, chartLoadTimeplot, - chartEarnedValueTimeplot, earnedValueChartFiller); + // avoid adding Timeplot since it has some pending issues + // appendTabpanels(chartComponent, chartLoadTimeplot, + // chartEarnedValueTimeplot, earnedValueChartFiller); setupChart(chartLoadTimeplot, new CompanyLoadChartFiller(), planner); Chart earnedValueChart = setupChart(chartEarnedValueTimeplot, 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 f55485ccc..29f34d45f 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 @@ -373,8 +373,9 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { orderReloaded); earnedValueChartFiller.calculateValues(planner.getTimeTracker() .getRealInterval()); - appendTabpanels(chartComponent, chartLoadTimeplot, - chartEarnedValueTimeplot, earnedValueChartFiller); + // avoid adding Timeplot since it has some pending issues + // 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 65f87cecf..88442ec13 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 @@ -29,10 +29,10 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import java.util.Map.Entry; import org.apache.commons.lang.Validate; import org.joda.time.LocalDate; @@ -515,8 +515,9 @@ public class ResourceLoadController implements Composer { Tabpanels chartTabpanels = new Tabpanels(); Tabpanel loadChartPannel = new Tabpanel(); - CompanyPlanningModel.appendLoadChartAndLegend(loadChartPannel, - buildLoadChart()); + // avoid adding Timeplot since it has some pending issues + // CompanyPlanningModel.appendLoadChartAndLegend(loadChartPannel, + // buildLoadChart()); chartTabpanels.appendChild(loadChartPannel); chartComponent.appendChild(chartTabpanels);