This commit is contained in:
2020-12-02 00:48:58 +00:00
parent 3b8a809d5a
commit 86b354425b
6 changed files with 28 additions and 44 deletions

View File

@@ -6,11 +6,6 @@
MISC ITEMS THAT CAME UP MISC ITEMS THAT CAME UP
todo: telephone fields on entry forms need a control to trigger dialing
but check first with the docs and vuetify, if type is tel shouldn't it do it itself?
todo: email fields on entry forms need a control to trigger emailing
same as above for tel
todo: iPad view on map shows error about browser not allowing popups, however it does work so remove the error would be best todo: iPad view on map shows error about browser not allowing popups, however it does work so remove the error would be best

View File

@@ -1,4 +1,4 @@
export default { export default {
version: "8.0.0-alpha.93", version: "8.0.0-alpha.94",
copyright: "© 1999-2020, Ground Zero Tech-Works Inc." copyright: "© 1999-2020, Ground Zero Tech-Works Inc."
}; };

View File

@@ -248,7 +248,7 @@
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field <gz-email
v-model="optionsObj.emailAddress" v-model="optionsObj.emailAddress"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('UserEmailAddress')" :label="$ay.t('UserEmailAddress')"
@@ -256,8 +256,7 @@
ref="emailAddress" ref="emailAddress"
@input="fieldValueChanged('emailAddress')" @input="fieldValueChanged('emailAddress')"
data-cy="emailAddress" data-cy="emailAddress"
type="email" ></gz-email>
></v-text-field>
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'Phone1')" v-if="form().showMe(this, 'Phone1')"
@@ -266,17 +265,16 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <gz-phone
v-model="optionsObj.phone1" v-model="optionsObj.phone1"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('UserPhone1')" :label="$ay.t('UserPhone1')"
ref="phone1" ref="phone1"
data-cy="phone1" data-cy="phone1"
type="tel"
:error-messages="form().serverErrors(this, 'phone1')" :error-messages="form().serverErrors(this, 'phone1')"
@input="fieldValueChanged('phone1')" @input="fieldValueChanged('phone1')"
></v-text-field> ></gz-phone>
</v-col> </v-col>
<v-col <v-col
@@ -286,17 +284,16 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <gz-phone
v-model="optionsObj.phone2" v-model="optionsObj.phone2"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('UserPhone2')" :label="$ay.t('UserPhone2')"
ref="phone2" ref="phone2"
data-cy="phone2" data-cy="phone2"
type="tel"
:error-messages="form().serverErrors(this, 'phone2')" :error-messages="form().serverErrors(this, 'phone2')"
@input="fieldValueChanged('phone2')" @input="fieldValueChanged('phone2')"
></v-text-field> ></gz-phone>
</v-col> </v-col>
<v-col <v-col
@@ -306,17 +303,16 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <gz-phone
v-model="optionsObj.phone3" v-model="optionsObj.phone3"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('UserPageAddress')" :label="$ay.t('UserPageAddress')"
ref="phone3" ref="phone3"
data-cy="phone3" data-cy="phone3"
type="tel"
:error-messages="form().serverErrors(this, 'phone3')" :error-messages="form().serverErrors(this, 'phone3')"
@input="fieldValueChanged('phone3')" @input="fieldValueChanged('phone3')"
></v-text-field> ></gz-phone>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">

View File

@@ -137,7 +137,7 @@
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('CustomerPhone2')" :label="$ay.t('CustomerPhone2')"
ref="phone2" ref="phone2"
data-cy="phone2" data-cy="phone2"
:error-messages="form().serverErrors(this, 'phone2')" :error-messages="form().serverErrors(this, 'phone2')"
@input="fieldValueChanged('phone2')" @input="fieldValueChanged('phone2')"
></gz-phone> ></gz-phone>

View File

