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

---
 ayanova/src/views/ay-data-list-view.vue | 63 ++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 5ea6b366..71e438b6 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -234,11 +234,7 @@
                               :key="index"
                             >
                               <v-list-item-content>
-                                <v-list-item-title
-                                  v-text="
-                                    filterItem.op + ' ' + filterItem.value
-                                  "
-                                >
+                                <v-list-item-title v-text="filterItem.display">
                                 </v-list-item-title>
                               </v-list-item-content>
                               <v-list-item-action>
@@ -415,10 +411,10 @@ 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
+      //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 };
+      var filterItem = { op: null, value: null, display: null };
       var filterItemSet = false;
       //DATE relative token?
       if (item.uiFieldDataType === 1) {
@@ -427,6 +423,13 @@ export default {
           //special relative token
           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;
           filterItemSet = true;
         }
       }
@@ -435,12 +438,30 @@ export default {
       if (item.tempFilterOperator == "*NOVALUE*") {
         filterItem.op = "=";
         filterItem.value = "*NULL*";
+        //display
+        var valueDisplay = window.$gz._.find(
+          this.pickLists.stringFilterOperators,
+          {
+            id: item.tempFilterOperator
+          }
+        ).name;
+
+        filterItem.display = valueDisplay;
         filterItemSet = true;
       }
 
       if (item.tempFilterOperator == "*HASVALUE*") {
         filterItem.op = "!=";
         filterItem.value = "*NULL*";
+        //display
+        var valueDisplay = window.$gz._.find(
+          this.pickLists.stringFilterOperators,
+          {
+            id: item.tempFilterOperator
+          }
+        ).name;
+
+        filterItem.display = valueDisplay;
         filterItemSet = true;
       }
 
@@ -448,6 +469,34 @@ 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;
+        }
+
+        var opDisplay = window.$gz._.find(this.pickLists.dateFilterOperators, {
+          id: filterItem.op
+        }).name;
+        filterItem.display = opDisplay + " " + valueDisplay;
+
         filterItemSet = true;
       }