alma/NeahStable
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vision refactor

Browse Source
This commit is contained in:
alma 2026-01-15 22:18:47 +01:00
parent 0aaaf468ff
commit 0f12b2a5ab
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/flow.tsx
View File

@ -117,14 +117,31 @@ export function Duties() {
} }
// Backend already filters out status=5 (Done) and filters by editorId // Backend already filters out status=5 (Done) and filters by editorId
// Only sort by dateToFinish here // Filter to keep only tasks with due date before today (past due)
const sortedTasks = data const today = new Date();
today.setHours(0, 0, 0, 0); // Set to start of today for accurate comparison
const filteredTasks = data.filter((task: Task) => {
const dueDate = getValidDate(task);
if (!dueDate) {
return false; // Exclude tasks without a due date
}
const taskDueDate = new Date(dueDate);
taskDueDate.setHours(0, 0, 0, 0); // Set to start of day for accurate comparison
// Keep only tasks with due date before today (past due)
return taskDueDate < today;
});
// Sort by dateToFinish (oldest first)
const sortedTasks = filteredTasks
.sort((a: Task, b: Task) => { .sort((a: Task, b: Task) => {
// First sort by dateToFinish (oldest first) // First sort by dateToFinish (oldest first)
const dateA = getValidDate(a); const dateA = getValidDate(a);
const dateB = getValidDate(b); const dateB = getValidDate(b);
// If both dates are valid, compare them // Both dates are guaranteed to exist after filtering
if (dateA && dateB) { if (dateA && dateB) {
const timeA = new Date(dateA).getTime(); const timeA = new Date(dateA).getTime();
const timeB = new Date(dateB).getTime(); const timeB = new Date(dateB).getTime();
@ -133,11 +150,7 @@ export function Duties() {
} }
} }
// If only one date is valid, put the task with a date first // If dates are equal, sort by status (4 before others)
if (dateA) return -1;
if (dateB) return 1;
// If dates are equal or neither has a date, sort by status (4 before others)
if (a.status === 4 && b.status !== 4) return -1; if (a.status === 4 && b.status !== 4) return -1;
if (b.status === 4 && a.status !== 4) return 1; if (b.status === 4 && a.status !== 4) return 1;
@ -261,7 +274,7 @@ export function Duties() {
) : error ? ( ) : error ? (
<div className="text-xs text-red-500 text-center py-3">{error}</div> <div className="text-xs text-red-500 text-center py-3">{error}</div>
) : tasks.length === 0 ? ( ) : tasks.length === 0 ? (
<div className="text-xs text-gray-500 text-center py-6">No tasks with due dates found</div> <div className="text-xs text-gray-500 text-center py-6">Aucune tâche en retard</div>
) : ( ) : (
<div className="space-y-2 max-h-[400px] overflow-y-auto pr-1 scrollbar-thin scrollbar-thumb-gray-200 scrollbar-track-transparent"> <div className="space-y-2 max-h-[400px] overflow-y-auto pr-1 scrollbar-thin scrollbar-thumb-gray-200 scrollbar-track-transparent">
{tasks.map((task) => ( {tasks.map((task) => (