ayanova/src/views/ay-data-list-view.vue

@@ -184,7 +184,25 @@
                               item.uiFieldDataType === 12
                           "
                         >
-                          STRING BUILDER
+                          <v-select
+                            v-model="item.tempFilterOperator"
+                            :items="pickLists.stringFilterOperators"
+                            item-text="name"
+                            item-value="id"
+                            :label="lt('Filter')"
+                            prepend-icon="fa-filter"
+                          ></v-select>
+                          <v-text-field
+                            v-model="item.tempFilterValue"
+                            clearable
+                          ></v-text-field>
+                          <v-btn
+                            large
+                            block
+                            v-if="item.tempFilterToken != null"
+                            @click="addFilterCondition(item)"
+                            ><v-icon large>fa-plus</v-icon></v-btn
+                          >
                         </div>
 
                         <!-- INTEGER BUILDER  -->
@@ -414,9 +432,6 @@ export default {
       this.obj.splice(newIndex, 0, this.obj.splice(index, 1)[0]);
     },
     addFilterCondition(item) {
-      //TODO: Need to also set a filter item DISPLAY property
-      //so that can display localized for user in the list and then
-      //change the list to use the DISPLAY property instead
       var filterItem = { op: null, value: null, display: null };
       var filterItemSet = false;
       //DATE relative token?
@@ -472,35 +487,43 @@ export default {
       if (item.tempFilterOperator && item.tempFilterValue) {
         filterItem.op = item.tempFilterOperator;
         filterItem.value = item.tempFilterValue;
-        //display
-        var valueDisplay = "selected value";
-        switch (item.uiFieldDataType) {
-          case 1: //date localize
-            valueDisplay = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-              item.tempFilterValue
-            );
-            break;
-          case 8: //currency localize
-            valueDisplay = window.$gz.locale.currencyLocalized(
-              item.tempFilterValue
-            );
-            break;
-          case 7: //decimal localize
-            valueDisplay = window.$gz.locale.decimalLocalized(
-              item.tempFilterValue
-            );
-            break;
-          default:
-            valueDisplay = item.tempFilterValue;
-            break;
+        //only add if there is both an op and a value
+        //above here for tokens that isn't a restriction but 
+        //after passing through those conditions were at a point where there MUST be both
+        if (filterItem.op && filterItem.value) {
+          //display
+          var valueDisplay = "selected value";
+          switch (item.uiFieldDataType) {
+            case 1: //date localize
+              valueDisplay = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+                item.tempFilterValue
+              );
+              break;
+            case 8: //currency localize
+              valueDisplay = window.$gz.locale.currencyLocalized(
+                item.tempFilterValue
+              );
+              break;
+            case 7: //decimal localize
+              valueDisplay = window.$gz.locale.decimalLocalized(
+                item.tempFilterValue
+              );
+              break;
+            default:
+              valueDisplay = item.tempFilterValue;
+              break;
+          }
+
+          var opDisplay = window.$gz._.find(
+            this.pickLists.dateFilterOperators,
+            {
+              id: filterItem.op
+            }
+          ).name;
+          filterItem.display = opDisplay + " " + valueDisplay;
+
+          filterItemSet = true;
         }
-
-        var opDisplay = window.$gz._.find(this.pickLists.dateFilterOperators, {
-          id: filterItem.op
-        }).name;
-        filterItem.display = opDisplay + " " + valueDisplay;
-
-        filterItemSet = true;
       }
 
       if (filterItemSet) {