From be5a3903c6c17ff84c45134411597f58343d401a Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 21 Feb 2020 21:18:04 +0000
Subject: [PATCH]

---
 ayanova/src/views/ay-data-list-view.vue | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 1c6700d7..2138f4c8 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -635,12 +635,18 @@ export default {
           filterItem.op = "="; //equality
           filterItem.value = item.tempFilterToken;
           //display
-          var valueDisplay = window.$gz._.find(
-            this.pickLists.dateFilterTokens,
-            { id: item.tempFilterToken }
-          ).name;
-          var opDisplay = filterItem.op;
-          filterItem.display = opDisplay + " " + valueDisplay;
+          filterItem.display = getDisplayForFilter(
+            this,
+            item.uiFieldDataType,
+            filterItem.op,
+            filterItem.value
+          );
+          // var valueDisplay = window.$gz._.find(
+          //   this.pickLists.dateFilterTokens,
+          //   { id: item.tempFilterToken }
+          // ).name;
+          // var opDisplay = filterItem.op;
+          // filterItem.display = opDisplay + " " + valueDisplay;
           filterItemSet = true;
         }
       }
@@ -1362,7 +1368,7 @@ function getDisplayForFilter(
   if (uiFieldDataType === 1) {
     if (filterValue != "*select*") {
       var valueDisplay = window.$gz._.find(vm.pickLists.dateFilterTokens, {
-        id: item.tempFilterToken
+        id: filterValue
       }).name;
       var opDisplay = filterItem.op;
       return filterOperator + " " + valueDisplay;
@@ -1410,7 +1416,7 @@ function getDisplayForFilter(
       valueDisplay = vm.lt(ltKey);
       break;
     case 10: //ENUM localize
-      valueDisplay = window.$gz.enums.get(item.enumType, filterValue);
+      valueDisplay = window.$gz.enums.get(enumType, filterValue);
       break;
     default:
       valueDisplay = filterValue;