Compare commits
2
Commits
7fc16e78de
...
63c80f0bae
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63c80f0bae | ||
|
|
f36c8ba315 |
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tout-doux",
|
||||
"version": "1.7.4",
|
||||
"version": "1.7.5",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"engines": {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "tout-doux"
|
||||
version = "1.7.4"
|
||||
version = "1.7.5"
|
||||
description = ""
|
||||
requires-python = ">=3.14"
|
||||
dependencies = [
|
||||
|
||||
@@ -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() -
|
||||
(taskNextReset(b) ?? fallbackDate(b)).getTime());
|
||||
((taskSortReset(a) ?? fallbackDate(a)).getTime() -
|
||||
(taskSortReset(b) ?? fallbackDate(b)).getTime());
|
||||
case SortType.NAME:
|
||||
return (a: Task, b: Task) =>
|
||||
(reverse ? -1 : 1) * a.name.localeCompare(b.name);
|
||||
|
||||
Reference in New Issue
Block a user