From e31934c06014eb74966cc18c813a0e5dddb702d8 Mon Sep 17 00:00:00 2001 From: renato Date: Wed, 24 Feb 2016 10:51:31 +0100 Subject: [PATCH] group by bug fix --- controllets/datalet-selection-controllet/datalet-selection-controllet.html | 56 +++++++++++++++++++++++++++----------------------------- controllets/datalet-selection-controllet/demo/index.html | 4 +++- locales/controllet_ln.js | 9 ++++++--- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/controllets/datalet-selection-controllet/datalet-selection-controllet.html b/controllets/datalet-selection-controllet/datalet-selection-controllet.html index df28f14..90a3ded 100755 --- a/controllets/datalet-selection-controllet/datalet-selection-controllet.html +++ b/controllets/datalet-selection-controllet/datalet-selection-controllet.html @@ -232,7 +232,7 @@
- +
@@ -250,7 +250,7 @@
- +
@@ -439,24 +439,34 @@ _showGroupedFields : function(e) { var index = e.target.id; - var isSelected = false; var temp = []; +// var isSelected = false; +// for (var i = 0; i < this.selectedFields.length; i++) { +// if (this.selectedFields[i]) { +// if (this.selectedFields[i].indexOf(this.fields[index]) > -1) { +// isSelected = true; +// } +// else { +// temp.push(this.selectedFields[i]); +// } +// } +// } +// +// if (isSelected) +// this.groupedFields = this._copy(temp); +// else +// this.groupedFields =[]; + for (var i = 0; i < this.selectedFields.length; i++) { if (this.selectedFields[i]) { - if (this.selectedFields[i].indexOf(this.fields[index]) > -1) { - isSelected = true; - } - else { - temp.push(this.selectedFields[i]) + if (i != index) { + temp.push(this.selectedFields[i]); } } } - if (isSelected) - this.groupedFields = this._copy(temp); - else - this.groupedFields =[]; + this.groupedFields = this._copy(temp); this.async(function() { var ddls = document.getElementsByTagName("paper-dropdown-menu"); @@ -566,22 +576,13 @@ this.selectedDatalet = this.preselectedDatalet; this.selectedFields = this._copy(this.fields); - -// this.params["filters"] = JSON.stringify(this.filters); -// this.params["aggregators"] = JSON.stringify(this.aggregators); -// this.params["orders"] = JSON.stringify(this.orders); - -// this.filters = JSON.parse(this.dataletPreset["filters"]);/*no?*/ +// this.filters = JSON.parse(this.dataletPreset["filters"]); // this.aggregators = JSON.parse(this.dataletPreset["aggregators"]); // this.orders = JSON.parse(this.dataletPreset["orders"]); - /*sss*/ - this.async(function() { this.selectedFields = this._copy(this.fields); - - //set info labels options var textarea = this.$.datalet_selection_labels.querySelectorAll("paper-textarea"); textarea[0].value = this.dataletPreset["description"]; @@ -710,21 +711,21 @@ if(icon.indexOf("unfold-more") > -1){ t.setAttribute("icon", "expand-less"); - t.setAttribute("title", "sort ascending"); + t.setAttribute("title", ln["sortAscending_" + ln["localization"]]); var orders = this.orders.filter(function (el) { return el.field !== name; }); orders.push({"field": name, "operation": "ASC"}); this.orders = this._copy(orders); } else if(icon.indexOf("expand-less") > -1){ t.setAttribute("icon", "expand-more"); - t.setAttribute("title", "sort descending"); + t.setAttribute("title", ln["sortDescending_" + ln["localization"]]); var orders = this.orders.filter(function (el) { return el.field !== name; }); orders.push({"field": name, "operation": "DESC"}); this.orders = this._copy(orders); } else if(icon.indexOf("expand-more") > -1){ t.setAttribute("icon", "unfold-more"); - t.setAttribute("title", "unsort"); + t.setAttribute("title", ln["unsort_" + ln["localization"]]); var orders = this.orders.filter(function (el) { return el.field !== name; }); this.orders = this._copy(orders); } @@ -773,7 +774,7 @@ } }, - _updateParams : function(){/*sss*/ + _updateParams : function(){ var textarea = this.$.datalet_selection_labels.querySelectorAll("paper-textarea"); this.params["description"] = textarea[0].value; @@ -922,9 +923,6 @@ $("#datalet_selection_inputs").height(h); $("#datalet_selection_labels").height(h); -// if(this.modify) -// $("#datalet_selection_datalet").height(h-128); -// else $("#datalet_selection_datalet").height(h); } diff --git a/controllets/datalet-selection-controllet/demo/index.html b/controllets/datalet-selection-controllet/demo/index.html index 79d010a..7e36d6f 100755 --- a/controllets/datalet-selection-controllet/demo/index.html +++ b/controllets/datalet-selection-controllet/demo/index.html @@ -18,8 +18,10 @@ - + + + diff --git a/locales/controllet_ln.js b/locales/controllet_ln.js index 5774690..8030332 100755 --- a/locales/controllet_ln.js +++ b/locales/controllet_ln.js @@ -33,9 +33,12 @@ ln["filterField_en"] = "Field"; ln["filterOperation_en"] = "Operation"; ln["filterValue_en"] = "Value"; ln["contains_en"] = "contains"; -ln["start_en"] = "start"; -ln["ends_en"] = "ends"; - +ln["start_en"] = "start with"; +ln["ends_en"] = "ends with"; +ln["sortAscending_en"] = "sorted ascending"; +ln["sortDescending_en"] = "sorted descending"; +ln["unsort_en"] = "unsorted"; +ln["countOf_en"] = "COUNT of"; ln["datatable_it"] = "tabella"; ln["barchart_it"] = "bar-chart"; -- libgit2 0.21.4