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

feat(calendar): improve duration

Browse Source
This commit is contained in:
Johannes Millan 2020-12-25 20:29:26 +01:00
parent c3a6359fe2
commit 7e62de3f93
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import { EventInput } from '@fullcalendar/common';
import { WorkContextService } from '../work-context/work-context.service';
import { TaskService } from '../tasks/task.service';
import { TaskWithReminderData } from '../tasks/task.model';
import { getWorklogStr } from '../../util/get-work-log-str';
const MIN_TASK_DURATION = 30 * 60 * 1000;
@ -83,12 +84,16 @@ export class CalendarComponent {
calOptions$: Observable<CalendarOptions> = this._scheduledTaskService.allScheduledTasks$.pipe(
withLatestFrom(this._workContextService.allWorkContextColors$),
map(([tasks, colorMap]): CalendarOptions => {
const TD_STR = getWorklogStr();
const events: EventInput[] = tasks.map((task) => {
const timeToGo: number = (task.timeEstimate - task.timeSpent);
console.log(timeToGo / 60000, ((timeToGo > (MIN_TASK_DURATION))
? timeToGo
: MIN_TASK_DURATION) / 60000);
let timeToGo: number = (task.timeEstimate - task.timeSpent);
const timeSpentToday = task.timeSpentOnDay[TD_STR] || 0;
if (timeToGo < timeSpentToday) {
timeToGo = timeSpentToday;
}
// console.log(timeToGo / 60000, ((timeToGo > (MIN_TASK_DURATION))
// ? timeToGo
// : MIN_TASK_DURATION) / 60000);
return {
title: task.title,
start: task.reminderData.remindAt,