Skip to content

Commit 6b6b64f

Browse files
authored
Merge pull request #1472 from bcgov/stories/ecer-5180
ecer-5180 manage submission card on dashboard
2 parents 8ba325a + 24beace commit 6b6b64f

File tree

5 files changed

+36
-64
lines changed

5 files changed

+36
-64
lines changed

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/IcraCard.vue

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/IcraEligibilityCard.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
2-
<v-card :rounded="!isRounded ? '0' : ''" flat color="primary">
2+
<v-card :rounded="!isRounded ? '0' : ''" flat color="primary" :variant="icraStore.icraEligibilityStatus === undefined ? 'outlined' : undefined">
33
<v-card-item class="ma-4">
4-
<h2 class="text-white">{{ title }}</h2>
5-
<p class="small text-white mt-4">
4+
<h2 :class="{ 'text-white': icraStore.icraEligibilityStatus !== undefined }">{{ title }}</h2>
5+
<p :class="{ small: true, 'mt-4': true, 'text-white': icraStore.icraEligibilityStatus !== undefined }">
66
{{ subTitle }}
77
</p>
88
</v-card-item>
@@ -30,6 +30,9 @@
3030
Manage submission
3131
</v-btn>
3232
</v-card-actions>
33+
<v-card-actions v-else-if="icraStore.icraEligibilityStatus === undefined">
34+
<router-link :to="{ name: 'icra-eligibility' }">Learn more</router-link>
35+
</v-card-actions>
3336
</div>
3437
</v-card>
3538
</template>

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/IcraEligibilityManageWorkExperienceReferences.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export default defineComponent({
4343
4444
return {
4545
smAndUp,
46-
4746
router,
4847
};
4948
},

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/pages/Dashboard.vue

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,14 @@
6767
<v-row v-if="applications && userStore.isVerified && (showApplicationCard || showIcraEligibilityCard)" justify="center">
6868
<v-col>
6969
<v-row>
70-
<v-col v-if="showIcraEligibilityCard" cols="12" :sm="showTransferCard ? 6 : 12">
71-
<IcraEligibilityCard @cancel-application="showCancelDialog = true" />
72-
</v-col>
73-
<v-col v-else-if="showApplicationCard" cols="12" :sm="showTransferCard ? 6 : 12">
70+
<v-col v-if="showApplicationCard" cols="12" :sm="showTransferCard ? 6 : 12">
7471
<ApplicationCard @cancel-application="showCancelDialog = true" />
7572
</v-col>
7673
<v-col v-if="showTransferCard" cols="12" sm="6">
7774
<TransferCard />
7875
</v-col>
79-
<v-col v-if="showIcraCard" cols="12" sm="6">
80-
<IcraCard />
76+
<v-col v-if="showIcraEligibilityCard" cols="12" :sm="showTransferCard ? 6 : 12">
77+
<IcraEligibilityCard />
8178
</v-col>
8279
</v-row>
8380
</v-col>
@@ -223,7 +220,6 @@ import ActionCard from "@/components/ActionCard.vue";
223220
import Alert from "@/components/Alert.vue";
224221
import ApplicationCard from "@/components/ApplicationCard.vue";
225222
import TransferCard from "@/components/TransferCard.vue";
226-
import IcraCard from "@/components/IcraCard.vue";
227223
import IcraEligibilityCard from "@/components/IcraEligibilityCard.vue";
228224
import CertificationCard from "@/components/CertificationCard.vue";
229225
import ConfirmationDialog from "@/components/ConfirmationDialog.vue";
@@ -250,7 +246,6 @@ export default defineComponent({
250246
PageContainer,
251247
ApplicationCard,
252248
TransferCard,
253-
IcraCard,
254249
IcraEligibilityCard,
255250
CertificationCard,
256251
ECEHeader,
@@ -343,6 +338,10 @@ export default defineComponent({
343338
return false;
344339
}
345340
341+
if (this.icraStore.hasIcraEligibilityInProcess) {
342+
return false;
343+
}
344+
346345
return (
347346
this.applicationStore.applicationStatus === undefined ||
348347
this.applicationStore.applicationStatus === "Draft" ||
@@ -358,20 +357,21 @@ export default defineComponent({
358357
!this.icraStore.hasSubmittedIcraEligibility
359358
);
360359
},
361-
showIcraCard(): boolean {
362-
return (
363-
(this.configurationStore.applicationConfiguration.icraFeatureEnabled ?? false) &&
364-
!this.applicationStore.hasApplication &&
365-
!this.applicationStore.hasDraftApplication &&
366-
!this.icraStore.hasDraftIcraEligibility &&
367-
!this.icraStore.hasSubmittedIcraEligibility
368-
);
369-
},
370360
showIcraEligibilityCard(): boolean {
371-
return (
372-
(this.configurationStore.applicationConfiguration.icraFeatureEnabled ?? false) &&
373-
(this.icraStore.hasDraftIcraEligibility || this.icraStore.hasSubmittedIcraEligibility)
374-
);
361+
if (this.configurationStore.applicationConfiguration.icraFeatureEnabled === false) {
362+
return false;
363+
}
364+
if (this.certificationStore.hasCertifications && this.icraStore.icraEligibilityStatus === undefined) {
365+
return false;
366+
}
367+
// do not show if there is an application in process
368+
if (this.applicationStore.hasApplication || this.applicationStore.hasDraftApplication) {
369+
return false;
370+
}
371+
if (this.icraStore.hasIcraEligibilityInProcess || this.icraStore.icraEligibilityStatus === undefined) {
372+
return true;
373+
}
374+
return false;
375375
},
376376
showLoading(): boolean {
377377
return (

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/store/icra.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ export const useIcraStore = defineStore("icra", {
4444
state.icraEligibility?.status === "ReadyforAssessment"
4545
);
4646
},
47+
hasIcraEligibilityInProcess(state): boolean {
48+
return (
49+
state.icraEligibility?.status === "Submitted" ||
50+
state.icraEligibility?.status === "InReview" ||
51+
state.icraEligibility?.status === "ReadyforReview" ||
52+
state.icraEligibility?.status === "ReadyforAssessment" ||
53+
state.icraEligibility?.status === "Draft"
54+
);
55+
},
4756
},
4857
actions: {
4958
async fetchIcraEligibilities() {

0 commit comments

Comments
 (0)