@@ -541,6 +541,8 @@
this.$.base_title.label = ln["title_" + ln["localization"]];
this.$.base_description.label = ln["description_" + ln["localization"]];
+ this.$.groupBy.innerHTML = ln["groupBy_" + ln["localization"]];
+
if(this.modify)
this.$.add_button.innerHTML = ln["modifyDatalet_" + ln["localization"]];
},
diff --git a/controllets/filters-controllet/filters-controllet.html b/controllets/filters-controllet/filters-controllet.html
index ff291aa..49811bb 100644
--- a/controllets/filters-controllet/filters-controllet.html
+++ b/controllets/filters-controllet/filters-controllet.html
@@ -229,7 +229,9 @@
_addFilter : function() {
if (this.$.filter_field.selectedItem && this.$.filter_operation_menu.selectedItem && this.$.filter_value.value != "" && !this.$.filter_value.invalid) {
var field = this.$.filter_field.value;
- var operation = this.$.filter_operation.value;
+ var id = this.$.filter_operation.selectedItem.id;
+ var operation = this.operations[id];
+// var operation = this.$.filter_operation.value;
var value = this.$.filter_value.value;
var filters = this.filters;
diff --git a/controllets/select-data-controllet/demo/index.html b/controllets/select-data-controllet/demo/index.html
index 54a3784..a706ed0 100755
--- a/controllets/select-data-controllet/demo/index.html
+++ b/controllets/select-data-controllet/demo/index.html
@@ -16,7 +16,8 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/datalets/base-ajax-json-alasql-datalet/static/js/AjaxJsonAlasqlBehavior.js b/datalets/base-ajax-json-alasql-datalet/static/js/AjaxJsonAlasqlBehavior.js
index 67caae2..3ef89c8 100755
--- a/datalets/base-ajax-json-alasql-datalet/static/js/AjaxJsonAlasqlBehavior.js
+++ b/datalets/base-ajax-json-alasql-datalet/static/js/AjaxJsonAlasqlBehavior.js
@@ -117,7 +117,7 @@ var AjaxJsonAlasqlBehavior = {
else if(filters[i]["operation"] == "ends")
where += filters[i]["field"] + " like '%" + filters[i]["value"] + "' AND ";
else
- where += filters[i]["field"] + " " + filters[i]["operation"] + " " + filters[i]["value"] + " AND ";
+ where += filters[i]["field"] + " " + filters[i]["operation"] + " '" + filters[i]["value"] + "' AND ";
}
where = where.slice(0, -5);
}
diff --git a/locales/controllet_ln.js b/locales/controllet_ln.js
index 8030332..9225d48 100755
--- a/locales/controllet_ln.js
+++ b/locales/controllet_ln.js
@@ -38,7 +38,8 @@ 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["countOf_en"] = "COUNT of";
+ln["groupBy_en"] = "GROUP BY";
ln["datatable_it"] = "tabella";
ln["barchart_it"] = "bar-chart";