From 38ea746cfcb803f3c37761567fbffd1616704933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Wed, 25 Jun 2025 15:07:37 +0200 Subject: [PATCH] fix(calendar): enhance task filtering logic and update date handling in scheduled capacity calculation --- .../tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 0443c37..785c65c 100644 --- a/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts +++ b/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts @@ -28,11 +28,10 @@ export default { let totalScheduledTime = 0 this.calendarData.tasks.forEach(task => { - // console.log(task) if ((task.subtask?.employee_id != employee.id) && (task.blocker?.employee?.id != employee.id)) return - if (task.type == 'non-working-hours' || task.subtask?.is_finished || task.blocker?.is_finished) + if (task.type == 'non-working-hours' || task.subtask?.is_finished || task.blocker?.is_finished || task.isBlocker) return if (selectedDate.isBefore(moment(), 'days')) { @@ -51,7 +50,7 @@ export default { if (isTaskCurrentlyInProgress) { scheduledCapacityMinutes += timelineUtils._getDifferenceInMinutes( - moment(), + new Date(), task._real_end, ); } else if (isTaskInFuture) {