ayanova/src/components/quote-header.vue

@@ -59,7 +59,7 @@
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('QuotePreparedByID')"
           data-cy="preparedById"
-          :error-messages="form().serverErrors(this, 'QuotePreparedByID')"
+          :error-messages="form().serverErrors(this, 'preparedById')"
           @input="fieldValueChanged('preparedById')"
         ></gz-pick-list>
       </v-col>
@@ -120,7 +120,7 @@
           v-model="value.introduction"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('QuoteIntroduction')"
-          :error-messages="form().serverErrors(this, 'QuoteIntroduction')"
+          :error-messages="form().serverErrors(this, 'introduction')"
           data-cy="introduction"
           auto-grow
           @input="fieldValueChanged('introduction')"
@@ -141,7 +141,7 @@
           v-model="value.notes"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('WorkOrderSummary')"
-          :error-messages="form().serverErrors(this, 'WorkOrderSummary')"
+          :error-messages="form().serverErrors(this, 'notes')"
           data-cy="notes"
           auto-grow
           @input="fieldValueChanged('notes')"
@@ -167,7 +167,7 @@
           :label="$ay.t('QuoteQuoteRequestDate')"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           data-cy="requested"
-          :error-messages="form().serverErrors(this, 'QuoteQuoteRequestDate')"
+          :error-messages="form().serverErrors(this, 'requested')"
           @input="fieldValueChanged('requested')"
         ></gz-date-time-picker>
       </v-col>
@@ -191,7 +191,7 @@
           :label="$ay.t('QuoteValidUntilDate')"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           data-cy="validUntil"
-          :error-messages="form().serverErrors(this, 'QuoteValidUntilDate')"
+          :error-messages="form().serverErrors(this, 'validUntil')"
           @input="fieldValueChanged('validUntil')"
         ></gz-date-time-picker>
       </v-col>
@@ -215,7 +215,7 @@
           :label="$ay.t('QuoteDateSubmitted')"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           data-cy="submitted"
-          :error-messages="form().serverErrors(this, 'QuoteDateSubmitted')"
+          :error-messages="form().serverErrors(this, 'submitted')"
           @input="fieldValueChanged('submitted')"
         ></gz-date-time-picker>
       </v-col>
@@ -239,7 +239,7 @@
           :label="$ay.t('QuoteDateApproved')"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           data-cy="approved"
-          :error-messages="form().serverErrors(this, 'QuoteDateApproved')"
+          :error-messages="form().serverErrors(this, 'approved')"
           @input="fieldValueChanged('approved')"
         ></gz-date-time-picker>
       </v-col>
@@ -265,7 +265,7 @@
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('Contract')"
           data-cy="contractId"
-          :error-messages="form().serverErrors(this, 'Contract')"
+          :error-messages="form().serverErrors(this, 'contractId')"
           @input="fieldValueChanged('contractId')"
         ></gz-pick-list>
       </v-col>
@@ -291,7 +291,7 @@
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('Project')"
           data-cy="projectId"
-          :error-messages="form().serverErrors(this, 'Project')"
+          :error-messages="form().serverErrors(this, 'projectId')"
           @input="fieldValueChanged('projectId')"
         ></gz-pick-list>
       </v-col>
@@ -314,9 +314,7 @@
           "
           :label="$ay.t('WorkOrderCustomerContactName')"
           data-cy="customerContactName"
-          :error-messages="
+          :error-messages="form().serverErrors(this, 'customerContactName')"
-            form().serverErrors(this, 'WorkOrderCustomerContactName')
-          "
           @input="fieldValueChanged('customerContactName')"
         ></v-text-field>
       </v-col>
@@ -340,9 +338,7 @@
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('WorkOrderCustomerReferenceNumber')"
           data-cy="customerReferenceNumber"
-          :error-messages="
+          :error-messages="form().serverErrors(this, 'customerReferenceNumber')"
-            form().serverErrors(this, 'WorkOrderCustomerReferenceNumber')
-          "
           @input="fieldValueChanged('customerReferenceNumber')"
         ></v-text-field>
       </v-col>
@@ -366,9 +362,7 @@
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('WorkOrderInternalReferenceNumber')"
           data-cy="internalReferenceNumber"
-          :error-messages="
+          :error-messages="form().serverErrors(this, 'internalReferenceNumber')"
-            form().serverErrors(this, 'WorkOrderInternalReferenceNumber')
-          "
           @input="fieldValueChanged('internalReferenceNumber')"
         ></v-text-field>
       </v-col>

ayanova/src/components/quote-items.vue

@@ -267,10 +267,7 @@
             :disabled="isDeleted"
             :label="$ay.t('WorkOrderItemTechNotes')"
             :error-messages="
-              form().serverErrors(
+              form().serverErrors(this, `items[${activeItemIndex}].techNotes`)
-                this,
-                `items[${activeItemIndex}].WorkOrderItemTechNotes`
-              )
             "
             data-cy="items.techNotes"
             auto-grow
@@ -296,10 +293,7 @@
             :disabled="isDeleted"
             data-cy="requestDate"
             :error-messages="
-              form().serverErrors(
+              form().serverErrors(this, `items[${activeItemIndex}].requestDate`)
-                this,
-                `items[${activeItemIndex}].WorkOrderItemRequestDate`
-              )
             "
             @input="fieldValueChanged('requestDate')"
           ></gz-date-time-picker>
@@ -327,7 +321,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `items[${activeItemIndex}].WorkOrderItemWorkOrderStatusID`
+                `items[${activeItemIndex}].workOrderItemStatusId`
               )
             "
             data-cy="workOrderItemStatusId"
@@ -383,7 +377,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `items[${activeItemIndex}].WorkOrderItemPriorityID`
+                `items[${activeItemIndex}].workOrderItemPriorityId`
               )
             "
             data-cy="workOrderItemPriorityId"
@@ -456,10 +450,7 @@
             :readonly="formState.readOnly"
             data-cy="tags"
             :error-messages="
-              form().serverErrors(
+              form().serverErrors(this, `items[${activeItemIndex}].tags`)
-                this,
-                `items[${activeItemIndex}].WorkOrderItemTags`
-              )
             "
             @input="fieldValueChanged('tags')"
           ></gz-tag-picker>

ayanova/src/components/work-order-items.vue

@@ -348,7 +348,7 @@
 
         <v-col
           v-if="
-            form().showMe(this, 'WorkOrderItemStatusId') &&
+            form().showMe(this, 'WorkOrderItemWorkOrderStatusID') &&
               !value.userIsRestrictedType
           "
           cols="12"
@@ -789,7 +789,7 @@ export default {
       });
 
       if (
-        this.form().showMe(this, "WorkOrderItemStatusId") &&
+        this.form().showMe(this, "WorkOrderItemWorkOrderStatusID") &&
         !this.value.userIsRestrictedType
       ) {
         headers.push({