Skip to content

Commit

Permalink
- app version = 7.0.18
Browse files Browse the repository at this point in the history
- updated some shared imports
- added amalgamation as supported filing type
- added amalgamation template to Filing History List
- added amalgamation application to Todo List
- added amalgamation sub-types to enum
- added amalgamation to API Filing interface
- added amalgamation to Task Todo interface
- added an enum mixin method
- added enum utilities methods
- updated filingTypeToName()
  • Loading branch information
severinbeauvais committed Nov 22, 2023
1 parent c9fda7c commit d3694ba
Show file tree
Hide file tree
Showing 13 changed files with 320 additions and 62 deletions.
46 changes: 23 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-filings-ui",
"version": "7.0.16",
"version": "7.0.18",
"private": true,
"appName": "Filings UI",
"sbcName": "SBC Common Components",
Expand All @@ -17,15 +17,15 @@
"@bcrs-shared-components/base-address": "2.0.9",
"@bcrs-shared-components/breadcrumb": "2.1.11",
"@bcrs-shared-components/confirm-dialog": "1.2.1",
"@bcrs-shared-components/corp-type-module": "1.0.11",
"@bcrs-shared-components/corp-type-module": "1.0.14",
"@bcrs-shared-components/court-order-poa": "2.1.4",
"@bcrs-shared-components/date-picker": "1.2.34",
"@bcrs-shared-components/document-delivery": "1.2.1",
"@bcrs-shared-components/enums": "1.0.51",
"@bcrs-shared-components/enums": "1.1.2",
"@bcrs-shared-components/expandable-help": "1.0.1",
"@bcrs-shared-components/folio-number-input": "1.1.18",
"@bcrs-shared-components/interfaces": "1.0.76",
"@bcrs-shared-components/mixins": "1.1.27",
"@bcrs-shared-components/interfaces": "1.1.2",
"@bcrs-shared-components/mixins": "1.1.30",
"@bcrs-shared-components/staff-comments": "1.3.11",
"@bcrs-shared-components/staff-payment": "2.1.11",
"@mdi/font": "^5.9.55",
Expand Down
12 changes: 8 additions & 4 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ export default {
}
}
// is this a draft app entity?
// is this a draft app entity (incorporation/registration/amalgamation)?
if (this.tempRegNumber) {
try {
await this.fetchDraftAppData() // throws on error
Expand Down Expand Up @@ -525,7 +525,7 @@ export default {
const draft = await LegalServices.fetchDraftApp(this.tempRegNumber)
// Handle Draft filings
// handle draft filings
this.storeDraftApp(draft)
// if the draft has a NR, load it
Expand Down Expand Up @@ -610,15 +610,19 @@ export default {
}
},
/** Verifies and stores a draft applications data. */
/** Verifies and stores a draft application's data. */
storeDraftApp (application: any): void {
const filing = application?.filing
const filingName = filing.header?.name as FilingTypes
if (!filing || !filing.header || !filingName) {
throw new Error(`Invalid ${filingName} filing`)
}
if (![FilingTypes.INCORPORATION_APPLICATION, FilingTypes.REGISTRATION].includes(filingName)) {
const supportedTypes = [
FilingTypes.AMALGAMATION,
FilingTypes.INCORPORATION_APPLICATION,
FilingTypes.REGISTRATION]
if (!supportedTypes.includes(filingName)) {
throw new Error(`Invalid ${filingName} filing - filing name`)
}
Expand Down
1 change: 1 addition & 0 deletions src/components/Dashboard/FilingHistoryList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ export default class FilingHistoryList extends Mixins(FilingMixin) {
case filing.availableOnPaperOnly: return 'paper-filing' // must come first
case EnumUtilities.isTypeAgmExtension(filing): return 'agm-extension'
case EnumUtilities.isTypeAlteration(filing): return 'alteration-filing'
case EnumUtilities.isTypeAmalgamation(filing): return 'amalgamation-filing'
case EnumUtilities.isTypeChangeOfAddress(filing): return 'change-of-address'
case EnumUtilities.isTypeConsentContinuationOut(filing): return 'consent-continuation-out'
case EnumUtilities.isTypeContinuationOut(filing): return 'continuation-out'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<template>
<FilingTemplate
class="amalgamation-filing"
:filing="filing"
:index="index"
>
<template #subtitle>
<FiledAndPendingPaid
v-if="isFutureEffectivePending"
class="item-header-subtitle"
:filing="filing"
:index="index"
/>

<FutureEffectivePaid
v-else-if="isFutureEffective"
class="item-header-subtitle"
:filing="filing"
:index="index"
/>
</template>

<template #body>
<FutureEffectivePending
v-if="isFutureEffectivePending"
:filing="filing"
/>

<FutureEffective
v-else-if="isFutureEffective"
:filing="filing"
/>

<div
v-else-if="isStatusCompleted"
class="completed-ia-details"
>
<h4>Amalgamation Complete</h4>

<!-- *** TODO: ask Yui what this should look like -->
<!-- <p>
{{ getLegalName || 'A Numbered Benefit Company' }} has been successfully incorporated.
</p> -->

<p>
Return to My Business Registry to access your business and file changes.
</p>

<div class="to-dashboard-container text-center mt-6">
<v-btn
color="primary"
@click.stop="returnToMyBusinessRegistry()"
>
<span>Return to My Business Registry</span>
</v-btn>
</div>
</div>
</template>
</FilingTemplate>
</template>

<script lang="ts">
import { Component, Prop, Vue } from 'vue-property-decorator'
import { Getter } from 'pinia-class'
import { ApiFilingIF } from '@/interfaces'
import { DateUtilities, EnumUtilities } from '@/services'
import { navigate } from '@/utils'
import FiledAndPendingPaid from '../subtitles/FiledAndPendingPaid.vue'
import FilingTemplate from '../FilingTemplate.vue'
import FutureEffective from '../bodies/FutureEffective.vue'
import FutureEffectivePaid from '../subtitles/FutureEffectivePaid.vue'
import FutureEffectivePending from '../bodies/FutureEffectivePending.vue'
import { useBusinessStore, useConfigurationStore } from '@/stores'
@Component({
components: {
FiledAndPendingPaid,
FilingTemplate,
FutureEffective,
FutureEffectivePaid,
FutureEffectivePending
}
})
export default class AmalgamationFiling extends Vue {
@Prop({ required: true }) readonly filing!: ApiFilingIF
@Prop({ required: true }) readonly index!: number
@Getter(useBusinessStore) getLegalName!: string
@Getter(useConfigurationStore) getMyBusinessRegistryUrl!: string
/** Whether this filing is in Complete status. */
get isStatusCompleted (): boolean {
return EnumUtilities.isStatusCompleted(this.filing)
}
/** Whether this filing is Future Effective Pending (overdue). */
get isFutureEffectivePending (): boolean {
return (
EnumUtilities.isStatusPaid(this.filing) &&
this.filing.isFutureEffective &&
DateUtilities.isDatePast(this.filing.effectiveDate)
)
}
/** Whether this filing is Future Effective (not yet completed). */
get isFutureEffective (): boolean {
return (
EnumUtilities.isStatusPaid(this.filing) &&
this.filing.isFutureEffective &&
DateUtilities.isDateFuture(this.filing.effectiveDate)
)
}
returnToMyBusinessRegistry (): void {
navigate(this.getMyBusinessRegistryUrl)
}
}
</script>

<style lang="scss" scoped>
@import "@/assets/styles/theme.scss";
.item-header-subtitle {
color: $gray7;
margin-top: 0.5rem;
}
p {
color: $gray7;
font-size: $px-15;
margin-top: 1rem !important;
}
</style>
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export { default as AgmExtension } from './AgmExtension.vue'
export { default as AlterationFiling } from './AlterationFiling.vue'
export { default as AmalgamationFiling } from './AmalgamationFiling.vue'
export { default as ChangeOfAddress } from './ChangeOfAddress.vue'
export { default as ConsentContinuationOut } from './ConsentContinuationOut.vue'
export { default as ContinuationOut } from './ContinuationOut.vue'
Expand Down
Loading

0 comments on commit d3694ba

Please sign in to comment.