Find better starting week per month

naddeoa · Jan 9, 2024 · f43b86d · f43b86d
1 parent 5efa0e6
commit f43b86d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/lib/components/CalendarQuarter.svelte b/src/lib/components/CalendarQuarter.svelte
@@ -12,7 +12,7 @@
 		if (!settings.monthPage.disable) return month.id;
 		if (!settings.weekPage.disable) {
 			const week = settings.weeks.find(
-				(week) => week.start >= month.weekStart && week.start <= month.end,
+				(week) => week.month === month.month && week.year === month.year,
 			);
 			return week ? week.id : '';
 		}

diff --git a/src/lib/components/CalendarYear.svelte b/src/lib/components/CalendarYear.svelte
@@ -12,7 +12,7 @@
 		if (!settings.monthPage.disable) return month.id;
 		if (!settings.weekPage.disable) {
 			const week = settings.weeks.find(
-				(week) => week.start >= month.weekStart && week.start <= month.end,
+				(week) => week.month === month.month && week.year === month.year,
 			);
 			return week ? week.id : '';
 		}

diff --git a/src/lib/components/NotesQuarter.svelte b/src/lib/components/NotesQuarter.svelte
@@ -8,7 +8,7 @@
 		if (!settings.monthPage.disable) return month.id;
 		if (!settings.weekPage.disable) {
 			const week = settings.weeks.find(
-				(week) => week.start >= month.weekStart && week.start <= month.end,
+				(week) => week.month === month.month && week.year === month.year,
 			);
 			return week ? week.id : '';
 		}

diff --git a/src/lib/components/NotesYear.svelte b/src/lib/components/NotesYear.svelte
@@ -8,7 +8,7 @@
 		if (!settings.monthPage.disable) return month.id;
 		if (!settings.weekPage.disable) {
 			const week = settings.weeks.find(
-				(week) => week.start >= month.weekStart && week.start <= month.end,
+				(week) => week.month === month.month && week.year === month.year,
 			);
 			return week ? week.id : '';
 		}