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

working leantime widget 113

Browse Source
This commit is contained in:
Alma 2025-04-12 22:38:11 +02:00
parent ba9ee7ab23
commit 9b235a9785
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
components/flow.tsx
View File

@ -114,11 +114,12 @@ export function Flow() {
.map((task: Task): TaskWithDate => { .map((task: Task): TaskWithDate => {
let validDate: Date | undefined; let validDate: Date | undefined;
// First try dateToFinish // First try dateToFinish if it's a valid date
if (task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00') { if (task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00') {
const date = new Date(task.dateToFinish); const date = new Date(task.dateToFinish);
if (!isNaN(date.getTime())) { if (!isNaN(date.getTime())) {
validDate = date; validDate = date;
console.log(`Task ${task.id} - Valid dateToFinish:`, task.dateToFinish);
} }
} }
@ -127,42 +128,52 @@ export function Flow() {
const date = new Date(task.date); const date = new Date(task.date);
if (!isNaN(date.getTime())) { if (!isNaN(date.getTime())) {
validDate = date; validDate = date;
console.log(`Task ${task.id} - Using date field:`, task.date);
} }
} }
console.log(`Task ${task.id} - Date Processing:`, {
headline: task.headline,
dateToFinish: task.dateToFinish,
date: task.date,
validDate: validDate?.toISOString(),
status: task.status
});
return { ...task, validDate }; return { ...task, validDate };
}); });
// Sort tasks by date // Sort tasks: first by status (4 before 3), then by date
const sortedTasks = processedTasks const sortedTasks = processedTasks
.sort((a: TaskWithDate, b: TaskWithDate) => { .sort((a: TaskWithDate, b: TaskWithDate) => {
// Tasks with dates come first // First sort by status (4 before 3)
if (a.validDate && !b.validDate) return -1; if (a.status !== b.status) {
if (!a.validDate && b.validDate) return 1; return b.status - a.status; // Higher status numbers first
if (!a.validDate && !b.validDate) return 0; }
// Sort by date if both have dates // Then sort by date
return a.validDate!.getTime() - b.validDate!.getTime(); if (a.validDate && b.validDate) {
}) return a.validDate.getTime() - b.validDate.getTime();
.slice(0, 12); // Show more tasks }
if (a.validDate) return -1;
if (b.validDate) return 1;
return 0;
});
console.log('Final sorted tasks:', sortedTasks.map((t: TaskWithDate) => ({ console.log('Sorted tasks before slice:', sortedTasks.map((t: TaskWithDate) => ({
id: t.id, id: t.id,
headline: t.headline, headline: t.headline,
status: t.status,
dateToFinish: t.dateToFinish, dateToFinish: t.dateToFinish,
validDate: t.validDate?.toISOString(), date: t.date,
status: t.status validDate: t.validDate?.toISOString()
}))); })));
setTasks(sortedTasks); // Take the first 12 tasks
const finalTasks = sortedTasks.slice(0, 12);
console.log('Final tasks to display:', finalTasks.map((t: TaskWithDate) => ({
id: t.id,
headline: t.headline,
status: t.status,
dateToFinish: t.dateToFinish,
date: t.date,
validDate: t.validDate?.toISOString()
})));
setTasks(finalTasks);
} catch (error) { } catch (error) {
console.error('Error fetching tasks:', error); console.error('Error fetching tasks:', error);
setError('Failed to fetch tasks'); setError('Failed to fetch tasks');