Refactor method loadData for single set widgets

mendixlabs · May 10, 2017 · 208cf07 · 208cf07
1 parent e547bac
commit 208cf07
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 112 deletions.
diff --git a/src/ChartJS/widgets/Core.js b/src/ChartJS/widgets/Core.js
@@ -224,6 +224,42 @@ define([
 
         },
 
+        _loadDataSingleSet: function () {
+            logger.debug(this.id + "._loadDataSingleSet");
+            this._executeMicroflow(this.datasourcemf, lang.hitch(this, function(objs) {
+                if (objs && objs.length > 0) {
+                    var obj = objs[0], // Chart object is always only one.
+                        j = null,
+                        dataset = null;
+
+                    this._data.object = obj;
+                    this._chartEntityObject = obj;
+
+                    // Retrieve datasets
+                    mx.data.get({
+                        guids: obj.get(this._dataset),
+                        callback: lang.hitch(this, function(datasets) {
+                            var set = null;
+                            this._data.datasets = [];
+
+                            for (j = 0; j < datasets.length; j++) {
+                                dataset = datasets[j];
+
+                                set = {
+                                    dataset: dataset,
+                                    sorting: +(dataset.get(this.datasetsorting))
+                                };
+                                this._data.datasets.push(set);
+                            }
+                            this._processData();
+                        })
+                    });
+                } else {
+                    console.warn(this.id + "._loadDataSingleSet execution of microflow:" + this.datasourcemf + " has not returned any objects.");
+                }
+            }), this._mxObj);
+        },
+
         uninitialize: function () {
             logger.debug(this.id + ".uninitialize");
 

diff --git a/src/ChartJS/widgets/DoughnutChart/widget/DoughnutChart.js b/src/ChartJS/widgets/DoughnutChart/widget/DoughnutChart.js
@@ -61,41 +61,7 @@ define([
         },
 
         _loadData: function() {
-            logger.debug(this.id + "._loadData");
-            this._executeMicroflow(this.datasourcemf, lang.hitch(this, function(objs) {
-                if (objs && objs.length > 0) {
-                    var obj = objs[0], // Chart object is always only one.
-                        j = null,
-                        dataset = null;
-
-                    this._data.object = obj;
-                    this._chartEntityObject = obj;
-
-                    // Retrieve datasets
-                    mx.data.get({
-                        guids: obj.get(this._dataset),
-                        callback: lang.hitch(this, function(datasets) {
-                            var set = null;
-                            this._data.datasets = [];
-
-                            for (j = 0; j < datasets.length; j++) {
-                                dataset = datasets[j];
-
-                                set = {
-                                    dataset: dataset,
-                                    sorting: +(dataset.get(this.datasetsorting))
-                                };
-                                this._data.datasets.push(set);
-                            }
-                            this._processData();
-                        })
-                    });
-                } else {
-                    console.warn(this.id + "._loadData execution of microflow:" + this.datasourcemf + " has not returned any objects.");
-                }
-
-            }), this._mxObj);
-
+            this._loadDataSingleSet();
         },
 
         _createChart: function(data) {
@@ -138,10 +104,10 @@ define([
                 this._resize();
             }));
 
-            var content = this._data.object.get(this.numberInside);
-
-            // Set the con
-            html.set(this._numberNode, content !== null ? content.toString() : "");
+            if (this.numberInside) {
+                var content = this._data.object.get(this.numberInside);
+                html.set(this._numberNode, content !== null ? content.toString() : "");
+            }
 
             // Add class to determain chart type
             this._addChartClass("chartjs-doughnut-chart");

diff --git a/src/ChartJS/widgets/PieChart/widget/PieChart.js b/src/ChartJS/widgets/PieChart/widget/PieChart.js
@@ -60,40 +60,7 @@ define([
         },
 
         _loadData: function() {
-            logger.debug(this.id + "._loadData");
-            this._executeMicroflow(this.datasourcemf, lang.hitch(this, function(objs) {
-                if (objs && objs.length > 0) {
-                    var obj = objs[0], // Chart object is always only one.
-                        j = null,
-                        dataset = null;
-
-                    this._data.object = obj;
-                    this._chartEntityObject = obj;
-
-                    // Retrieve datasets
-                    mx.data.get({
-                        guids: obj.get(this._dataset),
-                        callback: lang.hitch(this, function(datasets) {
-                            var set = null;
-                            this._data.datasets = [];
-
-                            for (j = 0; j < datasets.length; j++) {
-                                dataset = datasets[j];
-
-                                set = {
-                                    dataset: dataset,
-                                    sorting: +(dataset.get(this.datasetsorting))
-                                };
-                                this._data.datasets.push(set);
-                            }
-                            this._processData();
-                        })
-                    });
-                } else {
-                    console.warn(this.id + "._loadData execution of microflow:" + this.datasourcemf + " has not returned any objects.");
-                }
-            }), this._mxObj);
-
+            this._loadDataSingleSet();
         },
 
         _createChart: function(data) {
@@ -139,10 +106,10 @@ define([
                 };
                 this._chart = new this._chartJS(this._ctx, chartProperties);
 
-                var content = this._data.object.get(this.numberInside);
-
-                // Set the con
-                html.set(this._numberNode, content !== null ? content.toString() : "");
+                if (this.numberInside) {
+                    var content = this._data.object.get(this.numberInside);
+                    html.set(this._numberNode, content !== null ? content.toString() : "");
+                }
 
                 // Add class to determain chart type
                 this._addChartClass("chartjs-pie-chart");

diff --git a/src/ChartJS/widgets/PolarChart/widget/PolarChart.js b/src/ChartJS/widgets/PolarChart/widget/PolarChart.js
@@ -61,41 +61,7 @@ define([
         },
 
         _loadData : function () {
-            logger.debug(this.id + "._loadData");
-
-            this._executeMicroflow(this.datasourcemf, lang.hitch(this, function (objs) {
-                if (objs && objs.length > 0) {
-                    var obj = objs[0], // Chart object is always only one.
-                        j = null,
-                        dataset = null;
-
-                    this._data.object = obj;
-                    this._chartEntityObject = obj;
-
-                    // Retrieve datasets
-                    mx.data.get({
-                        guids : obj.get(this._dataset),
-                        callback : lang.hitch(this, function (datasets) {
-                            var set = null;
-                            this._data.datasets = [];
-
-                            for (j = 0; j < datasets.length; j++) {
-                                dataset = datasets[j];
-
-                                set = {
-                                    dataset : dataset,
-                                    sorting : +(dataset.get(this.datasetsorting))
-                                };
-                                this._data.datasets.push(set);
-                            }
-                            this._processData();
-                        })
-                    });
-                } else {
-                    console.warn(this.id + "._loadData execution of microflow:" + this.datasourcemf + " has not returned any objects.");
-                }
-            }), this._mxObj);
-
+            this._loadDataSingleSet();
         },
 
         _createChart : function (data) {