Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix styling for filing history items #77

Merged
merged 5 commits into from
Nov 26, 2024
Merged

Fix styling for filing history items #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4fb27fa
update tooltip for pending COA in Filing History
Nov 21, 2024
fedd998
wrap text in subtitles (todo, pending, and filing history)
Nov 23, 2024
b85fe73
text update
Nov 24, 2024
cde23fa
PR update
Nov 26, 2024
152a85d
style tweak
Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/components/bcros/Divider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<template>
<span class="h-4 border-l border-gray-600" />
</template>
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 3 additions & 4 deletions src/components/bcros/filing/CommonTemplate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,11 @@
<div v-if="isShowBody" data-cy="filingHistoryItem-body">
<slot name="body">
<!-- is this a generic paid (not yet completed) filing? -->
<div v-if="isStatusPaid || isStatusApproved" class="body-2">
<div v-if="isStatusPaid|| isStatusApproved" class="mt-2 flex flex-col gap-2">
<strong>{{ $t('text.filing.general.filingPending') }}</strong>

<p>
{{ $t('text.filing.general.filingPending') }}&nbsp;{{ title }}
{{ $t('text.filing.general.paidButNotCompletedByRegistry') }}
{{ $t('text.filing.general.paidButNotCompletedByRegistry').replace('FILING', title) }}
</p>

<BcrosFilingCommonCourtNumber :filing="filing" />
Expand All @@ -59,7 +58,7 @@
</div>

<!-- otherwise, this is a completed filing -->
<div v-else class="body-2">
<div v-else class="mt-2 flex flex-col gap-2">
<BcrosFilingCommonCourtNumber :filing="filing" />
<BcrosFilingCommonPlanOfArrangement :filing="filing" />
</div>
Expand Down
47 changes: 25 additions & 22 deletions src/components/bcros/filing/common/FiledLabel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
</template>

<script setup lang="ts">
Expand Down
2 changes: 1 addition & 1 deletion src/components/bcros/filing/common/filedAnd/Paid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="flex flex-row gap-2">
<div>
<span>{{ $t('text.filing.filedAndPaid') }}</span>
<BcrosFilingCommonFiledLabel :filing="filing" />
</div>
Expand Down
16 changes: 9 additions & 7 deletions src/components/bcros/filing/common/filedAnd/PendingCoa.vue
View file
Open in desktop
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<template>
<div class="flex flex-row gap-2 w-full ">
<span>{{ $t('text.filing.filedAndPending') }} <BcrosFilingCommonFiledLabel :filing="filing" /></span>

