PR update

bcgov · Nov 26, 2024 · 4dace97 · 4dace97
1 parent 9587162
commit 4dace97
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 50 deletions.
diff --git a/src/components/bcros/Divider.vue b/src/components/bcros/Divider.vue
@@ -1,3 +1,3 @@
 <template>
-  <span class="mt-[0.1rem] mx-[0.5rem] h-4 border-l border-gray-600" />
+  <span class="h-4 border-l border-gray-600" />
 </template>
diff --git a/src/components/bcros/filing/common/FiledLabel.vue b/src/components/bcros/filing/common/FiledLabel.vue
@@ -1,26 +1,29 @@
 <template>
-  <div class="filed-label d-inline">
-    <template v-if="isTypeStaff && putBackOnOrAdminDissolution">
-      <span>
-        {{ capitalizedFiledBy }} {{ filing.submitter }} {{ $t('text.filing.on') }}
-        <BcrosTooltipDate :date="filing.submittedDate" />
-      </span>
-    </template>
-
-    <template v-else>
-      <div class="flex flex-row gap-2 w-full">
-        <span>
-          ({{ $t('text.filing.filedBy') }} {{ filing.submitter }} {{ $t('text.filing.on') }}
-          <BcrosTooltipDate :date="filing.submittedDate" />)
-        </span>
-        <UDivider v-if="showEffectiveAs" orientation="vertical" :ui="{ border: { base: 'border-gray-600'} }" />
-        <span v-if="showEffectiveAs">
-          {{ $t('text.filing.effectiveAsOf').toString() }}
-          <BcrosTooltipDate :date="filing.effectiveDate" />
-        </span>
-      </div>
-    </template>
-  </div>
+  <template v-if="isTypeStaff">
+    <span v-if="putBackOnOrAdminDissolution">
+      ({{ $t('text.filing.filedBy') }} {{ filing.submitter }} {{ $t('text.filing.on') }}
+      <BcrosTooltipDate :date="filing.submittedDate" />)
+      <BcrosDivider class="ml-1 mr-2" />
+      {{ $t('text.filing.effectiveAsOf').toString() }}
+      <BcrosTooltipDate :date="filing.effectiveDate" />
+    </span>
+    <span v-else>
+      {{ capitalizedFiledBy }} {{ filing.submitter }} {{ $t('text.filing.on') }}
+      <BcrosTooltipDate :date="filing.submittedDate" />
+    </span>
+  </template>
+
+  <template v-else>
+    <span>
+      ({{ $t('text.filing.filedBy') }} {{ filing.submitter }} {{ $t('text.filing.on') }}
+      <BcrosTooltipDate :date="filing.submittedDate" />)
+    </span>
+    <span v-if="showEffectiveAs">
+      <BcrosDivider class="ml-1 mr-2" />
+      {{ $t('text.filing.effectiveAsOf').toString() }}
+      <BcrosTooltipDate :date="filing.effectiveDate" />
+    </span>
+  </template>
 </template>
 
 <script setup lang="ts">

diff --git a/src/components/bcros/filing/common/filedAnd/Paid.vue b/src/components/bcros/filing/common/filedAnd/Paid.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="break-words">
+  <div>
     <span>{{ $t('text.filing.filedAndPaid') }}</span>
     <BcrosFilingCommonFiledLabel :filing="filing" />
   </div>

diff --git a/src/components/bcros/filing/common/filedAnd/PendingCoa.vue b/src/components/bcros/filing/common/filedAnd/PendingCoa.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="flex flex-col gap-1 items-start w-full">
-    <div class="break-words">
+    <span>
       {{ $t('text.filing.filedAndPending') }}
       <BcrosFilingCommonFiledLabel :filing="filing" />
-    </div>
+    </span>
     <BcrosTooltip
       :text="tooltipText"
       :popper="{
