From 8e7d92d5ea29785ebaa5fb3435623463faa9a601 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 11 Jun 2021 19:52:15 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 4 ++ .../components/work-order-item-expenses.vue | 58 ++++++++----------- .../src/components/work-order-item-units.vue | 58 +++---------------- ayanova/src/views/svc-workorder.vue | 2 +- 4 files changed, 39 insertions(+), 83 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 8c6cc203..135731c1 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -385,6 +385,10 @@ todo: many biz objects are not using new PUT methodology CURRENTLY DOING: Work order notifications - PartRequested +todo: add unit required rule to backend woitemunits selection +todo: search workorder tree for front end required and other rules then replicate at back end, some are missing and moer will be missing after below blocks of new wo issues fixed + + bugbug: new wokrorder adding new item of any kind doesn't trigger dirty bugubg: completely fresh workorder riddled with errors when attempting to create one of each type of record diff --git a/ayanova/src/components/work-order-item-expenses.vue b/ayanova/src/components/work-order-item-expenses.vue index 734c812c..7f390c02 100644 --- a/ayanova/src/components/work-order-item-expenses.vue +++ b/ayanova/src/components/work-order-item-expenses.vue @@ -99,22 +99,18 @@ :disabled="isDeleted" :label="$ay.t('WorkOrderItemExpenseName')" :ref=" - `Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].name` + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].name` " :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].name` + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].name` ) " @input=" - fieldValueChanged(`Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].name`) + fieldValueChanged( + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].name` + ) " > @@ -154,9 +150,9 @@ ) ]" @input=" - fieldValueChanged(`Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].totalCost`) + fieldValueChanged( + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].totalCost` + ) " > @@ -197,9 +193,9 @@ ) ]" @input=" - fieldValueChanged(`Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].chargeAmount`) + fieldValueChanged( + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].chargeAmount` + ) " > @@ -230,9 +226,9 @@ ) " @change=" - fieldValueChanged(`Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].chargeToCustomer`) + fieldValueChanged( + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].chargeToCustomer` + ) " > @@ -272,9 +268,9 @@ ) ]" @input=" - fieldValueChanged(`Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].taxPaid`) + fieldValueChanged( + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].taxPaid` + ) " > @@ -341,9 +337,9 @@ ) " @change=" - fieldValueChanged(`Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].reimburseUser`) + fieldValueChanged( + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].reimburseUser` + ) " > @@ -399,21 +395,17 @@ :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].description` + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].description` ) " :ref=" - `Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].description` + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].description` " data-cy="expenseDescription" @input=" - fieldValueChanged(`Items[${activeWoItemIndex}].expenses[ - ${activeItemIndex} - ].description`) + fieldValueChanged( + `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].description` + ) " auto-grow > diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue index 15bec40a..a26251ed 100644 --- a/ayanova/src/components/work-order-item-units.vue +++ b/ayanova/src/components/work-order-item-units.vue @@ -93,9 +93,7 @@ :rules="[ form().required( this, - `Items[${activeWoItemIndex}].units[ - ${activeItemIndex} - ].unitId` + `Items[${activeWoItemIndex}].units[${activeItemIndex}].unitId` ) ]" :error-messages=" @@ -124,9 +122,7 @@ :error-messages=" form().serverErrors( this, - `Items[${activeWoItemIndex}].units[ - ${activeItemIndex} - ].notes` + `Items[${activeWoItemIndex}].units[${activeItemIndex}].notes` ) " :ref=" @@ -136,9 +132,9 @@ " data-cy="unitUnitNotes" @input=" - fieldValueChanged(`Items[${activeWoItemIndex}].units[ - ${activeItemIndex} - ].notes`) + fieldValueChanged( + `Items[${activeWoItemIndex}].units[${activeItemIndex}].notes` + ) " auto-grow > @@ -238,47 +234,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////////// /* XXXeslint-disable */ //////////////////////////////////////////////////////////////////////////////////////////////////////////// -/* -l.Add(new FormField { TKey = "WorkOrderItemUnitNotes", FieldKey = "WorkOrderItemUnitNotes", TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "Unit", FieldKey = "WorkOrderItemUnit", TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemUnitTags", TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "Attachments", FieldKey = "WorkOrderItemUnitAttachments", TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom1", FieldKey = "WorkOrderItemUnitCustom1", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom2", FieldKey = "WorkOrderItemUnitCustom2", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom3", FieldKey = "WorkOrderItemUnitCustom3", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom4", FieldKey = "WorkOrderItemUnitCustom4", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom5", FieldKey = "WorkOrderItemUnitCustom5", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom6", FieldKey = "WorkOrderItemUnitCustom6", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom7", FieldKey = "WorkOrderItemUnitCustom7", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom8", FieldKey = "WorkOrderItemUnitCustom8", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom9", FieldKey = "WorkOrderItemUnitCustom9", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom10", FieldKey = "WorkOrderItemUnitCustom10", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom11", FieldKey = "WorkOrderItemUnitCustom11", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom12", FieldKey = "WorkOrderItemUnitCustom12", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom13", FieldKey = "WorkOrderItemUnitCustom13", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom14", FieldKey = "WorkOrderItemUnitCustom14", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom15", FieldKey = "WorkOrderItemUnitCustom15", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); -l.Add(new FormField { TKey = "WorkOrderItemUnitCustom16", FieldKey = "WorkOrderItemUnitCustom16", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); - -{ -"0": { -"id": 39, -"concurrency": 8129666, -"notes": "Saepe quos omnis fugiat aliquam amet animi sit dolorum voluptatibus.", -"wiki": null, -"customFields": null, -"tags": [], -"unitId": 2, -"unitViz": "86876317", -"isDirty": false, -"workOrderItemId": 20 -} -} - - -*/ export default { created() { this.setDefaultView(); @@ -353,6 +309,10 @@ export default { this.$emit("change"); this.selectedRow = [{ index: newIndex }]; this.activeItemIndex = newIndex; + //trigger rule breaking / validation + this.fieldValueChanged( + `Items[${this.activeWoItemIndex}].units[${this.activeItemIndex}].unitId` + ); }, unDeleteItem() { this.value.items[this.activeWoItemIndex].units[ diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue index eb3a70e9..16526219 100644 --- a/ayanova/src/views/svc-workorder.vue +++ b/ayanova/src/views/svc-workorder.vue @@ -14,7 +14,7 @@ data-cy="woHeader" @change="setDirty()" /> - {{ formState }} +