SAN Amendments (#1913)

* SAN Amendments * tests and clean up * PR Clean Up
bcgov · Jun 5, 2024 · 6f1756e · 6f1756e
1 parent d13332f
commit 6f1756e
Show file tree

Hide file tree

Showing 27 changed files with 818 additions and 301 deletions.
diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.2.7",
+  "version": "3.2.8",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",

diff --git a/ppr-ui/src/assets/styles/layout.scss b/ppr-ui/src/assets/styles/layout.scss
@@ -60,3 +60,9 @@ aside {
 .column-xs {
   min-width: 5rem;
 }
+.col-30 {
+  width: 30%;
+}
+.col-22-5 {
+  width: 22.5%;
+}
diff --git a/ppr-ui/src/components/parties/party/RegisteringParty.vue b/ppr-ui/src/components/parties/party/RegisteringParty.vue
@@ -33,7 +33,7 @@
                   >
                     <v-row noGutters>
                       <v-col cols="auto">
-                        <div class="icon-div mt-n1 pr-4">
+                        <div class="icon-div mt-n1 pr-2">
                           <v-icon v-if="isBusiness(item)">
                             mdi-domain
                           </v-icon>
@@ -57,17 +57,19 @@
                     />
                   </td>
                   <td>{{ item.emailAddress }}</td>
-                  <td>{{ item.code }}</td>
-                  <td class="actions-cell actions-width px-0">
-                    <div
-                      v-if="!isSecurityActNotice"
-                      class="actions"
-                    >
+                  <td>
+                    {{ item.code }}
+                  </td>
+                  <td
+                    v-if="!isSecurityActNotice"
+                    class="ml-8 pr-0"
+                  >
+                    <div class="actions">
                       <v-btn
                         v-if="!item.action"
                         variant="plain"
                         color="primary"
-                        class="smaller-button edit-btn pr-2 float-right"
+                        class="smaller-button edit-btn pr-2"
                         @click="changeRegisteringParty()"
                       >
                         <v-icon size="small">

diff --git a/ppr-ui/src/components/parties/party/SecuredParties.vue b/ppr-ui/src/components/parties/party/SecuredParties.vue
diff --git a/ppr-ui/src/components/parties/summaries/BasePartySummary.vue b/ppr-ui/src/components/parties/summaries/BasePartySummary.vue
@@ -50,11 +50,11 @@
                 :class="{ 'disabled-text-not-first': item?.action === ActionTypes.REMOVED}"
               >
                 <td
-                  class="list-item__title title-text"
+                  class="list-item__title"
                 >
                   <v-row noGutters>
                     <v-col cols="auto">
-                      <div class="icon-div mt-n1 pr-4">
+                      <div class="icon-div mt-n1 pr-2">
                         <v-icon v-if="isBusiness(item)">
                           mdi-domain
                         </v-icon>
@@ -65,7 +65,7 @@
                     </v-col>
                     <v-col cols="9">
                       <div :class="{ 'disabled-text': item?.action === ActionTypes.REMOVED}">
-                        {{ getName(item) }}
+                        <span class="font-weight-bold">{{ getName(item) }}</span>
                       </div>
                       <div v-if="item?.action && registrationFlowType === RegistrationFlowType.AMENDMENT">
                         <v-chip
@@ -107,8 +107,8 @@
             <tbody v-else-if="options.enableNoDataAction">
               <tr>
                 <td
-                  :colspan="1"
-                  class="error-text text-center"
+                  :colspan="headers.length"
+                  class="error-text text-left"
                 >
                   <v-icon color="error ml-2">
                     mdi-information-outline
@@ -216,7 +216,6 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 @import '@/assets/styles/theme.scss';
-
 .sectionText {
   color: $gray9;
 }

diff --git a/ppr-ui/src/components/registration/securities-act-notices/AddEditCommissionOrder.vue b/ppr-ui/src/components/registration/securities-act-notices/AddEditCommissionOrder.vue
@@ -30,7 +30,7 @@
               class="court-date-text-input"
               nudgeRight="40"
               title="Date of Order"
-              :initialValue="commissionOrderData?.orderDate"
+              :initialValue="commissionOrderData?.orderDate.split('T')[0]"
               :minDate="null"
               :maxDate="localTodayDate(new Date(), true)"
               :persistentHint="true"

diff --git a/ppr-ui/src/components/registration/securities-act-notices/AddEditCourtOrder.vue b/ppr-ui/src/components/registration/securities-act-notices/AddEditCourtOrder.vue
@@ -72,7 +72,7 @@
               class="court-date-text-input"
               nudgeRight="40"
               title="Date of Order"
-              :initialValue="courtOrderData?.orderDate"
+              :initialValue="courtOrderData?.orderDate.split('T')[0]"
               :minDate="null"
               :maxDate="localTodayDate(new Date(), true)"
               :persistentHint="true"

diff --git a/ppr-ui/src/components/registration/securities-act-notices/AddEditNotice.vue b/ppr-ui/src/components/registration/securities-act-notices/AddEditNotice.vue
@@ -30,6 +30,7 @@
               class="mt-0 pr-1"
               inline
               hideDetails="true"
+              :disabled="isAmendment && isEditing && notice?.action !== ActionTypes.ADDED"
               :rules="required('')"
             >
               <v-radio
@@ -51,7 +52,7 @@
             <InputFieldDatePicker
               class="mt-8 mr-3"
               :title="'Effective Date (Optional)'"
-              :initialValue="effectiveDateTime"
+              :initialValue="effectiveDateTime?.split('T')[0]"
               :minDate="null"
               :maxDate="localTodayDate(new Date(), true)"
               @emitCancel="effectiveDateTime = ''"
@@ -90,9 +91,10 @@
 import { computed, ref } from 'vue'
 import { FormCard, InputFieldDatePicker } from '@/components/common'
 import { AddEditSaNoticeIF, FormIF } from '@/interfaces'
-import { SaNoticeTypes } from '@/enums'
+import { ActionTypes, SaNoticeTypes } from '@/enums'
 import { useInputRules } from '@/composables'
 import { localTodayDate } from '@/utils'
+import { isEqual } from 'lodash'
 
 /** Composables **/
 const { required } = useInputRules()
@@ -109,10 +111,12 @@ const emits = defineEmits<{
 /** Props **/
 const props = withDefaults(defineProps<{
   isEditing?: boolean,
-  notice?: AddEditSaNoticeIF
+  notice?: AddEditSaNoticeIF,
+  isAmendment?: boolean
 }>(), {
   isEditing: false,
-  notice: null
+  notice: null,
+  isAmendment: false
 })
 
 /** Local Properties **/
@@ -121,8 +125,11 @@ const isFormValid = ref(false)
 const securitiesActNoticeType = ref(props.notice?.securitiesActNoticeType || null)
 const effectiveDateTime = ref(props.notice?.effectiveDateTime || '')
 const addEditLabel = computed(() => props.isEditing ? 'Edit' : 'Add')
-const isInvalidAddEditNotice = computed( () => {
-  return validateAddEditNotice.value && !isFormValid.value
+const isInvalidAddEditNotice = computed( () => validateAddEditNotice.value && !isFormValid.value)
+const isAmendedEffectiveDate = computed( () => {
+  return effectiveDateTime.value
+    ? !isEqual(props.notice?.effectiveDateTime?.split('T')[0], effectiveDateTime.value.split('T')[0])
+    : !!props.notice?.effectiveDateTime
 })
 
 /** Local Functions **/
@@ -132,9 +139,19 @@ const submitAddEditNotice = async () => {
 
   if(isFormValid.value) {
     emits('done', {
+      ...props.notice,
       securitiesActNoticeType: securitiesActNoticeType.value,
       effectiveDateTime: effectiveDateTime.value,
-      securitiesActOrders: props.notice?.securitiesActOrders || []
+      securitiesActOrders: props.notice?.securitiesActOrders || [],
+      ...props.isAmendment && {
+        ...props.isEditing && isAmendedEffectiveDate.value && props.notice.action !== ActionTypes.ADDED && {
+          noticeId: props.notice?.noticeId,
+          action: ActionTypes.EDITED
+        },
+        ...!props.isEditing && !props.notice?.action && {
+          action: ActionTypes.ADDED
+        }
+      }
     })
   }
 }

diff --git a/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue b/ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue
@@ -2,21 +2,31 @@
   <v-row
     id="court-commission-order-review"
     class="pa-4"
+    :class="{'removed-item': hasRemovedOrders || order.action === ActionTypes.REMOVED}"
     noGuttters
   >
     <v-col
-      cols="3"
-      class="py-0"
+      cols="6"
+      class="py-0 dp__flex"
     >
-      <h4>{{ courtCommissionLabel }} Order</h4>
+      <h4>
+        {{ courtCommissionLabel }} Order
+      </h4>
+      <span>
+        <InfoChip
+          v-if="isAmendment"
+          class="ml-2 py-1"
+          :action="order.action"
+        />
+      </span>
     </v-col>
     <v-col
-      cols="9"
+      cols="6"
       class="py-0 px-0 mx-0 mt-n1"
     >
       <slot name="actions" />
     </v-col>
-    <template v-if="props.order?.courtOrder">
+    <template v-if="order?.courtOrder">
       <v-col
         cols="3"
         class="pt-1 pb-0 mb-0"
@@ -64,7 +74,7 @@
       cols="9"
       class="pt-1 pb-0 mb-0"
     >
-      <p>{{ yyyyMmDdToPacificDate(order.orderDate, true) }}</p>
+      <p>{{ yyyyMmDdToPacificDate((order.orderDate.split('T')[0]), true) }}</p>
     </v-col>
     <v-col
       cols="3"
@@ -87,12 +97,18 @@
 import { computed } from 'vue'
 import { CourtOrderIF } from '@/interfaces'
 import { yyyyMmDdToPacificDate } from '@/utils'
+import { InfoChip } from '@/components/common'
+import { ActionTypes } from '@/enums'
 
 /** Props **/
 const props = withDefaults(defineProps<{
-  order: CourtOrderIF
+  order: CourtOrderIF,
+  isAmendment?: boolean,
+  hasRemovedOrders?: boolean
 }>(), {
-  order: null
+  order: null,
+  isAmendment: false,
+  hasRemovedOrders: false
 })
 
 /** Local Properties **/
@@ -103,10 +119,18 @@ const courtCommisionNumberLabel = computed(() => props.order?.courtOrder ? 'Cour
 </script>
 <style lang="scss" scoped>
 @import '@/assets/styles/theme';
+h4 {
+  white-space: nowrap;
+}
 p {
   font-size: .875rem;
   line-height: 2.25rem;
 }
+.removed-item {
+  h4, p {
+    opacity: .5
+  }
+}
 .effect-of-order-text {
   line-height: 22px;
 }