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

working leantime widget 110

Browse Source
This commit is contained in:
Alma 2025-04-12 22:29:05 +02:00
parent 78f469a0ee
commit bf9de49a0f
1 changed files with 24 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
components/flow.tsx
View File

@ -95,54 +95,28 @@ export function Flow() {
return; return;
} }
// Log the raw API response // Debug log to see raw task data
console.log('Raw API response:', {
taskCount: data.tasks.length,
firstTask: data.tasks[0],
taskFields: Object.keys(data.tasks[0])
});
// Debug log to see all tasks and their dates
data.tasks.forEach((task: Task) => { data.tasks.forEach((task: Task) => {
// Log the complete task object first console.log(`Task ${task.id} - Raw data:`, {
console.log(`Task ${task.id} - Complete data:`, {
id: task.id,
headline: task.headline, headline: task.headline,
dateToFinish: task.dateToFinish, dateToFinish: task.dateToFinish,
date: task.date, date: task.date,
status: task.status, status: task.status
editorId: task.editorId,
projectName: task.projectName
}); });
}); });
const getValidDate = (task: Task): Date | undefined => { const getValidDate = (task: Task): Date | undefined => {
// First try dateToFinish as it's the primary due date field // First check dateToFinish
const rawDateToFinish = task.dateToFinish; if (task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00') {
console.log(`Task ${task.id} - Raw dateToFinish:`, { const date = new Date(task.dateToFinish);
value: rawDateToFinish, if (!isNaN(date.getTime())) {
type: typeof rawDateToFinish,
hasValue: !!rawDateToFinish
});
if (rawDateToFinish && rawDateToFinish !== '0000-00-00 00:00:00') {
const date = new Date(rawDateToFinish);
const isValid = !isNaN(date.getTime());
console.log(`Task ${task.id} - Date parsing result:`, {
input: rawDateToFinish,
parsed: date.toISOString(),
isValid: isValid
});
if (isValid) {
return date; return date;
} }
} }
// Then try date field as fallback // Then check date field
const rawDate = task.date; if (task.date && task.date !== '0000-00-00 00:00:00') {
if (rawDate && rawDate !== '0000-00-00 00:00:00') { const date = new Date(task.date);
const date = new Date(rawDate);
if (!isNaN(date.getTime())) { if (!isNaN(date.getTime())) {
return date; return date;
} }
@ -151,40 +125,38 @@ export function Flow() {
return undefined; return undefined;
}; };
// Process and sort tasks - only non-completed tasks // Process tasks - exclude completed tasks and get valid dates
const processedTasks = data.tasks const processedTasks = data.tasks
.filter((task: Task) => task.status !== 5) // Exclude completed tasks .filter((task: Task) => task.status !== 5) // Exclude completed tasks
.map((task: Task): TaskWithDate => { .map((task: Task): TaskWithDate => {
const validDate = getValidDate(task); const validDate = getValidDate(task);
console.log(`Task ${task.id} - Final processing:`, { console.log(`Task ${task.id} - Processing:`, {
headline: task.headline, headline: task.headline,
dateToFinish: task.dateToFinish, dateToFinish: task.dateToFinish,
date: task.date,
validDate: validDate?.toISOString(), validDate: validDate?.toISOString(),
status: task.status, status: task.status
hasValidDate: !!validDate
}); });
return { ...task, validDate }; return { ...task, validDate };
}); });
// Sort tasks by date (tasks with dates come first) // Sort tasks by date
const sortedTasks = processedTasks const sortedTasks = processedTasks
.sort((a: TaskWithDate, b: TaskWithDate) => { .sort((a: TaskWithDate, b: TaskWithDate) => {
if (a.validDate && b.validDate) { if (!a.validDate && !b.validDate) return 0;
return a.validDate.getTime() - b.validDate.getTime(); if (!a.validDate) return 1;
} if (!b.validDate) return -1;
if (!a.validDate && !b.validDate) { return a.validDate.getTime() - b.validDate.getTime();
return 0; // Keep original order for tasks without dates
}
return a.validDate ? -1 : 1; // Tasks with dates come first
}) })
.slice(0, 6); // Only take the first 6 tasks .slice(0, 6); // Take first 6 tasks
console.log('Final sorted tasks:', sortedTasks.map((t: TaskWithDate) => ({ console.log('Final sorted tasks:', sortedTasks.map((t: TaskWithDate) => ({
id: t.id, id: t.id,
headline: t.headline, headline: t.headline,
dateToFinish: t.dateToFinish,
date: t.date,
validDate: t.validDate?.toISOString(), validDate: t.validDate?.toISOString(),
status: t.status, status: t.status
dateToFinish: t.dateToFinish
}))); })));
setTasks(sortedTasks); setTasks(sortedTasks);
@ -201,7 +173,7 @@ export function Flow() {
}, []); }, []);
// Update the date display component // Update the date display component
const TaskDate = ({ task }: { task: Task & { validDate?: Date } }) => { const TaskDate = ({ task }: { task: TaskWithDate }) => {
const today = new Date(); const today = new Date();
today.setHours(0, 0, 0, 0); today.setHours(0, 0, 0, 0);