From 508b66ca52eb48e666ea13019072a6d4c98c2e83 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 11 Feb 2022 19:15:23 +0000 Subject: [PATCH] add selected task group User option to fill in user automatically for assignment --- ayanova/devdocs/todo.txt | 6 ++---- ayanova/src/components/pm-item-tasks.vue | 19 +++++++++++++++--- ayanova/src/components/quote-item-tasks.vue | 20 ++++++++++++++++--- .../src/components/work-order-item-tasks.vue | 20 ++++++++++++++++--- 4 files changed, 52 insertions(+), 13 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 068c1faf..b776d29b 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -204,9 +204,7 @@ Coded by importance \_____|______|_____|______|_| \_| |_| -todo: 1 Restriced user is supposed to only be able to edit tehir own tasks but it's coded to allow them to view and attempt to edit other users task. -validation catches it but gives a cryptic error that the user is incorrect. TEchnically it's working but they shouuld not even see other users's tasks -when not assigned to them so this is a bug + todo: 1 Add task group allow to choose the User at same time or will have to assign them all which is fucked for a restricted user @@ -868,7 +866,7 @@ BUILD 8.0.0-beta.0.14 CHANGES OF NOTE - case 4112 added, also other changes that were on my list - native browser time control now shows the label - Help -> about added items to show settings for Dark mode and Use native browser date time inputs - +- work order item tasks cleaned up restricted user being able to edit other users tasks but then getting server error, now it just prevents any edit also in UI diff --git a/ayanova/src/components/pm-item-tasks.vue b/ayanova/src/components/pm-item-tasks.vue index dcbff20b..7fccdc0b 100644 --- a/ayanova/src/components/pm-item-tasks.vue +++ b/ayanova/src/components/pm-item-tasks.vue @@ -291,6 +291,14 @@ :label="$ay.t('TaskGroupList')" data-cy="selectedTaskGroup" > + {{ @@ -337,7 +345,9 @@ export default { activeItemIndex: null, selectedRow: [], taskGroupDialog: false, - selectedTaskGroup: null + selectedTaskGroup: null, + selectedTaskGroupUser: null, + selectedTaskGroupUserName: null }; }, computed: { @@ -524,12 +534,12 @@ export default { task: z.task, status: 1, //incomplete==1 statusViz: incompleteViz, - completedByUserId: null, + completedByUserId: this.selectedTaskGroupUser, completedDate: null, isDirty: true, pmItemId: this.value.items[this.activeWoItemIndex].id, uid: Date.now(), - completedByUserViz: null + completedByUserViz: this.selectedTaskGroupUserName }); }); this.$emit("change"); @@ -656,6 +666,9 @@ export default { ret += this.form().tableRowErrorClass(); } return ret; + }, + selectedTaskGroupUserChange(newName) { + this.selectedTaskGroupUserName = newName; } } }; diff --git a/ayanova/src/components/quote-item-tasks.vue b/ayanova/src/components/quote-item-tasks.vue index 5ce1e8ee..8428ae80 100644 --- a/ayanova/src/components/quote-item-tasks.vue +++ b/ayanova/src/components/quote-item-tasks.vue @@ -291,6 +291,15 @@ :label="$ay.t('TaskGroupList')" data-cy="selectedTaskGroup" > + + {{ @@ -337,7 +346,9 @@ export default { activeItemIndex: null, selectedRow: [], taskGroupDialog: false, - selectedTaskGroup: null + selectedTaskGroup: null, + selectedTaskGroupUser: null, + selectedTaskGroupUserName: null }; }, computed: { @@ -521,12 +532,12 @@ export default { task: z.task, status: 1, //incomplete==1 statusViz: incompleteViz, - completedByUserId: null, + completedByUserId: this.selectedTaskGroupUser, completedDate: null, isDirty: true, quoteItemId: this.value.items[this.activeWoItemIndex].id, uid: Date.now(), - completedByUserViz: null + completedByUserViz: this.selectedTaskGroupUserName }); }); this.$emit("change"); @@ -653,6 +664,9 @@ export default { ret += this.form().tableRowErrorClass(); } return ret; + }, + selectedTaskGroupUserChange(newName) { + this.selectedTaskGroupUserName = newName; } } }; diff --git a/ayanova/src/components/work-order-item-tasks.vue b/ayanova/src/components/work-order-item-tasks.vue index 6cd8ead9..619017a1 100644 --- a/ayanova/src/components/work-order-item-tasks.vue +++ b/ayanova/src/components/work-order-item-tasks.vue @@ -302,6 +302,15 @@ :label="$ay.t('TaskGroupList')" data-cy="selectedTaskGroup" > + + {{ @@ -349,7 +358,9 @@ export default { activeItemIndex: null, selectedRow: [], taskGroupDialog: false, - selectedTaskGroup: null + selectedTaskGroup: null, + selectedTaskGroupUser: null, + selectedTaskGroupUserName: null }; }, computed: { @@ -535,12 +546,12 @@ export default { task: z.task, status: 1, //incomplete==1 statusViz: incompleteViz, - completedByUserId: null, + completedByUserId: this.selectedTaskGroupUser, completedDate: null, isDirty: true, workOrderItemId: this.value.items[this.activeWoItemIndex].id, uid: Date.now(), - completedByUserViz: null + completedByUserViz: this.selectedTaskGroupUserName }); }); this.$emit("change"); @@ -667,6 +678,9 @@ export default { ret += this.form().tableRowErrorClass(); } return ret; + }, + selectedTaskGroupUserChange(newName) { + this.selectedTaskGroupUserName = newName; } } };