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

@@ -746,11 +746,10 @@ export default {
           this,
           item.uiFieldDataType,
           filterItem.op,
-          filterItem.value
+          filterItem.value,
+          item.enumType
         );
         //add only if not already in the collection (accidental double click)
-        console.log("addFilterCondition::find is:");
-        console.log(window.$gz._.find);
         if (!window.$gz._.find(item.filter.items, filterItem)) {
           item.filter.items.push(filterItem);
           window.$gz.form.setFormState({
@@ -1372,17 +1371,7 @@ function getDisplayForFilter(
   enumType
 ) {
   var ret = "";
-
+  //debugger;
-  //DATE RELATIVE FILTER
-  if (uiFieldDataType === 1) {
-    if (filterValue != "*select*") {
-      var valueDisplay = window.$gz._.find(vm.pickLists.dateFilterTokens, {
-        id: filterValue
-      }).name;
-      var opDisplay = filterOperator;
-      return filterOperator + " " + valueDisplay;
-    }
-  }
 
   //BLANKS FILTER
   if (filterOperator == "=" && filterValue == "*NULL*") {
@@ -1397,6 +1386,15 @@ function getDisplayForFilter(
     }).name;
   }
 
+  //DATE RELATIVE TOKEN FILTER
+  if (uiFieldDataType === 1 && filterValue[0] == "*") {
+    var valueDisplay = window.$gz._.find(vm.pickLists.dateFilterTokens, {
+      id: filterValue
+    }).name;
+    var opDisplay = filterOperator;
+    return filterOperator + " " + valueDisplay;
+  }
+
   //VALUE FILTER
   //Nothing more to do if there isn't both a value AND an operator at this point
   if (filterOperator == null || filterValue == null) {