From 201f59d0d6b6a4e149a8e9dfb3aa4640f2da210b Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 10 Feb 2020 18:42:45 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                 |  4 --
 ayanova/src/components/gz-data-table.vue | 87 +++++++++++++++++-------
 2 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 718737a8..c6e3fb6f 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -50,10 +50,6 @@ SHELL / NAV / MENUS / LAYOUT
 TODO: LOCALIZATION
 	- TODO ACTIONS
 
-		
-	- Remove relative time token filter integration tests
-		- Keep the ones that rely on filtering dates between values because that's how the client will be sending the relative filters
-		- Add a BETWEEN test
 
 	- DataTable, make bools display as checkboxes instead of text (could just use icons instead of actual checkbox)
 	- DataTable Need enum translator in it's own class or maybe part of locale or uses locale I guess
diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 888cd414..cef748ab 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -38,26 +38,6 @@
                 </td>
               </template>
               <td v-for="c in item.columns" :key="c.key">
-                <!-- Handle all plain text types right up to and including enums -->
-                <!--TODO when get to coloured stuff will need to add that as a prop to column data but leaving out for now-->
-                <!-- public enum UiFieldDataType : int
-    {
-        NoType = 0,
-        DateTime = 1,
-        Date = 2,
-        Time = 3,
-        Text = 4,
-        Integer = 5,
-        Bool = 6,
-        Decimal = 7,
-        Currency = 8,
-        Tags = 9,
-        Enum = 10,
-        EmailAddress = 11,
-        HTTP = 12
-
-    }
-} -->
                 <template v-if="c.t == 1">
                   <!-- DATETIME -->
                   {{ c.v }}
@@ -88,7 +68,13 @@
                 </template>
                 <template v-else-if="c.t == 6">
                   <!-- BOOL -->
-                  {{ c.v }}
+                  <div class="text-center">
+                    <v-icon v-if="c.v === false" small>far fa-square</v-icon>
+                    <v-icon v-else-if="c.v === true" small
+                      >far fa-check-square</v-icon
+                    >
+                    <v-icon v-else small>far fa-minus-square</v-icon>
+                  </div>
                 </template>
                 <template v-else-if="c.t == 7">
                   <!-- DECIMAL -->
@@ -192,9 +178,20 @@
                         {{ getHeaderText(c.key) }}</v-list-item-title
                       >
                       <v-list-item-subtitle>
-                        <!-- Handle all plain text types right up to and including enums -->
-                        <!--TODO when get to coloured stuff will need to add that as a prop to column data but leaving out for now-->
-                        <template v-if="c.t < 11">
+                        <template v-if="c.t == 1">
+                          <!-- DATETIME -->
+                          {{ c.v }}
+                        </template>
+                        <template v-else-if="c.t == 2">
+                          <!-- DATE -->
+                          {{ c.v }}
+                        </template>
+                        <template v-else-if="c.t == 3">
+                          <!-- TIME -->
+                          {{ c.v }}
+                        </template>
+                        <template v-else-if="c.t == 4">
+                          <!-- TEXT (also maybe openable)-->
                           <template v-if="c.i">
                             <!-- openable object with an ID -->
                             <span
@@ -208,13 +205,51 @@
                             {{ c.v }}
                           </template>
                         </template>
-                        <template v-if="c.t == 11">
+                        <template v-else-if="c.t == 5">
+                          <!-- INTEGER -->
+                          {{ c.v }}
+                        </template>
+                        <template v-else-if="c.t == 6">
+                          <!-- BOOL -->
+                          <div>
+                            <v-icon v-if="c.v === false" small
+                              >far fa-square</v-icon
+                            >
+                            <v-icon v-else-if="c.v === true" small
+                              >far fa-check-square</v-icon
+                            >
+                            <v-icon v-else small>far fa-minus-square</v-icon>
+                          </div>
+                        </template>
+                        <template v-else-if="c.t == 7">
+                          <!-- DECIMAL -->
+                          {{ c.v }}
+                        </template>
+                        <template v-else-if="c.t == 8">
+                          <!-- CURRENCY -->
+                          <div>{{ c.v }}</div>
+                        </template>
+                        <template v-else-if="c.t == 9">
+                          <!-- TAGS -->
+                          {{ c.v }}
+                        </template>
+                        <template v-else-if="c.t == 10">
+                          <!-- ENUM (translated to text on getdata) -->
+                          {{ c.v }}
+                        </template>
+                        <template v-else-if="c.t == 11">
+                          <!-- EMAIL -->
                           <a :href="'mailto:' + c.v">{{ c.v }}</a>
                         </template>
-                        <template v-if="c.t == 12">
+                        <template v-else-if="c.t == 12">
+                          <!-- URL / HTTP -->
                           <!-- Expects full url with protocol etc in c.v so might need to add to record builder -->
                           <a :href="c.v" target="_blank">{{ c.v }}</a>
                         </template>
+                        <template v-else>
+                          <!-- UNKNOWN -->
+                          {{ c.v }}
+                        </template>
                       </v-list-item-subtitle>
                     </v-list-item-content>
                   </v-list-item>