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

duties widget correction 9

Browse Source
This commit is contained in:
Alma 2025-04-13 19:26:41 +02:00
parent 314e9723ac
commit 0a53c97f61
2 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,29 +161,11 @@ export async function GET(request: NextRequest) {
dependingTicketId: task.dependingTicketId
});
// If it's a main task and it's Done (status 5), filter it out
if (!task.type || task.type !== 'subtask') {
// Filter out any task (main or subtask) that has status Done (5)
if (task.status === 5) {
console.log(`Filtering out completed main task ${task.id} (status: ${task.status})`);
console.log(`Filtering out Done task ${task.id} (type: ${task.type || 'main'}, status: ${task.status})`);
return false;
}
}
// For subtasks, check if their parent task is Done (status 5)
if (task.type === 'subtask' && task.dependingTicketId) {
const parentTask = data.result.find((t: any) => t.id === task.dependingTicketId);
if (parentTask) {
console.log(`Found parent task for ${task.id}:`, {
parentId: parentTask.id,
parentHeadline: parentTask.headline,
parentStatus: parentTask.status
});
}
if (parentTask && parentTask.status === 5) {
console.log(`Filtering out subtask ${task.id} because parent task ${task.dependingTicketId} is Done (status: ${parentTask.status})`);
return false;
}
}
// Convert both to strings for comparison to handle any type mismatches
const taskEditorId = String(task.editorId).trim();

28
components/flow.tsx
View File

@ -106,29 +106,17 @@ export function Duties() {
return;
}
// Filter out parent tasks with status Done (5) and sort by dateToFinish
// Filter out tasks with status Done (5) and sort by dateToFinish
const sortedTasks = data
.filter((task: Task) => {
// If it's a main task and it's Done (status 5), filter it out
if (!task.type || task.type !== 'subtask') {
const isMainTaskActive = task.status !== 5;
if (!isMainTaskActive) {
console.log(`Filtering out completed main task ${task.id} (status: ${task.status})`);
// Filter out any task (main or subtask) that has status Done (5)
const isNotDone = task.status !== 5;
if (!isNotDone) {
console.log(`Filtering out Done task ${task.id} (type: ${task.type || 'main'}, status: ${task.status})`);
} else {
console.log(`Keeping task ${task.id}: status=${task.status} (${getStatusLabel(task.status)}), type=${task.type || 'main'}`);
}
return isMainTaskActive;
}
// For subtasks, check if their parent task is Done (status 5)
if (task.type === 'subtask' && task.dependingTicketId) {
const parentTask = data.find(t => t.id === task.dependingTicketId);
if (parentTask && parentTask.status === 5) {
console.log(`Filtering out subtask ${task.id} because parent task ${task.dependingTicketId} is Done (status: ${parentTask.status})`);
return false;
}
}
console.log(`Keeping task ${task.id}: status=${task.status} (${getStatusLabel(task.status)}), type=${task.type}, parentId=${task.dependingTicketId || 'none'}`);
return true;
return isNotDone;
})
.sort((a: Task, b: Task) => {
// First sort by dateToFinish (oldest first)