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

duties widget correction 6

Browse Source
This commit is contained in:
Alma 2025-04-13 19:13:19 +02:00
parent a3ff7d27a3
commit 08d83f73eb
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/api/leantime/tasks/route.ts
View File

@ -152,17 +152,10 @@ export async function GET(request: NextRequest) {
const tasks = data.result const tasks = data.result
.filter((task: any) => { .filter((task: any) => {
// Skip completed tasks (status 5 - Done) // For main tasks, filter out if status is Done (3)
if (task.status === 5) { if (!task.type || task.type !== 'subtask') {
console.log(`Filtering out completed task ${task.id} (type: ${task.type || 'main'}, status: ${task.status})`); if (task.status === 3) {
return false; console.log(`Filtering out completed main task ${task.id} (status: ${task.status})`);
}
// For subtasks, check if parent task is completed
if (task.type === 'subtask' && task.dependingTicketId) {
const parentTask = data.result.find((t: any) => t.id === task.dependingTicketId);
if (parentTask && parentTask.status === 5) {
console.log(`Filtering out subtask ${task.id} because parent task ${task.dependingTicketId} is completed`);
return false; return false;
} }
} }

18
components/flow.tsx
View File

@ -106,13 +106,21 @@ export function Duties() {
return; return;
} }
// Filter out tasks with status Done (5) and sort by dateToFinish // Filter out parent tasks with status Done (3) and sort by dateToFinish
const sortedTasks = data const sortedTasks = data
.filter((task: Task) => { .filter((task: Task) => {
const isNotDone = task.status !== 5; // Only filter status 5 (Done) // If it's a main task (not a subtask) and it's Done, filter it out
// Log task details for debugging if (!task.type || task.type !== 'subtask') {
console.log(`Task ${task.id}: status=${task.status} (${getStatusLabel(task.status)}), type=${task.type || 'main'}, parentId=${task.dependingTicketId || 'none'}, dateToFinish=${task.dateToFinish}, isNotDone=${isNotDone}`); const isMainTaskActive = task.status !== 3;
return isNotDone; if (!isMainTaskActive) {
console.log(`Filtering out completed main task ${task.id} (status: ${task.status})`);
}
return isMainTaskActive;
}
// For subtasks, we keep them regardless of their status
console.log(`Keeping subtask ${task.id}: status=${task.status} (${getStatusLabel(task.status)}), parentId=${task.dependingTicketId || 'none'}`);
return true;
}) })
.sort((a: Task, b: Task) => { .sort((a: Task, b: Task) => {
// First sort by dateToFinish (oldest first) // First sort by dateToFinish (oldest first)