Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

feat: 🎸 clone week note when it cross month

Browse Source
This commit is contained in:
Jin
2025-04-01 18:09:08 +02:00
parent 198842de31
commit fc84729229
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/services/backend_script_api.ts
View File

@@ -241,11 +241,6 @@ interface Api {
*/ */
getWeekFirstDayNote( getWeekFirstDayNote(
date: string, date: string,
options: {
// TODO: Deduplicate type with date_notes.ts once ES modules are added.
/** either "monday" (default) or "sunday" */
startOfTheWeek: "monday" | "sunday";
},
rootNote: BNote rootNote: BNote
): BNote | null; ): BNote | null;

14
src/services/date_notes.ts
View File

@@ -12,6 +12,7 @@ import { t } from "i18next";
import dayjs from "dayjs"; import dayjs from "dayjs";
import type { Dayjs } from "dayjs"; import type { Dayjs } from "dayjs";
import isSameOrAfter from "dayjs/plugin/isSameOrAfter.js"; import isSameOrAfter from "dayjs/plugin/isSameOrAfter.js";
import cloningService from "./cloning.js";
dayjs.extend(isSameOrAfter); dayjs.extend(isSameOrAfter);
@@ -353,8 +354,13 @@ function getWeekNote(weekStr: string, _rootNote: BNote | null = null): BNote | n
weekStartDate.setDate(firstDayOfYear.getDate() + (weekNumber - 1) * 7); weekStartDate.setDate(firstDayOfYear.getDate() + (weekNumber - 1) * 7);
const startDate = getWeekStartDate(weekStartDate, optionService.getOption("firstDayOfWeek") === '0' ? 'sunday' : 'monday'); const startDate = getWeekStartDate(weekStartDate, optionService.getOption("firstDayOfWeek") === '0' ? 'sunday' : 'monday');
const monthNote = getMonthNote(dateUtils.utcDateStr(startDate), rootNote); const endDate = new Date(startDate);
endDate.setDate(startDate.getDate() + 6);
const startMonth = startDate.getMonth();
const endMonth = endDate.getMonth();
const monthNote = getMonthNote(dateUtils.utcDateStr(startDate), rootNote);
const noteTitle = getWeekNoteTitle(rootNote, weekNumber); const noteTitle = getWeekNoteTitle(rootNote, weekNumber);
sql.transactional(() => { sql.transactional(() => {
@@ -368,6 +374,12 @@ function getWeekNote(weekStr: string, _rootNote: BNote | null = null): BNote | n
if (weekTemplateAttr) { if (weekTemplateAttr) {
attributeService.createRelation(weekNote.noteId, "template", weekTemplateAttr.value); attributeService.createRelation(weekNote.noteId, "template", weekTemplateAttr.value);
} }
// If the week spans different months, clone the week note in the other month as well
if (startMonth !== endMonth) {
const secondMonthNote = getMonthNote(dateUtils.utcDateStr(endDate), rootNote);
cloningService.cloneNoteToParentNote(weekNote.noteId, secondMonthNote.noteId);
}
}); });
return weekNote as unknown as BNote; return weekNote as unknown as BNote;