working leantime widget 100
This commit is contained in:
parent
a45f0bf578
commit
e25a804246
@ -101,39 +101,62 @@ export function Flow() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const getValidDate = (task: Task): Date | undefined => {
|
const getValidDate = (task: Task): Date | undefined => {
|
||||||
const isValidDate = (dateStr: string | undefined): boolean => {
|
const tryParseDate = (dateStr: string | undefined, fieldName: string): Date | undefined => {
|
||||||
if (!dateStr) return false;
|
console.log(`Trying to parse ${fieldName}:`, dateStr);
|
||||||
if (dateStr === '0000-00-00 00:00:00') return false;
|
|
||||||
if (dateStr === '') return false;
|
if (!dateStr) {
|
||||||
|
console.log(`${fieldName} is empty or undefined`);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dateStr === '0000-00-00 00:00:00') {
|
||||||
|
console.log(`${fieldName} is invalid format (0000-00-00)`);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
const date = new Date(dateStr);
|
const date = new Date(dateStr);
|
||||||
return !isNaN(date.getTime());
|
if (isNaN(date.getTime())) {
|
||||||
|
console.log(`${fieldName} parsed to invalid date`);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`${fieldName} successfully parsed to:`, date.toISOString());
|
||||||
|
return date;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Try all possible date fields in order of priority
|
// Try each date field in order of priority
|
||||||
if (isValidDate(task.dateToFinish)) {
|
let date: Date | undefined;
|
||||||
return new Date(task.dateToFinish!);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isValidDate(task.editTo)) {
|
date = tryParseDate(task.dateToFinish, 'dateToFinish');
|
||||||
return new Date(task.editTo!);
|
if (date) return date;
|
||||||
}
|
|
||||||
|
|
||||||
if (isValidDate(task.editFrom)) {
|
date = tryParseDate(task.editTo, 'editTo');
|
||||||
return new Date(task.editFrom!);
|
if (date) return date;
|
||||||
}
|
|
||||||
|
|
||||||
if (isValidDate(task.date)) {
|
date = tryParseDate(task.editFrom, 'editFrom');
|
||||||
return new Date(task.date);
|
if (date) return date;
|
||||||
}
|
|
||||||
|
|
||||||
|
date = tryParseDate(task.date, 'date');
|
||||||
|
if (date) return date;
|
||||||
|
|
||||||
|
console.log('No valid date found for task:', task.id);
|
||||||
return undefined;
|
return undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Sort tasks by date
|
// Sort tasks by date
|
||||||
const sortedTasks = data.tasks
|
const sortedTasks = data.tasks
|
||||||
.map((task: Task): TaskWithDate => {
|
.map((task: Task): TaskWithDate => {
|
||||||
|
console.log(`\nProcessing task ${task.id} - ${task.headline}`);
|
||||||
|
console.log('Raw task data:', {
|
||||||
|
dateToFinish: task.dateToFinish,
|
||||||
|
editTo: task.editTo,
|
||||||
|
editFrom: task.editFrom,
|
||||||
|
date: task.date
|
||||||
|
});
|
||||||
|
|
||||||
const validDate = getValidDate(task);
|
const validDate = getValidDate(task);
|
||||||
console.log(`Task ${task.id} - ${task.headline} - Valid Date:`, validDate?.toISOString());
|
console.log('Final valid date:', validDate?.toISOString() || 'NO DATE');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...task,
|
...task,
|
||||||
validDate
|
validDate
|
||||||
@ -152,14 +175,16 @@ export function Flow() {
|
|||||||
return a.validDate ? -1 : 1;
|
return a.validDate ? -1 : 1;
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log('Final sorted tasks:', sortedTasks.map((t: TaskWithDate) => ({
|
console.log('\nFinal sorted tasks:', sortedTasks.map((t: TaskWithDate) => ({
|
||||||
id: t.id,
|
id: t.id,
|
||||||
headline: t.headline,
|
headline: t.headline,
|
||||||
validDate: t.validDate?.toISOString(),
|
validDate: t.validDate?.toISOString(),
|
||||||
date: t.date,
|
rawDates: {
|
||||||
dateToFinish: t.dateToFinish,
|
dateToFinish: t.dateToFinish,
|
||||||
editFrom: t.editFrom,
|
editTo: t.editTo,
|
||||||
editTo: t.editTo
|
editFrom: t.editFrom,
|
||||||
|
date: t.date
|
||||||
|
}
|
||||||
})));
|
})));
|
||||||
|
|
||||||
setTasks(sortedTasks);
|
setTasks(sortedTasks);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user