vikunja
/
vikunja
6
43
Fork 72
Code Issues 151 Pull Requests 19 Packages Releases 32 Activity

fix(filters): pass correct filter query to kanban and gantt loading

This commit is contained in:
kolaente 2024-03-09 18:30:01 +01:00
parent 9f84e5b8b0
commit 2616c51ed3
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/views/project/ProjectKanban.vue
View File

@ -296,6 +296,7 @@ import {calculateItemPosition} from '@/helpers/calculateItemPosition'
import {isSavedFilter} from '@/services/savedFilter' import {isSavedFilter} from '@/services/savedFilter'
import {success} from '@/message' import {success} from '@/message'
import {useProjectStore} from '@/stores/projects' import {useProjectStore} from '@/stores/projects'
import type {TaskFilterParams} from '@/services/taskCollection'
const { const {
projectId = undefined, projectId = undefined,
@ -347,11 +348,12 @@ const collapsedBuckets = ref<CollapsedBuckets>({})
const taskUpdating = ref<{[id: ITask['id']]: boolean}>({}) const taskUpdating = ref<{[id: ITask['id']]: boolean}>({})
const oneTaskUpdating = ref(false) const oneTaskUpdating = ref(false)
const params = ref({ const params = ref<TaskFilterParams>({
filter_by: [], sort_by: [],
filter_value: [], order_by: [],
filter_comparator: [], filter: '',
filter_concat: 'and', filter_include_nulls: false,
s: '',
}) })
const getTaskDraggableTaskComponentData = computed(() => (bucket: IBucket) => { const getTaskDraggableTaskComponentData = computed(() => (bucket: IBucket) => {

5
frontend/src/views/project/helpers/useGanttFilters.ts
View File

@ -79,10 +79,7 @@ function ganttFiltersToApiParams(filters: GanttFilters): TaskFilterParams {
return { return {
sort_by: ['start_date', 'done', 'id'], sort_by: ['start_date', 'done', 'id'],
order_by: ['asc', 'asc', 'desc'], order_by: ['asc', 'asc', 'desc'],
filter_by: ['start_date', 'start_date'], filter: 'start_date >= ' + isoToKebabDate(filters.dateFrom) + ' && start_date <= ' + isoToKebabDate(filters.dateTo),
filter_comparator: ['greater_equals', 'less_equals'],
filter_value: [isoToKebabDate(filters.dateFrom), isoToKebabDate(filters.dateTo)],
filter_concat: 'and',
filter_include_nulls: filters.showTasksWithoutDates, filter_include_nulls: filters.showTasksWithoutDates,
} }
} }