diff --git a/frontend/src/app/schedules/draggable-scheduler/draggable-scheduler.component.html b/frontend/src/app/schedules/draggable-scheduler/draggable-scheduler.component.html index 3e1412a..341ccd1 100644 --- a/frontend/src/app/schedules/draggable-scheduler/draggable-scheduler.component.html +++ b/frontend/src/app/schedules/draggable-scheduler/draggable-scheduler.component.html @@ -3,7 +3,14 @@
-

Monday, {{ viewDate | calendarDate:(view + 'ViewTitle'):'en':1 }}

+
+ + + +
+
+

Monday, {{ viewDate | calendarDate:(view + 'ViewTitle'):'en':1 }}

+
Schedule Strategy @@ -13,11 +20,13 @@
+

TZest

-
diff --git a/frontend/src/app/schedules/draggable-scheduler/draggable-scheduler.component.ts b/frontend/src/app/schedules/draggable-scheduler/draggable-scheduler.component.ts index 23e6ac5..b5a1e2f 100644 --- a/frontend/src/app/schedules/draggable-scheduler/draggable-scheduler.component.ts +++ b/frontend/src/app/schedules/draggable-scheduler/draggable-scheduler.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild} from '@angular/core'; +import {Component, OnInit, ViewChild} from '@angular/core'; import {NavigationLink, NavigationLinkListComponent} from "../../navigation-link-list/navigation-link-list.component"; import { AdvancedScheduleInfo, @@ -47,7 +47,7 @@ const colors: Record = { `, ], }) -export class DraggableSchedulerComponent { +export class DraggableSchedulerComponent implements OnInit{ defaultNavigationLinkPath: NavigationLink[] = [ { linkText: "Dashboard", @@ -104,6 +104,7 @@ export class DraggableSchedulerComponent { } ngOnInit() { + this.viewDate = moment().startOf('isoWeek').toDate() this.scheduleService.schedulesGet().subscribe({ next: resp => { resp.forEach(schedule => { @@ -282,4 +283,8 @@ export class DraggableSchedulerComponent { } } + + resetCalendarToToday() { + this.viewDate = moment().startOf('isoWeek').toDate(); + } } diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.css b/frontend/src/app/schedules/scheduler/scheduler.component.css index abdc086..cc03881 100644 --- a/frontend/src/app/schedules/scheduler/scheduler.component.css +++ b/frontend/src/app/schedules/scheduler/scheduler.component.css @@ -29,3 +29,20 @@ ::ng-deep .cal-event-title { white-space: normal; } + +.calendar-header { + display: flex; + align-items: center; +} + +.calendar-control { + display: flex; +} + +.calendar-header-title { + align-content: center; + flex-grow: 1; + flex-shrink: 0; + text-align: center; + margin-right: auto; +} diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.html b/frontend/src/app/schedules/scheduler/scheduler.component.html index c8456e3..b42cfbe 100644 --- a/frontend/src/app/schedules/scheduler/scheduler.component.html +++ b/frontend/src/app/schedules/scheduler/scheduler.component.html @@ -1,8 +1,15 @@
- +

Tets

-

Monday, {{ viewDate | calendarDate:(view + 'ViewTitle'):'en':1 }}

+
+ + + +
+
+

Monday, {{ viewDate | calendarDate:(view + 'ViewTitle'):'en':1 }}

+
Schedule Strategy diff --git a/frontend/src/app/schedules/scheduler/scheduler.component.ts b/frontend/src/app/schedules/scheduler/scheduler.component.ts index b71223d..c8799da 100644 --- a/frontend/src/app/schedules/scheduler/scheduler.component.ts +++ b/frontend/src/app/schedules/scheduler/scheduler.component.ts @@ -80,6 +80,7 @@ export class SchedulerComponent implements OnInit{ } ngOnInit(): void { + this.viewDate = moment().startOf('isoWeek').toDate(); this.activatedRoute.paramMap.subscribe(params => { if (params.has('taskgroupID')) { this.taskgroupID = Number(params.get('taskgroupID')); @@ -131,8 +132,6 @@ export class SchedulerComponent implements OnInit{ protected readonly CalendarView = CalendarView; timeClick(clickedDate: Date) { - - console.log(clickedDate) if(this.basicScheduler != undefined && this.scheduleStrategy === 1) { this.basicScheduler.setDate(clickedDate) } else if(this.advancedScheduler != undefined && this.scheduleStrategy === 3) { @@ -335,4 +334,8 @@ export class SchedulerComponent implements OnInit{ }) this.refresh.next(); } + resetCalendarToToday() { + this.viewDate = moment().startOf('isoWeek').toDate(); + } + }