datalet refactoring

isisadmin
1 parent 8afea66c
Showing 10 changed files with 27 additions and 12 deletions
datalets/barchart-datalet/barchart-datalet.html
datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js
datalets/base-datalet/static/js/BaseDataletBehaviors.js
datalets/column3Dchart-datalet/column3Dchart-datalet.html
datalets/columnchart-datalet/columnchart-datalet.html
datalets/datatable-datalet/datatable-datalet.html
datalets/highcharts-datalet/highcharts-datalet.html
datalets/leafletjs-datalet/leafletjs-datalet.html
datalets/linechart-datalet/linechart-datalet.html
datalets/treemap-datalet/treemap-datalet.html
@@ -49,7 +49,7 @@ Example:
              *
              * @method transformData
              */
-            transformData: function(){
+            presentData: function(){
                 $(this._component.$.charts.$.container).highcharts({
                     chart: {
@@ -62,11 +62,10 @@ var AjaxJsonJsonPathBehavior = {
      */
     handleResponse: function(e) {
         this.properties.json_results.value = e;
-        this.createDataObject();
         this.runWorkcycle();
     },
-    createDataObject : function(){
+    selectData : function(){
         this.data = [];
         this._component.fields = JSON.parse(this._component.fields);
@@ -80,7 +80,6 @@ var WorkcycleBehavior = {
      * @method requestData
      */
     requestData: function(){
-
     },
     /**
@@ -110,6 +109,15 @@ var WorkcycleBehavior = {
     },
     /**
+     * Build the object/s for presentation layer.
+     *
+     * @method presentData
+     */
+    presentData: function(){
+
+    },
+
+    /**
      * Called when iron-ajax component receive the json data from called url. It is responsible to
      * extract data from response, coded in json, and refine it by using JsonPath queries in the query attribute.
      * After this phase it parses the resulting object to populate the structure(keys,values) to fill the final table by using
@@ -121,6 +129,7 @@ var WorkcycleBehavior = {
         this.selectData();
         this.filterData();
         this.transformData();
+        this.presentData();
     },
     init: function(component){
@@ -61,7 +61,7 @@ Example:
              *
              * @method transformData
              */
-            transformData: function(){
+            presentData: function(){
                          chart = new Highcharts.Chart({
                              chart: {
                                  renderTo: this._component.$.charts.$.container,
@@ -49,7 +49,7 @@ Example:
              *
              * @method transformData
              */
-            transformData: function(){
+            presentData: function(){
                 $(this._component.$.charts.$.container).highcharts({
                     chart: {
                         type: 'column',
@@ -32,7 +32,7 @@ Example
     <script>
         var DatatableBehavior = {
-            transformData: function(){
+            presentData: function(){
                 if(!this.data || this.data == undefined) return;
                 html = "";
                 html += '<thead>'+
@@ -31,7 +31,7 @@
                 }
             },
-            selectData: function () {
+            transformData: function () {
                 this.properties.categories.value = this.data[0].data;
@@ -60,7 +60,7 @@ Example:
              *
              * @method transformData
              */
-            transformData: function(){
+            presentData: function(){
 				var coordinates = [];
 				//var keys = Object.keys(this.properties.data.value[0]);
@@ -49,7 +49,7 @@ Example:
              *
              * @method transformData
              */
-            transformData: function(){
+            presentData: function(){
                 $(this._component.$.charts.$.container).highcharts({
                     title: {
@@ -88,11 +88,13 @@ THE SOFTWARE.
     <script>
         var TreemapBehavior = {
+
             map : {
                 name : "Expenses",
                 children : []
             },
-            selectData: function(e)
+
+            transformData: function(e)
             {
                 var treemapData = [];
@@ -117,8 +119,11 @@ THE SOFTWARE.
                 for(var i = 0; i < treemapData.length; i++){
                     this.checkAggragationField(treemapData[i], this._component.fields.length , this._component.fields.length - 1);
                 }
+
                 var json = JSON.stringify(this.map);
+
             },
+
             findChild: function(child, category){
                 var children = child.children;
                 for (var i=0; i<children.length; i++) {
@@ -129,6 +134,7 @@ THE SOFTWARE.
                 children.push(nchild);
                 return nchild;
             },
+
             checkAggragationField: function(object, levels, value_index){
                 var curchild = this.map;
                 var keys = Object.keys(object);
@@ -145,7 +151,8 @@ THE SOFTWARE.
                 curchild.children = null;
                 curchild.value = value;
             },
-            transformData: function(){
+
+            presentData: function(){
                 build(this.map, "treemap_placeholder");
             }
         };