diff --git a/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-activation/single-event-dashboard-event-activation.component.ts b/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-activation/single-event-dashboard-event-activation.component.ts
index 9508434..a4622eb 100644
--- a/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-activation/single-event-dashboard-event-activation.component.ts
+++ b/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-activation/single-event-dashboard-event-activation.component.ts
@@ -57,7 +57,7 @@ export class SingleEventDashboardEventActivation {
this.calendarService.applyException(eventId, payload ).subscribe(
{
next: () => {
- this.onAction()('close');
+ this.onAction()('save-event-success');
},
error: err => {
alert('Failed to change event');
diff --git a/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-delete/single-event-dashboard-event-delete.html b/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-delete/single-event-dashboard-event-delete.html
index b863224..e5171ec 100644
--- a/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-delete/single-event-dashboard-event-delete.html
+++ b/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-delete/single-event-dashboard-event-delete.html
@@ -7,7 +7,7 @@
}
-
+
Törlés
diff --git a/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-delete/single-event-dashboard-event-delete.ts b/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-delete/single-event-dashboard-event-delete.ts
index f7296f1..821b7c6 100644
--- a/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-delete/single-event-dashboard-event-delete.ts
+++ b/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-delete/single-event-dashboard-event-delete.ts
@@ -1,9 +1,10 @@
-import { Component, effect, input, output } from '@angular/core';
+import { Component, effect, inject, input, output } from '@angular/core';
import { CalendarEventDto } from '../../../models/events-in-range-dto.model';
import { DetailView, DetailViewConfig } from '../../../../../components/detail-view/detail-view';
import { SvgIcons } from '../../../../../svg-icons';
import { SafeHtmlPipe } from '../../../../../pipes/safe-html-pipe';
import { Button } from '@rschneider/ng-daisyui';
+import { CalendarService } from '../../../services/calendar.service';
@Component({
selector: 'app-single-event-dashboard-event-delete',
@@ -18,6 +19,7 @@ import { Button } from '@rschneider/ng-daisyui';
})
export class SingleEventDashboardEventDelete {
+ calendarService = inject(CalendarService);
event = input();
// Define an input that expects a function
onAction = input.required<(msg: string) => void>();
@@ -59,6 +61,16 @@ export class SingleEventDashboardEventDelete {
this.onAction()('close');
}
+ doDelete() {
+ this.calendarService.deleteEvent(this.event()!.id).subscribe(
+ {
+ next: ( ) => {
+ this.onAction()('save-event-success');
+ }
+ }
+ )
+ // Call the function passed from the parent
+ }
protected readonly SvgIcons = SvgIcons;
}
diff --git a/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-edit/single-event-dashboard-event-edit.ts b/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-edit/single-event-dashboard-event-edit.ts
index 6210ec7..1d18cc3 100644
--- a/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-edit/single-event-dashboard-event-edit.ts
+++ b/admin/src/app/features/calendar/components/calendar-view/single-event-dashboard-event-edit/single-event-dashboard-event-edit.ts
@@ -25,6 +25,7 @@ export class SingleEventDashboardEventEdit {
* proxy to ready event from form to parent
*/
protected triggerAction(action: string) {
+ console.info("event details dashboard", action)
this.onAction()(action)
}
}
diff --git a/admin/src/app/features/calendar/services/calendar.service.ts b/admin/src/app/features/calendar/services/calendar.service.ts
index d69c161..1868342 100644
--- a/admin/src/app/features/calendar/services/calendar.service.ts
+++ b/admin/src/app/features/calendar/services/calendar.service.ts
@@ -9,17 +9,18 @@ import { CreateExceptionDto } from '../models/event-exception.model';
@Injectable({
- providedIn: 'root'
+ providedIn: 'root',
})
export class CalendarService {
private readonly apiUrl: string;
constructor(
private http: HttpClient,
- private configService: ConfigurationService
+ private configService: ConfigurationService,
) {
this.apiUrl = `${this.configService.getApiUrl()}/calendar`;
}
+
/**
* get events in range
*/
@@ -27,21 +28,26 @@ export class CalendarService {
const params = new HttpParams()
.set('startDate', eventsInRangeDto.startTime!.toISOString())
.set('endDate', eventsInRangeDto.endTime!.toISOString());
- return this.http.get(this.apiUrl+'', { params });
+ return this.http.get(this.apiUrl + '', { params });
}
/**
* Create a new record.
*/
public create(data: EventFormDTO): Observable {
- return this.http.post(this.apiUrl+'/events', data);
+ return this.http.post(this.apiUrl + '/events', data);
}
- public update(id: number,data: UpdateEventFormDTO): Observable {
- return this.http.patch(this.apiUrl+'/events/'+id, data);
+ public update(id: number, data: UpdateEventFormDTO): Observable {
+ return this.http.patch(this.apiUrl + '/events/' + id, data);
}
- public applyException(eventId: number, eventException: CreateExceptionDto){
- return this.http.post(this.apiUrl+`/events/${eventId}/exceptions`, eventException);
+ public applyException(eventId: number, eventException: CreateExceptionDto) {
+ return this.http.post(this.apiUrl + `/events/${eventId}/exceptions`, eventException);
}
+
+ public deleteEvent(id: number): Observable {
+ return this.http.delete(this.apiUrl + '/events/' + id);
+ }
+
}