From e3b1460c83a1f25e0a096c8c7a9d44936bdbbd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Thu, 13 Apr 2023 23:05:08 +0200 Subject: [PATCH] [Unscheduled time] Added unscheduled time to tasks and teams --- .../tasks/_components/a-tasks-filter.vue | 10 ++-- app/src/plugins/tm@dashboard/tasks/tasks.vue | 19 +++--- .../teams/_components/a-team-filter.vue | 16 ++--- .../teams/_mixins/TeamsCalendar.mixin.ts | 60 ++++++++++++++++--- app/src/plugins/tm@dashboard/teams/teams.vue | 7 ++- 5 files changed, 78 insertions(+), 34 deletions(-) diff --git a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue index 3b92502..45d6b68 100644 --- a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue +++ b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue @@ -38,9 +38,9 @@ export default { emits: ['filter-changed'], props: { - unscheduledTime: { - type: Number, - default: () => 0 + splitDays: { + type: [Array, null], + default: () => null } }, @@ -101,8 +101,8 @@ export default { this._emitFilterChanged() }, - unscheduledTime() { - this.time = this.unscheduledTime + splitDays() { + this.time = this.splitDays.map(day => parseFloat(day.unscheduledTime)).reduce((acc, val) => acc + val, 0) } } } diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue index b6d7aca..dcfd29f 100644 --- a/app/src/plugins/tm@dashboard/tasks/tasks.vue +++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue @@ -1,6 +1,6 @@ @@ -54,7 +54,7 @@ export default { // Ignore elapsed task return } - else if (now.isAfter(moment(task._real_start) && now.isBefore(moment(task._real_end)))) { + else if (now.isAfter(moment(task._real_start)) && now.isBefore(moment(task._real_end))) { // Task in progress schedulesCapacityBySplit[task.split] += timelineUtils._getDifferenceInMinutes(task._real_end, new Date()) } @@ -64,13 +64,10 @@ export default { } }) - - - schedulesCapacityBySplit[1] = 0 // Set YESTERDAY value to 0 this.timelineData.homeoffices.forEach(task => { - homeoffice[task.split] = true + homeoffice[task.split - 1] = true }) for (let i = 0; i < 7; i++) { @@ -79,10 +76,12 @@ export default { let unscheduledTime - if (i == 0) { + const date = moment(addDays(this.filter.start, i)) + + if (date.isBefore(moment(), 'days')) { // Yesterday unscheduledTime = 0 - } else if (i == 1) { + } else if (date.isSame(moment(), 'days')) { // Today const elapsedMinutes = now.diff(now.clone().startOf('day'), 'minutes') const workStart = this.user.work_start * 60 > elapsedMinutes ? this.user.workStart : elapsedMinutes @@ -93,8 +92,6 @@ export default { unscheduledTime = dailyCapacityMinutes - schedulesCapacityBySplit[i + 1] } - console.log(unscheduledTime) - days.push({ id: i + 1, fullname: `${this.filter.employee.name} ${this.filter.employee.surname}`, @@ -106,8 +103,6 @@ export default { }) } - console.log(days) - return days }, diff --git a/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue b/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue index d9ae81f..d73739b 100644 --- a/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue +++ b/app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue @@ -38,9 +38,9 @@ export default { emits: ['filter-changed'], props: { - unscheduledTime: { - type: Number, - default: () => 0 + splitDays: { + type: [Array, null], + default: () => null } }, @@ -60,7 +60,7 @@ export default { computed: { ...mapGetters('auth', ['user']), - ...mapGetters('tm', ['teams']), + ...mapGetters('tm', ['teams']) }, mounted() { @@ -83,8 +83,8 @@ export default { _updateFilters() { this.filter.start = this.date - this.filter.end = this.date - // this.filter.end = addDays(this.date, 1) + // this.filter.end = this.date + this.filter.end = addDays(this.date, 1) this.selectedDate = String(this.filter.start?.toLocaleDateString('sk-SK')) this._emitFilterChanged() @@ -103,8 +103,8 @@ export default { this._emitFilterChanged() }, - unscheduledTime() { - this.time = this.unscheduledTime + splitDays() { + this.time = this.splitDays.map(day => parseFloat(day.unscheduledTime)).reduce((acc, val) => acc + val, 0) } } } diff --git a/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts b/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts index 265af7e..d623f98 100644 --- a/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts +++ b/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts @@ -11,10 +11,7 @@ export default { const blockers = this._generateBlockers() - console.log([...this._generateNonWorking(), ...this._generateTasks(), ...blockers.filter(blocker => blocker.type != 'home_office')]) - return { - unscheduledTime: 333, tasks: [...this._generateNonWorking(), ...this._generateTasks(), ...blockers.filter(blocker => blocker.type != 'home_office')], homeoffices: [...blockers.filter(blocker => blocker.type == 'home_office')] } @@ -23,15 +20,30 @@ export default { splitDays() { const days = [] const homeoffice = {} + const now = moment() this.filter.team.employees.forEach((employee, index) => { - let workingHours = 0 + const selectedDate = moment(this.filter.start) + const capacityMinutes = this._getRemainingWorkCapacityMinutes(employee) + let scheduledCapacityMinutes = 0 this.calendarData.tasks.forEach(task => { - if ((task.subtask?.employee?.id != employee.id) && (task.blocker?.employee?.id != employee.id)) + // console.log(task) + if ((task.subtask?.employee_id != employee.id) && (task.blocker?.employee?.id != employee.id)) return - workingHours += timelineUtils._getDifferenceInHours(task.end, task.start) + if (task.type == 'non-working-hours' || task.subtask?.is_finished || task.blocker?.is_finished) + return + + if (selectedDate.isBefore(moment(), 'days')) { + // Past + return + } else if (selectedDate.isSame(moment(), 'days')) { + // Today + + } else { + scheduledCapacityMinutes += timelineUtils._getDifferenceInMinutes(task._real_end, task._real_start) + } }) this.calendarData.homeoffices.forEach(task => { @@ -40,12 +52,14 @@ export default { homeoffice[task.split] = true }) + const unscheduledTime = capacityMinutes - scheduledCapacityMinutes + days.push({ id: index + 1, name: employee.name, fullname: `${employee.name} ${employee.surname}`, initials: employee.name.charAt(0).toUpperCase() + employee.surname.charAt(0).toUpperCase(), - unscheduledTime: workingHours, + unscheduledTime: unscheduledTime > 0 ? (unscheduledTime / 60).toFixed(1) : 0, isHomeoffice: homeoffice[index + 1] ? true : false }) }) @@ -122,8 +136,11 @@ export default { initials: employee?.name?.charAt(0)?.toUpperCase() + employee?.surname?.charAt(0)?.toUpperCase(), split: split, project_code: subtask.project_code, + type: 'subtask', subtask, - _timeblock_id: timeblock.id + _timeblock_id: timeblock.id, + _real_start: new Date(timeblock.start), + _real_end: new Date(timeblock.end) }) } }) @@ -157,6 +174,8 @@ export default { color: '#B00020', draggable: false, isWeekend: moment(blocker.start).day() % 6 == 0, + _real_start: new Date(blocker.start), + _real_end: new Date(blocker.end) }) }) @@ -173,6 +192,31 @@ export default { _setMinutesToDate(minutes, date = new Date(this.filter.start)) { date.setHours(Math.floor(minutes / 60), minutes % 60, 0, 0) return date + }, + + _getRemainingWorkCapacityMinutes(employee) { + const date = moment(this.filter.start) + const now = moment() + + if (now.isAfter(date, 'days')) { + // Past dates + return 0 + } else if (now.isBefore(date, 'days')) { + // Future dates + return (employee.work_end - employee.work_start) * 60 + } + + // Today + const workStartMinutes = employee.work_start * 60 + const workEndMinutes = employee.work_end * 60 + const elapsedMinutesOfCurrenyDay = now.diff(moment().startOf('day'), 'minutes') + + if (workStartMinutes > elapsedMinutesOfCurrenyDay) + return workEndMinutes - workStartMinutes + else if (workEndMinutes < elapsedMinutesOfCurrenyDay) + return 0 + else + return workEndMinutes - elapsedMinutesOfCurrenyDay } } } \ No newline at end of file diff --git a/app/src/plugins/tm@dashboard/teams/teams.vue b/app/src/plugins/tm@dashboard/teams/teams.vue index ba20d31..908912a 100644 --- a/app/src/plugins/tm@dashboard/teams/teams.vue +++ b/app/src/plugins/tm@dashboard/teams/teams.vue @@ -1,6 +1,6 @@ @@ -10,6 +10,7 @@ import ATeamFilter from './_components/a-team-filter.vue' import ZTimeline from '@/plugins/tm@dashboard/_components/z-timeline.vue' import moment from 'moment' import TeamsCalendar from './_mixins/TeamsCalendar.mixin' +import { mapGetters } from 'vuex' export default { mixins: [TeamsCalendar], @@ -31,6 +32,10 @@ export default { } }, + computed: { + ...mapGetters('auth', ['user']), + }, + mounted() { this.$events.on('on-subtask-edited', () => { this.onFilterChanged(this.filter)