Fix #72 again, making sure it starts at zero even without data points

Author: Jelte Lagendijk

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ChartJS",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "This widget is a wrapper for the ChartJS library and you can use it to visualize your aggregated data.",
   "license": "Apache License, Version 2",
   "author": "Mendix",

src/ChartJS/widgets/BarChart/widget/BarChart.js

@@ -105,7 +105,7 @@ define([
                 this._chart.update(1000);
                 this._chart.bindEvents(); // tooltips otherwise won't work
             } else {
-                this._chart = new this._chartJS(this._ctx, {
+                var chartOptions = {
                     type: "bar",
                     data: data,
                     options: {
@@ -195,7 +195,14 @@ define([
                         // Custom tooltip?
                         customTooltips : false,
                     }
-                });
+                };
+
+                if (this.scaleBeginAtZero) {
+                    chartOptions.options.scales.yAxes[0].ticks.suggestedMin = 0;
+                    chartOptions.options.scales.yAxes[0].ticks.suggestedMax = 4;
+                }
+
+                this._chart = new this._chartJS(this._ctx, chartOptions);
 
                 this.connect(window, "resize", lang.hitch(this, function () {
                     this._resize();

src/ChartJS/widgets/Core.js

@@ -71,8 +71,6 @@ define([
             // Activate chartJS.
             this._chartJS = _charts.noConflict();
 
-            console.log(this._chartJS);
-
             // Fonts
             this._font = this.labelFont || "Helvetica Neue";
 

src/ChartJS/widgets/LineChart/widget/LineChart.js

@@ -120,9 +120,9 @@ define([
                 this._chart.update(1000);
                 this._chart.bindEvents(); // tooltips otherwise won't work
             } else {
-                logger.debug("stacked:" + this.isStacked);
+                //logger.debug("stacked:" + this.isStacked);
 
-                this._chart = new this._chartJS(this._ctx, {
+                var chartOptions = {
                     type: "line",
                     data: data,
                     options: {
@@ -231,7 +231,14 @@ define([
                         customTooltips : false, //lang.hitch(this, this.customTooltip)
 
                     }
-                });
+                };
+
+                if (this.scaleBeginAtZero) {
+                    chartOptions.options.scales.yAxes[0].ticks.suggestedMin = 0;
+                    chartOptions.options.scales.yAxes[0].ticks.suggestedMax = 4;
+                }
+
+                this._chart = new this._chartJS(this._ctx, chartOptions);
 
                 this.connect(window, "resize", lang.hitch(this, function () {
                     this._resize();
@@ -243,7 +250,6 @@ define([
                 if (this.onclickmf) {
                     on(this._chart.chart.canvas, "click", lang.hitch(this, this._onClickChart));
                 }
-
             }
         }
 

src/ChartJS/widgets/StackedBarChart/widget/StackedBarChart.js

@@ -107,7 +107,7 @@ define([
                 this._chart.bindEvents(); // tooltips otherwise won't work
             } else {
 
-                this._chart = new this._chartJS(this._ctx, {
+                var chartOptions = {
                     type: "bar",
                     data: data,
                     options: {
@@ -199,19 +199,27 @@ define([
                         // Custom tooltip?
                         customTooltips : false, //lang.hitch(this, this.customTooltip)
                     }
-                });
-            }
+                };
+
+                if (this.scaleBeginAtZero) {
+                    chartOptions.options.scales.yAxes[0].ticks.suggestedMin = 0;
+                    chartOptions.options.scales.yAxes[0].ticks.suggestedMax = 4;
+                }
+
+                this._chart = new this._chartJS(this._ctx, chartOptions);
 
-            this.connect(window, "resize", lang.hitch(this, function () {
-                this._resize();
-            }));
+                this.connect(window, "resize", lang.hitch(this, function () {
+                    this._resize();
+                }));
 
-            // Add class to determain chart type
-            this._addChartClass("chartjs-stacked-bar-chart");
+                // Add class to determain chart type
+                this._addChartClass("chartjs-stacked-bar-chart");
 
-            if (this.onclickmf) {
-                on(this._chart.chart.canvas, "click", lang.hitch(this, this._onClickChart));
+                if (this.onclickmf) {
+                    on(this._chart.chart.canvas, "click", lang.hitch(this, this._onClickChart));
+                }
             }
+
         }
     });
 });

src/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ChartJS" version="3.4.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ChartJS" version="3.4.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ChartJS/widgets/BarChart/BarChart.xml"/>
             <widgetFile path="ChartJS/widgets/LineChart/LineChart.xml"/>