group by bug fix

Renato De Donato
1 parent efb059b1
Showing 3 changed files with 36 additions and 33 deletions
controllets/datalet-selection-controllet/datalet-selection-controllet.html
controllets/datalet-selection-controllet/demo/index.html
locales/controllet_ln.js
@@ -232,7 +232,7 @@
                             </paper-menu>
                         </paper-dropdown-menu>
                         <div class="info_button">
-                            <paper-icon-button id="gb" on-click="_addOrder" icon="unfold-more" title="unsort"></paper-icon-button>
+                            <paper-icon-button id="gb" on-click="_addOrder" icon="unfold-more" title=""></paper-icon-button>
                         </div>
                     </div>
@@ -250,7 +250,7 @@
                                 </paper-menu>
                             </paper-dropdown-menu>
                             <div class="info_button">
-                                <paper-icon-button id={{_fieldName(item)}} on-click="_addOrder" icon="unfold-more" title="unsort"></paper-icon-button>
+                                <paper-icon-button id={{_fieldName(item)}} on-click="_addOrder" icon="unfold-more" title=""></paper-icon-button>
                             </div>
                         </div>
                     </template>
@@ -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);
             }
@@ -18,8 +18,10 @@
 <body>
-<datalet-selection-controllet fields='["result,records,Anno","result,records,Cinesi","result,records,Albanesi","result,records,Rumeni","result,records,Pakistani","result,records,Marocchini","result,records,Altri stranieri" ]' data-url="http://ckan.routetopa.eu/api/action/datastore_search?resource_id=e04338cf-7a92-4221-81c6-fe12f41003d5" deep-url="http://172.16.15.38/DEEalerProvider/DEEP/" datalets-list-url="http://172.16.15.38/DEEalerProvider/DEEP/datalets-list"></datalet-selection-controllet>
+<!--<datalet-selection-controllet fields='["result,records,Anno","result,records,Cinesi","result,records,Albanesi","result,records,Rumeni","result,records,Pakistani","result,records,Marocchini","result,records,Altri stranieri" ]' data-url="http://ckan.routetopa.eu/api/action/datastore_search?resource_id=e04338cf-7a92-4221-81c6-fe12f41003d5" deep-url="http://172.16.15.38/DEEalerProvider/DEEP/" datalets-list-url="http://172.16.15.38/DEEalerProvider/DEEP/datalets-list"></datalet-selection-controllet>-->
+
 <!--<datalet-selection-controllet fields='["records,fields,title", "records,fields,published"]' data-url="https://data.issy.com/api/records/1.0/search?dataset=flux-rss-des-offres-demplois-a-issy-les-moulineaux&sort=published&facet=published&refine.published=2015%2F10" deep-url="http://172.16.15.38/DEEalerProvider/DEEP/" datalets-list-url="http://172.16.15.38/DEEalerProvider/DEEP/datalets-list"></datalet-selection-controllet>-->
+<datalet-selection-controllet fields='["records,fields,annee", "records,fields,preteur", "records,fields,capital_restant_du"]' data-url="https://data.issy.com/api/records/1.0/search/?dataset=repartitiondeladetteparpreteursau3112n-feuille1&rows=56&sort=-annee" deep-url="http://172.16.15.38/DEEalerProvider/DEEP/" datalets-list-url="http://172.16.15.38/DEEalerProvider/DEEP/datalets-list"></datalet-selection-controllet>
 </body>
@@ -33,9 +33,12 @@ ln[&quot;filterField_en&quot;] = &quot;Field&quot;;
 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";