Merge pull request #1858 from bcgov/feature/enrol

Changes for enrol

Author: mightycox

frontend/src/components/common/ResolvedDuplicates.vue

@@ -98,7 +98,7 @@
           density="compact"
           type="info"
           variant="tonal"
-          text="There are no resolved enrollment duplicates."
+          text="There are no resolved enrolment duplicates."
         />
       </v-row>
     </template>

frontend/src/components/sdcCollection/sdcDistrictCollection/duplicates/StepFourInDistrictDuplicates.vue

@@ -38,12 +38,12 @@
     </v-tabs>
     <v-window v-model="tab">
       <v-window-item
-        value="Enrollment Duplicates"
+        value="Enrolment Duplicates"
         transition="false"
         reverse-transition="false"
       >
         <DuplicateTab
-          v-if="tab==='Enrollment Duplicates'"
+          v-if="tab==='Enrolment Duplicates'"
           duplicate-type="enrollment"
           duplicate-level="DISTRICT"
           :headers-config="IN_DISTRICT_DUPLICATES"
@@ -90,7 +90,7 @@
   >
     <p class="form-hint mr-3">
       <span v-if="nonAllowableDuplicates.length > 0">
-        {{ nonAllowableDuplicates.length }} enrollment
+        {{ nonAllowableDuplicates.length }} enrolment
       </span>
       <span v-if="nonAllowableDuplicates.length > 0 && nonAllowableProgramDuplicates.length > 0">
         and
