fix maxYValue

mendixlabs · Nov 10, 2017 · 226d24d · 226d24d
1 parent bb103e4
commit 226d24d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/src/ChartJS/widgets/LineChart/LineChart.xml b/src/ChartJS/widgets/LineChart/LineChart.xml
@@ -9,11 +9,11 @@
 
     <properties>
         <!-- Appearance -->
-        <!-- <property key="maxYValue" type="string" required="true" defaultValue="0">
+        <property key="maxYValue" type="string" required="false" defaultValue="">
             <caption>Maximum Y Value</caption>
             <category>Appearance</category>
-            <description>The Maximum Y value on the chart</description>
-        </property> -->
+            <description>The Maximum Y value on the chart. Leave empty to set to the max value in your dataset</description>
+        </property>
         <property key="width" type="integer" required="true" defaultValue="500">
             <caption>Width</caption>
             <category>Appearance</category>

diff --git a/src/ChartJS/widgets/LineChart/widget/LineChart.js b/src/ChartJS/widgets/LineChart/widget/LineChart.js
@@ -127,6 +127,22 @@ define([
             } else {
                 //logger.debug("stacked:" + this.isStacked);
 
+                var ticksOptions = {
+                    fontFamily: this._font,
+                    beginAtZero: this.scaleBeginAtZero,
+                    display: this.scaleShowLabels,
+                    callback: lang.hitch(this, function(value) {
+                        var round = parseInt(this.roundY);
+                        if (!isNaN(round) && round >= 0) {
+                            return Number(value).toFixed(round);
+                        }
+                        return value;
+                    })
+                };
+                if (this.maxYValue) {
+                    ticksOptions.max = this.maxYValue * 1;
+                }
+
                 var chartProperties = {
                     type: this._chartType,
                     data: data,
@@ -147,19 +163,7 @@ define([
                                     color: this.scaleGridLineColor,
                                     lineWidth: this.scaleLineWidth
                                 },
-                                ticks: {
-                                    // max: (this.maxYValue ? this.maxYValue * 1 : false), //CC
-                                    fontFamily: this._font,
-                                    beginAtZero: this.scaleBeginAtZero,
-                                    display: this.scaleShowLabels,
-                                    callback: lang.hitch(this, function(value) {
-                                        var round = parseInt(this.roundY);
-                                        if (!isNaN(round) && round >= 0) {
-                                            return Number(value).toFixed(round);
-                                        }
-                                        return value;
-                                    })
-                                }
+                                ticks: ticksOptions
                             }],
                             xAxes: [{
                                 display: this.scaleShow,

diff --git a/test/[Test] ChartJS.mpr b/test/[Test] ChartJS.mpr
diff --git a/test/widgets/ChartJS.mpk b/test/widgets/ChartJS.mpk