From 9d20335c590d91290c1149894e72c60104a9c6e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Sun, 17 Mar 2024 12:04:59 +0100 Subject: [PATCH] Visualize Upcoming Deadlines (use default view) --- .../upcoming-deadlines-overview.component.css | 28 ------------------- ...upcoming-deadlines-overview.component.html | 17 ++--------- .../upcoming-deadlines-overview.component.ts | 25 ++++++++++++++++- 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.css b/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.css index 4321d61..06d0baa 100644 --- a/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.css +++ b/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.css @@ -24,31 +24,3 @@ .undecorated-link:hover { color: #3498db; } - -.cal-event-title { - color: black; - margin-left: 5px; - - white-space: nowrap; - display: inline-block; -} - -.cal-event-circle { - width: 10px; /* Beispielgröße für den Kreis */ - height: 10px; /* Beispielgröße für den Kreis */ - border-radius: 50%; - display: inline-block; - background-color: #1e90ff; - vertical-align: top; /* Vertikale Ausrichtung zentrieren */ -} - -.event { - display: block; - align-items: center; - margin-bottom: 10px; -} - - -.cal-cell-content { - width: calc(100% - 20px); /* Breite der Zelle abzüglich des linken Randes für den Titel */ -} diff --git a/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.html b/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.html index 29540b4..6483b0a 100644 --- a/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.html +++ b/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.html @@ -1,21 +1,8 @@
- -
- {{ day.badgeTotal }} - {{ day.date | calendarDate:'monthViewDayNumber':locale }} -
-
-
-
-
-
{{ event.title }}
-
-
-
-
-
diff --git a/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.ts b/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.ts index 62e4eee..8fbcc89 100644 --- a/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.ts +++ b/frontend/src/app/upcoming-deadlines-overview/upcoming-deadlines-overview.component.ts @@ -24,9 +24,24 @@ export class UpcomingDeadlinesOverviewComponent implements OnInit{ } ] - events: CalendarEvent[] = [] + events: CalendarEvent[] = [{ + title: "testdkjawfwekjdbjfbjsekdhwadvsjfbsadgascbsdadkawsdjkasfc", + start: moment("2024-03-18").toDate(), + end: moment("2024-03-18").toDate(), + resizable: { + beforeStart: false, + afterEnd: false + }, + draggable: false, + allDay: true, + color: { + primary: '#1e90ff', + secondary: '#D1E8FF', + } + }] viewDate = new Date() refresh: Subject = new Subject() + activeDayIsOpen = false; constructor(private taskService: TaskService) { } @@ -57,4 +72,12 @@ export class UpcomingDeadlinesOverviewComponent implements OnInit{ } }) } + + dayClicked({ date, events }: { date: Date; events: CalendarEvent[] }): void { + if (moment(date).isSame(this.viewDate, 'month')) { + this.activeDayIsOpen = !((moment(date).isSame(this.viewDate, 'day') && this.activeDayIsOpen) || + events.length === 0); + this.viewDate = date; + } + } }