@@ -29,7 +29,7 @@ const props = defineProps({
 const effectiveDateTime = computed((): string =>
   props.filing.effectiveDate
     ? dateToPacificDateTime(new Date(props.filing.effectiveDate))
-    : `[${t('tooltip.filing.coaFileAndPendingPart2')}]`
+    : '[unknown]'
 )
 
 const tooltipText = computed(() =>

diff --git a/src/components/bcros/filing/common/filedAnd/PendingPaid.vue b/src/components/bcros/filing/common/filedAnd/PendingPaid.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="break-words">
+  <div>
     <span class="text-orange-500">
       {{ $t('text.filing.filedAndPending') }}
     </span>
-    <BcrosDivider />
+    <BcrosDivider class="ml-1 mr-2" />
     {{ $t('text.filing.paid') }}
     <BcrosFilingCommonFiledLabel :filing="filing" />
   </div>

diff --git a/src/components/bcros/filing/common/filedAnd/Rejected.vue b/src/components/bcros/filing/common/filedAnd/Rejected.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="break-words">
+  <div>
     <span class="text-orange-500 font-bold">
       {{ $t('text.filing.rejected') }}
     </span>
-    <BcrosDivider />
+    <BcrosDivider class="ml-1 mr-2" />
     <span>
       {{ $t('text.filing.submittedBy') }} {{ filing.submitter }} {{ $t('text.filing.on') }}
     </span>

diff --git a/src/components/bcros/filing/common/futureEffective/Paid.vue b/src/components/bcros/filing/common/futureEffective/Paid.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="break-words">
+  <div>
     <span v-if="isTypeIncorporationApplication">{{ $t('text.filing.futureEffectiveIncorporation') }}</span>
     <span v-else-if="isTypeContinuationApplication">{{ $t('text.filing.futureEffectiveContinuation') }}</span>
     <span v-else-if="isTypeAlteration">{{ $t('text.filing.futureEffectiveAlteration') }}</span>
@@ -8,7 +8,7 @@
     <span>
       {{ $t('text.filing.paid') }}
     </span>
-    <BcrosDivider />
+    <BcrosDivider class="ml-1 mr-2" />
     <BcrosFilingCommonFiledLabel :filing="filing" />
   </div>
 </template>

diff --git a/src/components/bcros/filing/item/StaffFiling.vue b/src/components/bcros/filing/item/StaffFiling.vue
@@ -9,10 +9,8 @@
     </template>
 
     <template #subtitle>
-      <div class="flex flex-row gap-1 w-full">
-        <span v-if="putBackOnOrAdminDissolution">{{ $t('text.filing.filed') }}</span>
-        <BcrosFilingCommonFiledLabel :filing="filing" />
-      </div>
+      <span v-if="putBackOnOrAdminDissolution">{{ $t('text.filing.filed') }}</span>
+      <BcrosFilingCommonFiledLabel :filing="filing" />
     </template>
 
     <template #body>

diff --git a/src/components/bcros/pending/Item.vue b/src/components/bcros/pending/Item.vue
@@ -35,9 +35,9 @@ const expanded = ref(true)
             </span>
           </UButton>
         </div>
-        <div class="break-words">
+        <div>
           <span>PENDING STAFF REVIEW</span>
-          <BcrosDivider />
+          <BcrosDivider class="ml-1 mr-2" />
           <span>Submitted by {{ item.submitter }} on</span>
           <BcrosTooltipDate :date="item.submittedDate" />
         </div>

diff --git a/src/components/bcros/todo/content/ApprovedContinuationIn.vue b/src/components/bcros/todo/content/ApprovedContinuationIn.vue
@@ -11,9 +11,9 @@ const { linkedNr } = storeToRefs(useBcrosBusinessBootstrap())
   <div
     class="flex flex-col gap-2 items-start"
   >
-    <div class="break-words">
+    <div>
       <span>Continuation Authorization APPROVED</span>
-      <BcrosDivider />
+      <BcrosDivider class="ml-1 mr-2" />
       <span>Submitted by {{ todoItem.submitter }} on</span>
       <BcrosTooltipDate :date="dateToString(todoItem.submittedDate)" />
     </div>

diff --git a/src/components/bcros/todo/content/ChangeRequested.vue b/src/components/bcros/todo/content/ChangeRequested.vue
@@ -11,11 +11,11 @@ const { linkedNr } = storeToRefs(useBcrosBusinessBootstrap())
   <div
     class="flex flex-col gap-2 items-start"
   >
-    <div class="break-words">
+    <div>
       <span class="text-orange-500 font-bold">
         {{ $t('text.todoItem.changeRequested') }}
       </span>
-      <BcrosDivider />
+      <BcrosDivider class="ml-1 mr-2" />
       <span>
         Submitted by {{ todoItem.submitter }} on <BcrosTooltipDate :date="dateToString(todoItem.submittedDate)" />
       </span>

diff --git a/src/components/bcros/todo/content/Error.vue b/src/components/bcros/todo/content/Error.vue
@@ -7,9 +7,9 @@ defineProps({
 
 <template>
   <!-- error filing -->
-  <div class="break-words">
+  <div>
     <span>{{ $t('text.todoItem.status.pending') }}</span>
-    <BcrosDivider />
+    <BcrosDivider class="ml-1 mr-2" />
     <span v-if="inProcessFiling === todoItem.filingId">{{ $t('text.todoItem.status.processing') }}...</span>
     <span v-else>{{ $t('text.todoItem.status.paymentIncomplete') }}</span>
   </div>

diff --git a/src/components/bcros/todo/content/Paid.vue b/src/components/bcros/todo/content/Paid.vue
@@ -7,9 +7,9 @@ defineProps({
 
 <template>
   <!-- paid filing -->
-  <div class="break-words">
+  <div>
     <span>{{ $t('text.todoItem.status.pending') }}</span>
-    <BcrosDivider />
+    <BcrosDivider class="ml-1 mr-2" />
     <span v-if="inProcessFiling === todoItem.filingId">{{ $t('text.todoItem.status.processing') }}...</span>
     <span v-else>{{ $t('text.todoItem.status.paid') }}</span>
   </div>

diff --git a/src/components/bcros/todo/content/Pending.vue b/src/components/bcros/todo/content/Pending.vue
@@ -20,9 +20,9 @@ defineProps({
       <span v-else>{{ $t('text.todoItem.status.pending') }}</span>
     </template>
 
-    <div v-else class="break-words">
+    <div v-else>
       <span>{{ $t('text.todoItem.status.pending') }}</span>
-      <BcrosDivider />
+      <BcrosDivider class="ml-1 mr-2" />
       <span v-if="inProcessFiling === todoItem.filingId">{{ $t('text.todoItem.status.processing') }}...</span>
       <span v-else-if="todoItem.paymentMethod === PaymentMethodE.ONLINE_BANKING">
         {{ $t('text.todoItem.status.pendingOnlineBanking') }}

diff --git a/src/components/bcros/tooltip/Date.vue b/src/components/bcros/tooltip/Date.vue
@@ -6,7 +6,7 @@
       arrow: true
     }"
   >
-    <span class="font-13 ml-1 underline decoration-dotted break-words">
+    <span class="font-13 underline decoration-dotted">
       {{ dateToPacificDate(displayDate) }}
     </span>
   </BcrosTooltip>

diff --git a/src/lang/en.json b/src/lang/en.json
@@ -281,6 +281,10 @@
         "title": "File Address Change",
         "draftTitle": "Address Change"
       },
+      "directorChange": {
+        "title": "File Director Change",
+        "draftTitle": "Director Change"
+      },
       "changeRequested": "CHANGE REQUESTED",
       "status": {
         "draft": "DRAFT",