rschneider/dvbooking
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add originalStartTime to event DTOs and service to correctly identify and manage event exceptions in the UI.

Browse Source
This commit is contained in:
Schneider Roland
2025-12-31 12:27:25 +01:00
parent 7ed3367ed8
commit 4349fa39b4
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-activation/single-event-dashboard-event-activation.component.ts
View File

@@ -36,10 +36,15 @@ export class SingleEventDashboardEventActivation {
const event = this.event();
console.info('setEventOccurrenceActivation', event);
const eventId = this.event()?.id!;
const startTime = this.event()?.startTime!;
const eventId = event?.id!;
const originalStartTime = event?.originalStartTime!;
let payload: CreateExceptionDto | undefined;
const eventException = event?.exceptions?.length ? event.exceptions[0] : undefined;
// Correctly find the exception that matches this specific occurrence
const eventException = event?.exceptions?.find(ex =>
new Date(ex.originalStartTime).getTime() === new Date(originalStartTime).getTime()
);
if (eventException) {
payload = {
...eventException,
@@ -50,7 +55,7 @@ export class SingleEventDashboardEventActivation {
};
} else {
payload = {
originalStartTime: new Date(startTime),
originalStartTime: new Date(originalStartTime),
isCancelled: !activated,
};
}

3
admin/src/app/features/calendar/models/events-in-range-dto.model.ts
View File

@@ -16,7 +16,7 @@ export type BookingWithUserDto = {
id: number;
};
export interface EventExceptionDto{
export interface EventExceptionDto {
id: number,
description: string;
eventId: number;
@@ -33,6 +33,7 @@ export type CalendarEventDto = {
id: number;
title: string;
startTime: string,
originalStartTime: string,
endTime: string,
description: string,
isModified?: boolean;