fix bug-modify in private room

Renato De Donato
1 parent eae8bcd8
Showing 3 changed files with 72 additions and 23 deletions
controllets/datalet-selection-controllet/datalet-selection-controllet.html
locales/fr.l20n
locales/nl.l20n
@@ -325,14 +325,14 @@
                 $(this.$.datalet_selection_labels).perfectScrollbar();
                 $(this.$.datalet_selection_datalet).perfectScrollbar();
  
-                this.modify = true;//da eliminare in futuro
+                this.params = {'data-url' : this.dataUrl};
+
+                //this.modify = true;//da eliminare in futuro
                 if(this.preselectedDatalet){
                     this.modify = true;
                     this._preselectDatalet();
                     this.preselectedDatalet = undefined;
                 }
-
-                this.params = {'data-url' : this.dataUrl};
             },
  
             attached : function() {
@@ -348,11 +348,12 @@
 //                    console.log($(inputs[i]).children("paper-menu"));
  
                 this._translate();
-
             },
  
             _translate : function(){
                 document.l10n.formatValue('commentLabel').then(s => $("#comment")[0].setAttribute("label", s));
+                if(this.modify)
+                    document.l10n.formatValue('modifyDatalet').then(s => this.$.add_button.innerText = s);
             },
  
             setFields : function(fields) {
@@ -387,10 +388,6 @@
             },
  
             _preselectDatalet : function() {
-//                this.$.add_button.innerText = "MODIFY DATALET";
-                document.l10n.formatValue('modifyDatalet').then(s => this.$.add_button.innerText = s);
-
-
                 this.selectedDatalet = this.preselectedDatalet;
                 this.selectedFields = this._copy(this.fields);
  
@@ -426,11 +423,6 @@
             },
  
             _addInput : function(e){
-//                console.log(e.target.innerHTML.trim());
-//                console.log(e.target.innerText);
-//                console.log(e.currentTarget.innerHTML.trim());
-//                console.log(e.currentTarget.innerText);
-
                 var selectedFields = this._copy(this.selectedFields);
  
                 var index = $(e.target).parents("paper-dropdown-menu")[0].id;
@@ -456,13 +448,12 @@
                 }
  
                 if(load){
-                    var labels = this.$.datalet_selection_labels.querySelectorAll("paper-textarea");
-//                    console.log(labels);
-                    for (var i = 0; i < labels.length; i++) {
-                        if (labels[i].innerHTML.trim() != "") {
-                            this.params[labels[i].label] = labels[i].value;
-                        }
-                    }
+//                    var labels = this.$.datalet_selection_labels.querySelectorAll("paper-textarea");
+//                    for (var i = 0; i < labels.length; i++) {
+//                        if (labels[i].innerHTML.trim() != "") {
+//                            this.params[labels[i].label] = labels[i].value;
+//                        }
+//                    }
  
                     this._loadDatalet(selectedFields);
                 }
@@ -472,6 +463,18 @@
             _loadDatalet : function(selectedFields){
 //                var params = {'data-url' : this.dataUrl};
  
+                var labels = this.$.datalet_selection_labels.querySelectorAll("paper-textarea");
+                for (var i = 0; i < labels.length; i++) {
+                    if (labels[i].innerHTML.trim() != "") {
+                        this.params[labels[i].label] = labels[i].value;
+                    }
+                }
+
+                console.log(this.selectedDatalet);
+                console.log(this.params);
+                console.log(selectedFields);
+                console.log(this.dataUrl);
+
                 var dataletParams ={
                     component   : this.selectedDatalet+"-datalet",
                     params      : this.params,
@@ -545,10 +548,10 @@
  
                 $("#datalet_selection_inputs").height(h);
                 $("#datalet_selection_labels").height(h);
-                if(this.modify)
+//                if(this.modify)
                     $("#datalet_selection_datalet").height(h-128);
-                else
-                    $("#datalet_selection_datalet").height(h);
+//                else
+//                    $("#datalet_selection_datalet").height(h);
             }
  
         });
+<slide1Title "SELECT DATASET">
+<slide1Subtitle "Search or copy and paste the url of dataset.">
+<slide2Title "SELECT DATA">
+<slide2Subtitle "Select the fields from tree-view. The multi-table will show the values related to the selected fields.">
+<slide3Title "SELECT VISUALIZATION">
+<slide3Subtitle "Select a visualization, fill out inputs and labels (optional).">
+
+<listView "LIST VIEW">
+<treeMapView "TREE MAP VIEW">
+<mostPopular "MOST POPULAR">
+<availableDatasets "Available datasets">
+<suggestedDatasets "Suggested datasets">
+<selectedUrl "Selected url">
+
+<inputs "INPUTS">
+<labels "LABELS / OPTIONS">
+<comment "COMMENT">
+<commentLabel "comment (max 100 characters)">
+<dataletPreview "DATALET PREVIEW">
+<addDatalet "ADD">
+<modifyDatalet "MODIFY">
+
+<googlePiechartDescription "The labels of slices.">
 \ No newline at end of file
+<slide1Title "SELECT DATASET">
+<slide1Subtitle "Search or copy and paste the url of dataset.">
+<slide2Title "SELECT DATA">
+<slide2Subtitle "Select the fields from tree-view. The multi-table will show the values related to the selected fields.">
+<slide3Title "SELECT VISUALIZATION">
+<slide3Subtitle "Select a visualization, fill out inputs and labels (optional).">
+
+<listView "LIST VIEW">
+<treeMapView "TREE MAP VIEW">
+<mostPopular "MOST POPULAR">
+<availableDatasets "Available datasets">
+<suggestedDatasets "Suggested datasets">
+<selectedUrl "Selected url">
+
+<inputs "INPUTS">
+<labels "LABELS / OPTIONS">
+<comment "COMMENT">
+<commentLabel "comment (max 100 characters)">
+<dataletPreview "DATALET PREVIEW">
+<addDatalet "ADD">
+<modifyDatalet "MODIFY">
+
+<googlePiechartDescription "The labels of slices.">
 \ No newline at end of file