From fe4dc828f1dc621f9c0e95533d32164b96b26c4b Mon Sep 17 00:00:00 2001 From: Colin Dawson Date: Tue, 17 Mar 2026 20:14:06 +0000 Subject: [PATCH] Tasks page is now working --- src/App.tsx | 9 +++++++++ .../task/assignments/AssignmentComplete.tsx | 12 ++++++++++++ .../manager/tasks/components/tasksTable.tsx | 19 +++++++++++-------- .../manager/tasks/services/tasksService.ts | 2 ++ 4 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 src/modules/manager/task/assignments/AssignmentComplete.tsx diff --git a/src/App.tsx b/src/App.tsx index a33e9b0..f7c0d32 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -48,6 +48,7 @@ import WorkflowTemplateManager from "./modules/manager/workflowTemplates/Workflo import WorkflowTemplateDetails from "./modules/manager/workflowTemplates/WorkflowTemplateDetails"; import CreateActivity from "./modules/manager/activity/CreateActivity"; import Tasks from "./modules/manager/tasks/tasks"; +import AssignmentComplete from "./modules/manager/task/assignments/AssignmentComplete"; function GetSecureRoutes() { const { t } = useTranslation(Namespaces.Common); @@ -388,6 +389,14 @@ function GetSecureRoutes() { } /> + + + + } + /> { + const { t } = useTranslation(Namespaces.Common); + + return <>Complete Assignment goes here.; +}; + +export default AssignmentComplete; diff --git a/src/modules/manager/tasks/components/tasksTable.tsx b/src/modules/manager/tasks/components/tasksTable.tsx index 658ae34..8bf03d1 100644 --- a/src/modules/manager/tasks/components/tasksTable.tsx +++ b/src/modules/manager/tasks/components/tasksTable.tsx @@ -25,20 +25,23 @@ const TasksTable: React.FC = ({ () => [ { key: "taskName", - label: t("Name"), + label: t("TaskName"), content: (item) => { return ( - + + + ); }, order: "asc", }, + { key: "activityName", label: t("ActivityName"), order: "asc" }, { key: "user", label: t("Assignee"), diff --git a/src/modules/manager/tasks/services/tasksService.ts b/src/modules/manager/tasks/services/tasksService.ts index 976a81a..51e3b03 100644 --- a/src/modules/manager/tasks/services/tasksService.ts +++ b/src/modules/manager/tasks/services/tasksService.ts @@ -11,6 +11,8 @@ export interface GetMyAssignments { taskType: string; taskName: string; + activityId: GeneralIdRef; + activityName: string; user?: GeneralIdRef; role?: GeneralIdRef; startDateTime?: Date;