Merge branch 'Mcpoowl-master'

# Conflicts:
#	src/ChartJS/widgets/Core.js
#	test/widgets/ChartJS.mpk

Author: Jelte Lagendijk

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ChartJS",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "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",
@@ -30,4 +30,4 @@
   "scripts": {
     "test": "grunt test"
   }
-}
+}

src/ChartJS/widgets/Core.js

@@ -61,7 +61,7 @@ define([
 
         startup: function () {
             // Uncomment line to start debugging
-            logger.level(logger.DEBUG);
+            //logger.level(logger.DEBUG); 
             logger.debug(this.id + ".startup");
 
             var domNode = null;

src/ChartJS/widgets/LineChart/LineChart.xml

@@ -14,6 +14,11 @@
             <category>Appearance</category>
 			<description>Initial width of the chart canvas, will be ignored when responsive property is set to 'Yes'</description>
         </property>
+        <property key="isStacked" type="boolean" required="true" defaultValue="false">
+            <caption>Stacked</caption>
+            <category>Appearance</category>
+            <description>When yes, different dataset will stack on top of eachother on the Y-axis</description>
+        </property>
         <property key="height" type="integer" required="true" defaultValue="250">
             <caption>Height</caption>
             <category>Appearance</category>

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

@@ -80,7 +80,7 @@ define([
 
                 _set = {
                     label : (this.scaleShowLabelsBottom === true) ? label : "",
-                    backgroundColor: (this.seriesColorReduceOpacity) ? this._hexToRgb(color, "0.2") : this._hexToRgb(color, "0.2"),
+                    backgroundColor: (this.seriesColorReduceOpacity) ? this._hexToRgb(color, "0.2") : color,
                     borderColor: (this.seriesColorReduceOpacity) ? this._hexToRgb(color, "0.5") : color,
                     pointColor: (this.seriesColorReduceOpacity) ? this._hexToRgb(color, "0.8") : color,
                     pointBorderColor: (this.seriesColorReduceOpacity) ? this._hexToRgb(color, "0.8") : color,
@@ -110,18 +110,25 @@ define([
         _createChart : function (data) {
             logger.debug(this.id + "._createChart");
 
+
             if (this._chart) {
                 this._chart.stop();
                 this._chart.data.datasets = data.datasets;
                 this._chart.data.labels = data.labels;
                 this._chart.update(1000);
                 this._chart.bindEvents(); // tooltips otherwise won't work
             } else {
-
+                            logger.debug("stacked:" + this.isStacked);
                 this._chart = new this._chartJS(this._ctx, {
                     type: "line",
                     data: data,
                     options: {
+                        scales : {
+                            yAxes: [{
+                                //If stacked is set to true, the Y-axis needs to be stacked for it to work
+                                stacked: this.isStacked
+                            }]
+                        },
 
                         responsive : this.responsive,
                         responsiveAnimationDuration : (this.responsiveAnimationDuration > 0 ? this.responsiveAnimationDuration : 0),
@@ -151,6 +158,9 @@ define([
                         //Boolean - Whether to show vertical lines (except Y axis)
                         scaleShowVerticalLines : this.scaleShowVerticalLines,
 
+                        //Boolean - Whether or not to render as a stacked chart
+                        stacked : this.isStacked,
+
                         //Boolean - Whether to show a dot for each point
                         pointDot : this.pointDot,
 

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.1.3" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ChartJS" version="3.1.4" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ChartJS/widgets/BarChart/BarChart.xml"/>
             <widgetFile path="ChartJS/widgets/LineChart/LineChart.xml"/>
@@ -20,4 +20,4 @@
             <file path="ChartJS/widgets/DoughnutChart/widget/"/>
         </files>
     </clientModule>
-</package>
+</package>