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

Luigi Serra
2 parents 7705e54a 909cd28a
Showing 7 changed files with 174 additions and 30 deletions
controllets/items-vslider-controllet/items-vslider-controllet.html
controllets/select-visualization-controllet/select-datalet-inputs.html
controllets/select-visualization-controllet/select-datalet-inputs_series.html
controllets/select-visualization-controllet/select-datalet-options.html
controllets/select-visualization-controllet/select-visualization-controllet.html
datalets/base-datalet/base-datalet.html
datalets/bubblechart-datalet/bubblechart-datalet.html
@@ -185,10 +185,10 @@
             },
  
             attached : function() {
-                if(this.preselectedDatalet){
-                    this._preselectDatalet();
-                    this.preselectedDatalet = undefined;
-                }
+//                if(this.preselectedDatalet){
+//                    this._preselectDatalet();
+//                    this.preselectedDatalet = undefined;
+//                }
  
                 this._translate();
             },
@@ -279,12 +279,23 @@
             },
  
             _preselectDatalet : function(){
+//                this.async(function() {
                 var dataletCard = document.getElementById(this.preselectedDatalet);
+//                console.log(dataletCard);
+//                console.log(this.preselectedDatalet);
+//                var id = "#"+this.preselectedDatalet;
+//                var dataletCard = $(id);
+//                var dataletCard = this.$$("#datatable");
+//                console.log(dataletCard);
+
                 dataletCard.elevation = "5";
                 dataletCard.getElementsByClassName("legend")[0].className = dataletCard.getElementsByClassName("legend")[0].className + " selected";
+
+//                dataletCard.find(".legend")[0].className += " selected";
                 this.selectedDatalet = this.preselectedDatalet;
  
                 this.fire('items-vslider-controllet_selected-datalet', {datalet: this.selectedDatalet});
+//                }, 500);
             },
  
             _getImageUrl : function(index){
@@ -187,15 +187,68 @@
             },
  
             _preselectInputs : function(fields, aggregators, orders) {
+                aggregators = JSON.parse(aggregators);
+                orders = JSON.parse(orders);
+
+                this.selectedFields = this._copy(fields);
+
                 var ddls = this.$.inputs_container.querySelectorAll("paper-dropdown-menu");
  
-//                this.async(function () {
-                for (var i = 0; i < fields.length; i++) {
-                    var menu = $(ddls[i]).find("paper-menu")[0];
-                        menu.select(i+1);
+                for (var i = 0; i < fields.length; i++)
+                   $(ddls[i]).find("paper-menu")[0].select(i+1);
+
+                if(orders.length > 0) {
+                    this.orders = this._copy(orders);//wrong
+                }
+
+                if(aggregators.length > 0) {
+
+                    this.$.group_by.removeAttribute("disabled");
+                    this._showExpertMode();
+
+                    var groupableFields = [];
+                    for (var i = 0; i < this.selectedFields.length; i++) {
+                        if(this.selectedFields[i])
+                            groupableFields.push(this.selectedFields[i]);
+                    }
+                    this.groupableFields = this._copy(groupableFields);
+                    this.aggregateFields = [];
+
+                    var index = this.groupableFields.indexOf(aggregators[0].field);
+
+                    this.async(function () {
+                        var menu = $(this.$.group_by).find("paper-menu")[0];
+                        menu.select(index);
+                    }, 0);
+
+                    var aggregateFields = [];
+                    for (var i = 0; i < this.groupableFields.length; i++) {
+                        if (i != index && this.groupableFields[i])
+                            aggregateFields.push(this.groupableFields[i]);
+                    }
+                    this.aggregateFields = this._copy(aggregateFields);
+
+                    this.async(function() {
+                        var ddls = document.getElementsByTagName("paper-dropdown-menu");
+                        var j = 1;
+                        for (var i = 0; i < ddls.length; i++){
+                            var id = ddls[i].id;
+                            if(id.indexOf("calculate") > -1) {
+                                var ii = this.functions.indexOf(aggregators[j].operation);
+                                j++;
+                                $(ddls[i]).find("paper-menu")[0].select(-1);
+                                $(ddls[i]).find("paper-menu")[0].select(ii);
+                            }
+                        }
+
+//                        this._setAggregators();
+                        this.aggregators = this._copy(aggregators);
+
+                        this.fireReady();
+                    }, 0);
                 }
-                    this.selectedFields = this._copy(fields);
-//                }, 2);
+                else
+                    this.fireReady();
             },
  
             getSelectedFields : function () {
@@ -188,15 +188,55 @@
             },
  
             _preselectInputs : function(fields, aggregators, orders) {
+                aggregators = JSON.parse(aggregators);
+                orders = JSON.parse(orders);
+
+                //fields = [f1 gb(opt) f2] --> si può cambiare in f1 f2 gb ???
+
+                this.selectedFields = this._copy(fields);
+
                 var ddls = this.$.inputs_series_container.querySelectorAll("paper-dropdown-menu");
  
-//                this.async(function () {
-                    for (var i = 0; i < fields.length; i++) {
-                        var menu = $(ddls[i]).find("paper-menu")[0];
-                        menu.select(i+1);
+                $(ddls[0]).find("paper-menu")[0].select(1);
+                $(ddls[1]).find("paper-menu")[0].select(2);
+
+                if(orders.length > 0) {
+                    this.orders = this._copy(orders);//wrong
+                }
+
+                if(aggregators.length > 0) {
+                    this.selectedFields = [fields[0], fields[2]];
+
+                    this.$.group_by.removeAttribute("disabled");
+                    $("#calculate_0")[0].removeAttribute("disabled");
+                    $("#gb")[0].removeAttribute("disabled");
+                    this._showExpertMode();
+
+                    var groupableFields = [];
+                    for (var i = 0; i < this.fields.length; i++) {
+                        if(this.fields[i] != this.selectedFields[1])
+                            groupableFields.push(this.fields[i]);
                     }
-                    this.selectedFields = this._copy(fields);
-//                }, 0);
+                    this.groupableFields = this._copy(groupableFields);
+                    this.aggregateFields = [this.selectedFields[1]];
+
+                    $(ddls[0]).find("paper-menu")[0].select(1);
+                    $(ddls[1]).find("paper-menu")[0].select(3);
+
+                    this.async(function () {
+                        var i = this.functions.indexOf(aggregators[2].operation);
+
+                        $(this.$.group_by).find("paper-menu")[0].select(2);
+                        $("#calculate_0").find("paper-menu")[0].select(i);
+
+//                        this._setAggregators();//if dont --> $("#gb")[0].removeAttribute("disabled");
+                        this.aggregators = this._copy(aggregators);
+
+                        this.fireReady();
+                    }, 0);
+                }
+                else
+                    this.fireReady();
             },
  
             getSelectedFields : function () {
@@ -228,7 +228,7 @@
 //                this.params["description"] = "";
             },
  
-            ceckOptions : function(options) {
+            checkOptions : function(options) {
                 if(options.length != this.options.length)
                     this.setOptions(options);
             },
@@ -236,8 +236,10 @@
             },
  
             show : function() {//show --> preselect
-                if(this.preselectedDatalet)
+//                if(this.preselectedDatalet)
+                if(this.dataletPreset)
                     this._preselectDatalet();
+                
 //                if (this.$.datalet_selection_datalet_placeholder.innerHTML == "") {
 //                    var inputs = this._getInputs();
 //                    inputs.fireReady();
@@ -286,7 +288,7 @@
                     this.$.options.setOptions(e.detail.response.idm.inputs.layouts.input);
                 }
                 else {
-                    this.$.options.ceckOptions(e.detail.response.idm.inputs.layouts.input);
+                    this.$.options.checkOptions(e.detail.response.idm.inputs.layouts.input);
                 }
  
                 this.async(function () {
@@ -300,16 +302,18 @@
 //                }, 1);
             },
  
-            _preselectDatalet : function() {
-                var inputs = this._getInputs();
-                inputs._preselectInputs(this.fields, this.dataletPreset["aggregators"], this.dataletPreset["orders"]);
-                this.$.options._preselectOptions(this.dataletPreset);
-                this.dataletPreset = undefined;
+            _preselectDatalet : function() {console.log("preselzionando si impara");
+                this.$.vslider._preselectDatalet();
  
-//                this.async(function () {
-//                var inputs = this._getInputs();
-//                inputs.fireReady();
-//                }, 500);
+                this.async(function () {
+                    this.$.options._preselectOptions(this.dataletPreset);
+                }, 100);
+
+                this.async(function () {
+                    var inputs = this._getInputs();
+                    inputs._preselectInputs(this.fields, this.dataletPreset["aggregators"], this.dataletPreset["orders"]);
+                    this.dataletPreset = undefined;
+                }, 200);
             },
  
             _tryLoadDatalet : function(){
@@ -367,7 +367,43 @@ Example :
  
                 var post = 'svg_data=' + window.encodeURIComponent(svg) + '&datalet=' + parent.is + '&dataset=' + this.$.base_datalet_link.getAttribute("href");
                 xhr.responseType = 'blob';
-                xhr.send(post);
+
+                //OpenDataSoft check
+                if(this.dataUrl.indexOf("/records/") > -1 )
+                {
+                    var urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
+
+                    var i;
+                    if(this.dataUrl.indexOf("&") > -1)
+                        i = this.dataUrl.indexOf("&");
+                    else
+                        i = this.dataUrl.length;
+
+                    $.ajax({
+                        url: urlSource + "/api/dataset/1.0/" + this.dataUrl.substring(this.dataUrl.indexOf("=")+1, i),
+                        dataType: "json",
+                        success: function(e){
+                            post += '&name=' + e.metas.title + '&description=' + e.metas.description + '&created=' + e.metas.data_processed  + '&lastModified=' + e.metas.modified;
+                            xhr.send(post);
+                        }
+                    });
+                }
+                else if(this.dataUrl.indexOf("datastore_search?resource_id") > -1 )
+                {
+                    $.ajax({
+                        url: this.dataUrl.replace("datastore_search?resource_id", "resource_show?id"),
+                        dataType: "json",
+                        success: function(e){
+                            post += '&name=' + e.result.name + '&description=' + e.result.description + '&created=' + e.result.created + '&format=' + e.result.format + '&lastModified=' + e.result.last_modified;
+                            xhr.send(post);
+                        }
+                    });
+                }
+                else
+                {
+                    xhr.send(post);
+                }
+
             },
  
             importToMySpace: function() {
@@ -59,7 +59,7 @@ Examples:
  
 <dom-module id="bubblechart-datalet">
     <template>
-        <base-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}" export_menu="{{export_menu}}"></base-datalet>
+        <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" title="{{title}}" description="{{description}}" export_menu="{{export_menu}}"></highcharts-datalet>
     </template>
     <script>
         var BubblechartBehavior = {