diff --git a/ayanova/src/components/work-order-item-loans.vue b/ayanova/src/components/work-order-item-loans.vue index ba26364f..94207bd5 100644 --- a/ayanova/src/components/work-order-item-loans.vue +++ b/ayanova/src/components/work-order-item-loans.vue @@ -180,7 +180,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].quantity` + `Items[${activeWoItemIndex}].loans[${activeItemIndex}].quantity` ) " > @@ -351,7 +351,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].priceOverride` + `Items[${activeWoItemIndex}].loans[${activeItemIndex}].priceOverride` ) " > @@ -368,16 +368,14 @@ :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].notes` + `Items[${activeWoItemIndex}].loans[${activeItemIndex}].notes` ) " - :ref=" - `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].notes` - " + :ref="`Items[${activeWoItemIndex}].loans[${activeItemIndex}].notes`" data-cy="loanUnitNotes" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].notes` + `Items[${activeWoItemIndex}].loans[${activeItemIndex}].notes` ) " auto-grow diff --git a/ayanova/src/components/work-order-item-outside-services.vue b/ayanova/src/components/work-order-item-outside-services.vue index caaee9fe..9bdf4caa 100644 --- a/ayanova/src/components/work-order-item-outside-services.vue +++ b/ayanova/src/components/work-order-item-outside-services.vue @@ -161,17 +161,17 @@ :disabled="isDeleted" :label="$ay.t('WorkOrderItemOutsideServiceRMANumber')" :ref=" - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].rmaNumber` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].rmaNumber` " :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].rmaNumber` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].rmaNumber` ) " @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].rmaNumber` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].rmaNumber` ) " > @@ -210,7 +210,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].repairCost` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairCost` ) " > @@ -250,7 +250,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].repairPrice` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairPrice` ) " > @@ -312,17 +312,17 @@ :disabled="isDeleted" :label="$ay.t('WorkOrderItemOutsideServiceTrackingNumber')" :ref=" - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].trackingNumber` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].trackingNumber` " :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].trackingNumber` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].trackingNumber` ) " @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].trackingNumber` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].trackingNumber` ) " > @@ -361,7 +361,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].shippingCost` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingCost` ) " > @@ -401,7 +401,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].shippingPrice` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingPrice` ) " > @@ -557,16 +557,16 @@ :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].notes` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].notes` ) " :ref=" - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].notes` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].notes` " data-cy="outsideServiceNotes" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].notes` + `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].notes` ) " auto-grow diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue index 22095889..06612a07 100644 --- a/ayanova/src/components/work-order-item-parts.vue +++ b/ayanova/src/components/work-order-item-parts.vue @@ -107,7 +107,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].quantity` + `Items[${activeWoItemIndex}].parts[${activeItemIndex}].quantity` ) " > @@ -226,7 +226,7 @@ " @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].description` + `Items[${activeWoItemIndex}].parts[${activeItemIndex}].description` ) " > @@ -302,7 +302,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].priceOverride` + `Items[${activeWoItemIndex}].parts[${activeItemIndex}].priceOverride` ) " > @@ -319,16 +319,16 @@ :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].serials` + `Items[${activeWoItemIndex}].parts[${activeItemIndex}].serials` ) " :ref=" - `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].serials` + `Items[${activeWoItemIndex}].parts[${activeItemIndex}].serials` " data-cy="partSerials" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].serials` + `Items[${activeWoItemIndex}].parts[${activeItemIndex}].serials` ) " auto-grow diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue index dd91734d..5060539e 100644 --- a/ayanova/src/components/work-order-item-scheduled-users.vue +++ b/ayanova/src/components/work-order-item-scheduled-users.vue @@ -183,7 +183,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].scheduledUsers[ ${activeItemIndex} ].estimatedQuantity` + `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].estimatedQuantity` ) " > diff --git a/ayanova/src/components/work-order-item-tasks.vue b/ayanova/src/components/work-order-item-tasks.vue index 14a178c3..3dd36a25 100644 --- a/ayanova/src/components/work-order-item-tasks.vue +++ b/ayanova/src/components/work-order-item-tasks.vue @@ -93,23 +93,23 @@ :disabled="isDeleted" :label="$ay.t('Sequence')" :ref=" - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].sequence` " :rules="[ form().integerValid( this, - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].sequence` ) ]" :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].sequence` ) " @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].sequence` ) " type="number" @@ -139,24 +139,24 @@ :disabled="isDeleted" :label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')" :ref=" - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].status` " data-cy="usertype" :rules="[ form().integerValid( this, - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].status` ) ]" :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].status` ) " @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].status` ) " @change="statusChange" @@ -242,16 +242,20 @@ :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].task` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].task` ) " - :ref=" - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].task` - " + :rules="[ + form().required( + this, + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].tasks` + ) + ]" + :ref="`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].task`" data-cy="expenseDescription" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].task` + `Items[${activeWoItemIndex}].tasks[${activeItemIndex}].task` ) " auto-grow @@ -473,7 +477,7 @@ export default { const hasError = this.form().childRowHasError( this, - `Items[${this.activeWoItemIndex}].Expenses[${item.index}].` + `Items[${this.activeWoItemIndex}].Tasks[${item.index}].` ); if (isDeleted) { diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue index 79239290..14a079ea 100644 --- a/ayanova/src/components/work-order-item-travels.vue +++ b/ayanova/src/components/work-order-item-travels.vue @@ -181,7 +181,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelRateQuantity` + `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelRateQuantity` ) " > @@ -297,7 +297,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].noChargeQuantity` + `Items[${activeWoItemIndex}].travels[${activeItemIndex}].noChargeQuantity` ) " > @@ -373,7 +373,7 @@ ]" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].priceOverride` + `Items[${activeWoItemIndex}].travels[${activeItemIndex}].priceOverride` ) " > @@ -394,16 +394,16 @@ :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelDetails` + `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelDetails` ) " :ref=" - `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelDetails` + `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelDetails` " data-cy="traveltravelDetails" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelDetails` + `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelDetails` ) " auto-grow diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue index 7cf2f1b5..2658d640 100644 --- a/ayanova/src/components/work-order-item-units.vue +++ b/ayanova/src/components/work-order-item-units.vue @@ -125,9 +125,7 @@ `Items[${activeWoItemIndex}].units[${activeItemIndex}].notes` ) " - :ref=" - `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].notes` - " + :ref="`Items[${activeWoItemIndex}].units[${activeItemIndex}].notes`" data-cy="unitUnitNotes" @input=" fieldValueChanged( @@ -146,15 +144,13 @@ :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].tags` + `Items[${activeWoItemIndex}].units[${activeItemIndex}].tags` ) " - :ref=" - `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].tags` - " + :ref="`Items[${activeWoItemIndex}].units[${activeItemIndex}].tags`" @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].tags` + `Items[${activeWoItemIndex}].units[${activeItemIndex}].tags` ) " > @@ -170,18 +166,18 @@ :parent-v-m="this" key-start-with="WorkOrderItemUnitCustom" :ref=" - `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].customFields` + `Items[${activeWoItemIndex}].units[${activeItemIndex}].customFields` " data-cy="unitCustomFields" :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].customFields` + `Items[${activeWoItemIndex}].units[${activeItemIndex}].customFields` ) " @input=" fieldValueChanged( - `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].customFields` + `Items[${activeWoItemIndex}].units[${activeItemIndex}].customFields` ) " > @@ -191,14 +187,12 @@