@@ -154,7 +154,7 @@ export default defineComponent({
       sdcDistrictCollectionID: this.$route.params.sdcDistrictCollectionID,
       tab: null,
       tabs: [
-        'Enrollment Duplicates',
+        'Enrolment Duplicates',
         'Program Duplicates'
       ],
     };

frontend/src/components/sdcCollection/sdcDistrictCollection/duplicates/StepSixProvincialDuplicates.vue

@@ -33,17 +33,17 @@
         class="divider"
         :value="name"
       >
-        {{ name }} {{ name === 'Enrollment Duplicates' ? '(' + nonAllowableDuplicates.length + ')': '(' + nonAllowableProgramDuplicates.length + ')' }}
+        {{ name }} {{ name === 'Enrolment Duplicates' ? '(' + nonAllowableDuplicates.length + ')': '(' + nonAllowableProgramDuplicates.length + ')' }}
       </v-tab>
     </v-tabs>
     <v-window v-model="tab">
       <v-window-item
-        value="Enrollment Duplicates"
+        value="Enrolment Duplicates"
         transition="false"
         reverse-transition="false"
       >
         <DuplicateTab
-          v-if="tab==='Enrollment Duplicates'"
+          v-if="tab==='Enrolment Duplicates'"
           duplicate-type="enrollment"
           duplicate-level="PROVINCIAL"
           :headers-config="PROVINCIAL_DUPLICATES"
@@ -90,7 +90,7 @@
   >
     <p class="form-hint mr-3">
       <span v-if="nonAllowableDuplicates.length > 0">
-        {{ nonAllowableDuplicates.length }} enrollment
+        {{ nonAllowableDuplicates.length }} enrolment
       </span>
       <span v-if="nonAllowableDuplicates.length > 0 && nonAllowableProgramDuplicates.length > 0">
         and
@@ -153,7 +153,7 @@ export default defineComponent({
       sdcDistrictCollectionID: this.$route.params.sdcDistrictCollectionID,
       tab: null,
       tabs: [
-        'Enrollment Duplicates',
+        'Enrolment Duplicates',
         'Program Duplicates'
       ],
     };

frontend/src/components/sdcCollection/sdcSchoolCollection/ProvincialDuplicatesStep.vue

@@ -38,12 +38,12 @@
     </v-tabs>
     <v-window v-model="tab">
       <v-window-item
-        value="Enrollment Duplicates"
+        value="Enrolment Duplicates"
         transition="false"
         reverse-transition="false"
       >
         <DuplicateTab
-          v-if="tab==='Enrollment Duplicates'"
+          v-if="tab==='Enrolment Duplicates'"
           duplicate-type="enrollment"
           duplicate-level="PROVINCIAL"
           :headers-config="PROVINCIAL_DUPLICATES"
@@ -73,35 +73,34 @@
     </v-window>
   </div>
 
-    <v-row justify="end">
-      <PrimaryButton
-        id="step-4-next-button-district"
-        class="mr-3 mb-3"
-        :disabled="disableNextButton() || apiError || !hasEditPermission"
-        icon="mdi-check"
-        text="Verify as Correct"
-        :click-action="next"
-      />
-    </v-row>
-    <v-row
-      v-if="disableNextButton()"
-      justify="end"
-      class="my-0"
-    >
-      <p class="form-hint mr-3">
-        <span v-if="nonAllowableDuplicates.length > 0">
-          {{ nonAllowableDuplicates.length }} enrollment
-        </span>
-        <span v-if="nonAllowableDuplicates.length > 0 && nonAllowableProgramDuplicates.length > 0">
-          and
-        </span>
-        <span v-if="nonAllowableProgramDuplicates.length > 0">
-          {{ nonAllowableProgramDuplicates.length }} program
-        </span>
-        duplicate(s) unresolved
-      </p>
-    </v-row>
-
+  <v-row justify="end">
+    <PrimaryButton
+      id="step-4-next-button-district"
+      class="mr-3 mb-3"
+      :disabled="disableNextButton() || apiError || !hasEditPermission"
+      icon="mdi-check"
+      text="Verify as Correct"
+      :click-action="next"
+    />
+  </v-row>
+  <v-row
+    v-if="disableNextButton()"
+    justify="end"
+    class="my-0"
+  >
+    <p class="form-hint mr-3">
+      <span v-if="nonAllowableDuplicates.length > 0">
+        {{ nonAllowableDuplicates.length }} enrolment
+      </span>
+      <span v-if="nonAllowableDuplicates.length > 0 && nonAllowableProgramDuplicates.length > 0">
+        and
+      </span>
+      <span v-if="nonAllowableProgramDuplicates.length > 0">
+        {{ nonAllowableProgramDuplicates.length }} program
+      </span>
+      duplicate(s) unresolved
+    </p>
+  </v-row>
 </template>
 <script>
 import {defineComponent} from 'vue';
@@ -154,7 +153,7 @@ export default defineComponent({
       duplicateResolutionCodesMap: null,
       tab: null,
       tabs: [
-        'Enrollment Duplicates',
+        'Enrolment Duplicates',
         'Program Duplicates'
       ],
     };

frontend/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/StepOneUploadData.vue

@@ -60,7 +60,7 @@
           variant="text"
           @click="clickReportZeroEnrollment"
         >
-          Report Zero Enrollment
+          Report Zero Enrolment
         </v-btn>
         <div class="pl-4">
           More information on the
@@ -182,7 +182,7 @@
               </a>
             </span>
             <span v-if="hasEditPermission">
-              <br>To manually add all student enrollment data for this collection,
+              <br>To manually add all student enrolment data for this collection,
               <a
                 rel="noopener noreferrer"
                 style="color: rgb(56, 89, 138); text-decoration: underline"
@@ -203,14 +203,14 @@
           color="#003366"
           style="width: 18em"
           prepend-icon="mdi-numeric-0-circle"
-          text="Report Zero Enrollment"
+          text="Report Zero Enrolment"
           :disabled="!hasEditPermission"
           @click="clickReportZeroEnrollment"
         />
       </v-col>
       <v-col class="d-flex justify-start">
         <div class="mt-2">
-          This option should only be used for schools with no student<br> enrollment to report for this collection.
+          This option should only be used for schools with no student<br> enrolment to report for this collection.
         </div>
       </v-col>
     </v-row>
@@ -251,7 +251,7 @@
   </ConfirmationDialog>
   <ConfirmationDialog ref="confirmZeroEnrollment">
     <template #message>
-      <p>Please confirm if you would like to report zero enrollment for this collection.</p>
+      <p>Please confirm if you would like to report zero enrolment for this collection.</p>
       &nbsp;
       <p>Confirming below will <strong>finalize your 1701 submission</strong> and <strong>remove your ability to edit data for this collection.</strong></p>
     </template>
@@ -405,7 +405,7 @@ export default {
       await this.handleFileImport();
     },
     async clickReportZeroEnrollment(){
-      const confirmation = await this.$refs.confirmZeroEnrollment.open('Confirm Zero Enrollment', null, {color: '#fff', width: 580, closeIcon: false, subtitle: false, dark: false, resolveText: 'Confirm', rejectText: 'Cancel'});
+      const confirmation = await this.$refs.confirmZeroEnrollment.open('Confirm Zero Enrolment', null, {color: '#fff', width: 580, closeIcon: false, subtitle: false, dark: false, resolveText: 'Confirm', rejectText: 'Cancel'});
       if (!confirmation) {
         return;
       }
@@ -458,7 +458,7 @@ export default {
         })
         .catch(error => {
           console.error(error);
-          this.setFailureAlert(error?.response?.data?.message ? error?.response?.data?.message : 'An error occurred while triggering manual enrollment. Please try again later.');
+          this.setFailureAlert(error?.response?.data?.message ? error?.response?.data?.message : 'An error occurred while triggering manual enrolment. Please try again later.');
         });
     },
     async startPollingStatus() {
@@ -521,11 +521,11 @@ export default {
     },
     async reportZeroEnrollment(sdcSchoolCollectionId) {
       ApiService.apiAxios.post(`${ApiRoutes.sdc.BASE_URL}/${sdcSchoolCollectionId}/reportZeroEnrollment`).then(() => {
-        this.setSuccessAlert('Your report of zero enrollment was recorded successfully.');
+        this.setSuccessAlert('Your report of zero enrolment was recorded successfully.');
         this.$emit('refresh-store');
       }).catch(e => {
         console.error(e);
-        this.fileUploadErrorMessage = 'An error has occurred when reporting zero enrollment: ' + e.message;
+        this.fileUploadErrorMessage = 'An error has occurred when reporting zero enrolment: ' + e.message;
       });
     },
     async getFileProgress() {

tests-e2e/cypress/support/selectors.ts

@@ -188,7 +188,7 @@ export default {
     reportDropdown: '#reports'
   },
   provincialDuplicatesComponent : {
-    enrollmentDuplicatesTab: 'button[value="Enrollment Duplicates"]',
+    enrollmentDuplicatesTab: 'button[value="Enrolment Duplicates"]',
     programDuplicatesTab: 'button[value="Program Duplicates"]',
     nonAllowableEnrollmentTab: '#nonAllowableenrollmentButton',
     nonAllowableProgramTab: '#nonAllowableprogramButton',