Merge pull request #1444 from TomChapmanGov/my_workplans

My workplans
bcgov · Dec 12, 2023 · 8061efb · 8061efb
2 parents 1189db0 + fb2512e
commit 8061efb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/epictrack-api/src/api/services/work.py b/epictrack-api/src/api/services/work.py
@@ -108,6 +108,7 @@ def _serialize_work(work, work_staffs, works_statuses, work_phase):
                 "eao_team",
                 "title",
                 "is_active",
+                "project.name"
             )
         ).dump(work)
         if work_phase and len(work_phase) > 0:

diff --git a/epictrack-web/src/components/myWorkplans/Card/CardHeader.tsx b/epictrack-web/src/components/myWorkplans/Card/CardHeader.tsx
@@ -34,7 +34,7 @@ const CardHeader = ({ workplan }: CardProps) => {
             whiteSpace: "nowrap",
           }}
         >
-          {workplan.title}
+          {workplan?.project?.name}
         </ETCaption1>
       </Grid>
       <Grid item container xs={2} justifyContent="flex-end">

diff --git a/epictrack-web/src/models/workplan.tsx b/epictrack-web/src/models/workplan.tsx
@@ -9,6 +9,10 @@ export interface WorkPlan {
   work_type: WorkType;
   work_state: string;
 
+  project: {
+    name: string;
+  };
+
   phase_info: {
     days_left: number;
     milestone_progress: number;