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

working leantime widget 99

Browse Source
This commit is contained in:
Alma 2025-04-12 21:22:16 +02:00
parent 6c138e4a79
commit a45f0bf578
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
components/flow.tsx
View File

@ -101,28 +101,29 @@ export function Flow() {
}); });
const getValidDate = (task: Task): Date | undefined => { const getValidDate = (task: Task): Date | undefined => {
// Try dateToFinish first const isValidDate = (dateStr: string | undefined): boolean => {
if (task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00') { if (!dateStr) return false;
const d = new Date(task.dateToFinish); if (dateStr === '0000-00-00 00:00:00') return false;
if (!isNaN(d.getTime())) return d; if (dateStr === '') return false;
const date = new Date(dateStr);
return !isNaN(date.getTime());
};
// Try all possible date fields in order of priority
if (isValidDate(task.dateToFinish)) {
return new Date(task.dateToFinish!);
} }
// Try editTo if (isValidDate(task.editTo)) {
if (task.editTo && task.editTo !== '0000-00-00 00:00:00') { return new Date(task.editTo!);
const d = new Date(task.editTo);
if (!isNaN(d.getTime())) return d;
} }
// Try editFrom if (isValidDate(task.editFrom)) {
if (task.editFrom && task.editFrom !== '0000-00-00 00:00:00') { return new Date(task.editFrom!);
const d = new Date(task.editFrom);
if (!isNaN(d.getTime())) return d;
} }
// Try date if (isValidDate(task.date)) {
if (task.date && task.date !== '0000-00-00 00:00:00') { return new Date(task.date);
const d = new Date(task.date);
if (!isNaN(d.getTime())) return d;
} }
return undefined; return undefined;
@ -130,30 +131,32 @@ export function Flow() {
// Sort tasks by date // Sort tasks by date
const sortedTasks = data.tasks const sortedTasks = data.tasks
.map((task: Task): TaskWithDate => ({ .map((task: Task): TaskWithDate => {
...task, const validDate = getValidDate(task);
validDate: getValidDate(task) console.log(`Task ${task.id} - ${task.headline} - Valid Date:`, validDate?.toISOString());
})) return {
...task,
validDate
};
})
.sort((a: TaskWithDate, b: TaskWithDate) => { .sort((a: TaskWithDate, b: TaskWithDate) => {
// If both tasks have dates, sort by date (oldest first) // If both tasks have dates, sort by date (oldest first)
if (a.validDate && b.validDate) { if (a.validDate && b.validDate) {
return a.validDate.getTime() - b.validDate.getTime(); return a.validDate.getTime() - b.validDate.getTime();
} }
// If neither has a date, sort by ID (most recent first) // Put tasks without dates at the end and sort by ID (newest first)
if (!a.validDate && !b.validDate) { if (!a.validDate && !b.validDate) {
return b.id - a.id; // Reverse ID sort for undated tasks return b.id - a.id;
} }
// Put tasks without dates at the end // Tasks with dates come before tasks without dates
if (!a.validDate) return 1; return a.validDate ? -1 : 1;
if (!b.validDate) return -1;
return 0;
}); });
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,
date: t.validDate?.toISOString(), validDate: t.validDate?.toISOString(),
status: t.status, date: t.date,
dateToFinish: t.dateToFinish, dateToFinish: t.dateToFinish,
editFrom: t.editFrom, editFrom: t.editFrom,
editTo: t.editTo editTo: t.editTo