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 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 622f08fb1b - Show all commits

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

@ -89,18 +89,16 @@ const {
const showAll = computed(() => typeof dateFrom === 'undefined' || typeof dateTo === 'undefined')
konrad marked this conversation as resolved Outdated
dpschen commented 2022-02-06 13:32:29 +00:00
Outdated
Review
Copy Link

Readd route props

Readd route props
konrad commented 2022-02-06 19:12:55 +00:00
Outdated
Review
Copy Link

Changed it to route props.

However, we still have a dependency on the router: every time when seleting a date in ShowTasks it will push the change to the route. I don't know how to change that without massively overengeneering everything so I'd say we leave it at that.

Changed it to route props. However, we still have a dependency on the router: every time when seleting a date in ShowTasks it will push the change to the route. I don't know how to change that without massively overengeneering everything so I'd say we leave it at that.
dpschen commented 2022-02-06 19:23:36 +00:00
Outdated
Review
Copy Link

I think it's fine for now. I thought a while about this but also don't have a better soltion for this at the moment (except the v-model version)

I think it's fine for now. I thought a while about this but also don't have a better soltion for this at the moment (except the v-model version)
const pageTitle = computed(() => {
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(DATE_RANGES)
// eslint-disable-next-line no-unused-vars
.find(([key, value]) => dateFrom === value[0] && dateTo === value[1])
?.[0]
if (typeof predefinedRange !== 'undefined') {
konrad marked this conversation as resolved Outdated
dpschen commented 2022-02-07 11:26:12 +00:00
Outdated
Review
Copy Link

Unsure: I think eslint doesn't complain here if you use underscore (_) to spread the unused variable.

Unsure: I think eslint doesn't complain here if you use underscore (`_`) to spread the unused variable.
dpschen commented 2022-02-07 11:27:50 +00:00
Outdated
Review
Copy Link

Add ?.[0] so we return the key, which is what we actually want to use and adjust variable name.

Add `?.[0]` so we return the key, which is what we actually want to use and adjust variable name.
konrad commented 2022-02-20 20:19:20 +00:00
Outdated
Review
Copy Link

Unsure: I think eslint doesn't complain here if you use underscore (_) to spread the unused variable.

Nope, does not seem to have an effect.

> Unsure: I think eslint doesn't complain here if you use underscore (_) to spread the unused variable. Nope, does not seem to have an effect.
konrad commented 2022-02-20 20:21:17 +00:00
Outdated
Review
Copy Link

Add ?.[0] so we return the key, which is what we actually want to use and adjust variable name.

Done.

> Add ?.[0] so we return the key, which is what we actually want to use and adjust variable name. Done.
dpschen commented 2022-02-20 21:19:43 +00:00
Outdated
Review
Copy Link

Nope, does not seem to have an effect.

Interesting!

> Nope, does not seem to have an effect. Interesting!
return t(`input.datepickerRange.ranges.${predefinedRange}`)
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.
}
return showAll
return showAll.value
? t('task.show.titleCurrent')
: t('task.show.fromuntil', {
from: formatDate(dateFrom, 'PPP'),