Fix using filters for overview views

This commit is contained in:
kolaente 2020-05-09 15:46:05 +02:00
parent 67de7e7c8f
commit 2270272a8f
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B

View file

@ -44,15 +44,26 @@
}, },
methods: { methods: {
loadPendingTasks() { loadPendingTasks() {
let params = { const params = {
sort_by: ['due_date_unix', 'id'], sort_by: ['due_date_unix', 'id'],
order_by: ['desc', 'desc'], order_by: ['desc', 'desc'],
filter_by: ['done'], filter_by: ['done'],
filter_value: [false], filter_value: [false],
filter_comparator: ['equals'],
filter_concat: 'and',
} }
if (!this.showAll) { if (!this.showAll) {
params.startdate = Math.round(+ this.startDate / 1000) params.filter_by.push('start_date')
params.enddate = Math.round(+ this.endDate / 1000) params.filter_value.push(Math.round(+ this.startDate / 1000))
params.filter_comparator.push('greater')
params.filter_by.push('end_date')
params.filter_value.push(Math.round(+ this.endDate / 1000))
params.filter_comparator.push('less')
params.filter_by.push('due_date')
params.filter_value.push(Math.round(+ this.endDate / 1000))
params.filter_comparator.push('less')
} }
this.taskService.getAll({}, params) this.taskService.getAll({}, params)
@ -64,8 +75,7 @@
} }
} }
} }
this.$set(this, 'tasks', r) this.$set(this, 'tasks', r.filter(t => !t.done))
this.sortTasks()
}) })
.catch(e => { .catch(e => {
this.error(e, this) this.error(e, this)