diff --git a/worklenz-backend/src/controllers/home-page-controller.ts b/worklenz-backend/src/controllers/home-page-controller.ts index be290eb9..5a0d87f4 100644 --- a/worklenz-backend/src/controllers/home-page-controller.ts +++ b/worklenz-backend/src/controllers/home-page-controller.ts @@ -137,6 +137,10 @@ export default class HomePageController extends WorklenzControllerBase { WHERE category_id NOT IN (SELECT id FROM sys_task_status_categories WHERE is_done IS FALSE)) + AND NOT EXISTS(SELECT project_id + FROM archived_projects + WHERE project_id = p.id + AND user_id = $2) ${groupByClosure} ORDER BY t.end_date ASC`; @@ -158,9 +162,13 @@ export default class HomePageController extends WorklenzControllerBase { WHERE category_id NOT IN (SELECT id FROM sys_task_status_categories WHERE is_done IS FALSE)) + AND NOT EXISTS(SELECT project_id + FROM archived_projects + WHERE project_id = p.id + AND user_id = $3) ${groupByClosure}`; - const result = await db.query(q, [teamId, userId]); + const result = await db.query(q, [teamId, userId, userId]); const [row] = result.rows; return row; } diff --git a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx index cd249062..01e7706c 100644 --- a/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx +++ b/worklenz-frontend/src/pages/home/task-list/tasks-list.tsx @@ -123,11 +123,11 @@ const TasksList: React.FC = React.memo(() => { {t('tasks.name')} ), - width: '150px', + width: '40%', render: (_, record) => (
- + {record.name} @@ -155,15 +155,14 @@ const TasksList: React.FC = React.memo(() => { { key: 'project', title: t('tasks.project'), - width: '120px', + width: '25%', render: (_, record) => { return ( - + {record.project_name} @@ -173,7 +172,7 @@ const TasksList: React.FC = React.memo(() => { { key: 'status', title: t('tasks.status'), - width: '180px', + width: '20%', render: (_, record) => ( ), @@ -181,7 +180,7 @@ const TasksList: React.FC = React.memo(() => { { key: 'dueDate', title: t('tasks.dueDate'), - width: '180px', + width: '15%', dataIndex: 'end_date', render: (_, record) => , },