vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

WIP: feat: make today really today #1380

Closed
kergma-lw wants to merge 27 commits from fix/upcoming into fix/upcoming
pull from: fix/upcoming
merge into: vikunja:fix/upcoming
Conversation 0 Commits 27 Files Changed 4 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c24b8af00d - Show all commits

10
src/components/date/datepickerWithRange.vue
View File

@ -47,7 +47,8 @@ const {t} = useI18n()
const emit = defineEmits(['dateChanged'])
const weekStart = computed<number>(() => store.state.auth.settings.weekStart)
// FIXME: This seems to always contain the default value - that breaks the picker
const weekStart = computed<number>(() => store.state.auth.settings.weekStart ?? 0)
const flatPickerConfig = computed(() => ({
altFormat: t('date.altFormatLong'),
altInput: true,
@ -55,10 +56,9 @@ const flatPickerConfig = computed(() => ({
enableTime: false,
inline: true,
mode: 'range',
/*locale: {
// FIXME: This seems to always contain the default value - that breaks the picker
locale: {
firstDayOf7Days: weekStart,
},*/
},
}))
const dateRange = ref<string>('')
@ -110,7 +110,7 @@ const datesToday = computed<string>(() => {
function thisWeek() {
const startDate = startOfDay(new Date())
const first = startDate.getDate() - startDate.getDay()
const first = startDate.getDate() - startDate.getDay() + weekStart.value
startDate.setDate(first)
const endDate = endOfDay(new Date((new Date(startDate).setDate(first + 6))))