github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-23 06:45:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge 28d7e4f695 into ac984a2d04

Browse source
This commit is contained in:
Simon Zumbrunnen 2025-06-18 08:51:07 +02:00 • committed by GitHub
commit f437320689
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
frontend/pages/household/mealplan/planner.vue
View file

@ -88,16 +88,23 @@ export default defineComponent({
} }
const state = ref({ const state = ref({
range: [fmtYYYYMMDD(new Date()), fmtYYYYMMDD(addDays(new Date(), adjustForToday(numberOfDays.value)))] as [string, string], range: [],
start: new Date(),
picker: false, picker: false,
end: addDays(new Date(), adjustForToday(numberOfDays.value)),
}); });
const firstDayOfWeek = computed(() => { const firstDayOfWeek = computed(() => {
return household.value?.preferences?.firstDayOfWeek || 0; 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 weekRange = computed(() => {
const sorted = state.value.range.sort((a, b) => { const sorted = state.value.range.sort((a, b) => {
return parseYYYYMMDD(a).getTime() - parseYYYYMMDD(b).getTime(); return parseYYYYMMDD(a).getTime() - parseYYYYMMDD(b).getTime();
@ -110,8 +117,8 @@ export default defineComponent({
}; };
} }
return { return {
start: new Date(), start: firstDayOfCurrentWeek.value,
end: addDays(new Date(), adjustForToday(numberOfDays.value)), end: addDays(firstDayOfCurrentWeek.value, adjustForToday(numberOfDays.value)),
}; };
}); });