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

working leantime widget 92

Browse Source
This commit is contained in:
Alma 2025-04-12 20:52:20 +02:00
parent 237451c41d
commit 47d3824807
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/flow.tsx
View File

@ -89,15 +89,22 @@ export function Flow() {
return; return;
} }
// Filter tasks with valid due dates and sort them // Sort tasks by date, using either dateToFinish or date field
const sortedTasks = data.tasks const sortedTasks = data.tasks
.filter((task: Task) => task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00') .filter((task: Task) => {
.sort((a: Task, b: Task) => { const hasValidDate = (dateStr: string) =>
const dateA = new Date(a.dateToFinish).getTime(); dateStr && dateStr !== '0000-00-00 00:00:00';
const dateB = new Date(b.dateToFinish).getTime(); return hasValidDate(task.dateToFinish) || hasValidDate(task.date);
return dateA - dateB;
}) })
.slice(0, 6); // Limit to 6 tasks .sort((a: Task, b: Task) => {
const getDate = (task: Task) => {
return task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00'
? new Date(task.dateToFinish)
: new Date(task.date);
};
return getDate(a).getTime() - getDate(b).getTime();
})
.slice(0, 6);
console.log('Sorted and filtered tasks:', sortedTasks); console.log('Sorted and filtered tasks:', sortedTasks);
setTasks(sortedTasks); setTasks(sortedTasks);