mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
fixy
This commit is contained in:
1 parent
4ed354904c
commit
b16ff2e34f
4 files changed
+63
-95
No files matched your search
@@ -4,7 +4,7 @@
|
||||
<Z-tasks-search @search="onSearch" @employee-selected="onEmployeeSelected" @update-sort-order="onUpdateSortOrder" />
|
||||
|
||||
<W-loadable :content="filteredUnscheduledTasks" :emptyMessage="searchQuery.length ? 'Neboli nájdené žiadne úlohy' : 'Nenašli sa žiadne záznamy'">
|
||||
<A-unscheduled-table :subtasks="selectedTasks" />
|
||||
<A-unscheduled-table :subtasks="filteredUnscheduledTasks" />
|
||||
</W-loadable>
|
||||
|
||||
</div>
|
||||
@@ -39,51 +39,41 @@ export default {
|
||||
if (!this.unscheduledSubtasks)
|
||||
return null
|
||||
|
||||
return this.unscheduledSubtasks.filter(subtask => {
|
||||
let filteredSubtasks = this.unscheduledSubtasks.filter(subtask => {
|
||||
return this.filterParams(this.searchQuery, subtask.master_task?.name || subtask.title) || this.filterParams(this.searchQuery, subtask.project_code)
|
||||
})
|
||||
},
|
||||
|
||||
sortedUnscheduledTasks() {
|
||||
if (!this.unscheduledSubtasks)
|
||||
return null
|
||||
|
||||
let sortedTasks = this.unscheduledSubtasks
|
||||
|
||||
//Sorting by name A-Z
|
||||
if (this.sortOrder === 'nameAsc') {
|
||||
sortedTasks.sort((a, b) => {
|
||||
const nameA = (a.title || a.master_task || '').toLowerCase()
|
||||
const nameB = (b.title || b.master_task || '').toLowerCase()
|
||||
return nameA.localeCompare(nameB)
|
||||
})
|
||||
filteredSubtasks.sort((a, b) => {
|
||||
const nameA = (a.title || a.master_task || '').toLowerCase()
|
||||
const nameB = (b.title || b.master_task || '').toLowerCase()
|
||||
return nameA.localeCompare(nameB)
|
||||
})
|
||||
//Sorting by name Z-A
|
||||
} else if (this.sortOrder === 'nameDesc') {
|
||||
sortedTasks.sort((a, b) => {
|
||||
const nameA = (a.title || a.master_task || '').toLowerCase()
|
||||
const nameB = (b.title || b.master_task || '').toLowerCase()
|
||||
return nameB.localeCompare(nameA)
|
||||
})
|
||||
filteredSubtasks.sort((a, b) => {
|
||||
// const { nameA, nameB } = this._getTaskTitleOrMastertaskName(a, b)
|
||||
const nameA = (a.title || a.master_task || '').toLowerCase()
|
||||
const nameB = (b.title || b.master_task || '').toLowerCase()
|
||||
return nameB.localeCompare(nameA)
|
||||
})
|
||||
//Sorting by date Newest-Oldest
|
||||
} else if (this.sortOrder === 'deadlineDesc') {
|
||||
sortedTasks.sort((a, b) => {
|
||||
const deadlineA = a.deadline ? new Date(a.deadline) : new Date(this.getMasterTaskDeadline(a))
|
||||
const deadlineB = b.deadline ? new Date(b.deadline) : new Date(this.getMasterTaskDeadline(b))
|
||||
return deadlineB - deadlineA
|
||||
})
|
||||
filteredSubtasks.sort((a, b) => {
|
||||
const deadlineA = a.deadline ? new Date(a.deadline) : new Date(this.getMasterTaskDeadline(a))
|
||||
const deadlineB = b.deadline ? new Date(b.deadline) : new Date(this.getMasterTaskDeadline(b))
|
||||
return deadlineB - deadlineA
|
||||
})
|
||||
//Sorting by date Oldest-Newest
|
||||
} else if (this.sortOrder === 'deadlineAsc') {
|
||||
sortedTasks.sort((a, b) => {
|
||||
const deadlineA = a.deadline ? new Date(a.deadline) : new Date(this.getMasterTaskDeadline(a))
|
||||
const deadlineB = b.deadline ? new Date(b.deadline) : new Date(this.getMasterTaskDeadline(b))
|
||||
return deadlineA - deadlineB
|
||||
})
|
||||
filteredSubtasks.sort((a, b) => {
|
||||
const deadlineA = a.deadline ? new Date(a.deadline) : new Date(this.getMasterTaskDeadline(a))
|
||||
const deadlineB = b.deadline ? new Date(b.deadline) : new Date(this.getMasterTaskDeadline(b))
|
||||
return deadlineA - deadlineB
|
||||
})
|
||||
}
|
||||
return sortedTasks
|
||||
},
|
||||
|
||||
selectedTasks() {
|
||||
return this.sortOrder ? this.sortedUnscheduledTasks : this.filteredUnscheduledTasks
|
||||
return filteredSubtasks
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
Reference in new issue
Block a user