Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 13:01:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(calendar): allow dragging timed events

Browse Source
This commit is contained in:
Elian Doran 2025-03-16 20:34:05 +02:00
parent ccd9bfc1e7
commit d7e31f94fd
No known key found for this signature in database
1 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/public/app/widgets/view_widgets/calendar_view.ts
View File

@ -11,6 +11,7 @@ import type { EventData } from "../../components/app_context.js";
import utils from "../../services/utils.js"; import utils from "../../services/utils.js";
import date_notes from "../../services/date_notes.js"; import date_notes from "../../services/date_notes.js";
import appContext from "../../components/app_context.js"; import appContext from "../../components/app_context.js";
import type { EventImpl } from "@fullcalendar/core/internal";
const TPL = ` const TPL = `
<div class="calendar-view"> <div class="calendar-view">
@ -190,24 +191,13 @@ export default class CalendarView extends ViewMode {
async #onCalendarSelection(e: DateSelectArg) { async #onCalendarSelection(e: DateSelectArg) {
// Handle start and end date // Handle start and end date
const startDate = CalendarView.#formatDateToLocalISO(e.start); const { startDate, endDate } = this.#parseStartEndDateFromEvent(e);
if (!startDate) { if (!startDate) {
return; return;
} }
let endDate;
if (e.allDay) {
endDate = CalendarView.#formatDateToLocalISO(CalendarView.#offsetDate(e.end, -1));
} else {
endDate = CalendarView.#formatDateToLocalISO(e.end);
}
// Handle start and end time. // Handle start and end time.
let startTime = null; const { startTime, endTime } = this.#parseStartEndTimeFromEvent(e);
let endTime = null;
if (!e.allDay) {
startTime = CalendarView.#formatTimeToLocalISO(e.start);
endTime = CalendarView.#formatTimeToLocalISO(e.end);
}
// Ask for the title // Ask for the title
const title = await dialogService.prompt({ message: t("relation_map.enter_title_of_new_note"), defaultValue: t("relation_map.default_new_note_title") }); const title = await dialogService.prompt({ message: t("relation_map.enter_title_of_new_note"), defaultValue: t("relation_map.default_new_note_title") });
@ -235,10 +225,37 @@ export default class CalendarView extends ViewMode {
} }
} }
#parseStartEndDateFromEvent(e: DateSelectArg | EventImpl) {
const startDate = CalendarView.#formatDateToLocalISO(e.start);
if (!startDate) {
return { startDate: null, endDate: null };
}
let endDate;
if (e.allDay) {
endDate = CalendarView.#formatDateToLocalISO(CalendarView.#offsetDate(e.end, -1));
} else {
endDate = CalendarView.#formatDateToLocalISO(e.end);
}
return { startDate, endDate };
}
#parseStartEndTimeFromEvent(e: DateSelectArg | EventImpl) {
let startTime = null;
let endTime = null;
if (!e.allDay) {
startTime = CalendarView.#formatTimeToLocalISO(e.start);
endTime = CalendarView.#formatTimeToLocalISO(e.end);
}
return { startTime, endTime };
}
async #onEventMoved(e: EventChangeArg) { async #onEventMoved(e: EventChangeArg) {
const startDate = CalendarView.#formatDateToLocalISO(e.event.start); // Handle start and end date
// Fullcalendar end date is exclusive, not inclusive but we store it the other way around. let { startDate, endDate } = this.#parseStartEndDateFromEvent(e.event);
let endDate = CalendarView.#formatDateToLocalISO(CalendarView.#offsetDate(e.event.end, -1)); if (!startDate) {
return;
}
const noteId = e.event.extendedProps.noteId; const noteId = e.event.extendedProps.noteId;
// Don't store the end date if it's empty. // Don't store the end date if it's empty.
@ -254,11 +271,21 @@ export default class CalendarView extends ViewMode {
// Since they can be customized via calendar:startDate=$foo and calendar:endDate=$bar we need to determine the // Since they can be customized via calendar:startDate=$foo and calendar:endDate=$bar we need to determine the
// attributes to be effectively updated // attributes to be effectively updated
const startAttribute = note.getAttributes("label").filter(attr => attr.name == "calendar:startDate").shift()?.value||"startDate" const startAttribute = note.getAttributes("label").filter(attr => attr.name == "calendar:startDate").shift()?.value||"startDate";
const endAttribute = note.getAttributes("label").filter(attr => attr.name == "calendar:endDate").shift()?.value||"endDate" const endAttribute = note.getAttributes("label").filter(attr => attr.name == "calendar:endDate").shift()?.value||"endDate";
attributes.setAttribute(note, "label", startAttribute, startDate); attributes.setAttribute(note, "label", startAttribute, startDate);
attributes.setAttribute(note, "label", endAttribute, endDate); attributes.setAttribute(note, "label", endAttribute, endDate);
// Update start time and end time if needed.
if (!e.event.allDay) {
const startAttribute = note.getAttributes("label").filter(attr => attr.name == "calendar:startTime").shift()?.value||"startTime";
const endAttribute = note.getAttributes("label").filter(attr => attr.name == "calendar:endTime").shift()?.value||"endTime";
const { startTime, endTime } = this.#parseStartEndTimeFromEvent(e.event);
attributes.setAttribute(note, "label", startAttribute, startTime);
attributes.setAttribute(note, "label", endAttribute, endTime);
}
} }
onEntitiesReloaded({ loadResults }: EventData<"entitiesReloaded">) { onEntitiesReloaded({ loadResults }: EventData<"entitiesReloaded">) {