mirror of
https://github.com/hay-kot/mealie.git
synced 2025-08-23 06:45:22 -07:00
Merge 28d7e4f695
into ac984a2d04
This commit is contained in:
commit
f437320689
1 changed files with 12 additions and 5 deletions
|
@ -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)),
|
||||
};
|
||||
});
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue