From 7079b37245c3091d1f5bd07ea741821bab37d791 Mon Sep 17 00:00:00 2001 From: Simon Zumbrunnen Date: Fri, 17 Jan 2025 11:06:03 +0000 Subject: [PATCH] Show the current week instead today + 7 days --- frontend/pages/household/mealplan/planner.vue | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/pages/household/mealplan/planner.vue b/frontend/pages/household/mealplan/planner.vue index 09703feef..693fb8f02 100644 --- a/frontend/pages/household/mealplan/planner.vue +++ b/frontend/pages/household/mealplan/planner.vue @@ -88,16 +88,23 @@ export default defineComponent({ } const state = ref({ - range: [fmtYYYYMMDD(new Date()), fmtYYYYMMDD(addDays(new Date(), adjustForToday(numberOfDays.value)))] as [string, string], - start: new Date(), + range: [], picker: false, - end: addDays(new Date(), adjustForToday(numberOfDays.value)), }); const firstDayOfWeek = computed(() => { return household.value?.preferences?.firstDayOfWeek || 0; }); + const firstDayOfCurrentWeek = computed(() => { + const today = new Date(); + let difference = today.getDay() - firstDayOfWeek.value; + if (difference < 0) { + difference = 7 + difference; + } + return addDays(today, -difference); + }); + const weekRange = computed(() => { const sorted = state.value.range.sort((a, b) => { return parseYYYYMMDD(a).getTime() - parseYYYYMMDD(b).getTime(); @@ -110,8 +117,8 @@ export default defineComponent({ }; } return { - start: new Date(), - end: addDays(new Date(), adjustForToday(numberOfDays.value)), + start: firstDayOfCurrentWeek.value, + end: addDays(firstDayOfCurrentWeek.value, adjustForToday(numberOfDays.value)), }; });