2 Commits
Author SHA1 Message Date
klemek 7fc16e78de chore: 1.7.4
Python Lint CI / ruff (push) Successful in 3m56s
Python Lint CI / ruff-format-check (push) Successful in 3m53s
Python Lint CI / ty (push) Successful in 4m2s
TS Lint / Oxlint (push) Successful in 3m46s
TS Lint / ESLint (push) Successful in 3m50s
Docker Build / build (push) Successful in 10m13s
TS Lint / TypeScript (push) Successful in 4m54s
2026-08-02 09:32:00 +02:00
klemek f8f38c9197 fix: task sorting 2026-08-02 09:31:56 +02:00
5 changed files with 26 additions and 49 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "tout-doux", "name": "tout-doux",
"version": "1.7.3", "version": "1.7.4",
"private": true, "private": true,
"type": "module", "type": "module",
"engines": { "engines": {
+1 -1
View File
@@ -1,6 +1,6 @@
[project] [project]
name = "tout-doux" name = "tout-doux"
version = "1.7.3" version = "1.7.4"
description = "" description = ""
requires-python = ">=3.14" requires-python = ">=3.14"
dependencies = [ dependencies = [
+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();
} }
} }
+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) {
Generated
+1 -1
View File
@@ -323,7 +323,7 @@ asyncpg = [
[[package]] [[package]]
name = "tout-doux" name = "tout-doux"
version = "1.7.3" version = "1.7.4"
source = { editable = "." } source = { editable = "." }
dependencies = [ dependencies = [
{ name = "flask", extra = ["async"] }, { name = "flask", extra = ["async"] },