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

---
 ayanova/src/views/customize.vue | 103 +++++++++++++-------------------
 1 file changed, 41 insertions(+), 62 deletions(-)

diff --git a/ayanova/src/views/customize.vue b/ayanova/src/views/customize.vue
index 45bde47c..b63bf50d 100644
--- a/ayanova/src/views/customize.vue
+++ b/ayanova/src/views/customize.vue
@@ -45,8 +45,23 @@
                     v-model="item.visible"
                     :label="lt('FormFieldVisible')"
                     :ref="item.key"
-                    :disabled="!item.hideable"
+                    :disabled="item.stockRequired"
+                    @change="visibleChanged(item)"
                   ></v-checkbox>
+                  <v-checkbox
+                    v-model="item.required"
+                    :label="lt('FormFieldEntryRequired')"
+                    :disabled="item.stockRequired"
+                    @change="requiredChanged(item)"
+                  ></v-checkbox>
+                  <v-select
+                    v-if="item.custom"
+                    v-model="item.type"
+                    :items="pickLists.formFieldDataTypes"
+                    item-text="name"
+                    item-value="id"
+                    :label="lt('FormfieldDataType')"
+                  ></v-select>
                   <v-divider></v-divider>
                   {{ item }}
                 </v-card>
@@ -59,7 +74,6 @@
   </v-container>
 </template>
 <script>
-//LTDisplay [FieldKey] , Visible, Required, DataType (if custom)
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /*  Xeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -95,9 +109,6 @@ export default {
       });
   },
   created() {
-    // Fetch as needed
-    // this.getDataFromApi();
-
     //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
     //modify the menu as necessary
     generateMenu(this, false); //default is never read only and passing in this vm
@@ -106,7 +117,17 @@ export default {
     return {
       obj: [],
       formCustomTemplateKey: this.$route.params.formCustomTemplateKey,
-
+      pickLists: {
+        formFieldDataTypes: [
+          { name: this.lt("FormFieldDataTypesCurrency"), id: "currency" },
+          { name: this.lt("FormFieldDataTypesDateOnly"), id: "date" },
+          { name: this.lt("FormFieldDataTypesTimeOnly"), id: "time" },
+          { name: this.lt("FormFieldDataTypesDateTime"), id: "datetime" },
+          { name: this.lt("FormFieldDataTypesText"), id: "text" },
+          { name: this.lt("FormFieldDataTypesNumber"), id: "number" },
+          { name: this.lt("FormFieldDataTypesTrueFalse"), id: "bool" }
+        ]
+      },
       formState: {
         ready: false,
         dirty: false,
@@ -161,66 +182,24 @@ export default {
     canDuplicate: function() {
       return this.formState.valid && !this.formState.dirty;
     }
-    // ,
-    // getTemplateItemForField: function(customTemplateFieldKey) {
-    //   //first check template
-    //   var templateItem = window.$gz.formCustomTemplate.getFieldTemplateValue(
-    //     this.formCustomTemplateKey,
-    //     availableFieldItem.key
-    //   );
-    //   if(templateItem==undefined){
-    //     templateItem=
-    //   }
-    //   return templateItem;
-    // },
-    // fullName: {
-    //   // getter
-    //   get: function() {
-    //     return this.firstName + " " + this.lastName;
-    //   },
-    //   // setter
-    //   set: function(newValue) {
-    //     var names = newValue.split(" ");
-    //     this.firstName = names[0];
-    //     this.lastName = names[names.length - 1];
-    //   }
-    // }
   },
   components: {},
   methods: {
     lt: function(ltkey) {
       return window.$gz.locale.get(ltkey);
+    },
+    visibleChanged: function(item) {
+      //Note: stock items can't be changed so no need to take that into account
+      if (item.required && item.visible == false) {
+        item.required = false;
+      }
+    },
+    requiredChanged: function(item) {
+      //Note: stock items can't be changed so no need to take that into account
+      if (item.required && item.visible == false) {
+        item.visible = true;
+      }
     }
-    // ,
-    // canHide: function(availableFieldItem) {
-    //   //Two things can prevent allowing hide, if the template says it's required and / or if the aviailable fields record
-    //   //hideable value is false
-    //   var templateSaysRequired = false;
-    //   var availableFieldsSayHideable = true;
-
-    //   //first check template
-    //   var templateItem = window.$gz.formCustomTemplate.getFieldTemplateValue(
-    //     this.formCustomTemplateKey,
-    //     availableFieldItem.key
-    //   );
-
-    //   if (
-    //     templateItem &&
-    //     templateItem.required !== undefined &&
-    //     templateItem.required === true //it's text
-    //   ) {
-    //     templateSaysRequired = true;
-    //   }
-
-    //   //Now check availableFields collection
-    //   if (availableFieldItem.hideable != true) {
-    //     availableFieldsSayHideable = false;
-    //   }
-
-    //   return (
-    //     templateSaysRequired === false && availableFieldsSayHideable === true
-    //   );
-    // }
   }
 };
 
@@ -295,9 +274,9 @@ function initDataObject(vm) {
       var objItem = {
         key: faf.key,
         title: window.$gz.locale.get(faf.key),
-        hideable: faf.hideable,
+        stockRequired: !faf.hideable,
         custom: faf.custom,
-        required: templateItem.required === true,
+        required: faf.hideable === false || templateItem.required === true,
         visible: templateItem.hide !== true,
         type: templateItem.type
       };