<div class="flex flex-col gap-1 items-start w-full">
<span>
{{ $t('text.filing.filedAndPending') }}
<BcrosFilingCommonFiledLabel :filing="filing" />
</span>
<BcrosTooltip
:text="tooltipText"
:popper="{
Expand All @@ -26,11 +28,11 @@ const props = defineProps({
/** The effective date-time of this filing. */
const effectiveDateTime = computed((): string =>
props.filing.effectiveDate
// todo: this toLocaleString was actually //DateUtilities.dateToPacificDateTime(
? new Date(props.filing.effectiveDate).toLocaleString()
: `[${t('tooltip.filing.coaFileAndPendingPart2')}]`
? dateToPacificDateTime(new Date(props.filing.effectiveDate))
: '[unknown]'
)

const tooltipText = computed(() =>
`${t('tooltip.filing.coaFileAndPendingPart1')} ${effectiveDateTime} ${t('tooltip.filing.coaFileAndPendingPart2')}.`
`${t('tooltip.pendingAddressChange').replace('COA_EFFECTIVE_DATE', effectiveDateTime.value)}`
)
</script>
11 changes: 5 additions & 6 deletions src/components/bcros/filing/common/filedAnd/PendingPaid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<template>
<div class="flex flex-row gap-2 w-full">
<span class="orange--text text--darken-2">
<div>
<span class="text-orange-500">
{{ $t('text.filing.filedAndPending') }}
</span>
<UDivider orientation="vertical" :ui="{ border: { base: 'border-gray-600'} }" />
<div>
<span>{{ $t('text.filing.paid') }} <BcrosFilingCommonFiledLabel :filing="filing" /> </span>
</div>
<BcrosDivider class="mx-2" />
<span>{{ $t('text.filing.paid') }}</span>
<BcrosFilingCommonFiledLabel :filing="filing" />
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
</div>
</template>

Expand Down
4 changes: 2 additions & 2 deletions src/components/bcros/filing/common/filedAnd/Rejected.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<div class="flex flex-row gap-2">
<div>
<span class="text-orange-500 font-bold">
{{ $t('text.filing.rejected') }}
</span>
<UDivider orientation="vertical" :ui="{ border: { base: 'border-gray-600'} }" />
<BcrosDivider class="mx-2" />
<span>
{{ $t('text.filing.submittedBy') }} {{ filing.submitter }} {{ $t('text.filing.on') }}
<BcrosTooltipDate :date="filing.submittedDate" />
Expand Down
4 changes: 2 additions & 2 deletions src/components/bcros/filing/common/futureEffective/Paid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="flex flex-row gap-2 w-full">
<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>
Expand All @@ -8,7 +8,7 @@
<span>
{{ $t('text.filing.paid') }}
</span>
<UDivider orientation="vertical" :ui="{ border: { base: 'border-gray-600'} }" />
<BcrosDivider class="mx-2" />
<BcrosFilingCommonFiledLabel :filing="filing" />
</div>
</template>
Expand Down
6 changes: 2 additions & 4 deletions src/components/bcros/filing/item/StaffFiling.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions src/components/bcros/pending/Item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@ const expanded = ref(true)
</span>
</UButton>
</div>
<div class="flex flex-row gap-2 w-full">
<div>
<span>PENDING STAFF REVIEW</span>
<UDivider orientation="vertical" :ui="{ border: { base: 'border-gray-500'} }" />
<div>Submitted by {{ item.submitter }} on <BcrosTooltipDate :date="item.submittedDate" /></div>
<BcrosDivider class="mx-2" />
<span>Submitted by {{ item.submitter }} on </span>
<BcrosTooltipDate :date="item.submittedDate" />
</div>
<div v-if="linkedNr">
{{ nrSubtitle(linkedNr) }}
Expand Down
9 changes: 4 additions & 5 deletions src/components/bcros/todo/content/ApprovedContinuationIn.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ const { linkedNr } = storeToRefs(useBcrosBusinessBootstrap())
<div
class="flex flex-col gap-2 items-start"
>
<div class="flex flex-row gap-2 w-full">
<div>
<span>Continuation Authorization APPROVED</span>
<UDivider orientation="vertical" :ui="{ border: { base: 'border-gray-600'} }" />
<div>
Submitted by {{ todoItem.submitter }} on <BcrosTooltipDate :date="dateToString(todoItem.submittedDate)" />
</div>
<BcrosDivider class="mx-2" />
<span>Submitted by {{ todoItem.submitter }} on </span>
<BcrosTooltipDate :date="dateToString(todoItem.submittedDate)" />
</div>
<div v-if="linkedNr">
{{ nrSubtitle(linkedNr) }}
Expand Down
9 changes: 4 additions & 5 deletions src/components/bcros/todo/content/ChangeRequested.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ const { linkedNr } = storeToRefs(useBcrosBusinessBootstrap())
<div
class="flex flex-col gap-2 items-start"
>
<div class="flex flex-row gap-2 w-full">
<div>
<span class="text-orange-500 font-bold">
{{ $t('text.todoItem.changeRequested') }}
</span>
<UDivider orientation="vertical" :ui="{ border: { base: 'border-gray-600'} }" />
<div>
Submitted by {{ todoItem.submitter }} on <BcrosTooltipDate :date="dateToString(todoItem.submittedDate)" />
</div>
<BcrosDivider class="mx-2" />
<span>Submitted by {{ todoItem.submitter }} on </span>
<BcrosTooltipDate :date="dateToString(todoItem.submittedDate)" />
</div>
<div v-if="linkedNr">
{{ nrSubtitle(linkedNr) }}
Expand Down
4 changes: 2 additions & 2 deletions src/components/bcros/todo/content/Error.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ defineProps({

<template>
<!-- error filing -->
<div class="flex flex-row gap-1">
<div>
<span>{{ $t('text.todoItem.status.pending') }}</span>
<UDivider orientation="vertical" :ui="{ border: { base: 'border-gray-600'} }" />
<BcrosDivider class="mx-2" />
<span v-if="inProcessFiling === todoItem.filingId">{{ $t('text.todoItem.status.processing') }}...</span>
<span v-else>{{ $t('text.todoItem.status.paymentIncomplete') }}</span>
</div>
Expand Down
6 changes: 2 additions & 4 deletions src/components/bcros/todo/content/Paid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ defineProps({

<template>
<!-- paid filing -->
<div
class="flex flex-row gap-1"
>
<div>
<span>{{ $t('text.todoItem.status.pending') }}</span>
<UDivider orientation="vertical" :ui="{ border: { base: 'border-gray-600'} }" />
<BcrosDivider class="mx-2" />
<span v-if="inProcessFiling === todoItem.filingId">{{ $t('text.todoItem.status.processing') }}...</span>
<span v-else>{{ $t('text.todoItem.status.paid') }}</span>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/bcros/todo/content/Pending.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ defineProps({
<span v-else>{{ $t('text.todoItem.status.pending') }}</span>
</template>

<div v-else class="flex flex-row gap-1">
<div v-else>
<span>{{ $t('text.todoItem.status.pending') }}</span>
<UDivider orientation="vertical" :ui="{ border: { base: 'border-gray-600'} }" />
<BcrosDivider class="mx-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') }}
Expand Down
4 changes: 3 additions & 1 deletion src/components/bcros/tooltip/Date.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
arrow: true
}"
>
<span class="font-13 ml-1 underline decoration-dotted">{{ dateToPacificDate(displayDate) }}</span>
<span class="font-13 underline decoration-dotted">
{{ dateToPacificDate(displayDate) }}
</span>
</BcrosTooltip>
</template>

Expand Down
1 change: 1 addition & 0 deletions src/components/bcros/tooltip/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<template>
<UTooltip
ref="tooltipRef"
class="inline"
:text="text"
:popper="popper"
tabindex="0"
Expand Down
8 changes: 5 additions & 3 deletions src/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,10 @@
"title": "File Address Change",
"draftTitle": "Address Change"
},
"directorChange": {
"title": "File Director Change",
"draftTitle": "Director Change"
},
Comment on lines +284 to +287
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caught this bug and got it fixed. The i18n path for director change was missing so the todo item title was not rendered properly.

Before:
Screenshot 2024-11-25 at 10 34 06 AM

Now:
Screenshot 2024-11-25 at 5 28 33 PM

"changeRequested": "CHANGE REQUESTED",
"status": {
"draft": "DRAFT",
Expand Down Expand Up @@ -428,7 +432,7 @@
},
"general": {
"filingPending": "Filing Pending",
"paidButNotCompletedByRegistry": "is paid, but the filing has not been completed by the Business Registry yet. Some filings may take longer than expected.",
"paidButNotCompletedByRegistry": "This FILING is paid, but the filing has not been completed by the Business Registry yet. Some filings may take longer than expected.",
"refreshScreenOrContact": "Refresh this screen in a few minutes or you can come back later to check on the progress. If this issue persists, please contact us."
},
"common": {
Expand Down Expand Up @@ -568,8 +572,6 @@
}
},
"filing": {
"coaFileAndPendingPart1": "The updated office addresses will be legally effective on",
"coaFileAndPendingPart2": "No other filings are allowed until then",
"button": {
"businessSummary": "View and download a summary of information about the business.",
"colinLink": "BC Limited Companies are managed in Corporate Online.",
Expand Down