From 2ed518029e87224d066e71b61edc952ce6ef02c8 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 6 Dec 2019 00:19:14 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                      |  2 +-
 ayanova/src/api/gzform.js                     |  1 -
 .../src/components/inventorywidgetlist.vue    |  1 -
 ayanova/src/views/About.vue                   |  1 -
 ayanova/src/views/customize.vue               | 21 ++++++++++---------
 ayanova/src/views/inventory-widget-edit.vue   |  1 -
 ayanova/src/views/inventory.vue               |  1 -
 ayanova/src/views/log.vue                     |  1 -
 8 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 623c9595..a17b1937 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -107,7 +107,7 @@ TODO: MAIN GRID LIST ANALYSIS, DESIGN AND COMPLETION
 		- Maybe make all stubbed things an alt colour so can tell at a glance what is outstanding.
 		- Reporting, list mass ops, go through cases look for stuff that will be required
 
-
+TODO: Make errorBoxError message box on all forms a component instead as it's just boilerplate
 
 TODO: Trial route ui support in client
 	- Add an area to support refreshing the database and generating test data
diff --git a/ayanova/src/api/gzform.js b/ayanova/src/api/gzform.js
index 5b888e0a..05d7553c 100644
--- a/ayanova/src/api/gzform.js
+++ b/ayanova/src/api/gzform.js
@@ -534,7 +534,6 @@ export default {
       formCustomTemplateFieldName
     ]);
 
- 
     if (templateItem === undefined || templateItem.hide !== true) {
       return true;
     }
diff --git a/ayanova/src/components/inventorywidgetlist.vue b/ayanova/src/components/inventorywidgetlist.vue
index 4d5d6649..940da518 100644
--- a/ayanova/src/components/inventorywidgetlist.vue
+++ b/ayanova/src/components/inventorywidgetlist.vue
@@ -7,7 +7,6 @@
           v-show="formState.errorBoxMessage"
           color="error"
           icon="fa-exclamation-circle "
-          value="true"
           transition="scale-transition"
           class="multi-line"
           outlined
diff --git a/ayanova/src/views/About.vue b/ayanova/src/views/About.vue
index ec8cfd04..8e605170 100644
--- a/ayanova/src/views/About.vue
+++ b/ayanova/src/views/About.vue
@@ -6,7 +6,6 @@
         v-show="formState.errorBoxMessage"
         color="error"
         icon="fa-exclamation-circle "
-        value="true"
         transition="scale-transition"
         class="multi-line"
         outlined
diff --git a/ayanova/src/views/customize.vue b/ayanova/src/views/customize.vue
index 3b480700..4d6280e4 100644
--- a/ayanova/src/views/customize.vue
+++ b/ayanova/src/views/customize.vue
@@ -13,7 +13,7 @@
       <br />
     </div> -->
     <div>
-      {{ this.$store.state.formCustomTemplate[formCustomTemplateKey] }}
+      {{ obj }}
     </div>
     <v-row v-if="this.formState.ready">
       <v-col>
@@ -25,7 +25,6 @@
                 v-show="formState.errorBoxMessage"
                 color="error"
                 icon="fa-exclamation-circle "
-                value="true"
                 transition="scale-transition"
                 class="multi-line"
                 outlined
@@ -33,20 +32,20 @@
               >
             </v-col>
 
-            <template v-for="item in formAvailableFields">
-              <v-col :key="item.fld" cols="12" sm="6" lg="4" xl="3" px-2>
+            <template v-for="item in obj">
+              <v-col :key="item.key" cols="12" sm="6" lg="4" xl="3" px-2>
                 <v-card>
                   <v-card-title>
-                    {{ lt(item.key) }}
+                    {{ item.title }}
                   </v-card-title>
                   <v-card-subtitle>
                     {{ item.key }}
                   </v-card-subtitle>
                   <v-checkbox
-                    v-model="getTemplateItemForField(item.key).visible"
+                    v-model="item.visible"
                     :label="lt('FormFieldVisible')"
                     :ref="item.key"
-                    :disabled="!canHide(item)"
+                    :disabled="!item.hideable"
                   ></v-checkbox>
                   <v-divider></v-divider>
                   {{ item }}
@@ -287,17 +286,19 @@ function initDataObject(vm) {
 
       //handle non-existent template item (expected)
       if (templateItem === undefined || templateItem === null) {
-        templateItem = { required: false, hide: false };
+        templateItem = { required: false, hide: false, type: "text" };
       }
 
       var objItem = {
         key: faf.key,
-        ltdisplay: window.$gz.locale.get(faf.key),
+        title: window.$gz.locale.get(faf.key),
         hideable: faf.hideable,
         custom: faf.custom,
         required: templateItem.required === true,
-        hide: templateItem.hide === true
+        visible: templateItem.hide !== true,
+        type: templateItem.type
       };
+      vm.obj.push(objItem);
     }
 
     // vm.formAvailableFields = res.data;
diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue
index bfc15a78..93340291 100644
--- a/ayanova/src/views/inventory-widget-edit.vue
+++ b/ayanova/src/views/inventory-widget-edit.vue
@@ -10,7 +10,6 @@
                 v-show="formState.errorBoxMessage"
                 color="error"
                 icon="fa-exclamation-circle "
-                value="true"
                 transition="scale-transition"
                 class="multi-line"
                 outlined
diff --git a/ayanova/src/views/inventory.vue b/ayanova/src/views/inventory.vue
index 251c2a4a..9ea39c8a 100644
--- a/ayanova/src/views/inventory.vue
+++ b/ayanova/src/views/inventory.vue
@@ -6,7 +6,6 @@
         v-show="formState.errorBoxMessage"
         color="error"
         icon="fa-exclamation-circle "
-        value="true"
         transition="scale-transition"
         class="multi-line"
         outlined
diff --git a/ayanova/src/views/log.vue b/ayanova/src/views/log.vue
index 5af8a5f5..c2797f13 100644
--- a/ayanova/src/views/log.vue
+++ b/ayanova/src/views/log.vue
@@ -6,7 +6,6 @@
         v-show="formState.errorBoxMessage"
         color="error"
         icon="fa-exclamation-circle "
-        value="true"
         transition="scale-transition"
         class="multi-line"
         outlined