@@ -232,7 +232,7 @@
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field <gz-email
v-model="optionsObj.emailAddress" v-model="optionsObj.emailAddress"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('UserEmailAddress')" :label="$ay.t('UserEmailAddress')"
@@ -240,8 +240,7 @@
ref="emailAddress" ref="emailAddress"
@input="fieldValueChanged('emailAddress')" @input="fieldValueChanged('emailAddress')"
data-cy="emailAddress" data-cy="emailAddress"
type="email" ></gz-email>
></v-text-field>
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'Phone1')" v-if="form().showMe(this, 'Phone1')"
@@ -250,17 +249,16 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <gz-phone
v-model="optionsObj.phone1" v-model="optionsObj.phone1"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('UserPhone1')" :label="$ay.t('UserPhone1')"
ref="phone1" ref="phone1"
data-cy="phone1" data-cy="phone1"
type="tel"
:error-messages="form().serverErrors(this, 'phone1')" :error-messages="form().serverErrors(this, 'phone1')"
@input="fieldValueChanged('phone1')" @input="fieldValueChanged('phone1')"
></v-text-field> ></gz-phone>
</v-col> </v-col>
<v-col <v-col
@@ -270,17 +268,16 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <gz-phone
v-model="optionsObj.phone2" v-model="optionsObj.phone2"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('UserPhone2')" :label="$ay.t('UserPhone2')"
ref="phone2" ref="phone2"
data-cy="phone2" data-cy="phone2"
type="tel"
:error-messages="form().serverErrors(this, 'phone2')" :error-messages="form().serverErrors(this, 'phone2')"
@input="fieldValueChanged('phone2')" @input="fieldValueChanged('phone2')"
></v-text-field> ></gz-phone>
</v-col> </v-col>
<v-col <v-col
@@ -290,17 +287,16 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <gz-phone
v-model="optionsObj.phone3" v-model="optionsObj.phone3"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('UserPageAddress')" :label="$ay.t('UserPageAddress')"
ref="phone3" ref="phone3"
data-cy="phone3" data-cy="phone3"
type="tel"
:error-messages="form().serverErrors(this, 'phone3')" :error-messages="form().serverErrors(this, 'phone3')"
@input="fieldValueChanged('phone3')" @input="fieldValueChanged('phone3')"
></v-text-field> ></gz-phone>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">

View File

@@ -19,7 +19,7 @@
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field <gz-email
v-model="obj.emailAddress" v-model="obj.emailAddress"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('UserEmailAddress')" :label="$ay.t('UserEmailAddress')"
@@ -27,8 +27,7 @@
ref="emailAddress" ref="emailAddress"
@input="fieldValueChanged('emailAddress')" @input="fieldValueChanged('emailAddress')"
data-cy="emailAddress" data-cy="emailAddress"
type="email" ></gz-email>
></v-text-field>
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'Phone1')" v-if="form().showMe(this, 'Phone1')"
@@ -37,17 +36,16 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <gz-phone
v-model="obj.phone1" v-model="obj.phone1"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('UserPhone1')" :label="$ay.t('UserPhone1')"
ref="phone1" ref="phone1"
data-cy="phone1" data-cy="phone1"
type="tel"
:error-messages="form().serverErrors(this, 'phone1')" :error-messages="form().serverErrors(this, 'phone1')"
@input="fieldValueChanged('phone1')" @input="fieldValueChanged('phone1')"
></v-text-field> ></gz-phone>
</v-col> </v-col>
<v-col <v-col
@@ -57,17 +55,16 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <gz-phone
v-model="obj.phone2" v-model="obj.phone2"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('UserPhone2')" :label="$ay.t('UserPhone2')"
ref="phone2" ref="phone2"
data-cy="phone2" data-cy="phone2"
type="tel"
:error-messages="form().serverErrors(this, 'phone2')" :error-messages="form().serverErrors(this, 'phone2')"
@input="fieldValueChanged('phone2')" @input="fieldValueChanged('phone2')"
></v-text-field> ></gz-phone>
</v-col> </v-col>
<v-col <v-col
@@ -77,17 +74,16 @@
lg="4" lg="4"
xl="3" xl="3"
> >
<v-text-field <gz-phone
v-model="obj.phone3" v-model="obj.phone3"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:disabled="formState.readOnly" :disabled="formState.readOnly"
:label="$ay.t('UserPageAddress')" :label="$ay.t('UserPageAddress')"
ref="phone3" ref="phone3"
data-cy="phone3" data-cy="phone3"
type="tel"
:error-messages="form().serverErrors(this, 'phone3')" :error-messages="form().serverErrors(this, 'phone3')"
@input="fieldValueChanged('phone3')" @input="fieldValueChanged('phone3')"
></v-text-field> ></gz-phone>
</v-col> </v-col>
<v-col cols="12" sm="6" lg="4" xl="3"> <v-col cols="12" sm="6" lg="4" xl="3">
@@ -178,6 +174,7 @@
</template> </template>
<script> <script>
import EmailControl from "../components/email-control.vue";
///////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* Xeslint-disable */ /* Xeslint-disable */
//////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -222,7 +219,7 @@ export default {
beforeDestroy() { beforeDestroy() {
window.$gz.eventBus.$off("menu-click", clickHandler); window.$gz.eventBus.$off("menu-click", clickHandler);
}, },
components: {}, components: { EmailControl },
data() { data() {
return { return {
formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY, formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,