Merge pull request #1829 from bcgov/feature/sped

SPED renaming
bcgov · Aug 13, 2024 · 0161d8e · 0161d8e
2 parents 44edff2 + f57f913
commit 0161d8e
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 42 deletions.
diff --git a/backend/src/components/studentFilters.js b/backend/src/components/studentFilters.js
@@ -346,7 +346,7 @@ function validateSpedCodes(filters = []) {
   const activeSpedCodes = cacheService.getActiveSpecialEducationCodes();
   if (filters.length > 0) {
     if (filters.every(value => activeSpedCodes.includes(code => value === code.specialEducationCategoryCode))) {
-      log.error('Invalid special education filter.');
+      log.error('Invalid inclusive education filter.');
       throw new Error('400');
     }
   }

diff --git a/frontend/src/components/common/ViewStudentDetailsComponent.vue b/frontend/src/components/common/ViewStudentDetailsComponent.vue
@@ -187,7 +187,7 @@ export default {
 
       //sped row
       let spedRow = {};
-      spedRow.program = 'Special Education';
+      spedRow.program = 'Inclusive Education';
       spedRow.fundingEligible = this.studentForEdit?.specialEducationNonEligReasonCode !== null ? 'No': 'Yes';
       spedRow.nonEligibilityReason = this.getProgramEligibiltyTypeCodesDescription(this.studentForEdit?.specialEducationNonEligReasonCode);
 

diff --git a/...omponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue b/...omponents/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/StepThreeVerifyData.vue
@@ -89,12 +89,12 @@
         />
       </v-window-item>
       <v-window-item
-        value="Special Education"
+        value="Inclusive Education"
         transition="false"
         reverse-transition="false"
       >
         <SpecialEduComponent
-          v-if="tab==='Special Education'"
+          v-if="tab==='Inclusive Education'"
           :district="district"
           :is-final-sign-off="isFinalSignOff"
           :is-collection-active="isCollectionActive"

diff --git a/...d/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue b/...d/src/components/sdcCollection/sdcSchoolCollection/stepOneUploadData/SummaryComponent.vue
@@ -77,7 +77,7 @@
           :table-i-d="currentTableID"
         />
       </v-window-item>
-      <v-window-item value="Special Education">
+      <v-window-item value="Inclusive Education">
         <HeadCountReportComponent
           data-cy="spedTab"
           :headcount-table-data="headcountTableData"
@@ -128,7 +128,7 @@ export default defineComponent({
         'French Programs',
         'Career Programs',
         'Indigenous Students & Support Programs',
-        'Special Education',
+        'Inclusive Education',
         'English Language Learning',
         'Refugee'
       ],
@@ -145,7 +145,7 @@ export default defineComponent({
         return FRENCH_PR.summaryReport[0].endpoint;
       } else if(this.selectedTab==='Career Programs') {
         return CAREER_PR.summaryReport[0].endpoint;
-      } else if(this.selectedTab==='Special Education') {
+      } else if(this.selectedTab==='Inclusive Education') {
         return SPECIALED_PR.summaryReport[0].endpoint;
       } else if(this.selectedTab==='Indigenous Students & Support Programs') {
         return INDSUPPORT_PR.summaryReport[0].endpoint;
@@ -161,7 +161,7 @@ export default defineComponent({
         return FRENCH_PR.summaryReport[0].tableID;
       } else if(this.selectedTab==='Career Programs') {
         return CAREER_PR.summaryReport[0].tableID;
-      } else if(this.selectedTab==='Special Education') {
+      } else if(this.selectedTab==='Inclusive Education') {
         return SPECIALED_PR.summaryReport[0].tableID;
       } else if(this.selectedTab==='Indigenous Students & Support Programs') {
         return INDSUPPORT_PR.summaryReport[0].tableID;

diff --git a/.../components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/StepThreeVerifyData.vue b/.../components/sdcCollection/sdcSchoolCollection/stepThreeVerifyData/StepThreeVerifyData.vue
@@ -80,12 +80,12 @@
         />
       </v-window-item>
       <v-window-item
-        value="Special Education"
+        value="Inclusive Education"
         transition="false"
         reverse-transition="false"
       >
         <SpecialEduComponent
-          v-if="tab==='Special Education'"
+          v-if="tab==='Inclusive Education'"
           :school="school"
           :is-final-sign-off="isFinalSignOff"
           :is-collection-active="isCollectionActive"

diff --git a/frontend/src/utils/sdc/DistrictCollectionTableConfiguration.js b/frontend/src/utils/sdc/DistrictCollectionTableConfiguration.js
diff --git a/frontend/src/utils/sdc/SdcVerifyTabs.js b/frontend/src/utils/sdc/SdcVerifyTabs.js
@@ -8,7 +8,7 @@ export const SDC_VERIFY_TABS = Object.freeze(
     'French Programs',
     'Career Programs',
     'Indigenous Students & Support Programs',
-    'Special Education',
+    'Inclusive Education',
     'English Language Learning',
     'Refugee'
   ]

diff --git a/frontend/src/utils/sdc/TableConfiguration.js b/frontend/src/utils/sdc/TableConfiguration.js
@@ -536,7 +536,7 @@ export const BAND_FILTER = Object.freeze(
 
 export const SPED_FILTER = Object.freeze(
   {
-    heading: 'Special Education',
+    heading: 'Inclusive Education',
     id: 'sped',
     multiple: true,
     key: 'sped',
@@ -607,7 +607,7 @@ export const SPED_FILTER = Object.freeze(
 
 export const SPED_FUNDING_FILTER = Object.freeze(
   {
-    heading: 'Special Education Funding Eligibility',
+    heading: 'Inclusive Education Funding Eligibility',
     id: 'spedFunding',
     multiple: false,
     key: 'spedFunding',
@@ -715,7 +715,7 @@ export const FTE = Object.freeze(
       { title: 'Language Program', key: 'mappedLanguageEnrolledProgram', subHeader: { title: 'Years in ELL', key: 'yearsInEll' } },
       { title: 'Career Program', key: 'mappedCareerProgram', subHeader: { title: 'Career Code', key: 'mappedCareerProgramCode' } },
       { title: 'Indigenous Ancestry', key: 'mappedAncestryIndicator', subHeader: { title: 'Band Code', key: 'mappedBandCode' } },
-      { title: 'Indigenous Support Program', key: 'mappedIndigenousEnrolledProgram', subHeader: { title: 'Special Education Category', key: 'mappedSpedCode' } },
+      { title: 'Indigenous Support Program', key: 'mappedIndigenousEnrolledProgram', subHeader: { title: 'Inclusive Education Category', key: 'mappedSpedCode' } },
     ],
     summaryReport: [
       { tableID: 'eligEnrolmentFTE', title: 'Grade Enrolment & Eligible FTE', endpoint:'enrollment'}
@@ -787,7 +787,7 @@ export const FTE = Object.freeze(
         filterOptions: [
           ...SPED_FILTER.filterOptions,
           {
-            title: 'No Special Education Category',
+            title: 'No Inclusive Education Category',
             id: 'noSpedCategory',
             value: 'noSpedCode'
           }
@@ -889,7 +889,7 @@ export const INDSUPPORT_PR = Object.freeze(
 
 export const SPECIALED_PR = Object.freeze(
   {
-    defaultFilter: { label: 'SPECIALED_PR', description: 'Has Special Education Category' },
+    defaultFilter: { label: 'SPECIALED_PR', description: 'Has Inclusive Education Category' },
     tableHeaders: [
       { title: 'select', key: 'select' },
       { key: 'sdcSchoolCollectionStudentStatusCode' },
@@ -898,10 +898,10 @@ export const SPECIALED_PR = Object.freeze(
       { title: 'Legal Surname, Given (Middle)', key: 'legalName', subHeader: { title: 'Usual Surname, Given (Middle)', key: 'usualName' } },
       { title: 'Adult', key: 'isAdult', subHeader: { title: 'Grad', key: 'isGraduated' } },
       { title: 'Grade', key: 'enrolledGradeCode', subHeader: { title: 'Funding Code', key: 'mappedSchoolFunding' } },
-      { title: 'Special Education Category', key: 'mappedSpedCode' },
+      { title: 'Inclusive Education Category', key: 'mappedSpedCode' },
     ],
     summaryReport: [
-      { tableID: 'eligSpecialEdHeadcount', title: 'Eligible Special Education Headcount', endpoint:'special-ed'}
+      { tableID: 'eligSpecialEdHeadcount', title: 'Eligible Inclusive Education Headcount', endpoint:'special-ed'}
     ],
     allowedFilters: {
       studentType: STUDENT_TYPE_FILTER,
@@ -980,7 +980,7 @@ export const SCH_DUPLICATES = Object.freeze(
       { title: 'Language Program', key: 'mappedLanguageEnrolledProgram', subHeader: { title: 'Years in ELL', key: 'yearsInEll' } },
       { title: 'Career Program', key: 'mappedCareerProgram', subHeader: { title: 'Career Code', key: 'mappedCareerProgramCode' } },
       { title: 'Indigenous Ancestry', key: 'mappedAncestryIndicator', subHeader: { title: 'Band Code', key: 'mappedBandCode' } },
-      { title: 'Indigenous Support Program', key: 'mappedIndigenousEnrolledProgram', subHeader: { title: 'Special Education Category', key: 'mappedSpedCode' } },
+      { title: 'Indigenous Support Program', key: 'mappedIndigenousEnrolledProgram', subHeader: { title: 'Inclusive Education Category', key: 'mappedSpedCode' } },
       { title: ' ', key: 'action' },
     ],
   }

diff --git a/frontend/src/utils/sdc/sdcValidationFieldMappings.js b/frontend/src/utils/sdc/sdcValidationFieldMappings.js
@@ -23,7 +23,7 @@ export const SDC_VALIDATION_FIELD_MAPPINGS = Object.freeze({
   USUAL_LAST_NAME: {label: 'Usual Surname', key: 'usualLastName', type: 'input', options: {maxlength: '255'}},
   DOB: {label: 'Birthdate', key: 'dob', type: 'datePicker', options: {rules: [formRules.required()]}},
   GENDER_CODE: {label: 'Gender', key: 'gender', type: 'select', options: {rules: [formRules.required()], items: 'genderCodes', itemValue: 'genderCode'}},
-  SPECIAL_EDUCATION_CATEGORY_CODE: {label: 'Special Education Category', key: 'specialEducationCategoryCode', type: 'select', options: {items: 'specialEducationCodes', itemValue: 'specialEducationCategoryCode'}},
+  SPECIAL_EDUCATION_CATEGORY_CODE: {label: 'Inclusive Education Category', key: 'specialEducationCategoryCode', type: 'select', options: {items: 'specialEducationCodes', itemValue: 'specialEducationCategoryCode'}},
   SCHOOL_FUNDING_CODE: {label: 'Funding Code', key: 'schoolFundingCode', type: 'select', options: {items: 'schoolFundingCodes', itemValue: 'schoolFundingCode'}},
   NATIVE_ANCESTRY_IND: {label: 'Indigenous Ancestry', key: 'nativeAncestryInd', type: 'select', options: {rules: [formRules.required()], items: 'ancestryItems', itemValue:'code'}},
   HOME_LANGUAGE_SPOKEN_CODE: {label: 'Home Language Spoken Code', key: 'homeLanguageSpokenCode', type: 'select', options: {items: 'homeLanguageSpokenCodes', itemValue: 'homeLanguageSpokenCode'}},