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

calendar root can now have datePattern and monthPattern to define the names

Browse Source
This commit is contained in:
zadam 2019-05-19 11:30:17 +02:00
parent 597eb5a300
commit ecfba95841
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/services/date_notes.js
View File

@ -70,6 +70,15 @@ async function getYearNote(dateStr, rootNote) {
return yearNote; return yearNote;
} }
async function getMonthNoteTitle(rootNote, monthNumber, dateObj) {
const pattern = await rootNote.getLabelValue("monthPattern") || "{monthNumberPadded} - {month}";
const monthName = MONTHS[dateObj.getMonth()];
return pattern
.replace(/{monthNumberPadded}/g, monthNumber)
.replace(/{month}/g, monthName);
}
async function getMonthNote(dateStr, rootNote) { async function getMonthNote(dateStr, rootNote) {
const monthStr = dateStr.substr(0, 7); const monthStr = dateStr.substr(0, 7);
const monthNumber = dateStr.substr(5, 2); const monthNumber = dateStr.substr(5, 2);
@ -84,7 +93,7 @@ async function getMonthNote(dateStr, rootNote) {
if (!monthNote) { if (!monthNote) {
const dateObj = dateUtils.parseLocalDate(dateStr); const dateObj = dateUtils.parseLocalDate(dateStr);
const noteTitle = monthNumber + " - " + MONTHS[dateObj.getMonth()]; const noteTitle = await getMonthNoteTitle(rootNote, monthNumber, dateObj);
monthNote = await createNote(yearNote.noteId, noteTitle); monthNote = await createNote(yearNote.noteId, noteTitle);
} }
@ -96,6 +105,17 @@ async function getMonthNote(dateStr, rootNote) {
return monthNote; return monthNote;
} }
async function getDateNoteTitle(rootNote, dayNumber, dateObj) {
const pattern = await rootNote.getLabelValue("datePattern") || "{dayInMonthPadded} - {weekDay}";
const weekDay = DAYS[dateObj.getDay()];
return pattern
.replace(/{dayInMonthPadded}/g, dayNumber)
.replace(/{weekDay}/g, weekDay)
.replace(/{weekDay3}/g, weekDay.substr(0, 3))
.replace(/{weekDay2}/g, weekDay.substr(0, 2));
}
async function getDateNote(dateStr) { async function getDateNote(dateStr) {
const rootNote = await getRootCalendarNote(); const rootNote = await getRootCalendarNote();
@ -111,7 +131,7 @@ async function getDateNote(dateStr) {
if (!dateNote) { if (!dateNote) {
const dateObj = dateUtils.parseLocalDate(dateStr); const dateObj = dateUtils.parseLocalDate(dateStr);
const noteTitle = dayNumber + " - " + DAYS[dateObj.getDay()]; const noteTitle = await getDateNoteTitle(rootNote, dayNumber, dateObj);
dateNote = await createNote(monthNote.noteId, noteTitle); dateNote = await createNote(monthNote.noteId, noteTitle);
} }