working leantime widget 126
This commit is contained in:
parent
e798670921
commit
39344777fb
@ -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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user