This commit is contained in:
2020-12-16 19:27:22 +00:00
parent 618b200241
commit 3d68166662
2 changed files with 70 additions and 57 deletions

View File

@@ -5,6 +5,9 @@
MISC ITEMS THAT CAME UP
todo: vendor edit form has locale keys from headoffice, check all recent, may be more, memo etc
todo: newer objects use full translation key for form field definitions but some forms have abbreviated or lower case for ShowMe() code, double check recent
todo: NEXT DEPLOY TO DEVOPS attach a photo from phone, no error just does nothing
worked here locally latest build
retest on server after next deploy

View File

@@ -3,7 +3,6 @@
<gz-report-selector ref="reportSelector"></gz-report-selector>
<div v-if="formState.ready">
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-form ref="form">
<v-row>
<v-col cols="12" sm="6" lg="4" xl="3">
@@ -38,7 +37,7 @@
</v-col>
<v-col
v-if="form().showMe(this, 'AccountNumber')"
v-if="form().showMe(this, 'ProjectAccountNumber')"
cols="12"
sm="6"
lg="4"
@@ -55,7 +54,65 @@
></v-text-field>
</v-col>
<v-col
v-if="form().showMe(this, 'ProjectProjectOverseerID')"
cols="12"
sm="6"
lg="4"
xl="3"
>
<gz-pick-list
:ayaType="ayaTypes().User"
:variant="'inside'"
:showEditIcon="true"
v-model="obj.projectOverseerId"
:readonly="formState.readOnly"
:label="$ay.t('ProjectProjectOverseerID')"
ref="projectOverseerId"
data-cy="projectOverseerId"
:error-messages="form().serverErrors(this, 'projectOverseerId')"
@input="fieldValueChanged('projectOverseerId')"
></gz-pick-list>
</v-col>
<v-col
v-if="form().showMe(this, 'ProjectDateStarted')"
cols="12"
sm="6"
lg="4"
xl="3"
>
<gz-date-time-picker
:label="$ay.t('ProjectDateStarted')"
v-model="obj.dateStarted"
:readonly="formState.readOnly"
ref="dateStarted"
testId="dateStarted"
:error-messages="form().serverErrors(this, 'dateStarted')"
@input="fieldValueChanged('dateStarted')"
></gz-date-time-picker>
</v-col>
<v-col
v-if="form().showMe(this, 'ProjectDateCompleted')"
cols="12"
sm="6"
lg="4"
xl="3"
>
<gz-date-time-picker
:label="$ay.t('ProjectDateCompleted')"
:rules="[
form().datePrecedence(this, 'dateStarted', 'dateCompleted')
]"
:error-messages="form().serverErrors(this, 'dateCompleted')"
v-model="obj.dateCompleted"
:readonly="formState.readOnly"
ref="dateCompleted"
testId="dateCompleted"
@input="fieldValueChanged('dateCompleted')"
></gz-date-time-picker>
</v-col>
<!-- --------------------------------- -->
<v-col v-if="form().showMe(this, 'Notes')" cols="12">
<v-textarea
@@ -70,10 +127,6 @@
></v-textarea>
</v-col>
<v-col v-if="form().showMe(this, 'Tags')" cols="12">
<gz-tag-picker
v-model="obj.tags"
@@ -212,29 +265,12 @@ export default {
wiki: null,
customFields: "{}",
tags: [],
webAddress: null,
popUpNotes: null,
contactNotes: null,
contact: null,
accountNumber: null,
phone1: null,
phone2: null,
phone3: null,
phone4: null,
phone5: null,
emailAddress: null,
postAddress: null,
postCity: null,
postRegion: null,
postCountry: null,
postCode: null,
address: null,
city: null,
region: null,
country: null,
latitude: null,
longitude: null
dateStarted: window.$gz.locale.nowUTC8601String(),
dateCompleted: null,
projectOverseerId: null,
accountNumber: null
},
tab: 0,
formState: {
ready: false,
@@ -754,36 +790,10 @@ async function fetchTranslatedText(vm) {
"Project",
"ProjectName",
"ProjectNotes",
"WebAddress",
"ProjectPopUpNotes",
"ProjectBillHeadOffice",
"HeadOffice",
"ProjectTechNotes",
"ProjectAccountNumber",
"ProjectContact",
"ProjectContactNotes",
"ProjectPhone1",
"ProjectPhone2",
"ProjectPhone3",
"ProjectPhone4",
"ProjectPhone5",
"ProjectEmail",
"AddressTypePhysical",
"AddressTypePostal",
"AddressCopyToPostal",
"AddressCopyToPhysical",
"Address",
"AddressPostalDeliveryAddress",
"AddressPostalCity",
"AddressPostalStateProv",
"AddressPostalCountry",
"AddressPostalPostal",
"AddressDeliveryAddress",
"AddressCity",
"AddressStateProv",
"AddressCountry",
"AddressLatitude",
"AddressLongitude",
"ProjectProjectOverseerID",
"ProjectDateStarted",
"ProjectDateCompleted",
"ProjectCustom1",
"ProjectCustom2",
"ProjectCustom3",