Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {
CalendarOptions,
DatesSetArg,
DayCellContentArg,
DayCellMountArg,
DayHeaderContentArg,
EventApi,
EventDropArg,
Expand Down Expand Up @@ -97,11 +96,6 @@ export interface CalendarViewEvent {
event:EventApi;
}

// The CalenderOptions typings are missing daygrid hooks
interface CalendarOptionsWithDayGrid extends CalendarOptions {
dayGridClassNames:(data:DayCellMountArg) => void;
}

@Injectable()
export class OpWorkPackagesCalendarService extends UntilDestroyedMixin {
private I18n = inject(I18nService);
Expand Down Expand Up @@ -373,7 +367,7 @@ export class OpWorkPackagesCalendarService extends UntilDestroyedMixin {
this.contextMenuService.show(handler, event);
}

private defaultOptions():CalendarOptionsWithDayGrid {
private defaultOptions():CalendarOptions {
return {
editable: false,
locales: allLocales,
Expand All @@ -392,7 +386,6 @@ export class OpWorkPackagesCalendarService extends UntilDestroyedMixin {
datesSet: (dates) => this.updateDateParam(dates),
dayHeaderClassNames: (data:DayHeaderContentArg) => this.calendarService.applyNonWorkingDay(data, this.nonWorkingDays),
dayCellClassNames: (data:DayCellContentArg) => this.calendarService.applyNonWorkingDay(data, this.nonWorkingDays),
dayGridClassNames: (data:DayCellContentArg) => this.calendarService.applyNonWorkingDay(data, this.nonWorkingDays),
slotLaneClassNames: (data:SlotLaneContentArg) => this.calendarService.applyNonWorkingDay(data, this.nonWorkingDays),
slotLabelClassNames: (data:SlotLabelContentArg) => this.calendarService.applyNonWorkingDay(data, this.nonWorkingDays),
dayHeaderContent: (data:DayHeaderContentArg) => this.calendarService.dayHeaderContent(data),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import timeGrid from '@fullcalendar/timegrid';
import {
CalendarOptions,
DayCellContentArg,
DayCellMountArg,
DayHeaderContentArg,
Duration,
EventApi,
Expand Down Expand Up @@ -90,9 +89,6 @@ interface CalendarMoveEvent {
delta:Duration;
revert:() => void;
}
interface CalendarOptionsWithDayGrid extends CalendarOptions {
dayGridClassNames:(data:DayCellMountArg) => void;
}
// An array of all the days that are displayed. The zero index represents Monday.
export type DisplayedDays = [
boolean,
Expand Down Expand Up @@ -189,7 +185,7 @@ export class TimeEntryCalendarComponent implements AfterViewInit, OnDestroy {
this.placeOpenPopover?.();
};

public additionalOptions:CalendarOptionsWithDayGrid = {
public additionalOptions:CalendarOptions = {
editable: false,
locales: allLocales,
locale: this.i18n.locale,
Expand Down Expand Up @@ -222,7 +218,6 @@ export class TimeEntryCalendarComponent implements AfterViewInit, OnDestroy {
eventDrop: this.moveEvent.bind(this),
dayHeaderClassNames: (data:DayHeaderContentArg) => this.calendar.applyNonWorkingDay(data, this.nonWorkingDays),
dayCellClassNames: (data:DayCellContentArg) => this.calendar.applyNonWorkingDay(data, this.nonWorkingDays),
dayGridClassNames: (data:DayCellContentArg) => this.calendar.applyNonWorkingDay(data, this.nonWorkingDays),
slotLaneClassNames: (data:SlotLaneContentArg) => this.calendar.applyNonWorkingDay(data, this.nonWorkingDays),
slotLabelClassNames: (data:SlotLabelContentArg) => this.calendar.applyNonWorkingDay(data, this.nonWorkingDays),
dayHeaderContent: (data:DayHeaderContentArg) => this.calendar.dayHeaderContent(data),
Expand Down
Loading