From 89df5d7a11564f13406f91d0cc7cf95dc2582a0c Mon Sep 17 00:00:00 2001 From: JakubPapso Date: Wed, 14 Feb 2024 20:55:40 +0100 Subject: [PATCH 1/2] [team calendar] priradenie vsetkych celnov teamu z kalendaru --- app/src/plugins/app@vendor/vue-cal/cell.vue | 6 +++++- app/src/plugins/tm@dashboard/_components/z-timeline.vue | 1 + app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue | 3 ++- app/src/plugins/tm@modal/task/z-task-modal.vue | 6 ++---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/plugins/app@vendor/vue-cal/cell.vue b/app/src/plugins/app@vendor/vue-cal/cell.vue index 20ce66b..e0e47f7 100644 --- a/app/src/plugins/app@vendor/vue-cal/cell.vue +++ b/app/src/plugins/app@vendor/vue-cal/cell.vue @@ -264,10 +264,13 @@ export default { const time = moment(dateFrom).format('HH:mm') + const isTeamCalendar = this.$route.name === 'Dashboard - Teams' + const employees = isTeamCalendar ? JSON.parse(JSON.stringify(this.teams.find(team => team.id == localStorage.getItem('selectedTeam')).employees)) : [this.user] + this.$events.emit('show-menu-modal', { time: time, date: tmUtils.formatDateTimeForBackend(dateFrom), - employee: this.user.id + employees }) setTimeout(() => { @@ -311,6 +314,7 @@ export default { computed: { ...mapGetters("auth", ["user"]), + ...mapGetters('tm', ['teams']), // Drag & drop module. dnd () { return this.modules.dnd diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue index 790d58b..d6d5226 100644 --- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue @@ -349,6 +349,7 @@ export default { }, editTask({subtask}) { + console.log('edit task') this.$events.emit('show-subtask-modal', {subtask}) }, diff --git a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue index 2c69a44..f46efff 100644 --- a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue +++ b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue @@ -54,11 +54,12 @@ export default { }, createTask() { + console.log(this.localData.date, this.localData.time, this.localData.employees) this.$events.emit('show-subtask-modal', { subtask: { deadline: this.localData.date, _deadline_time: this.localData.time, - employee_id: this.localData.employee + employees: this.localData.employees }, onTaskCreated: () => { this.closeModal() diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue index 9ed9324..37b9b64 100644 --- a/app/src/plugins/tm@modal/task/z-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-task-modal.vue @@ -241,7 +241,6 @@ export default { }, async showModal({ subtask, editMode = false, mastertask = {} }) { - console.log(subtask) this.isSaving = false this.subtask = null this.visible = true @@ -272,11 +271,10 @@ export default { } else { this.subtask = { master_task: mastertask, employees: [{}], _deadline_time: '17:00' } - if (subtask?.deadline && subtask._deadline_time && subtask.employee_id) { - const employee = this.enrichedEmployees.find(employee => employee.id == subtask.employee_id) - this.subtask.employees = [employee] + if (subtask?.deadline && subtask._deadline_time && subtask.employees?.length) { this.subtask.deadline = subtask.deadline this.subtask._deadline_time = subtask._deadline_time + this.subtask.employees = subtask.employees } if(subtask?.master_task_id && subtask?.project_code) { From 2f9e7eee71903094d4858e8a23b0d1262d668924 Mon Sep 17 00:00:00 2001 From: JakubPapso Date: Sun, 18 Feb 2024 20:43:31 +0100 Subject: [PATCH 2/2] [team calendar] prefill only one employee --- app/src/plugins/app@vendor/vue-cal/cell.vue | 13 ++++++------- .../plugins/tm@dashboard/_components/z-timeline.vue | 1 - .../tm@modal/task-cell/z-show-menu-modal.vue | 2 +- app/src/plugins/tm@modal/task/z-task-modal.vue | 5 +++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/src/plugins/app@vendor/vue-cal/cell.vue b/app/src/plugins/app@vendor/vue-cal/cell.vue index e0e47f7..674c665 100644 --- a/app/src/plugins/app@vendor/vue-cal/cell.vue +++ b/app/src/plugins/app@vendor/vue-cal/cell.vue @@ -257,7 +257,7 @@ export default { onCellClick(DOMEvent, split) { if (DOMEvent.offsetY > 950 && DOMEvent.offsetY < 1700) { - const dateFrom = split.date + const dateFrom = split.date dateFrom.setHours(Math.floor(DOMEvent.offsetY / 100), 0, 0, 0) const dateTo = new Date(dateFrom) dateTo.setHours(dateFrom.getHours() + 1) @@ -265,12 +265,12 @@ export default { const time = moment(dateFrom).format('HH:mm') const isTeamCalendar = this.$route.name === 'Dashboard - Teams' - const employees = isTeamCalendar ? JSON.parse(JSON.stringify(this.teams.find(team => team.id == localStorage.getItem('selectedTeam')).employees)) : [this.user] + const employee = isTeamCalendar ? split.employee_id : this.user.id - this.$events.emit('show-menu-modal', { - time: time, - date: tmUtils.formatDateTimeForBackend(dateFrom), - employees + this.$events.emit('show-menu-modal', { + time, + date: tmUtils.formatDateTimeForBackend(dateFrom), + employee }) setTimeout(() => { @@ -314,7 +314,6 @@ export default { computed: { ...mapGetters("auth", ["user"]), - ...mapGetters('tm', ['teams']), // Drag & drop module. dnd () { return this.modules.dnd diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue index d6d5226..790d58b 100644 --- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue +++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue @@ -349,7 +349,6 @@ export default { }, editTask({subtask}) { - console.log('edit task') this.$events.emit('show-subtask-modal', {subtask}) }, diff --git a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue index f46efff..5109319 100644 --- a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue +++ b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue @@ -59,7 +59,7 @@ export default { subtask: { deadline: this.localData.date, _deadline_time: this.localData.time, - employees: this.localData.employees + employee_id: this.localData.employee }, onTaskCreated: () => { this.closeModal() diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue index 37b9b64..9a1ca39 100644 --- a/app/src/plugins/tm@modal/task/z-task-modal.vue +++ b/app/src/plugins/tm@modal/task/z-task-modal.vue @@ -271,10 +271,11 @@ export default { } else { this.subtask = { master_task: mastertask, employees: [{}], _deadline_time: '17:00' } - if (subtask?.deadline && subtask._deadline_time && subtask.employees?.length) { + if (subtask?.deadline && subtask._deadline_time && subtask.employee_id) { + const employee = this.enrichedEmployees.find(employee => employee.id == subtask.employee_id) + this.subtask.employees = [employee] this.subtask.deadline = subtask.deadline this.subtask._deadline_time = subtask._deadline_time - this.subtask.employees = subtask.employees } if(subtask?.master_task_id && subtask?.project_code) {