duties widget correction 5
This commit is contained in:
parent
fba4b1754b
commit
a3ff7d27a3
@ -152,9 +152,9 @@ export async function GET(request: NextRequest) {
|
||||
|
||||
const tasks = data.result
|
||||
.filter((task: any) => {
|
||||
// Skip all completed tasks (status 5)
|
||||
// Skip completed tasks (status 5 - Done)
|
||||
if (task.status === 5) {
|
||||
console.log(`Filtering out completed task ${task.id} (type: ${task.type || 'main'})`);
|
||||
console.log(`Filtering out completed task ${task.id} (type: ${task.type || 'main'}, status: ${task.status})`);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@ -47,9 +47,9 @@ export function Duties() {
|
||||
const getStatusLabel = (status: number): string => {
|
||||
switch (status) {
|
||||
case 1: return 'New';
|
||||
case 2: return 'Ready';
|
||||
case 2: return 'Blocked';
|
||||
case 3: return 'In Progress';
|
||||
case 4: return 'Review';
|
||||
case 4: return 'Waiting for Approval';
|
||||
case 5: return 'Done';
|
||||
default: return 'Unknown';
|
||||
}
|
||||
@ -57,11 +57,11 @@ export function Duties() {
|
||||
|
||||
const getStatusColor = (status: number): string => {
|
||||
switch (status) {
|
||||
case 1: return 'bg-blue-500';
|
||||
case 2: return 'bg-green-500';
|
||||
case 3: return 'bg-yellow-500';
|
||||
case 4: return 'bg-purple-500';
|
||||
case 5: return 'bg-gray-500';
|
||||
case 1: return 'bg-blue-500'; // New - blue
|
||||
case 2: return 'bg-red-500'; // Blocked - red
|
||||
case 3: return 'bg-yellow-500'; // In Progress - yellow
|
||||
case 4: return 'bg-purple-500'; // Waiting for Approval - purple
|
||||
case 5: return 'bg-gray-500'; // Done - gray
|
||||
default: return 'bg-gray-300';
|
||||
}
|
||||
};
|
||||
@ -106,12 +106,12 @@ export function Duties() {
|
||||
return;
|
||||
}
|
||||
|
||||
// Filter out all tasks and subtasks with status 5 (Done) and sort by dateToFinish
|
||||
// Filter out tasks with status Done (5) and sort by dateToFinish
|
||||
const sortedTasks = data
|
||||
.filter((task: Task) => {
|
||||
const isNotDone = task.status !== 5;
|
||||
const isNotDone = task.status !== 5; // Only filter status 5 (Done)
|
||||
// Log task details for debugging
|
||||
console.log(`Task ${task.id}: status=${task.status}, type=${task.type || 'main'}, parentId=${task.dependingTicketId || 'none'}, dateToFinish=${task.dateToFinish}, isNotDone=${isNotDone}`);
|
||||
console.log(`Task ${task.id}: status=${task.status} (${getStatusLabel(task.status)}), type=${task.type || 'main'}, parentId=${task.dependingTicketId || 'none'}, dateToFinish=${task.dateToFinish}, isNotDone=${isNotDone}`);
|
||||
return isNotDone;
|
||||
})
|
||||
.sort((a: Task, b: Task) => {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user