Merge pull request #1521 from bcgov/fix/rework5182

Fix/rework5182: Rework required

Author: farzadnadiri

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

@@ -26,7 +26,7 @@
       >
         <v-btn variant="flat" size="large" color="warning" @click="handleManageIcraEligibility">
           <v-icon size="large" icon="mdi-arrow-right" />
-          Manage ICRA eligibility
+          Manage Submission
         </v-btn>
       </v-card-actions>
     </div>
@@ -61,10 +61,11 @@ export default defineComponent({
   computed: {
     title(): string {
       switch (this.icraStore.icraEligibilityStatus) {
-        case "Draft":
         case "Submitted":
         case "InReview":
         case "ReadyforReview":
+          return "Your eligibility to apply with international certification is in review";
+        case "Draft":
         case "Active":
           return "Your submission to determine eligibility to apply with international certification is in progress";
         default:

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

@@ -26,7 +26,7 @@
       </v-row>
       <v-row>
         <v-col md="8" lg="6" xl="4">
-          <EceTextField id="txtWorkReferenceFirstName" v-model="firstName" label="first name" maxlength="100"></EceTextField>
+          <EceTextField id="txtWorkReferenceFirstName" v-model="firstName" label="First name" maxlength="100"></EceTextField>
         </v-col>
       </v-row>
       <v-row>
@@ -35,7 +35,7 @@
             id="txtWorkReferenceEmail"
             v-model="emailAddress"
             :rules="[Rules.required(), Rules.email('Enter your reference\'s email in the format \'[email protected]\'')]"
-            label="Reference email"
+            label="Email"
             maxlength="200"
           ></EceTextField>
         </v-col>

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

@@ -359,19 +359,24 @@ export default defineComponent({
         !this.certificationStore.hasCertifications &&
         !this.applicationStore.hasApplication &&
         !this.applicationStore.hasDraftApplication &&
-        !this.icraStore.hasDraftIcraEligibility
+        !this.icraStore.hasDraftIcraEligibility &&
+        !this.icraStore.hasSubmittedIcraEligibility
       );
     },
     showIcraCard(): boolean {
       return (
         (this.configurationStore.applicationConfiguration.icraFeatureEnabled ?? false) &&
         !this.applicationStore.hasApplication &&
         !this.applicationStore.hasDraftApplication &&
-        !this.icraStore.hasDraftIcraEligibility
+        !this.icraStore.hasDraftIcraEligibility &&
+        !this.icraStore.hasSubmittedIcraEligibility
       );
     },
     showIcraEligibilityCard(): boolean {
-      return (this.configurationStore.applicationConfiguration.icraFeatureEnabled ?? false) && this.icraStore.hasDraftIcraEligibility;
+      return (
+        (this.configurationStore.applicationConfiguration.icraFeatureEnabled ?? false) &&
+        (this.icraStore.hasDraftIcraEligibility || this.icraStore.hasSubmittedIcraEligibility)
+      );
     },
     showLoading(): boolean {
       return (