From 5ef0ff483da3056ed7a028ceba1b284569ebfa55 Mon Sep 17 00:00:00 2001
From: AnneSkje <114983853+AnneSkje@users.noreply.github.com>
Date: Tue, 25 Jul 2023 11:16:00 +0200
Subject: [PATCH] =?UTF-8?q?feature/80600-IPO-=C3=B8nsker-mc-pakke-status-i?=
 =?UTF-8?q?-selected-scope-info=20(#766)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added m1, m02 info + status to selected scope info

* removed logging

* Formatted the date
---
 .../http/InvitationForPunchOutApiClient.ts        |  3 +++
 src/modules/InvitationForPunchOut/types.d.ts      |  3 +++
 .../CreateAndEditIPO/SelectScope/McPkgTable.tsx   |  3 +++
 .../SelectScope/SelectedScope.tsx                 | 15 +++++++++++++--
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/modules/InvitationForPunchOut/http/InvitationForPunchOutApiClient.ts b/src/modules/InvitationForPunchOut/http/InvitationForPunchOutApiClient.ts
index 2a90d16e5..b2078ac58 100644
--- a/src/modules/InvitationForPunchOut/http/InvitationForPunchOutApiClient.ts
+++ b/src/modules/InvitationForPunchOut/http/InvitationForPunchOutApiClient.ts
@@ -149,6 +149,9 @@ interface McPkgResponse {
     description: string;
     system: string;
     disciplineCode: string;
+    m01: string;
+    m02: string;
+    status: string;
 }
 
 interface PersonResponse {
diff --git a/src/modules/InvitationForPunchOut/types.d.ts b/src/modules/InvitationForPunchOut/types.d.ts
index 8d80615db..01d8f1cd8 100644
--- a/src/modules/InvitationForPunchOut/types.d.ts
+++ b/src/modules/InvitationForPunchOut/types.d.ts
@@ -100,6 +100,9 @@ export interface McPkgRow {
     tableData?: {
         isSelected: boolean;
     };
+    m01?: string;
+    m02?: string;
+    status?: string;
 }
 
 export interface McScope {
diff --git a/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/SelectScope/McPkgTable.tsx b/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/SelectScope/McPkgTable.tsx
index ffd92b79c..8a02730f2 100644
--- a/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/SelectScope/McPkgTable.tsx
+++ b/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/SelectScope/McPkgTable.tsx
@@ -65,6 +65,9 @@ const McPkgTable = forwardRef(
                                     discipline: mcPkg.disciplineCode,
                                     system: mcPkg.system,
                                     commPkgNo: commPkgNo,
+                                    status: mcPkg.status,
+                                    m01: mcPkg.m01,
+                                    m02: mcPkg.m02,
                                     tableData: {
                                         isSelected:
                                             selectedMcPkgScope.selected.some(
diff --git a/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/SelectScope/SelectedScope.tsx b/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/SelectScope/SelectedScope.tsx
index eb66c337c..d6c1310cd 100644
--- a/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/SelectScope/SelectedScope.tsx
+++ b/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/SelectScope/SelectedScope.tsx
@@ -11,6 +11,7 @@ import {
 
 import EdsIcon from '@procosys/components/EdsIcon';
 import React from 'react';
+import { getFormattedDate } from '@procosys/core/services/DateService';
 
 const multipleDisciplinesWarning = (
     <div>
@@ -111,13 +112,23 @@ const SelectedScope = ({
                                 {mcPkg.description}
                             </Typography>
                         </div>
+                        <div>
+                            <Typography variant="caption">Status</Typography>
+                            <Typography variant="body_long">
+                                {mcPkg.status}
+                            </Typography>
+                        </div>
                         <div>
                             <Typography variant="caption">M-01 date</Typography>
-                            <Typography variant="body_long">-</Typography>
+                            <Typography variant="body_long">
+                                {mcPkg.m01 ? getFormattedDate(mcPkg.m01) : '-'}
+                            </Typography>
                         </div>
                         <div>
                             <Typography variant="caption">M-02 date</Typography>
-                            <Typography variant="body_long">-</Typography>
+                            <Typography variant="body_long">
+                                {mcPkg.m02 ? getFormattedDate(mcPkg.m02) : '-'}
+                            </Typography>
                         </div>
                     </AccordionContent>
                 </Accordion.Panel>