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

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

@ -23,7 +23,7 @@
{{ $t('input.datepickerRange.from') }}
<div class="field has-addons">
<div class="control is-fullwidth">
<input class="input" type="text" v-model="from" @change="inputChanged"/>
<input class="input" type="text" v-model="from"/>
</div>
<div class="control">
<x-button icon="calendar" variant="secondary" data-toggle/>
@ -34,7 +34,7 @@
{{ $t('input.datepickerRange.to') }}
<div class="field has-addons">
<div class="control is-fullwidth">
<input class="input" type="text" v-model="to" @change="inputChanged"/>
<input class="input" type="text" v-model="to"/>
</div>
<div class="control">
<x-button icon="calendar" variant="secondary" data-toggle/>
@ -48,7 +48,9 @@
<p>
{{ $t('input.datepickerRange.math.canuse') }}
<BaseButton class="has-text-primary" @click="showHowItWorks = true">{{ $t('input.datepickerRange.math.learnhow') }}</BaseButton>
<BaseButton class="has-text-primary" @click="showHowItWorks = true">
{{ $t('input.datepickerRange.math.learnhow') }}
</BaseButton>
</p>
konrad marked this conversation as resolved
dpschen commented 2022-02-06 13:14:02 +00:00
Review
Copy Link

Use BaseButton

Use BaseButton
konrad commented 2022-02-06 17:52:16 +00:00
Review
Copy Link

Done.

Done.
<modal
@ -240,12 +242,13 @@ watch(
emitChanged()
},
)
watch(() => from, inputChanged)
watch(() => to, inputChanged)
function setDateRange(range: string[] | null) {
if (range === null) {
from.value = ''
to.value = ''
inputChanged()
return
}
@ -253,7 +256,6 @@ function setDateRange(range: string[] | null) {
from.value = range[0]
to.value = range[1]
inputChanged()
}
const customRangeActive = computed<Boolean>(() => {
@ -261,13 +263,13 @@ const customRangeActive = computed<Boolean>(() => {
})
const buttonText = computed<string>(() => {
if(from.value !== '' && to.value !== '') {
if (from.value !== '' && to.value !== '') {
return t('input.datepickerRange.fromto', {
from: from.value,
to: to.value,
})
}
return t('task.show.select')
})
</script>