From 39344777fb378c5f01caa7aa71b2201c91b2e04c Mon Sep 17 00:00:00 2001 From: Alma Date: Sat, 12 Apr 2025 23:11:16 +0200 Subject: [PATCH] working leantime widget 126 --- components/flow.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/components/flow.tsx b/components/flow.tsx index 76ed4e18..642d5e15 100644 --- a/components/flow.tsx +++ b/components/flow.tsx @@ -98,10 +98,16 @@ export function Flow() { return; } - // Filter out completed tasks (status 3) and sort by dateToFinish + // Filter out completed tasks (status 5) and sort by dateToFinish const sortedTasks = data - .filter((task: Task) => task.status !== 3) + .filter((task: Task) => task.status !== 5) // Only filter out completed tasks .sort((a: Task, b: Task) => { + // First sort by status (4 before 3) + if (a.status !== b.status) { + return a.status === 4 ? -1 : 1; + } + + // Then sort by dateToFinish const dateA = getValidDate(a); const dateB = getValidDate(b); @@ -112,7 +118,7 @@ export function Flow() { return new Date(dateA).getTime() - new Date(dateB).getTime(); }); - console.log('Sorted tasks by dateToFinish:', sortedTasks); + console.log('Sorted tasks:', sortedTasks); setTasks(sortedTasks.slice(0, 6)); } catch (error) { console.error('Error fetching tasks:', error);