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

calendar widget 8

Browse Source
This commit is contained in:
Alma 2025-04-13 18:46:31 +02:00
parent c90776e7da
commit aa0c41f1ea
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/calendar.tsx
View File

@ -54,7 +54,7 @@ export function Calendar() {
const upcomingEvents = allEvents const upcomingEvents = allEvents
.filter((event: any) => new Date(event.start) >= now) .filter((event: any) => new Date(event.start) >= now)
.sort((a: any, b: any) => new Date(a.start).getTime() - new Date(b.start).getTime()) .sort((a: any, b: any) => new Date(a.start).getTime() - new Date(b.start).getTime())
.slice(0, 5); .slice(0, 7);
console.log('Calendar Widget - Processed events:', upcomingEvents); console.log('Calendar Widget - Processed events:', upcomingEvents);
setEvents(upcomingEvents); setEvents(upcomingEvents);

15
components/flow.tsx
View File

@ -22,6 +22,7 @@ interface Task {
milestoneHeadline?: string; milestoneHeadline?: string;
editTo?: string; editTo?: string;
editFrom?: string; editFrom?: string;
type?: string;
} }
interface ProjectSummary { interface ProjectSummary {
@ -104,12 +105,13 @@ export function Duties() {
return; return;
} }
// Filter out completed tasks (status 5) and sort by dateToFinish // Filter out all tasks and subtasks with status 5 (Done) and sort by dateToFinish
const sortedTasks = data const sortedTasks = data
.filter((task: Task) => { .filter((task: Task) => {
const isValid = task.status !== 5; const isNotDone = task.status !== 5;
console.log(`Task ${task.id}: status=${task.status}, dateToFinish=${task.dateToFinish}, isValid=${isValid}`); // Log task details for debugging
return isValid; console.log(`Task ${task.id}: status=${task.status}, type=${task.type || 'main'}, dateToFinish=${task.dateToFinish}, isNotDone=${isNotDone}`);
return isNotDone;
}) })
.sort((a: Task, b: Task) => { .sort((a: Task, b: Task) => {
// First sort by dateToFinish (oldest first) // First sort by dateToFinish (oldest first)
@ -137,10 +139,11 @@ export function Duties() {
return 0; return 0;
}); });
console.log('Sorted tasks:', sortedTasks.map(t => ({ console.log('Sorted and filtered tasks:', sortedTasks.map(t => ({
id: t.id, id: t.id,
date: t.dateToFinish, date: t.dateToFinish,
status: t.status status: t.status,
type: t.type || 'main'
}))); })));
setTasks(sortedTasks.slice(0, 7)); setTasks(sortedTasks.slice(0, 7));
} catch (error) { } catch (error) {