narvey/productivity-nkh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(calendar): show no planned done tasks when they were done

Browse Source
This commit is contained in:
Johannes Millan 2021-04-03 21:33:50 +02:00
parent 72509af5d3
commit 02590f1d12
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/app/features/calendar/calendar.component.ts
View File

@ -195,7 +195,7 @@ export class CalendarComponent implements OnDestroy {
classNames.push('isCurrent');
}
return {
const base = {
title: task.title
+ ' '
+ msToString(task.timeSpent)
@ -210,24 +210,33 @@ export class CalendarComponent implements OnDestroy {
backgroundColor: task.projectId
? colorMap[task.projectId]
: colorMap[task.tagIds[0]],
...(task.plannedAt
? {
start: new Date(task.plannedAt),
end: new Date((task.isDone && task.doneOn)
? (task.plannedAt as number) + Math.max(timeSpentToday, CALENDAR_MIN_TASK_DURATION)
: (task.plannedAt as number) + Math.max(timeToGo, CALENDAR_MIN_TASK_DURATION)
),
}
: {
allDay: true,
// start: TD_STR,
duration: 2000000,
start: (task.isDone && task.doneOn) || Date.now(),
end: ((task.isDone && task.doneOn) || Date.now()) + timeToGo
}
),
};
if (task.plannedAt) {
return {
...base,
start: new Date(task.plannedAt),
end: new Date((task.isDone && task.doneOn)
? (task.plannedAt as number) + Math.max(timeSpentToday, CALENDAR_MIN_TASK_DURATION)
: (task.plannedAt as number) + Math.max(timeToGo, CALENDAR_MIN_TASK_DURATION)
),
};
} else if (task.isDone && task.doneOn) {
return {
...base,
start: task.doneOn - Math.max(timeSpentToday, CALENDAR_MIN_TASK_DURATION),
end: task.doneOn
};
} else {
return {
...base,
allDay: true,
// start: TD_STR,
duration: 2000000,
start: Date.now(),
end: Date.now() + timeToGo
};
}
});
// console.log(tasks, events);