From 892777791f5815aa8202ecce5b7a2676eb270a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Tue, 18 Apr 2023 01:08:17 +0200 Subject: [PATCH] [Unscheduled time] Unscheduled time fix --- app/src/plugins/tm@dashboard/tasks/tasks.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue index 3e2dd91..3e3858f 100644 --- a/app/src/plugins/tm@dashboard/tasks/tasks.vue +++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue @@ -87,14 +87,17 @@ export default { } 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 - const todayCapacityMinutes = this.user.work_end * 60 - workStart - unscheduledTime = todayCapacityMinutes - schedulesCapacityBySplit[i + 1] < 0 ? 0 : todayCapacityMinutes - schedulesCapacityBySplit[i + 1] + const workStart = this.user.work_start * 60 > elapsedMinutes ? this.user.work_start : elapsedMinutes + const todayCapacityMinutes = (this.user.work_end - workStart) * 60 + unscheduledTime = todayCapacityMinutes - schedulesCapacityBySplit[i + 1] / 60 < 0 ? 0 : todayCapacityMinutes - schedulesCapacityBySplit[i + 1] } else { // Future unscheduledTime = dailyCapacityMinutes - schedulesCapacityBySplit[i + 1] } + if (isNaN(unscheduledTime)) + unscheduledTime = dailyCapacityMinutes + days.push({ id: i + 1, fullname: `${this.filter.employee.name} ${this.filter.employee.surname}`,