From 19a479e7edc1c2783b5ee5e09805bffc31c3dac9 Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Sun, 6 Dec 2009 20:45:08 +0100 Subject: [PATCH] ItEr37S14CUVistaRecursosTempoEmpresaItEr36S16: Fixes and small grafical improvements for planner charts --- .../web/ganttz/zul/plannerLayout.zul | 2 +- .../web/planner/chart/ChartFiller.java | 3 +++ .../planner/chart/EarnedValueChartFiller.java | 2 +- .../planner/company/CompanyPlanningModel.java | 5 +++-- .../web/planner/order/OrderPlanningModel.java | 3 ++- .../main/webapp/common/css/navalpro_zk.css | 19 +++++++++++++------ 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul index b22f5d30e..ad12e19c6 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul @@ -68,7 +68,7 @@ planner = self; -
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java index 151527b61..240c1d22b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java @@ -398,6 +398,9 @@ public abstract class ChartFiller implements IChartFiller { timeGeometry.setMin(Integer.valueOf(min)); timeGeometry.setMax(Integer.valueOf(max)); + timeGeometry.setAxisLabelsPlacement("bottom"); + // Remove year separators + timeGeometry.setGridColor("#FFFFFF"); return timeGeometry; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java index 894abb890..8dcc5a583 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java @@ -294,7 +294,7 @@ public abstract class EarnedValueChartFiller extends ChartFiller { } chart.setWidth(size + "px"); - chart.setHeight("100px"); + chart.setHeight("150px"); } protected void addZeroBeforeTheFirstValue( 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 9fe41536f..bbc76ba3f 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 @@ -160,6 +160,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { Tabbox chartComponent = new Tabbox(); chartComponent.setOrient("vertical"); + chartComponent.setHeight("200px"); appendTabs(chartComponent); configuration.setChartComponent(chartComponent); @@ -189,7 +190,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { chartTabs.appendChild(new Tab(_("Indicators"))); chartComponent.appendChild(chartTabs); - chartTabs.setWidth("100px"); + chartTabs.setWidth("124px"); } private void appendTabpanels(Tabbox chartComponent, Timeplot loadChart, @@ -615,7 +616,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { appendPlotinfo(chart, plotInfoOverload, valueGeometry, timeGeometry); chart.setWidth(size + "px"); - chart.setHeight("100px"); + chart.setHeight("150px"); } private SortedMap getLoad(Date start, Date finish) { 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 fa4d96691..ccdb54db5 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 @@ -176,6 +176,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { configuration.setEditTaskCommand(buildEditTaskCommand(editTaskController)); Tabbox chartComponent = new Tabbox(); chartComponent.setOrient("vertical"); + chartComponent.setHeight("200px"); appendTabs(chartComponent); configuration.setChartComponent(chartComponent); @@ -723,7 +724,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { timeGeometry); chart.setWidth(size + "px"); - chart.setHeight("100px"); + chart.setHeight("150px"); } private void groupByWeekMaps() { diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css index d6782ebc0..4cf24dc66 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css @@ -951,15 +951,11 @@ tr.z-tree-row-seld, tr.z-list-item-seld, } .earned-parameter-column { - width: 70px; + width: 62px; } -.z-panel-header { -/* color: #0F3B82; */ -} .z-panel-body { -padding: 10px; -/* border-color: #0F3B82; */ + padding: 10px; } .perspectives-column { @@ -985,3 +981,14 @@ padding: 10px; .allocation-criterion-selector span.z-dottree-line { min-height:14px; } + +.timeplot-copyright { + display: none; +} + +.timeplot-grid-label { + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + font-size: 10px; + z-index: 2; + color: transparent; +}