From a19eb1870e8d07c13cb9df22143427ef1b0486c6 Mon Sep 17 00:00:00 2001 From: "Sams, Roland" Date: Sun, 27 Oct 2024 22:21:25 +0100 Subject: [PATCH] fix notifications --- .../termin-details.component.ts | 3 + src/app/helpers/util-functions.ts | 14 +- src/app/services/user-notification.service.ts | 258 +++++++++--------- .../mkj-user-notifications.component.html | 41 +-- .../mkj-user-notifications.component.ts | 5 + 5 files changed, 173 insertions(+), 148 deletions(-) diff --git a/src/app/components/termine/termin-details/termin-details.component.ts b/src/app/components/termine/termin-details/termin-details.component.ts index daae92dc..68d86058 100644 --- a/src/app/components/termine/termin-details/termin-details.component.ts +++ b/src/app/components/termine/termin-details/termin-details.component.ts @@ -67,11 +67,14 @@ export class TerminDetailsComponent implements OnInit { ngOnInit(): void { this.route.params.subscribe((e) => { + this.loading = true; + this.termin = null; this.termineApiService.getById(e.id).subscribe( (ausrueckung) => { this.termin = ausrueckung; this.updateToolbarButtons(); this.getGespielteNoten(); + this.loading = false; }, (error) => this.infoService.error(error), () => (this.loading = false) diff --git a/src/app/helpers/util-functions.ts b/src/app/helpers/util-functions.ts index 82baf10d..89dd561d 100644 --- a/src/app/helpers/util-functions.ts +++ b/src/app/helpers/util-functions.ts @@ -1,11 +1,13 @@ -import { MkjDropdownOption } from "../utilities/form-input-components/mkj-dropdown/mkj-dropdown.component"; +import { + MkjDropdownOption +} from '../utilities/form-input-components/mkj-dropdown/mkj-dropdown.component'; export abstract class UtilFunctions { public static getDropdownOptionsFromEnum( enumObject: any ): MkjDropdownOption[] { return Object.entries(enumObject).map((entry) => { - return { label: entry[0], value: entry[1] }; + return {label: entry[0], value: entry[1]}; }); } @@ -25,8 +27,8 @@ export abstract class UtilFunctions { } public static generateRandomHexColor(): string { - let color = "#"; - const possible = "0123456789ABCDEF"; + let color = '#'; + const possible = '0123456789ABCDEF'; for (let i = 0; i < 6; i++) { color += possible.charAt( @@ -38,7 +40,9 @@ export abstract class UtilFunctions { } public static isDarkBackground(backgroundColor: string): boolean { - if (!backgroundColor) return false; + if (!backgroundColor) { + return false; + } const color = backgroundColor.substring(1); // remove the leading '#' const r = parseInt(color.substring(0, 2), 16); const g = parseInt(color.substring(2, 4), 16); diff --git a/src/app/services/user-notification.service.ts b/src/app/services/user-notification.service.ts index 092799c2..d4cd0d99 100644 --- a/src/app/services/user-notification.service.ts +++ b/src/app/services/user-notification.service.ts @@ -1,148 +1,154 @@ -import { Injectable } from '@angular/core'; -import { UserNotificationAPIService } from './api/user-notifications-api.service'; -import { WebsocketService } from './api/websocket.service'; -import { SubSink } from 'subsink'; -import { UserNotification, UserNotificationType } from '../models/User-Notifications'; -import { BehaviorSubject, map } from 'rxjs'; -import { MenuItem } from 'primeng/api'; -import { Termin } from '../models/Termin'; -import { DatePipe } from '@angular/common'; -import { Router } from '@angular/router'; +import {Injectable} from '@angular/core'; +import {UserNotificationAPIService} from './api/user-notifications-api.service'; +import {WebsocketService} from './api/websocket.service'; +import {SubSink} from 'subsink'; +import {UserNotification, UserNotificationType} from '../models/User-Notifications'; +import {BehaviorSubject, map} from 'rxjs'; +import {MenuItem} from 'primeng/api'; +import {Termin} from '../models/Termin'; +import {DatePipe} from '@angular/common'; +import {Router} from '@angular/router'; import dayjs from 'dayjs'; @Injectable({ - providedIn: 'root', + providedIn: 'root', }) export class UserNotificationService { - private _userNotifications = new BehaviorSubject([]); - private _subs = new SubSink(); + private _userNotifications = new BehaviorSubject([]); + private _subs = new SubSink(); - public readonly userNotifications = this._userNotifications - .asObservable() - .pipe(map((notifications) => notifications.map((n) => this.mapNotificationToMenuItem(n)))); + public readonly userNotifications = this._userNotifications + .asObservable() + .pipe(map((notifications) => notifications.map((n) => this.mapNotificationToMenuItem(n)))); - constructor( - private apiService: UserNotificationAPIService, - private datePipe: DatePipe, - private router: Router, - webSocketService: WebsocketService - ) { - this.getUnreadNotifications(); + constructor( + private apiService: UserNotificationAPIService, + private datePipe: DatePipe, + private router: Router, + webSocketService: WebsocketService + ) { + this.getUnreadNotifications(); - this._subs.add( - webSocketService.getUserNotificationsChannel().subscribe((notification: UserNotification) => { - this.insertNotification(notification); - }) - ); - } + this._subs.add( + webSocketService.getUserNotificationsChannel().subscribe((notification: UserNotification) => { + this.insertNotification(notification); + }) + ); + } + + public markAllAsRead(): void { + this.apiService.markAllAsRead().subscribe(); + } - public addNotification(notification: UserNotification): void { - this.insertNotification(notification); - } + public addNotification(notification: UserNotification): void { + this.insertNotification(notification); + } - private insertNotification(notification: UserNotification): void { - if (notification.created_at == null) { - notification.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss'); + private insertNotification(notification: UserNotification): void { + if (notification.created_at == null) { + notification.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss'); + } + const notifications = this._userNotifications.value; + notifications.push(notification); + notifications.sort((a, b) => { + if (a.created_at < b.created_at) { + return 1; + } + if (a.created_at > b.created_at) { + return -1; + } + return 0; + }); + this._userNotifications.next(notifications); } - const notifications = this._userNotifications.value; - notifications.push(notification); - notifications.sort((a, b) => { - if (a.created_at < b.created_at) { - return 1; - } - if (a.created_at > b.created_at) { - return -1; - } - return 0; - }); - this._userNotifications.next(notifications); - } - private getUnreadNotifications(): void { - this.apiService.getUnreadNotifications().subscribe((notifications) => { - this._userNotifications.next(notifications); - }); - } + private getUnreadNotifications(): void { + this.apiService.getUnreadNotifications().subscribe((notifications) => { + this._userNotifications.next(notifications); + }); + } - private markAsRead(notification: UserNotification): void { - console.log(notification); - if (notification.type === UserNotificationType.SwUpdate || notification.type === UserNotificationType.TestSocket) { - this.removeNotification(notification); - return; + private markAsRead(notification: UserNotification): void { + if (notification.type === UserNotificationType.SwUpdate || notification.type === UserNotificationType.TestSocket) { + this.removeNotification(notification); + return; + } + this.apiService.markAsRead(notification.id).subscribe(() => { + this.removeNotification(notification); + }); } - this.apiService.markAsRead(notification.id).subscribe(() => { - this.removeNotification(notification); - }); - } - private removeNotification(notification: UserNotification): void { - const notifications = this._userNotifications.value.filter((n) => n.id !== notification.id); - this._userNotifications.next(notifications); - } + private removeNotification(notification: UserNotification): void { + const notifications = this._userNotifications.value.filter((n) => n.id !== notification.id); + this._userNotifications.next(notifications); + } - private mapNotificationToMenuItem(notification: UserNotification): MenuItem { - return { - label: this.getLabel(notification), - subLabel: this.getSubLabel(notification), - icon: this.getIcon(notification), - command: () => { - this.markAsRead(notification); - this.invokeCommand(notification); - }, - unread: notification.read_at == null, - notification: notification, - }; - } + private mapNotificationToMenuItem(notification: UserNotification): MenuItem { + return { + label: this.getLabel(notification), + subLabel: this.getSubLabel(notification), + icon: this.getIcon(notification), + command: () => { + this.markAsRead(notification); + this.invokeCommand(notification); + }, + unread: notification.read_at == null, + notification: notification, + }; + } - private getLabel(notification: UserNotification): string { - switch (notification.type) { - case UserNotificationType.TerminCreated: - return 'Neuer Termin'; - case UserNotificationType.TerminUpdated: - return 'Termin aktualisiert'; - case UserNotificationType.SwUpdate: - return 'Update verfügbar'; - default: - return 'Sonstiges'; + private getLabel(notification: UserNotification): string { + switch (notification.type) { + case UserNotificationType.TerminCreated: + return 'Neuer Termin'; + case UserNotificationType.TerminUpdated: + return 'Termin aktualisiert'; + case UserNotificationType.SwUpdate: + return 'Update verfügbar'; + default: + return 'Sonstiges'; + } } - } - private getSubLabel(notification: UserNotification): string { - switch (notification.type) { - case UserNotificationType.TerminCreated: - const termin = notification.data as Termin; - return termin?.name + ' ' + this.datePipe.transform(termin.vonDatum, 'd. MMMM YYYY'); - case UserNotificationType.TerminUpdated: - const updatedTermin = notification.data as Termin; - return updatedTermin?.name + ' ' + this.datePipe.transform(updatedTermin.vonDatum, 'd. MMMM YYYY'); - case UserNotificationType.SwUpdate: - return 'Installieren?'; - default: - return 'Sonstiges'; + + private getSubLabel(notification: UserNotification): string { + switch (notification.type) { + case UserNotificationType.TerminCreated: + const termin = notification.data as Termin; + return termin?.name + ' ' + this.datePipe.transform(termin.vonDatum, 'd. MMMM YYYY'); + case UserNotificationType.TerminUpdated: + const updatedTermin = notification.data as Termin; + return updatedTermin?.name + ' ' + this.datePipe.transform(updatedTermin.vonDatum, 'd. MMMM YYYY'); + case UserNotificationType.SwUpdate: + return 'Installieren?'; + default: + return 'Sonstiges'; + } } - } - private getIcon(notification: UserNotification): string { - switch (notification.type) { - case UserNotificationType.TerminCreated: - return 'pi pi-calendar-plus'; - case UserNotificationType.TerminUpdated: - return 'pi pi-refresh'; - case UserNotificationType.SwUpdate: - return 'pi pi-exclamation-triangle'; - default: - return ''; + + private getIcon(notification: UserNotification): string { + switch (notification.type) { + case UserNotificationType.TerminCreated: + return 'pi pi-calendar-plus'; + case UserNotificationType.TerminUpdated: + return 'pi pi-refresh'; + case UserNotificationType.SwUpdate: + return 'pi pi-exclamation-triangle'; + default: + return ''; + } } - } - private invokeCommand(notification: UserNotification): void { - switch (notification.type) { - case UserNotificationType.TerminUpdated: - case UserNotificationType.TerminCreated: - this.router.navigate(['/termine/details', (notification.data as Termin).id]); - return; - case UserNotificationType.SwUpdate: - notification.command(); - return; - default: - return void 0; + + private invokeCommand(notification: UserNotification): void { + switch (notification.type) { + case UserNotificationType.TerminUpdated: + case UserNotificationType.TerminCreated: + this.router.navigate(['/termine/details', (notification.data as Termin).id]); + return; + case UserNotificationType.SwUpdate: + notification.command(); + return; + default: + return void 0; + } } - } } diff --git a/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.html b/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.html index a15a8a6e..5fa2ee31 100644 --- a/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.html +++ b/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.html @@ -1,21 +1,28 @@ - - -
-
- {{ item.label }} -
-
{{ item.subLabel }}
-
+ + +
+
- - + + +
+
+ {{ item.label }} +
+
{{ item.subLabel }}
+
+
+ + + diff --git a/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.ts b/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.ts index 50567c7b..1de211f5 100644 --- a/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.ts +++ b/src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.ts @@ -28,4 +28,9 @@ export class MkjUserNotificationsComponent implements OnDestroy { public ngOnDestroy(): void { this._subs.unsubscribe(); } + + public markAllAsRead(): void { + this.userNotificationsService.markAllAsRead(); + this.menuItems = []; + } }