Merge pull request #99 from liamcain/use-startof-week-instead

Use startof("week") for weekly notes so that DD displays correctly

manifest.json

@@ -2,7 +2,7 @@
   "id": "calendar",
   "name": "Calendar",
   "description": "Calendar view of your daily notes",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "author": "Liam Cain",
   "authorUrl": "https://github.com/liamcain/",
   "isDesktopOnly": false,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "calendar",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "description": "Calendar view of your daily notes",
   "author": "liamcain",
   "main": "main.js",

src/io/weeklyNotes.ts

@@ -72,8 +72,8 @@ export function getWeeklyNote(date: Moment, settings: ISettings): TFile {
   const { vault } = window.app;
   const { format, folder } = getWeeklyNoteSettings(settings);
 
-  const endOfWeek = date.clone().endOf("week");
-  const baseFilename = endOfWeek.format(format);
+  const startOfWeek = date.clone().startOf("week");
+  const baseFilename = startOfWeek.format(format);
 
   const fullPath = getNotePath(folder, baseFilename);
   return vault.getAbstractFileByPath(fullPath) as TFile;

src/view.ts

@@ -118,16 +118,14 @@ export default class CalendarView extends ItemView {
   ): Promise<void> {
     const { workspace } = this.app;
 
-    // Important: Use end of week in case week overlaps 2 years
-    // YYYY should use the NEW year.
-    const endOfWeek = date.clone().endOf("week");
+    const startOfWeek = date.clone().startOf("week");
 
     const { format } = getWeeklyNoteSettings(this.settings);
-    const baseFilename = endOfWeek.format(format);
+    const baseFilename = startOfWeek.format(format);
 
     if (!existingFile) {
       // File doesn't exist
-      tryToCreateWeeklyNote(endOfWeek, inNewSplit, this.settings, () => {
+      tryToCreateWeeklyNote(startOfWeek, inNewSplit, this.settings, () => {
         this.calendar.$set({ activeFile: baseFilename });
       });
       return;