Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-29 19:12:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(calendar): allow customisable start & end dates

Browse Source
This commit is contained in:
Elian Doran 2025-02-27 00:02:58 +02:00
parent 7d5b0f825c
commit 5435b3c8fd
No known key found for this signature in database
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,7 +299,7 @@ export default class CalendarView extends ViewMode {
const events: EventSourceInput = []; const events: EventSourceInput = [];
for (const note of notes) { for (const note of notes) {
const startDate = note.getLabelValue("startDate"); const startDate = CalendarView.#getCustomisableLabel(note, "startDate", "calendar:startDate");
if (note.hasChildren()) { if (note.hasChildren()) {
const childrenEventData = await this.#buildEvents(note.getChildNoteIds()); const childrenEventData = await this.#buildEvents(note.getChildNoteIds());
@ -312,13 +312,35 @@ export default class CalendarView extends ViewMode {
continue; continue;
} }
const endDate = note.getAttributeValue("label", "endDate"); const endDate = CalendarView.#getCustomisableLabel(note, "endDate", "calendar:endDate");
events.push(await CalendarView.#buildEvent(note, startDate, endDate)); events.push(await CalendarView.#buildEvent(note, startDate, endDate));
} }
return events.flat(); return events.flat();
} }
/**
* Allows the user to customize the attribute from which to obtain a particular value. For example, if `customLabelNameAttribute` is `calendar:startDate`
* and `defaultLabelName` is `startDate` and the note at hand has `#calendar:startDate=#myStartDate #myStartDate=2025-02-26` then the value returned will
* be `2025-02-26`. If there is no custom attribute value, then the value of the default attribute is returned instead (e.g. `#startDate`).
*
* @param note the note from which to read the values.
* @param defaultLabelName the name of the label in case a custom value is not found.
* @param customLabelNameAttribute the name of the label to look for a custom value.
* @returns the value of either the custom label or the default label.
*/
static #getCustomisableLabel(note: FNote, defaultLabelName: string, customLabelNameAttribute: string) {
const customAttributeName = note.getLabelValue(customLabelNameAttribute);
if (customAttributeName?.startsWith("#")) {
const customValue = note.getLabelValue(customAttributeName.substring(1));
if (customValue) {
return customValue;
}
}
return note.getLabelValue(defaultLabelName);
}
static async #buildEvent(note: FNote, startDate: string, endDate?: string | null) { static async #buildEvent(note: FNote, startDate: string, endDate?: string | null) {
const customTitle = note.getLabelValue("calendar:title"); const customTitle = note.getLabelValue("calendar:title");
const titles = await CalendarView.#parseCustomTitle(customTitle, note); const titles = await CalendarView.#parseCustomTitle(customTitle, note);