chore: 1.7.6

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tout-doux",
-    "version": "1.7.4",
+    "version": "1.7.6",
     "private": true,
     "type": "module",
     "engines": {

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tout-doux"
-version = "1.7.4"
+version = "1.7.6"
 description = ""
 requires-python = ">=3.14"
 dependencies = [

resources/ts/lib/recurrence.ts

@@ -22,7 +22,7 @@ export function parseCron(cron: string | null): {
             value: 0,
             date: null,
         };
-    } else if (cron.startsWith("RRULE:") || cron.startsWith("DTSTART:")) {
+    } else if (isRrule(cron)) {
         return parseRrule(cron);
     } else if ((value = /^0 (\d+) \* \* \*$/i.exec(cron)) !== null) {
         return {
@@ -75,6 +75,10 @@ export function parseCron(cron: string | null): {
     }
 }
 
+function isRrule(cron: string): boolean {
+    return cron.startsWith("RRULE:") || cron.startsWith("DTSTART:");
+}
+
 export function parseRrule(rule: string): {
     type: CronType;
     value: number;
@@ -193,7 +197,7 @@ export function nextCronReset(
         return null;
     }
     try {
-        if (cron.startsWith("RRULE:")) {
+        if (isRrule(cron)) {
             try {
                 const rule = new RRule({
                     ...RRule.parseString(cron),

resources/ts/lib/tasks.ts

@@ -50,6 +50,14 @@ export function taskFutureReset(task: Task): Date | null {
     );
 }
 
+export function taskSortReset(task: Task): Date | null {
+    let resetDate = taskNextReset(task);
+    while (resetDate !== null && resetDate.getTime() < new Date().getTime()) {
+        resetDate = nextCronReset(resetDate, task.reset_cron, task.id);
+    }
+    return resetDate;
+}
+
 export function taskCompleted(task: Task): boolean {
     if (task.check_date === null) {
         return false;
@@ -94,8 +102,8 @@ export function taskSortFunction(
         case SortType.RESET_DATE:
             return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) *
-                ((taskNextReset(a) ?? fallbackDate(a)).getTime() -
+                ((taskSortReset(a) ?? fallbackDate(a)).getTime() -
-                    (taskNextReset(b) ?? fallbackDate(b)).getTime());
+                    (taskSortReset(b) ?? fallbackDate(b)).getTime());
         case SortType.NAME:
             return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) * a.name.localeCompare(b.name);

uv.lock

@@ -323,7 +323,7 @@ asyncpg = [
 
 [[package]]
 name = "tout-doux"
-version = "1.7.4"
+version = "1.7.6"
 source = { editable = "." }
 dependencies = [
     { name = "flask", extra = ["async"] },