filter ln

Renato De Donato
1 parent 5a69cfd8
Showing 4 changed files with 49 additions and 25 deletions
alasql-utility/alasql-utility.js
controllets/data-table-controllet/data-table-controllet.html
controllets/filters-controllet/filters-controllet.html
locales/controllet_ln.js
@@ -80,7 +80,7 @@ function _alasql_WHERE (filters) {
     for (var i=0; i < filters.length; i++) {
         if(filters[i]["operation"] == "contains")
             where += filters[i]["field"] + " like '%" + filters[i]["value"] + "%' " + logicalOperator + " ";
-        else if(filters[i]["operation"] == "not contains")
+        else if(filters[i]["operation"] == "notContains")
             where += filters[i]["field"] + " not like '%" + filters[i]["value"] + "%' " + logicalOperator + " ";
         else if(filters[i]["operation"] == "start")
             where += filters[i]["field"] + " like '" + filters[i]["value"] + "%' " + logicalOperator + " ";
@@ -43,7 +43,6 @@
                 height: 24px;
                 width: 24px;
                 cursor: pointer;
-                /*background: green;*/
             }
             paper-icon-button.warning {
@@ -51,7 +50,6 @@
                 width: 24px;
                 color: #FFEB3B;
                 cursor: help;
-                /*background: green;*/
             }
             paper-icon-button.order:hover {
@@ -108,7 +106,7 @@
                 height: 24px;
                 padding: 12px;
                 text-align: center;
-                max-width: 224px;
+                max-width: 256px;
                 min-width: 156px;
                 overflow: hidden;
                 white-space: nowrap;
@@ -121,18 +119,21 @@
                 color: #FFFFFF;
                 font-weight: 700;
                 cursor: help;
-                line-height: 0px;/*?? or49px su spod iron icon and paper icon icon problem*/
+            }
+
+            #data_table_container th,
+            #data_table_container th * {
+                line-height: 22px;/**/
             }
             #data_table_container th .th_label {
                 display: inline-block;
-                height: 24px;
                 max-width: calc(100% - 48px - 8px);
                 vertical-align: middle;
-                /*background: red;*/
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;
+                line-height: 24px;/**/
             }
             #data_table_container td {
@@ -140,13 +141,6 @@
                 padding: 4px;
             }
-            #data_table_container tfoot td {
-                height: 48px;
-                padding: 0px;
-                font-size: 16px;
-                background: #B6B6B6;
-            }
-
             #data_table_container #footer {
                 width: 100%;
                 height: 48px;
