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

working leantime widget 121

Browse Source
This commit is contained in:
Alma 2025-04-12 23:01:09 +02:00
parent 840685ae26
commit 301d708263
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/flow.tsx
View File

@ -81,10 +81,16 @@ export function Flow() {
}; };
const getValidDate = (task: Task): string | null => { const getValidDate = (task: Task): string | null => {
// Only use dateToFinish // First check dateToFinish
if (task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00') { if (task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00') {
return task.dateToFinish; return task.dateToFinish;
} }
// Then check date
if (task.date && task.date !== '0000-00-00 00:00:00') {
return task.date;
}
return null; return null;
}; };
@ -100,7 +106,7 @@ export function Flow() {
return; return;
} }
// Filter out completed tasks (status 3) and sort by dateToFinish // Filter out completed tasks (status 3) and sort by date
const sortedTasks = data const sortedTasks = data
.filter((task: Task) => task.status !== 3) .filter((task: Task) => task.status !== 3)
.sort((a: Task, b: Task) => { .sort((a: Task, b: Task) => {
@ -114,7 +120,7 @@ export function Flow() {
return new Date(dateA).getTime() - new Date(dateB).getTime(); 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)); setTasks(sortedTasks.slice(0, 6));
} catch (error) { } catch (error) {
console.error('Error fetching tasks:', error); console.error('Error fetching tasks:', error);