diff --git a/app/src/plugins/app@vendor/vue-cal/cell.vue b/app/src/plugins/app@vendor/vue-cal/cell.vue index 92fcd8d..97eeb57 100644 --- a/app/src/plugins/app@vendor/vue-cal/cell.vue +++ b/app/src/plugins/app@vendor/vue-cal/cell.vue @@ -65,6 +65,7 @@ transition-group.vuecal__cell( import Event from './event.vue' import tmUtils from '@/plugins/tm@_utils/tm.utils' import moment from 'moment' +import { mapGetters } from 'vuex' export default { inject: ['vuecal', 'utils', 'modules', 'view', 'domEvents'], @@ -265,7 +266,8 @@ export default { this.$events.emit('show-menu-modal', { time: time, - date: tmUtils.formatDateTimeForBackend(dateFrom) + date: tmUtils.formatDateTimeForBackend(dateFrom), + employee: this.user.id }) setTimeout(() => { @@ -308,6 +310,7 @@ export default { }, computed: { + ...mapGetters("auth", ["user"]), // Drag & drop module. dnd () { return this.modules.dnd diff --git a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue index 19298ca..71d6f23 100644 --- a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue +++ b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue @@ -64,7 +64,8 @@ export default { blocker: null, datepicker: null, starts_at_time: null, - ends_at_time: null + ends_at_time: null, + employee: null } }, @@ -112,9 +113,10 @@ export default { } else { this.blocker = {start: null } - if (blocker.starts_at_time && blocker.datepicker) { + if (blocker.starts_at_time && blocker.datepicker && blocker.employee_id) { this.datepicker = blocker.datepicker this.starts_at_time = blocker.starts_at_time + this.blocker.employee_id = blocker.employee_id } } } catch (error) { 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 43d394a..6657002 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 @@ -57,7 +57,7 @@ export default { this.$events.emit('show-subtask-modal', { subtask: { deadline: this.localData.date, - _deadline_time: this.localData.time, + _deadline_time: this.localData.time }, onTaskCreated: () => { this.closeModal() @@ -70,6 +70,7 @@ export default { blocker: { starts_at_time: this.localData.time, datepicker: this.localData.date, + employee_id: this.localData.employee }, onBlockerCreated: () => { this.closeModal() diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-employee.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-employee.vue index 8599a0b..a0a8c53 100644 --- a/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-employee.vue +++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-assigned-employee.vue @@ -15,6 +15,11 @@ {{ employee.name.charAt(0) + employee.surname.charAt(0) }}

+ diff --git a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue index 8b2aad9..a6604af 100644 --- a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue +++ b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue @@ -4,6 +4,7 @@ Kód projektu Názov + Deadline Trvanie Akcia @@ -14,6 +15,8 @@ {{ subtask.project_code }} {{ subtask.title ?? subtask.master_task?.name ?? subtask.master_task }} + {{ subtaskDeadline(subtask?.deadline) }} + {{ subtask.spent_time }} h

@@ -28,6 +31,8 @@