Janus007/Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactors event extraction to utility function

Browse source 
Moves event extraction logic to a shared utility function for reusability.

Removes redundant code and improves consistency in event handling.
The original duration is now mandatory.
This commit is contained in:
Janus C. H. Knudsen 2025-09-29 18:39:40 +02:00
parent 0d33b51ff8
commit 8b5420f367
2 changed files with 12 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/elements/SwpEventElement.ts
View file

@ -164,7 +164,7 @@ export class SwpEventElement extends BaseEventElement {
/** /**
* Extract CalendarEvent from DOM element * Extract CalendarEvent from DOM element
*/ */
private static extractCalendarEventFromElement(element: HTMLElement): CalendarEvent { public static extractCalendarEventFromElement(element: HTMLElement): CalendarEvent {
return { return {
id: element.dataset.eventId || '', id: element.dataset.eventId || '',
title: element.dataset.title || '', title: element.dataset.title || '',

84
src/renderers/EventRenderer.ts
View file

@ -136,25 +136,17 @@ export abstract class BaseEventRenderer implements EventRendererStrategy {
// Snap to interval // Snap to interval
const snappedStartMinutes = Math.round(actualStartMinutes / snapInterval) * snapInterval; const snappedStartMinutes = Math.round(actualStartMinutes / snapInterval) * snapInterval;
// Use cached original duration (no recalculation)
const cachedDuration = parseInt(clone.dataset.originalDuration || '60');
const endTotalMinutes = snappedStartMinutes + cachedDuration;
// Update dataset with reference date for performance if(!clone.dataset.originalDuration)
const referenceDate = new Date('1970-01-01T00:00:00'); throw new DOMException("missing clone.dataset.originalDuration")
const startDate = new Date(referenceDate);
startDate.setMinutes(startDate.getMinutes() + snappedStartMinutes);
const endDate = new Date(referenceDate); const endTotalMinutes = snappedStartMinutes + parseInt(clone.dataset.originalDuration);
endDate.setMinutes(endDate.getMinutes() + endTotalMinutes);
clone.dataset.start = startDate.toISOString(); // Update visual time display only
clone.dataset.end = endDate.toISOString();
// Update display
const timeElement = clone.querySelector('swp-event-time'); const timeElement = clone.querySelector('swp-event-time');
if (timeElement) { if (timeElement) {
const startTime = TimeFormatter.formatTimeFromMinutes(snappedStartMinutes); let startTime = TimeFormatter.formatTimeFromMinutes(snappedStartMinutes);
const endTime = TimeFormatter.formatTimeFromMinutes(endTotalMinutes); let endTime = TimeFormatter.formatTimeFromMinutes(endTotalMinutes);
timeElement.textContent = `${startTime} - ${endTime}`; timeElement.textContent = `${startTime} - ${endTime}`;
} }
} }
@ -289,7 +281,7 @@ export abstract class BaseEventRenderer implements EventRendererStrategy {
container = element.closest('swp-events-layer') as HTMLElement; container = element.closest('swp-events-layer') as HTMLElement;
} }
const event = this.elementToCalendarEvent(element); const event = SwpEventElement.extractCalendarEventFromElement(element);
if (event) { if (event) {
stackEvents.push(event); stackEvents.push(event);
} }
@ -326,7 +318,7 @@ export abstract class BaseEventRenderer implements EventRendererStrategy {
// Update dataset with new times after successful drop (only for timed events) // Update dataset with new times after successful drop (only for timed events)
if (draggedClone.dataset.displayType !== 'allday') { if (draggedClone.dataset.displayType !== 'allday') {
const newEvent = this.elementToCalendarEvent(draggedClone); const newEvent = SwpEventElement.extractCalendarEventFromElement(draggedClone);
if (newEvent) { if (newEvent) {
draggedClone.dataset.start = newEvent.start.toISOString(); draggedClone.dataset.start = newEvent.start.toISOString();
draggedClone.dataset.end = newEvent.end.toISOString(); draggedClone.dataset.end = newEvent.end.toISOString();
@ -390,7 +382,7 @@ export abstract class BaseEventRenderer implements EventRendererStrategy {
if (!eventsLayer) return; if (!eventsLayer) return;
// Convert dropped element to CalendarEvent with new position // Convert dropped element to CalendarEvent with new position
const droppedEvent = this.elementToCalendarEvent(droppedElement); const droppedEvent = SwpEventElement.extractCalendarEventFromElement(droppedElement);
if (!droppedEvent) return; if (!droppedEvent) return;
// Get existing events in the column (excluding the dropped element) // Get existing events in the column (excluding the dropped element)
@ -434,7 +426,7 @@ export abstract class BaseEventRenderer implements EventRendererStrategy {
return; return;
} }
const event = this.elementToCalendarEvent(element); const event = SwpEventElement.extractCalendarEventFromElement(element);
if (event) { if (event) {
events.push(event); events.push(event);
} }
@ -452,62 +444,6 @@ export abstract class BaseEventRenderer implements EventRendererStrategy {
// No need to manually track and remove from groups // No need to manually track and remove from groups
} }
/**
* Convert DOM element to CalendarEvent - handles both normal and 1970 reference dates
*/
private elementToCalendarEvent(element: HTMLElement): CalendarEvent | null {
const eventId = element.dataset.eventId;
const title = element.dataset.title;
const type = element.dataset.type;
const start = element.dataset.start;
const end = element.dataset.end;
if (!eventId || !title || !type || !start || !end) {
return null;
}
let startDate = new Date(start);
let endDate = new Date(end);
// Check if we have 1970 reference date (from drag operations)
if (startDate.getFullYear() === 1970) {
// Find the parent column to get the actual date
const columnElement = element.closest('swp-day-column') as HTMLElement;
if (columnElement && columnElement.dataset.date) {
const columnDate = new Date(columnElement.dataset.date);
// Keep the time portion from the 1970 dates, but use the column's date
startDate = new Date(
columnDate.getFullYear(),
columnDate.getMonth(),
columnDate.getDate(),
startDate.getHours(),
startDate.getMinutes()
);
endDate = new Date(
columnDate.getFullYear(),
columnDate.getMonth(),
columnDate.getDate(),
endDate.getHours(),
endDate.getMinutes()
);
}
}
return {
id: eventId,
title: title,
start: startDate,
end: endDate,
type: type,
allDay: false,
syncStatus: 'synced',
metadata: {
duration: element.dataset.duration
}
};
}
/** /**
* Handle conversion to all-day event * Handle conversion to all-day event