@@ -73,6 +73,7 @@
             paper-item {
                 min-width: 128px;
+                white-space: nowrap;
             }
             paper-item.iron-selected {
@@ -208,7 +209,7 @@
                     <template is="dom-if" if="{{index}}"><!--excludes logicalOperator-->
                         <div class="row2">
                             <div class="filter">
-                                {{item.field}}&nbsp;&nbsp;&nbsp;<span class="highlighted">{{item.operation}}</span>&nbsp;&nbsp;&nbsp;"{{item.value}}"&nbsp;&nbsp;&nbsp;<span class="highlighted">{{_getLogicalOperator(index)}}</span>
+                                {{item.field}}&nbsp;&nbsp;&nbsp;<span class="highlighted">{{_getOperationlName(item.operation)}}</span>&nbsp;&nbsp;&nbsp;"{{item.value}}"&nbsp;&nbsp;&nbsp;<span class="highlighted">{{_getLogicalOperator(index)}}</span>
                             </div>
                             <div class="remove_container">
                                 <paper-icon-button on-click="_deleteFilter" icon="cancel" class="cancel"></paper-icon-button>
@@ -238,7 +239,7 @@
                 operations : {
                     type : Array,
-                    value : ["=", "!=", ">", ">=", "<", "<=", "contains", "not contains", "start", "ends"]
+                    value : ["=", "!=", ">", ">=", "<", "<=", "contains", "notContains", "start", "ends"]
                 },
                 filters : {
@@ -364,15 +365,16 @@
             },
             _getOperationlName: function(operation) {
-                if(operation.indexOf("not") > -1)
-                    return ln["notContains_" + ln["localization"]];
-                if(operation.indexOf("contains") > -1)
-                    return ln["contains_" + ln["localization"]];
-                if(operation.indexOf("start") > -1)
-                    return ln["start_" + ln["localization"]];
-                if(operation.indexOf("ends") > -1)
-                    return ln["ends_" + ln["localization"]];
-                return operation;
+                return ln[operation + "_" + ln["localization"]];
+//                if(operation.indexOf("not") > -1)
+//                    return ln["notContains_" + ln["localization"]];
+//                if(operation.indexOf("contains") > -1)
+//                    return ln["contains_" + ln["localization"]];
+//                if(operation.indexOf("start") > -1)
+//                    return ln["start_" + ln["localization"]];
+//                if(operation.indexOf("ends") > -1)
+//                    return ln["ends_" + ln["localization"]];
+//                return operation;
             },
 //            _changeLogicalOperator : function() {
@@ -47,6 +47,13 @@ ln[&quot;warning_en&quot;] = &quot;WARNING&quot;;
 ln["filterField_en"] = "Field";
 ln["filterOperation_en"] = "Operation";
 ln["filterValue_en"] = "Value";
+
+ln["=_en"] = "is equal to";
+ln["!=_en"] = "is different from";
+ln[">_en"] = "is greater than";
+ln[">=_en"] = "is greater than or equal to";
+ln["<_en"] = "is less than";
+ln["<=_en"] = "is less than or equal to";
 ln["contains_en"] = "contains";
 ln["notContains_en"] = "not contains";
 ln["start_en"] = "start with";
@@ -173,6 +180,13 @@ ln[&quot;warning_it&quot;] = &quot;ATTENZIONE&quot;;
 ln["filterField_it"] = "Campo";
 ln["filterOperation_it"] = "Operazione";
 ln["filterValue_it"] = "Valore";
+
+ln["=_it"] = "è uguale a";
+ln["!=_it"] = "è diverso da";
+ln[">_it"] = "è maggiore di";
+ln[">=_it"] = "è maggiore uguale di";
+ln["<_it"] = "è minore di";
+ln["<=_it"] = "è minore uguale di";
 ln["contains_it"] = "contiene";
 ln["notContains_it"] = "non contiene";
 ln["start_it"] = "inizia con";
@@ -299,6 +313,13 @@ ln[&quot;warning_fr&quot;] = &quot;WARNING&quot;;
 ln["filterField_fr"] = "Field";
 ln["filterOperation_fr"] = "Operation";
 ln["filterValue_fr"] = "Value";
+
+ln["=_fr"] = "is equal to";
+ln["!=_fr"] = "is different from";
+ln[">_fr"] = "is greater than";
+ln[">=_fr"] = "is greater than or equal to";
+ln["<_fr"] = "is less than";
+ln["<=_fr"] = "is less than or equal to";
 ln["contains_fr"] = "contains";
 ln["notContains_fr"] = "not contains";
 ln["start_fr"] = "start with";
@@ -425,6 +446,13 @@ ln[&quot;warning_nl&quot;] = &quot;WARNING&quot;;
 ln["filterField_nl"] = "Field";
 ln["filterOperation_nl"] = "Operation";
 ln["filterValue_nl"] = "Value";
+
+ln["=_nl"] = "is equal to";
+ln["!=_nl"] = "is different from";
+ln[">_nl"] = "is greater than";
+ln[">=_nl"] = "is greater than or equal to";
+ln["<_nl"] = "is less than";
+ln["<=_nl"] = "is less than or equal to";
 ln["contains_nl"] = "contains";
 ln["notContains_nl"] = "not contains";
 ln["start_nl"] = "start with";