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

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

@ -57,7 +57,7 @@ const flatPickerConfig = computed(() => ({
inline: true,
mode: 'range',
locale: {
firstDayOf7Days: weekStart,
firstDayOf7Days: weekStart.value,
},
}))

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

@ -97,8 +97,8 @@ export default {
const title = this.showAll
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!
? this.$t('task.show.titleCurrent')
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.
: this.$t('task.show.fromuntil', {
from: this.formatDateShort(this.dateFrom),
until: this.formatDateShort(this.dateTo)
from: this.format(this.dateFrom, 'PPP'),
until: this.format(this.dateTo, 'PPP')
})
this.setTitle(title)