This commit is contained in:
2019-12-06 00:19:14 +00:00
parent bfb7d293d1
commit 2ed518029e
8 changed files with 12 additions and 17 deletions

View File

@@ -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. - 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 - 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 TODO: Trial route ui support in client
- Add an area to support refreshing the database and generating test data - Add an area to support refreshing the database and generating test data

View File

@@ -534,7 +534,6 @@ export default {
formCustomTemplateFieldName formCustomTemplateFieldName
]); ]);
if (templateItem === undefined || templateItem.hide !== true) { if (templateItem === undefined || templateItem.hide !== true) {
return true; return true;
} }

View File

@@ -7,7 +7,6 @@
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
color="error" color="error"
icon="fa-exclamation-circle " icon="fa-exclamation-circle "
value="true"
transition="scale-transition" transition="scale-transition"
class="multi-line" class="multi-line"
outlined outlined

View File

@@ -6,7 +6,6 @@
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
color="error" color="error"
icon="fa-exclamation-circle " icon="fa-exclamation-circle "
value="true"
transition="scale-transition" transition="scale-transition"
class="multi-line" class="multi-line"
outlined outlined

View File

@@ -13,7 +13,7 @@
<br /> <br />
</div> --> </div> -->
<div> <div>
{{ this.$store.state.formCustomTemplate[formCustomTemplateKey] }} {{ obj }}
</div> </div>
<v-row v-if="this.formState.ready"> <v-row v-if="this.formState.ready">
<v-col> <v-col>
@@ -25,7 +25,6 @@
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
color="error" color="error"
icon="fa-exclamation-circle " icon="fa-exclamation-circle "
value="true"
transition="scale-transition" transition="scale-transition"
class="multi-line" class="multi-line"
outlined outlined
@@ -33,20 +32,20 @@
> >
</v-col> </v-col>
<template v-for="item in formAvailableFields"> <template v-for="item in obj">
<v-col :key="item.fld" cols="12" sm="6" lg="4" xl="3" px-2> <v-col :key="item.key" cols="12" sm="6" lg="4" xl="3" px-2>
<v-card> <v-card>
<v-card-title> <v-card-title>
{{ lt(item.key) }} {{ item.title }}
</v-card-title> </v-card-title>
<v-card-subtitle> <v-card-subtitle>
{{ item.key }} {{ item.key }}
</v-card-subtitle> </v-card-subtitle>
<v-checkbox <v-checkbox
v-model="getTemplateItemForField(item.key).visible" v-model="item.visible"
:label="lt('FormFieldVisible')" :label="lt('FormFieldVisible')"
:ref="item.key" :ref="item.key"
:disabled="!canHide(item)" :disabled="!item.hideable"
></v-checkbox> ></v-checkbox>
<v-divider></v-divider> <v-divider></v-divider>
{{ item }} {{ item }}
@@ -287,17 +286,19 @@ function initDataObject(vm) {
//handle non-existent template item (expected) //handle non-existent template item (expected)
if (templateItem === undefined || templateItem === null) { if (templateItem === undefined || templateItem === null) {
templateItem = { required: false, hide: false }; templateItem = { required: false, hide: false, type: "text" };
} }
var objItem = { var objItem = {
key: faf.key, key: faf.key,
ltdisplay: window.$gz.locale.get(faf.key), title: window.$gz.locale.get(faf.key),
hideable: faf.hideable, hideable: faf.hideable,
custom: faf.custom, custom: faf.custom,
required: templateItem.required === true, required: templateItem.required === true,
hide: templateItem.hide === true visible: templateItem.hide !== true,
type: templateItem.type
}; };
vm.obj.push(objItem);
} }
// vm.formAvailableFields = res.data; // vm.formAvailableFields = res.data;

View File

@@ -10,7 +10,6 @@
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
color="error" color="error"
icon="fa-exclamation-circle " icon="fa-exclamation-circle "
value="true"
transition="scale-transition" transition="scale-transition"
class="multi-line" class="multi-line"
outlined outlined

View File

@@ -6,7 +6,6 @@
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
color="error" color="error"
icon="fa-exclamation-circle " icon="fa-exclamation-circle "
value="true"
transition="scale-transition" transition="scale-transition"
class="multi-line" class="multi-line"
outlined outlined

View File

@@ -6,7 +6,6 @@
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
color="error" color="error"
icon="fa-exclamation-circle " icon="fa-exclamation-circle "
value="true"
transition="scale-transition" transition="scale-transition"
class="multi-line" class="multi-line"
outlined outlined