From 63e205e6d1dba7fa2ceac8f64f60dcdc6d04d51b Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 17 Aug 2021 22:14:24 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 5 ++- ayanova/src/api/ayanova-version.js | 2 +- ayanova/src/components/pm-header.vue | 8 ++--- ayanova/src/components/pm-items.vue | 36 ++++++++++---------- ayanova/src/components/quote-header.vue | 8 ++--- ayanova/src/components/quote-items.vue | 36 ++++++++++---------- ayanova/src/components/work-order-header.vue | 8 ++--- ayanova/src/components/work-order-items.vue | 36 ++++++++++---------- ayanova/src/views/customer-csr-edit.vue | 4 +-- ayanova/src/views/svc-csr.vue | 4 +-- ayanova/src/views/svc-workorder.vue | 22 ++++++------ 11 files changed, 86 insertions(+), 83 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 7c941f9f..9cd80a69 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -871,6 +871,9 @@ BUILD CHANGES OF NOTE BUILD 120 - +- v8 migrate + PM implemented + Quote implemented +- Fixed bug where workorderitem priority and workorderItemStatus were not being saved properly for quotes and PM's diff --git a/ayanova/src/api/ayanova-version.js b/ayanova/src/api/ayanova-version.js index 195e0236..50192719 100644 --- a/ayanova/src/api/ayanova-version.js +++ b/ayanova/src/api/ayanova-version.js @@ -1,4 +1,4 @@ export default { - version: "8.0.0-alpha.120", + version: "8.0.0-alpha.121", copyright: "© 1999-2021, Ground Zero Tech-Works Inc." }; diff --git a/ayanova/src/components/pm-header.vue b/ayanova/src/components/pm-header.vue index f7c6cb36..049e3828 100644 --- a/ayanova/src/components/pm-header.vue +++ b/ayanova/src/components/pm-header.vue @@ -567,8 +567,8 @@ Example workorder tags: [], pmId: 10, techNotes: "technotes", - workorderItemStatusId: null, - workorderItemPriorityId: null, + workOrderItemStatusId: null, + workOrderItemPriorityId: null, requestDate: "2021-05-29T21:25:31.421011Z", warrantyService: false, isDirty: false, @@ -615,8 +615,8 @@ Example workorder tags: [], pmId: 10, techNotes: "technotes", - workorderItemStatusId: null, - workorderItemPriorityId: null, + workOrderItemStatusId: null, + workOrderItemPriorityId: null, requestDate: "2021-05-29T21:25:31.421011Z", warrantyService: false, isDirty: false, diff --git a/ayanova/src/components/pm-items.vue b/ayanova/src/components/pm-items.vue index dac91c0c..91f8a788 100644 --- a/ayanova/src/components/pm-items.vue +++ b/ayanova/src/components/pm-items.vue @@ -313,10 +313,10 @@ xl="3" > @@ -369,10 +369,10 @@ xl="3" > @@ -833,8 +833,8 @@ export default { tags: [], pmId: this.value.id, techNotes: null, - workorderItemStatusId: null, - workorderItemPriorityId: null, + workOrderItemStatusId: null, + workOrderItemPriorityId: null, requestDate: null, warrantyService: false, sequence: newIndex + 1, //indexes are zero based but sequences are visible to user so 1 based @@ -923,13 +923,13 @@ export default { handleEditItemStatusClick: function() { window.$gz.eventBus.$emit("openobject", { type: window.$gz.type.WorkOrderItemStatus, - id: this.value.items[this.activeItemIndex].workorderItemStatusId + id: this.value.items[this.activeItemIndex].workOrderItemStatusId }); }, handleEditItemPriorityClick: function() { window.$gz.eventBus.$emit("openobject", { type: window.$gz.type.WorkOrderItemPriority, - id: this.value.items[this.activeItemIndex].workorderItemPriorityId + id: this.value.items[this.activeItemIndex].workOrderItemPriorityId }); }, form() { @@ -1043,8 +1043,8 @@ export default { itemList: function() { return this.value.items .map((x, i) => { - const stat = statusViz(x.workorderItemStatusId, this); - const prior = priorityViz(x.workorderItemPriorityId, this); + const stat = statusViz(x.workOrderItemStatusId, this); + const prior = priorityViz(x.workOrderItemPriorityId, this); return { index: i, id: x.id, @@ -1066,14 +1066,14 @@ export default { }, selectableStatusList: function() { const selectedId = this.value.items[this.activeItemIndex] - .workorderItemStatusId; + .workOrderItemStatusId; return this.pvm.selectLists.woItemStatus.filter(s => { return s.active == true || s.id == selectedId; }); }, selectablePriorityList: function() { const selectedId = this.value.items[this.activeItemIndex] - .workorderItemPriorityId; + .workOrderItemPriorityId; return this.pvm.selectLists.woItemPriorities.filter(s => { return s.active == true || s.id == selectedId; }); diff --git a/ayanova/src/components/quote-header.vue b/ayanova/src/components/quote-header.vue index b9285e2f..7c54f3bd 100644 --- a/ayanova/src/components/quote-header.vue +++ b/ayanova/src/components/quote-header.vue @@ -578,8 +578,8 @@ Example workorder tags: [], quoteId: 10, techNotes: "technotes", - workorderItemStatusId: null, - workorderItemPriorityId: null, + workOrderItemStatusId: null, + workOrderItemPriorityId: null, requestDate: "2021-05-29T21:25:31.421011Z", warrantyService: false, isDirty: false, @@ -626,8 +626,8 @@ Example workorder tags: [], quoteId: 10, techNotes: "technotes", - workorderItemStatusId: null, - workorderItemPriorityId: null, + workOrderItemStatusId: null, + workOrderItemPriorityId: null, requestDate: "2021-05-29T21:25:31.421011Z", warrantyService: false, isDirty: false, diff --git a/ayanova/src/components/quote-items.vue b/ayanova/src/components/quote-items.vue index afe9e549..706da49f 100644 --- a/ayanova/src/components/quote-items.vue +++ b/ayanova/src/components/quote-items.vue @@ -313,10 +313,10 @@ xl="3" > @@ -369,10 +369,10 @@ xl="3" > @@ -833,8 +833,8 @@ export default { tags: [], quoteId: this.value.id, techNotes: null, - workorderItemStatusId: null, - workorderItemPriorityId: null, + workOrderItemStatusId: null, + workOrderItemPriorityId: null, requestDate: null, warrantyService: false, sequence: newIndex + 1, //indexes are zero based but sequences are visible to user so 1 based @@ -923,13 +923,13 @@ export default { handleEditItemStatusClick: function() { window.$gz.eventBus.$emit("openobject", { type: window.$gz.type.WorkOrderItemStatus, - id: this.value.items[this.activeItemIndex].workorderItemStatusId + id: this.value.items[this.activeItemIndex].workOrderItemStatusId }); }, handleEditItemPriorityClick: function() { window.$gz.eventBus.$emit("openobject", { type: window.$gz.type.WorkOrderItemPriority, - id: this.value.items[this.activeItemIndex].workorderItemPriorityId + id: this.value.items[this.activeItemIndex].workOrderItemPriorityId }); }, form() { @@ -1043,8 +1043,8 @@ export default { itemList: function() { return this.value.items .map((x, i) => { - const stat = statusViz(x.workorderItemStatusId, this); - const prior = priorityViz(x.workorderItemPriorityId, this); + const stat = statusViz(x.workOrderItemStatusId, this); + const prior = priorityViz(x.workOrderItemPriorityId, this); return { index: i, id: x.id, @@ -1066,14 +1066,14 @@ export default { }, selectableStatusList: function() { const selectedId = this.value.items[this.activeItemIndex] - .workorderItemStatusId; + .workOrderItemStatusId; return this.pvm.selectLists.woItemStatus.filter(s => { return s.active == true || s.id == selectedId; }); }, selectablePriorityList: function() { const selectedId = this.value.items[this.activeItemIndex] - .workorderItemPriorityId; + .workOrderItemPriorityId; return this.pvm.selectLists.woItemPriorities.filter(s => { return s.active == true || s.id == selectedId; }); diff --git a/ayanova/src/components/work-order-header.vue b/ayanova/src/components/work-order-header.vue index 779b1deb..78b1247c 100644 --- a/ayanova/src/components/work-order-header.vue +++ b/ayanova/src/components/work-order-header.vue @@ -545,8 +545,8 @@ Example workorder tags: [], workOrderId: 10, techNotes: "technotes", - workorderItemStatusId: null, - workorderItemPriorityId: null, + workOrderItemStatusId: null, + workOrderItemPriorityId: null, requestDate: "2021-05-29T21:25:31.421011Z", warrantyService: false, isDirty: false, @@ -593,8 +593,8 @@ Example workorder tags: [], workOrderId: 10, techNotes: "technotes", - workorderItemStatusId: null, - workorderItemPriorityId: null, + workOrderItemStatusId: null, + workOrderItemPriorityId: null, requestDate: "2021-05-29T21:25:31.421011Z", warrantyService: false, isDirty: false, diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue index 57256484..441443fa 100644 --- a/ayanova/src/components/work-order-items.vue +++ b/ayanova/src/components/work-order-items.vue @@ -343,10 +343,10 @@ xl="3" > @@ -399,10 +399,10 @@ xl="3" > @@ -976,8 +976,8 @@ export default { tags: [], workOrderId: this.value.id, techNotes: null, - workorderItemStatusId: null, - workorderItemPriorityId: null, + workOrderItemStatusId: null, + workOrderItemPriorityId: null, requestDate: null, warrantyService: false, sequence: newIndex + 1, //indexes are zero based but sequences are visible to user so 1 based @@ -1067,13 +1067,13 @@ export default { handleEditItemStatusClick: function() { window.$gz.eventBus.$emit("openobject", { type: window.$gz.type.WorkOrderItemStatus, - id: this.value.items[this.activeItemIndex].workorderItemStatusId + id: this.value.items[this.activeItemIndex].workOrderItemStatusId }); }, handleEditItemPriorityClick: function() { window.$gz.eventBus.$emit("openobject", { type: window.$gz.type.WorkOrderItemPriority, - id: this.value.items[this.activeItemIndex].workorderItemPriorityId + id: this.value.items[this.activeItemIndex].workOrderItemPriorityId }); }, form() { @@ -1215,8 +1215,8 @@ and it's probably not a big list to fill anyway itemList: function() { return this.value.items .map((x, i) => { - const stat = statusViz(x.workorderItemStatusId, this); - const prior = priorityViz(x.workorderItemPriorityId, this); + const stat = statusViz(x.workOrderItemStatusId, this); + const prior = priorityViz(x.workOrderItemPriorityId, this); return { index: i, id: x.id, @@ -1238,14 +1238,14 @@ and it's probably not a big list to fill anyway }, selectableStatusList: function() { const selectedId = this.value.items[this.activeItemIndex] - .workorderItemStatusId; + .workOrderItemStatusId; return this.pvm.selectLists.woItemStatus.filter(s => { return s.active == true || s.id == selectedId; }); }, selectablePriorityList: function() { const selectedId = this.value.items[this.activeItemIndex] - .workorderItemPriorityId; + .workOrderItemPriorityId; return this.pvm.selectLists.woItemPriorities.filter(s => { return s.active == true || s.id == selectedId; }); diff --git a/ayanova/src/views/customer-csr-edit.vue b/ayanova/src/views/customer-csr-edit.vue index 2d4ec798..613128c1 100644 --- a/ayanova/src/views/customer-csr-edit.vue +++ b/ayanova/src/views/customer-csr-edit.vue @@ -346,7 +346,7 @@ export default { "dateRequested": "2020-01-10T18:20:31.294229Z", "customerId": 28, "unitId": null, - "workorderItemId": null, + "workOrderItemId": null, "requestedByUserId": 48, "customerReferenceNumber": "65560804", "status": 0, @@ -365,7 +365,7 @@ export default { dateRequested: window.$gz.locale.nowUTC8601String(), customerId: null, unitId: null, - workorderItemId: null, + workOrderItemId: null, requestedByUserId: null, //window.$gz.store.state.userId, for outside version of this form customerReferenceNumber: null, status: 0, diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue index 862913b3..4ce68a88 100644 --- a/ayanova/src/views/svc-csr.vue +++ b/ayanova/src/views/svc-csr.vue @@ -344,7 +344,7 @@ export default { "dateRequested": "2020-01-10T18:20:31.294229Z", "customerId": 28, "unitId": null, - "workorderItemId": null, + "workOrderItemId": null, "requestedByUserId": 48, "customerReferenceNumber": "65560804", "status": 0, @@ -363,7 +363,7 @@ export default { dateRequested: window.$gz.locale.nowUTC8601String(), customerId: null, unitId: null, - workorderItemId: null, + workOrderItemId: null, requestedByUserId: null, //window.$gz.store.state.userId, for outside version of this form customerReferenceNumber: null, status: 0, diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue index 468d2c62..54fd59ee 100644 --- a/ayanova/src/views/svc-workorder.vue +++ b/ayanova/src/views/svc-workorder.vue @@ -975,46 +975,46 @@ async function saveItems(vm) { //fields to update if post if (isPost) { vm.obj.items[i].id = res.data.id; - vm.obj.items[i].workorderId = res.data.workorderId; + vm.obj.items[i].workOrderId = res.data.workOrderId; //walk all unsaved children and set the workorder item id so they can save vm.obj.items[i].units.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); vm.obj.items[i].scheduledUsers.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); vm.obj.items[i].tasks.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); vm.obj.items[i].parts.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); vm.obj.items[i].partRequests.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); vm.obj.items[i].labors.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); vm.obj.items[i].travels.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); vm.obj.items[i].expenses.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); vm.obj.items[i].loans.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); vm.obj.items[i].outsideServices.forEach( - z => (z.workorderItemId = vm.obj.items[i].id) + z => (z.workOrderItemId = vm.obj.items[i].id) ); } }