From 09feeb71af4eca8f6544e390beb393f11694252d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Tue, 10 Jan 2012 15:56:34 +0100 Subject: [PATCH] Display timeplot graph values when pointing over the chart FEA: ItEr76S04BugFixing --- .../resources/web/js/ganttz/GanttPanel.js | 2 +- .../web/planner/chart/ChartFiller.java | 1 + .../src/main/webapp/planner/css/ganttzk.css | 20 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ganttzk/src/main/resources/web/js/ganttz/GanttPanel.js b/ganttzk/src/main/resources/web/js/ganttz/GanttPanel.js index 1ac8d09d0..bd20095d8 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/GanttPanel.js +++ b/ganttzk/src/main/resources/web/js/ganttz/GanttPanel.js @@ -51,7 +51,7 @@ ganttz.GanttPanel = zk.$extends(zk.Widget,{ * it's not available right now. It is queried instead. Using throttle * to not re-query it constantly */ _getTimeplotContainer: common.Common.throttle(500, function() { - return jq('canvas.timeplot-canvas'); + return jq('canvas.timeplot-canvas').parent(); }), _initializeProperties : function(){ this._timetrackergap = jq('.timetrackergap'); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/ChartFiller.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/ChartFiller.java index 3394b03f3..eaac867bf 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/ChartFiller.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/ChartFiller.java @@ -631,6 +631,7 @@ public abstract class ChartFiller implements IChartFiller { ValueGeometry valueGeometry, TimeGeometry timeGeometry) { plotinfo.setValueGeometry(valueGeometry); plotinfo.setTimeGeometry(timeGeometry); + plotinfo.setShowValues(true); chart.appendChild(plotinfo); } diff --git a/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css b/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css index 32b1a6b22..b87abfaf2 100644 --- a/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css @@ -1317,4 +1317,24 @@ div.z-grid-header .second_level_ tr { .taskspanelgap #listlimitingdependencies { top: -2px; +} + +.plannergraph { + overflow: hidden; +} + +.plannergraph .timeplot-valueflag, +.plannergraph .timeplot-timeflag { + font-size: 12px; + font-weight: normal; + background-color: #f7f7bf; + border: solid 1px #CCCCCC; + -moz-box-shadow: 1px 1px 3px #999; + -webkit-box-shadow: 1px 1px 3px #999; + border-radius: 3px; +} + +.plannergraph .timeplot-timeflag { + opacity: 1 !important; + font-size: 12px; } \ No newline at end of file