Changes to include given name.

bcgov · Nov 18, 2024 · faf6903 · faf6903
1 parent a4f7ca1
commit faf6903
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/backend/src/components/eas/studentFilters.js b/backend/src/components/eas/studentFilters.js
@@ -17,6 +17,10 @@ function createMoreFiltersSearchCriteria(searchFilter = []) {
     }  
     //Default Filter End
 
+    if (key === 'givenName' && pValue) {
+      searchCriteriaList.push({ key: 'givenName', value: pValue.toString(), operation: FILTER_OPERATION.CONTAINS_IGNORE_CASE, valueType: VALUE_TYPE.STRING, condition: CONDITION.AND });
+    }
+
     if (key === 'surName' && pValue) {
       searchCriteriaList.push({ key: 'surName', value: pValue.toString(), operation: FILTER_OPERATION.CONTAINS_IGNORE_CASE, valueType: VALUE_TYPE.STRING, condition: CONDITION.AND });
     }

diff --git a/frontend/src/components/assessments/registrations/StudentRegistrationsFilter.vue b/frontend/src/components/assessments/registrations/StudentRegistrationsFilter.vue
@@ -63,7 +63,16 @@
           </v-col>
         </v-row>
         <v-row>
-          <v-col class="py-0" cols="12">
+          <v-col class="py-0" cols="6">
+            <v-text-field
+              id="searchInput"
+              v-model="givenName"
+              label="Given Name"
+              color="primary"
+              variant="underlined"
+            />
+          </v-col>
+          <v-col class="py-0" cols="6">
             <v-text-field
               id="searchInput"
               v-model="surName"
@@ -284,6 +293,7 @@ export default {
       selected: {},
       scoreRangeDefault: [0, 4],
       scoreRange: [0, 4],
+      givenName: null,
       surName: null,
       pen: null,
       localID: null,
@@ -378,7 +388,7 @@ export default {
       this.schoolSearchNames = sortBy(this.schoolSearchNames, ['schoolCodeName']);
     }, 
     setPenLocalIdNameFilter($event, val) {
-      const keys = ['surName', 'pen', 'localID'];
+      const keys = ['givenName', 'surName', 'pen', 'localID'];
       keys.forEach((key) => {
         if (this[key] != null) {
           if (this[key].length > 0) {
@@ -457,6 +467,7 @@ export default {
       this.districtNameNumberFilter = null;
       this.schoolNameNumberFilter = null;
       this.assessmentCenterNameNumberFilter = null;
+      this.givenName = null;
       this.surName = null;
       this.pen = null;
       this.localID = null;

diff --git a/frontend/src/utils/eas/StudentRegistrationTableConfiguration.js b/frontend/src/utils/eas/StudentRegistrationTableConfiguration.js
@@ -112,6 +112,7 @@ export const SCHOOL_YEAR_REGISTRATIONS_VIEW = Object.freeze(
       { title: 'Assessment Center', key: 'assessmentCenterName' },
       { title: 'PEN', key: 'pen' },
       { title: 'Local ID', key: 'localID' },
+      { title: 'Given Name', key: 'givenName' },
       { title: 'Surname', key: 'surName' },
       { title: 'Course Name (Code)', key: 'assessmentTypeName' },
       { title: 'Special Case', key: 'provincialSpecialCaseName' },
@@ -136,6 +137,7 @@ export const SESSION_REGISTRATIONS_VIEW = Object.freeze(
       { title: 'PEN', key: 'pen' },
       { title: 'Local ID', key: 'localID' },
       { title: 'Surname', key: 'surName' },
+      { title: 'Given Name', key: 'givenName' },
       { title: 'Course Name (Code)', key: 'assessmentTypeName' },
       { title: 'Special Case', key: 'provincialSpecialCaseName' },
       { title: 'Proficiency Score', key: 'proficiencyScore' },