working leantime widget 92
This commit is contained in:
parent
237451c41d
commit
47d3824807
@ -89,15 +89,22 @@ export function Flow() {
|
||||
return;
|
||||
}
|
||||
|
||||
// Filter tasks with valid due dates and sort them
|
||||
// Sort tasks by date, using either dateToFinish or date field
|
||||
const sortedTasks = data.tasks
|
||||
.filter((task: Task) => task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00')
|
||||
.sort((a: Task, b: Task) => {
|
||||
const dateA = new Date(a.dateToFinish).getTime();
|
||||
const dateB = new Date(b.dateToFinish).getTime();
|
||||
return dateA - dateB;
|
||||
.filter((task: Task) => {
|
||||
const hasValidDate = (dateStr: string) =>
|
||||
dateStr && dateStr !== '0000-00-00 00:00:00';
|
||||
return hasValidDate(task.dateToFinish) || hasValidDate(task.date);
|
||||
})
|
||||
.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);
|
||||
setTasks(sortedTasks);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user