klemek/tout-doux
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 15 Wiki Activity

fix: task sorting

Browse Source
This commit is contained in:
klemek
2026-08-02 09:31:56 +02:00
parent 6e508547fc
commit f8f38c9197
2 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/ts/lib/tasks.ts
+16 -39
View File
@@ -63,9 +63,9 @@ export function taskCompleted(task: Task): boolean {
export function fallbackDate(task: Task): Date { export function fallbackDate(task: Task): Date {
return new Date( return new Date(
task.created_at.getFullYear() - 100, (task.check_date ?? task.created_at).getFullYear() + 100,
task.created_at.getMonth(), (task.check_date ?? task.created_at).getMonth(),
task.created_at.getDate(), (task.check_date ?? task.created_at).getDate(),
0, 0,
0, 0,
0, 0,
@@ -73,54 +73,31 @@ export function fallbackDate(task: Task): Date {
); );
} }
export function sortTasks( export function taskSortFunction(
tasks: Task[],
sortType: SortType, sortType: SortType,
reverse: boolean, reverse: boolean,
): Task[] { ): (a: Task, b: Task) => number {
switch (sortType) { switch (sortType) {
case SortType.CREATED_AT: case SortType.CREATED_AT:
return tasks return (a: Task, b: Task) =>
.slice()
.sort(
(a: Task, b: Task) =>
(reverse ? -1 : 1) * (reverse ? -1 : 1) *
(a.created_at.getTime() - b.created_at.getTime()), (a.created_at.getTime() - b.created_at.getTime());
);
case SortType.UPDATED_AT: case SortType.UPDATED_AT:
return tasks return (a: Task, b: Task) =>
.slice()
.sort(
(a: Task, b: Task) =>
(reverse ? -1 : 1) * (reverse ? -1 : 1) *
(a.updated_at.getTime() - b.updated_at.getTime()), (a.updated_at.getTime() - b.updated_at.getTime());
);
case SortType.CHECK_DATE: case SortType.CHECK_DATE:
return tasks return (a: Task, b: Task) =>
.slice()
.sort(
(a: Task, b: Task) =>
(reverse ? -1 : 1) * (reverse ? -1 : 1) *
((a.check_date ?? fallbackDate(a)).getTime() - ((a.check_date ?? fallbackDate(a)).getTime() -
(b.check_date ?? fallbackDate(b)).getTime()), (b.check_date ?? fallbackDate(b)).getTime());
);
case SortType.RESET_DATE: case SortType.RESET_DATE:
return tasks return (a: Task, b: Task) =>
.slice()
.sort(
(a: Task, b: Task) =>
(reverse ? -1 : 1) * (reverse ? -1 : 1) *
(taskNextReset(a) ?? fallbackDate(a)).getTime() - ((taskNextReset(a) ?? fallbackDate(a)).getTime() -
(taskNextReset(b) ?? fallbackDate(b)).getTime(), (taskNextReset(b) ?? fallbackDate(b)).getTime());
);
case SortType.NAME: case SortType.NAME:
return tasks return (a: Task, b: Task) =>
.slice() (reverse ? -1 : 1) * a.name.localeCompare(b.name);
.sort(
(a: Task, b: Task) =>
(reverse ? -1 : 1) * a.name.localeCompare(b.name),
);
default:
return tasks.slice();
} }
} }
resources/ts/views/ListView.vue
+2 -2
View File
@@ -11,7 +11,7 @@ import {
} from "@lucide/vue"; } from "@lucide/vue";
import TaskItem from "@/components/TaskItem.vue"; import TaskItem from "@/components/TaskItem.vue";
import ListOptions from "@/components/ListOptions.vue"; import ListOptions from "@/components/ListOptions.vue";
import { taskCompleted, sortTasks, newTemporaryTask } from "@/lib/tasks"; import { taskCompleted, taskSortFunction, newTemporaryTask } from "@/lib/tasks";
import { SortType } from "@/enums"; import { SortType } from "@/enums";
import { booleanCookieRef, enumCookieRef } from "@/lib/cookies"; import { booleanCookieRef, enumCookieRef } from "@/lib/cookies";
import { useAlertStore } from "@/stores/alerts"; import { useAlertStore } from "@/stores/alerts";
@@ -75,7 +75,7 @@ function fetchTasks(requestedList: string) {
} }
function reSortTasks(update = false) { function reSortTasks(update = false) {
tasks.value = sortTasks(tasks.value, sortType.value, sortReverse.value); tasks.value.sort(taskSortFunction(sortType.value, sortReverse.value));
if (update) { if (update) {
updateTitle(); updateTitle();
if (tasks.value.length && list.value) { if (tasks.value.length && list.value) {