Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS

mwasiluk
2 parents e09a3d19 ff028a33
Showing 4 changed files with 27 additions and 6 deletions
controllets/dataset-table-controllet/dataset-table-controllet.html
datalets/base-datalet/base-datalet.html
datalets/base-datalet/static/js/WorkcycleBehavior.js
datalets/highcharts-datalet/highcharts-datalet.html
@@ -389,7 +389,7 @@
             _onDownloadInfoClick: function(e){
                 $.ajax({
                     url: ODE.ajax_coocreation_get_dataset_docs,
-                    data: {room_id : e.target.parentElement.room_id, version : e.target.parentElement.version},
+                    data: {room_id : e.target.parentElement.attributes["room_id"].value, version : e.target.parentElement.attributes["version"].value},
                     dataType: "text",
                     success: function(e){
                         var fileName = "dataset";
@@ -414,7 +414,7 @@
  
                 $.ajax({
                     url: ODE.ajax_coocreation_get_dataset,
-                    data: {room_id : e.target.parentElement.room_id, version : e.target.parentElement.version},
+                    data: {room_id : e.target.parentElement.attributes["room_id"].value, version : e.target.parentElement.attributes["version"].value},
                     dataType: "json",
                     success: function(e){
                         var arrData = e;
@@ -470,7 +470,7 @@
  
                 $.ajax({
                     url: ODE.ajax_coocreation_get_dataset,
-                    data: {room_id : e.target.parentElement.room_id, version : e.target.parentElement.version},
+                    data: {room_id : e.target.parentElement.attributes["room_id"].value, version : e.target.parentElement.attributes["version"].value},
                     dataType: "json",
                     success: function(e){
                         t.$.data_table_controllet.setData(e);
@@ -254,6 +254,10 @@ Example :
 //                this.$.domain.textContent = url;
 //            },
  
+            removeLoader: function() {
+                this.$.base_datalet_imgWaitDatalet.style.display = "none";
+            },
+
             hideFooter: function() {
                 this.$.base_datalet_container.innerHTML = "";
                 this.$.base_datalet_container.style.margin = 0;
@@ -79,6 +79,15 @@ var WorkcycleBehavior = {
     },
  
     /**
+     * Build the object/s for presentation layer.
+     *
+     * @method presentData
+     */
+    redraw: function(){
+
+    },
+
+    /**
      * This method represents the entire datalet workcycle.
      *
      * @method runWorkcycle
@@ -87,11 +96,13 @@ var WorkcycleBehavior = {
         this.selectData();
         this.filterData();
         this.transformData();
+
         var that = this;
         this._component.async(function () {
             that.presentData();
-            $("img[src$='spin.svg']").remove();
-        }, 100);
+            $(that._component).find("base-datalet")[0].removeLoader();
+            that.redraw();
+        }, 300);
     },
  
     /**
@@ -107,10 +118,12 @@ var WorkcycleBehavior = {
         }else{
             this.data = this._component.data;
             this.transformData();
+
             var that = this;
             this._component.async(function () {
                 that.presentData();
-                $("img[src$='spin.svg']").remove();
+                $(that._component).find("base-datalet")[0].removeLoader();
+                that.redraw();
             }, 100);
         }
     }
@@ -122,6 +122,10 @@ Example :
                     this.properties.series.value = series;
                 }
  
+            },
+
+            redraw: function () {
+                $(this._component.$.charts.$.container).highcharts().reflow();
             }
  
         };