From 41085825b64ae6639fa67157d79e6ba052e9f1fd Mon Sep 17 00:00:00 2001 From: Duarte Cunha Leao Date: Mon, 15 Oct 2012 14:45:27 +0100 Subject: [PATCH 01/11] [FIX] Fixed linear scale calculation for second axis when all values are equal. --- bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js b/bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js index d7712b3113..0338c5a134 100644 --- a/bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js +++ b/bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js @@ -1,4 +1,4 @@ -//VERSION TRUNK-20120215-patched-20120803 +//VERSION TRUNK-20120215-patched-20121015 // ECMAScript 5 shim if(!Object.keys) { @@ -4590,7 +4590,12 @@ pvc.CategoricalAbstract = pvc.TimeseriesAbstract.extend({ dMax = 0; } } - + + if (dMin === dMax) { + dMin = dMin !== 0 ? dMin * 0.99 : options.secondAxisOriginIsZero ? 0 : -0.1; + dMax = dMax !== 0 ? dMax * 1.01 : 0.1; + } + // Adding a small offset to the scale's domain: var dOffset = (dMax - dMin) * options.secondAxisOffset, scale = new pv.Scale.linear( From 9e3ab52a01c9aa72eb54d961105191aceae8547f Mon Sep 17 00:00:00 2001 From: Duarte Cunha Leao Date: Mon, 15 Oct 2012 15:57:15 +0100 Subject: [PATCH 02/11] * Added pv.Rule#strokeDasharray (with support for SVG only, not IE) --- bi-platform-v2-plugin/cdf/js/lib/CCC/protovis.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bi-platform-v2-plugin/cdf/js/lib/CCC/protovis.js b/bi-platform-v2-plugin/cdf/js/lib/CCC/protovis.js index 5d2ae37563..e5c1efdebe 100644 --- a/bi-platform-v2-plugin/cdf/js/lib/CCC/protovis.js +++ b/bi-platform-v2-plugin/cdf/js/lib/CCC/protovis.js @@ -6428,7 +6428,8 @@ pv.SvgScene.rule = function(scenes) { "y2": s.top + s.height, "stroke": stroke.color, "stroke-opacity": stroke.opacity, - "stroke-width": s.lineWidth / this.scale + "stroke-width": s.lineWidth / this.scale, + "stroke-dasharray": s.strokeDasharray || 'none' }); e = this.append(e, scenes, i); } @@ -8845,7 +8846,8 @@ pv.Rule.prototype = pv.extend(pv.Mark) .property("width", Number) .property("height", Number) .property("lineWidth", Number) - .property("strokeStyle", pv.color); + .property("strokeStyle", pv.color) + .property("strokeDasharray", String); pv.Rule.prototype.type = "rule"; @@ -8894,7 +8896,8 @@ pv.Rule.prototype.defaults = new pv.Rule() .extend(pv.Mark.prototype.defaults) .lineWidth(1) .strokeStyle("black") - .antialias(false); + .antialias(false) + .strokeDasharray("none"); /** * Constructs a new rule anchor with default properties. Rules support five From 41482d3b45bb8894987033560f8be11cafdc8c88 Mon Sep 17 00:00:00 2001 From: Duarte Cunha Leao Date: Mon, 15 Oct 2012 19:47:44 +0100 Subject: [PATCH 03/11] [FIX] Fixed linear scale calculation for second axis when all values are null. --- bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js b/bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js index 0338c5a134..f4e51bb52c 100644 --- a/bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js +++ b/bi-platform-v2-plugin/cdf/js/lib/CCC/pvc-d1.0.js @@ -1,4 +1,4 @@ -//VERSION TRUNK-20120215-patched-20121015 +//VERSION TRUNK-20120215-patched-20121015-b // ECMAScript 5 shim if(!Object.keys) { @@ -4582,7 +4582,15 @@ pvc.CategoricalAbstract = pvc.TimeseriesAbstract.extend({ var bypassAxisSize = pvc.get(keyArgs, 'bypassAxisSize', false), dMax = this.dataEngine.getSecondAxisMax(), dMin = this.dataEngine.getSecondAxisMin(); - + + if(!isFinite(dMin)){ + dMin = 0; + } + + if(!isFinite(dMax)){ + dMax = 0; + } + if(dMin * dMax > 0 && options.secondAxisOriginIsZero){ if(dMin > 0){ dMin = 0; From 707e6a4b56562d6562ce0d10f2c28a104b5e3a8a Mon Sep 17 00:00:00 2001 From: Pedro Vale Date: Mon, 22 Oct 2012 18:29:08 +0100 Subject: [PATCH 04/11] changed orient dependency to 1.3 --- bi-platform-v2-plugin/ivy.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bi-platform-v2-plugin/ivy.xml b/bi-platform-v2-plugin/ivy.xml index 2049e4a9e5..6ae6502880 100755 --- a/bi-platform-v2-plugin/ivy.xml +++ b/bi-platform-v2-plugin/ivy.xml @@ -51,11 +51,11 @@ - - - - - + + + + + From cc2cef2ffd1c5e3c9dda56b5aa5ab86ad60f0205 Mon Sep 17 00:00:00 2001 From: davidduque Date: Mon, 29 Oct 2012 11:18:21 +0000 Subject: [PATCH 05/11] Add support for dateFormat on DateRangeInputComponent --- bi-platform-v2-plugin/cdf/js/CoreComponents.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bi-platform-v2-plugin/cdf/js/CoreComponents.js b/bi-platform-v2-plugin/cdf/js/CoreComponents.js index c3e9cbdbd5..5c75c97087 100644 --- a/bi-platform-v2-plugin/cdf/js/CoreComponents.js +++ b/bi-platform-v2-plugin/cdf/js/CoreComponents.js @@ -1135,13 +1135,16 @@ var DateRangeInputComponent = BaseComponent.extend({ changed = closed = false; } }; + + var format = (myself.dateFormat == undefined || myself.dateFormat == null)? 'yy-mm-dd' : myself.dateFormat; + $(function(){ $("#" + myself.htmlObject + " input").daterangepicker({ posX: offset.left + leftOffset, posY: offset.top + topOffset, earliestDate: earliestDate, latestDate: latestDate, - dateFormat: 'yy-mm-dd', + dateFormat: format, onOpen: function() { changed = closed = false; myself.startValue = null; From 889e33034b583230d28d322d3ed92819c23c4895 Mon Sep 17 00:00:00 2001 From: Pedro Vale Date: Mon, 5 Nov 2012 12:07:24 +0000 Subject: [PATCH 06/11] Changed exportData so it does not break with url length --- bi-platform-v2-plugin/cdf/js/Dashboards.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bi-platform-v2-plugin/cdf/js/Dashboards.js b/bi-platform-v2-plugin/cdf/js/Dashboards.js index 46ac37aa35..a7e6aa664f 100644 --- a/bi-platform-v2-plugin/cdf/js/Dashboards.js +++ b/bi-platform-v2-plugin/cdf/js/Dashboards.js @@ -2052,10 +2052,16 @@ Query = function() { queryDefinition.settingdtSearchableColumns = options.dtSearchableColumns; } } + + var theDoQuery = CDA_PATH + $.param(queryDefinition); + $.post(theDoQuery, function(uuid) { _exportIframe = _exportIframe || $('