From 6c5f3c83c2a47a5b59404d2a69eb4f000b22ad8f Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Wed, 26 Jun 2024 07:32:49 -0700
Subject: [PATCH] include amend id's for output labelling

---
 .../securities-act-notices/CourtCommissionOrderReview.vue    | 5 +----
 .../interfaces/ppr-api-interfaces/court-order-interface.ts   | 2 ++
 .../security-act-notice-interfaces.ts                        | 1 +
 ppr-ui/src/utils/registration-helper.ts                      | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue b/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue
index ca10777d9..0d32305fc 100644
--- a/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue
+++ b/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue
@@ -86,7 +86,7 @@
       cols="9"
       class="pt-1 pb-0 mb-0"
     >
-      <p class="effect-of-order-text">
+      <p>
         {{ order.effectOfOrder || '(Not Entered)' }}
       </p>
     </v-col>
@@ -133,9 +133,6 @@ p {
     opacity: .5
   }
 }
-.effect-of-order-text {
-  line-height: 22px;
-}
 #court-commission-order-review {
   background-color: #F2F6FB;
 }
diff --git a/ppr-ui/src/interfaces/ppr-api-interfaces/court-order-interface.ts b/ppr-ui/src/interfaces/ppr-api-interfaces/court-order-interface.ts
index 1a277021b..3c520c8de 100644
--- a/ppr-ui/src/interfaces/ppr-api-interfaces/court-order-interface.ts
+++ b/ppr-ui/src/interfaces/ppr-api-interfaces/court-order-interface.ts
@@ -2,6 +2,7 @@ import { ActionTypes } from '@/enums'
 
 // Existing court order information may not be altered. All elements are required.
 export interface CourtOrderIF {
+  orderId?: number
   courtOrder?: boolean // Optional property indicating court order otherwise commission order
   courtName?: string, // Max length 250.
   courtRegistry?: string, // Max length 60.
@@ -9,4 +10,5 @@ export interface CourtOrderIF {
   orderDate: string, // UTC ISO 8601 datetime format YYYY-MM-DDThh:mm:ssTZD.
   effectOfOrder?: string, // Max length 500.
   action?: ActionTypes // Optional action type for amendments
+  amendOrderId?: number // to associate amended order to removed order
 }
diff --git a/ppr-ui/src/interfaces/registration-interfaces/security-act-notice-interfaces.ts b/ppr-ui/src/interfaces/registration-interfaces/security-act-notice-interfaces.ts
index cc8b94ebe..3083b6bbb 100644
--- a/ppr-ui/src/interfaces/registration-interfaces/security-act-notice-interfaces.ts
+++ b/ppr-ui/src/interfaces/registration-interfaces/security-act-notice-interfaces.ts
@@ -3,6 +3,7 @@ import { CourtOrderIF } from '@/interfaces'
 
 export interface AddEditSaNoticeIF {
   noticeId?: number
+  amendNoticeId?: number // to associate amended notice to removed notice
   securitiesActNoticeType: SaNoticeTypes
   effectiveDateTime: string
   securitiesActOrders?: Array<CourtOrderIF>
diff --git a/ppr-ui/src/utils/registration-helper.ts b/ppr-ui/src/utils/registration-helper.ts
index 3b96127c6..9b679ac51 100644
--- a/ppr-ui/src/utils/registration-helper.ts
+++ b/ppr-ui/src/utils/registration-helper.ts
@@ -73,12 +73,14 @@ export function setAmendmentList (baseList:Array<any>, addList:Array<any>, delet
       // Clean and format notice and orders
       const formattedNotice = {
         ...removeEmptyProperties(notice),
+        amendNoticeId: notice.noticeId,
         ...(!!notice.effectiveDateTime && {
           effectiveDateTime: convertToISO8601LastMinute(notice.effectiveDateTime.split('T')[0])
         }),
           securitiesActOrders: notice.securitiesActOrders?.filter(order =>
             order.action !== ActionTypes.REMOVED).map(order => ({
           ...removeEmptyProperties(order),
+            amendOrderId: order.orderId,
           orderDate: convertToISO8601LastMinute(order.orderDate.split('T')[0])
         }))
       } as AddEditSaNoticeIF