widget leantime refactor
This commit is contained in:
parent
c9cc0b666b
commit
b4099d507e
@ -319,7 +319,7 @@ export async function GET(request: NextRequest) {
|
|||||||
headline: task.title,
|
headline: task.title,
|
||||||
description: (task as any)._bodyText || null, // Use extracted body text
|
description: (task as any)._bodyText || null, // Use extracted body text
|
||||||
dateToFinish: task.dueAt || null,
|
dateToFinish: task.dueAt || null,
|
||||||
projectName: 'Twenty CRM',
|
projectName: 'Médiation',
|
||||||
projectId: 0,
|
projectId: 0,
|
||||||
status: task.status === 'Done' ? 5 : 1, // 5 = Done, 1 = New (or other status)
|
status: task.status === 'Done' ? 5 : 1, // 5 = Done, 1 = New (or other status)
|
||||||
editorId: task.assigneeId || null,
|
editorId: task.assigneeId || null,
|
||||||
|
|||||||
@ -154,6 +154,11 @@ export function Duties() {
|
|||||||
const todayDay = now.getDate();
|
const todayDay = now.getDate();
|
||||||
|
|
||||||
const filteredTasks = allTasks.filter((task: Task) => {
|
const filteredTasks = allTasks.filter((task: Task) => {
|
||||||
|
// Exclude tasks with status Done (5)
|
||||||
|
if (task.status === 5) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
const dueDate = getValidDate(task);
|
const dueDate = getValidDate(task);
|
||||||
if (!dueDate) {
|
if (!dueDate) {
|
||||||
return false; // Exclude tasks without a due date
|
return false; // Exclude tasks without a due date
|
||||||
@ -165,7 +170,7 @@ export function Duties() {
|
|||||||
const taskMonth = taskDueDate.getMonth();
|
const taskMonth = taskDueDate.getMonth();
|
||||||
const taskDay = taskDueDate.getDate();
|
const taskDay = taskDueDate.getDate();
|
||||||
|
|
||||||
// Keep tasks with due date <= today (overdue or due today)
|
// Keep tasks with due date <= today (overdue or due today, not future)
|
||||||
const isOverdueOrDueToday = taskYear < todayYear ||
|
const isOverdueOrDueToday = taskYear < todayYear ||
|
||||||
(taskYear === todayYear && taskMonth < todayMonth) ||
|
(taskYear === todayYear && taskMonth < todayMonth) ||
|
||||||
(taskYear === todayYear && taskMonth === todayMonth && taskDay <= todayDay);
|
(taskYear === todayYear && taskMonth === todayMonth && taskDay <= todayDay);
|
||||||
@ -339,7 +344,7 @@ export function Duties() {
|
|||||||
<Folder className="h-2.5 w-2.5 mr-1 opacity-70" />
|
<Folder className="h-2.5 w-2.5 mr-1 opacity-70" />
|
||||||
<span className="truncate">{task.projectName}</span>
|
<span className="truncate">{task.projectName}</span>
|
||||||
{(task as any).source === 'twenty-crm' && (
|
{(task as any).source === 'twenty-crm' && (
|
||||||
<span className="ml-1 text-[9px] text-purple-600 font-medium">(Twenty CRM)</span>
|
<span className="ml-1 text-[9px] text-purple-600 font-medium">(Médiation)</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user