diff --git a/controllets/data-sevc-controllet/data-sevc-controllet.html b/controllets/data-sevc-controllet/data-sevc-controllet.html index 202e580..cf2c312 100755 --- a/controllets/data-sevc-controllet/data-sevc-controllet.html +++ b/controllets/data-sevc-controllet/data-sevc-controllet.html @@ -135,7 +135,7 @@ // slider.setTitle("SELECT DATA", "Select the fields from tree-view. The multi-table will show the values related to the selected fields."); if(this.modify){ slider.chevronLeft("invisible"); - slider.setAvatar("2"); +// slider.setAvatar("2"); } else{ slider.chevronLeft(true); diff --git a/controllets/datalet-selection-controllet/datalet-selection-controllet.html b/controllets/datalet-selection-controllet/datalet-selection-controllet.html index 28a9fda..d253448 100755 --- a/controllets/datalet-selection-controllet/datalet-selection-controllet.html +++ b/controllets/datalet-selection-controllet/datalet-selection-controllet.html @@ -209,7 +209,7 @@ @@ -374,8 +374,10 @@ //this.modify = true;//da eliminare in futuro if(this.preselectedDatalet){ + if(this.modify) + this._preselectDatalet(); + this.modify = true; - this._preselectDatalet(); this.preselectedDatalet = undefined; } }, @@ -425,22 +427,29 @@ }, _preselectDatalet : function() { + this.type = "undefined"; + this.$.selectedDatalet_request.url = this.deepUrl + this.preselectedDatalet + "-datalet"; + this.$.selectedDatalet_request.generateRequest(); + this.selectedDatalet = this.preselectedDatalet; this.selectedFields = this._copy(this.fields); - var inputs = document.getElementsByTagName("paper-dropdown-menu"); - for(var i=0; i < inputs.length; i++) - $(inputs[i]).find("paper-menu")[0].select(i); + this.async(function() { + this.selectedFields = this._copy(this.fields); - //set info labels options - var labels = this.$.datalet_selection_labels.querySelectorAll("paper-textarea"); - for (var i = 0; i < labels.length; i++) - labels[i].value = this.dataletPreset[labels[i].label]; + var inputs = document.getElementsByTagName("paper-dropdown-menu"); + for (var i = 0; i < inputs.length; i++) + $(inputs[i]).find("paper-menu")[0].select(i); - var labels = this.$.datalet_selection_labels.querySelectorAll("paper-input"); - for (var i = 0; i < labels.length; i++) - labels[i].value = this.dataletPreset[labels[i].label]; + //set info labels options + var labels = this.$.datalet_selection_labels.querySelectorAll("paper-textarea"); + for (var i = 0; i < labels.length; i++) + labels[i].value = this.dataletPreset[labels[i].label]; + var labels = this.$.datalet_selection_labels.querySelectorAll("paper-input"); + for (var i = 0; i < labels.length; i++) + labels[i].value = this.dataletPreset[labels[i].label]; + }, 300); this.loadPreview = true; this._loadDatalet(this.selectedFields); @@ -461,6 +470,7 @@ var selection = inputs.selection; inputs = []; for (var i in this.fields) +// for (var i = 0; i < Math.max(this.fields.length, 8); i++)//error inputs.push({name: name + " " + i, description: description, selection: selection}); } @@ -482,8 +492,12 @@ _addInput : function(e){ var selectedFields = this._copy(this.selectedFields); - var index = $(e.target).parents("paper-dropdown-menu")[0].id; - selectedFields[index] = e.target.innerHTML.trim(); +// var index = $(e.target).parents("paper-dropdown-menu")[0].id; +// selectedFields[index] = e.target.innerHTML.trim(); + + var ddl_index = $(e.target).parents("paper-dropdown-menu")[0].id; + var index = e.target.id; + selectedFields[ddl_index] = this.fields[index]; this.selectedFields = this._copy(selectedFields); @@ -546,7 +560,16 @@ ComponentService.deep_url = this.deepUrl; ComponentService.getComponent(dataletParams); -// this.async(function(){this.$.add_button.removeAttribute("disabled");}, 1000); +// console.log(this.params); + + +// this.async(function(){ +// if(this.$.datalet_selection_datalet_placeholder.children[1]) +// this.$.datalet_selection_datalet_placeholder.children[1].behavior.setParameters(this.params); +// this.$.add_button.removeAttribute("disabled"); +// }, 300); + +// this.async(function(){this.$.add_button.removeAttribute("disabled");}, 300); this.$.add_button.removeAttribute("disabled"); }, @@ -557,7 +580,7 @@ if(this.selectedFields[i]) selectedFields.push(this.selectedFields[i]); - console.log(this.params); +// console.log(this.params); var data = { dataUrl : this.dataUrl, diff --git a/controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html b/controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html index 59d111a..a3408c8 100755 --- a/controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html +++ b/controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html @@ -117,14 +117,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN }, _computeCardClass: function(color) { - //var cls = 'card'; - //return cls + ' ' + color; this.$.card = color; }, _computeFixedBackgroundClass: function(color) { - //var cls = 'fixed'; - //return cls + ' ' + color + '-l'; this.$.fixed = color; } diff --git a/datalets/areachart-datalet/areachart-datalet.html b/datalets/areachart-datalet/areachart-datalet.html index eef7fcf..1b3717a 100755 --- a/datalets/areachart-datalet/areachart-datalet.html +++ b/datalets/areachart-datalet/areachart-datalet.html @@ -50,7 +50,7 @@ Example: diff --git a/datalets/base-datalet/base-datalet.html b/datalets/base-datalet/base-datalet.html index cfc277b..66bf875 100755 --- a/datalets/base-datalet/base-datalet.html +++ b/datalets/base-datalet/base-datalet.html @@ -64,41 +64,40 @@ Example : text-decoration: underline; } #base_datalet_container { - /*display: flex;*/ font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif; - /*color: #212121;*/ padding-top: 2px; - /*padding: 16px;*/ border-top: 2px solid #B6B6B6; } #base_datalet_rtp { - /*background-color: red;*/ display: flex; padding-top: 4px; } #rtp { - /*width: 152px;*/ padding-top: 8px; padding-right: 8px; font-size: small; } #rtpalogo { - height:32px; + height: 32px; width: 32px; } #base_datalet_spin { - height:64px; + height: 64px; width: 100%; + margin-top: 64px; } - /*#base_datalet_info{*/ - /*padding-top: 8px;*/ - /*/!*background-color: green;*!/*/ - /*width: 100%;*/ - /*/!*font-size: small;*!/*/ - /*}*/ + #base_datalet_source_link{ padding-top: 12px; } + + #span_title{ + font-size: small; + } + + #span_description{ + color: #727272; + }
@@ -108,7 +107,7 @@ Example :
- {{title}} - {{description}} + {{title}} {{description}}