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

feat: add date math for filters #1342

Merged
konrad merged 88 commits from feature/date-math into main 2022-03-28 17:30:43 +00:00
Conversation 2 Commits 88 Files Changed 18 +4 -2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7135288800 - Show all commits

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

@ -191,7 +191,7 @@ const props = defineProps({
showSelectedOnButton: {
konrad marked this conversation as resolved Outdated
dpschen commented 2022-02-06 13:50:28 +00:00
Outdated
Review
Copy Link

We could remove this prop if we would only expose the slot for the trigger.

We could remove this prop if we would only expose the slot for the trigger.
konrad commented 2022-02-06 17:51:26 +00:00
Outdated
Review
Copy Link

Done.

Done.
type: Boolean,
default: false,
}
},
})
// FIXME: This seems to always contain the default value - that breaks the picker
dpschen commented 2022-02-06 13:43:30 +00:00
Outdated
Review
Copy Link

Continuing from #1261 (comment)

With default value you mean the value of store.state.auth.settings.weekStart?

Continuing from https://kolaente.dev/vikunja/frontend/pulls/1261#issuecomment-22675 With default value you mean the value of store.state.auth.settings.weekStart?
konrad commented 2022-02-06 19:14:46 +00:00
Outdated
Review
Copy Link

As said in #1261:

It's not reflected in the flatpicker config (below). That always contains 0 as week start, no matter what is set in store.

As said in #1261: > It's not reflected in the flatpicker config (below). That always contains `0` as week start, no matter what is set in store.

2
src/components/misc/popup.vue
View File

@ -20,7 +20,7 @@ const props = defineProps({
hasOverflow: {
type: Boolean,
default: false,
}
},
})
function hidePopup(e) {

2
src/views/tasks/ShowTasks.vue
View File

@ -98,6 +98,8 @@ export default {
pageTitle() {
konrad marked this conversation as resolved Outdated
dpschen commented 2022-02-07 11:30:21 +00:00
Outdated
Review
Copy Link

Remove title var and return directly:

if (typeof predefinedRange !== 'undefined') {
    return t(`input.datepickerRange.ranges.${predefinedRangeKey}`)
} else {
    return showAll
			? t('task.show.titleCurrent')
			: t('task.show.fromuntil', {
				from: formatDate(dateFrom, 'PPP'),
				until: formatDate(dateTo, 'PPP'),
			})
}
Remove title var and return directly: ```js if (typeof predefinedRange !== 'undefined') { return t(`input.datepickerRange.ranges.${predefinedRangeKey}`) } else { return showAll ? t('task.show.titleCurrent') : t('task.show.fromuntil', { from: formatDate(dateFrom, 'PPP'), until: formatDate(dateTo, 'PPP'), }) }
konrad commented 2022-02-20 20:22:38 +00:00
Outdated
Review
Copy Link

Done.

Done.
let title = ''
// We need to define "key" because it is the first parameter in the array and we need the second
// eslint-disable-next-line no-unused-vars
const predefinedRange = Object.entries(dateRanges).find(([key, value]) => this.dateFrom === value[0] && this.dateTo === value[1])
if (typeof predefinedRange !== 'undefined') {
title = this.$t(`input.datepickerRange.ranges.${predefinedRange[0]}`)