duties widget correction 8
This commit is contained in:
parent
3cdc1adba8
commit
314e9723ac
@ -161,15 +161,15 @@ export async function GET(request: NextRequest) {
|
||||
dependingTicketId: task.dependingTicketId
|
||||
});
|
||||
|
||||
// If it's a main task and it's Done, filter it out
|
||||
// If it's a main task and it's Done (status 5), filter it out
|
||||
if (!task.type || task.type !== 'subtask') {
|
||||
if (task.status === 3) {
|
||||
if (task.status === 5) {
|
||||
console.log(`Filtering out completed main task ${task.id} (status: ${task.status})`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// For subtasks, check if their parent task is Done
|
||||
// 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) {
|
||||
@ -179,7 +179,7 @@ export async function GET(request: NextRequest) {
|
||||
parentStatus: parentTask.status
|
||||
});
|
||||
}
|
||||
if (parentTask && parentTask.status === 3) {
|
||||
if (parentTask && parentTask.status === 5) {
|
||||
console.log(`Filtering out subtask ${task.id} because parent task ${task.dependingTicketId} is Done (status: ${parentTask.status})`);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -106,22 +106,22 @@ export function Duties() {
|
||||
return;
|
||||
}
|
||||
|
||||
// Filter out parent tasks with status Done (3) and sort by dateToFinish
|
||||
// Filter out parent 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, filter it out
|
||||
// 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 !== 3;
|
||||
const isMainTaskActive = task.status !== 5;
|
||||
if (!isMainTaskActive) {
|
||||
console.log(`Filtering out completed main task ${task.id} (status: ${task.status})`);
|
||||
}
|
||||
return isMainTaskActive;
|
||||
}
|
||||
|
||||
// For subtasks, check if their parent task is Done
|
||||
// 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 === 3) {
|
||||
if (parentTask && parentTask.status === 5) {
|
||||
console.log(`Filtering out subtask ${task.id} because parent task ${task.dependingTicketId} is Done (status: ${parentTask.status})`);
|
||||
return false;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user