JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(calendar): enhance task filtering logic and update date handling in scheduled capacity calculation

Browse Source
This commit is contained in:
Matej Glasnák committed 2025-06-25 15:07:37 +02:00
1 parent ec0e46d986
commit 38ea746cfc
1 file changed
+2 -3
Download Patch File Download Diff File Expand all files Collapse all files
app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
+2 -3
View File
@@ -28,11 +28,10 @@ export default {
let totalScheduledTime = 0 let totalScheduledTime = 0
this.calendarData.tasks.forEach(task => { this.calendarData.tasks.forEach(task => {
// console.log(task)
if ((task.subtask?.employee_id != employee.id) && (task.blocker?.employee?.id != employee.id)) if ((task.subtask?.employee_id != employee.id) && (task.blocker?.employee?.id != employee.id))
return 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 return
if (selectedDate.isBefore(moment(), 'days')) { if (selectedDate.isBefore(moment(), 'days')) {
@@ -51,7 +50,7 @@ export default {
if (isTaskCurrentlyInProgress) { if (isTaskCurrentlyInProgress) {
scheduledCapacityMinutes += scheduledCapacityMinutes +=
timelineUtils._getDifferenceInMinutes( timelineUtils._getDifferenceInMinutes(
moment(), new Date(),
task._real_end, task._real_end,
); );
} else if (isTaskInFuture) { } else if (isTaskInFuture) {