Merge remote-tracking branch 'origin/master'

Author: arcshiftsolutions

frontend/src/components/assessments/registrations/StudentRegistrationsFilter.vue

@@ -21,21 +21,21 @@
       <v-row>
         <v-col class="d-flex justify-start">
           <PrimaryButton
-            id="clear-filter"
-            secondary
+            id="applyPenLocalIdNameFilter"
             large-icon
-            icon="mdi-filter-off-outline"
-            text="Clear All"
-            :click-action="clear"
+            icon="mdi-magnify"
+            text="Search Name and ID"
+            :click-action="($event) => setPenLocalIdNameFilter($event, 'click')"
           />
         </v-col>
         <v-col class="d-flex justify-end">
           <PrimaryButton
-            id="applyPenLocalIdNameFilter"
+            id="clear-filter"
+            secondary
             large-icon
-            icon="mdi-magnify"
-            text="Search Name and ID"
-            :click-action="($event) => setPenLocalIdNameFilter($event, 'click')"
+            icon="mdi-filter-off-outline"
+            text="Clear All"
+            :click-action="clear"
           />
         </v-col>
       </v-row>
@@ -65,18 +65,18 @@
         <v-row>
           <v-col class="py-0" cols="6">
             <v-text-field
-              id="givenName"
-              v-model="givenName"
-              label="Given Name"
+              id="pen"
+              v-model="pen"
+              label="PEN"
               color="primary"
               variant="underlined"
             />
           </v-col>
           <v-col class="py-0" cols="6">
             <v-text-field
-              id="surName"
-              v-model="surName"
-              label="Surname"
+              id="localID"
+              v-model="localID"
+              label="Local ID"
               color="primary"
               variant="underlined"
             />
@@ -85,43 +85,25 @@
         <v-row>
           <v-col class="py-0" cols="6">
             <v-text-field
-              id="pen"
-              v-model="pen"
-              label="PEN"
+              id="givenName"
+              v-model="givenName"
+              label="First Name"
               color="primary"
               variant="underlined"
             />
           </v-col>
           <v-col class="py-0" cols="6">
             <v-text-field
-              id="localID"
-              v-model="localID"
-              label="Local ID"
+              id="surName"
+              v-model="surName"
+              label="Last Name"
               color="primary"
               variant="underlined"
             />
           </v-col>
         </v-row>
       </div>
-      <div >
-        <v-row>
-          <v-col id="schoolDistrictFilters" class="filter-heading pb-0">
-            District, School and Assessment Center
-          </v-col>
-        </v-row>
-        <v-row>
-          <v-col cols="12" class="pt-0">
-            <v-row v-if="false">
-              <v-text-field
-                id="searchInput"
-                v-model="penLocalIdNameFilter"
-                label="PEN or Local ID or Name"
-                color="primary"
-                variant="underlined"
-              />
-            </v-row>            
-          </v-col>
-        </v-row>
+      <div>
         <v-row v-if="userInfo.activeInstituteType === 'DISTRICT'">
           <v-col cols="12" class="pt-0">
             <slot name="text-search">              
@@ -145,7 +127,7 @@
           </v-col>
         </v-row>
         <v-row>
-          <v-col cols="12" class="pt-0">
+          <v-col cols="12" class="mt-n8">
             <slot name="text-search">              
               <v-autocomplete
                 id="selectSchool"
@@ -213,7 +195,22 @@
                 </v-btn>
               </span>
             </div>     
-            <div v-else-if="filter?.id === 'specialCaseCode'">
+            <div v-else-if="filter?.id === 'proficiencyScoreValue'">
+
+              <span 
+                v-for="(option, i) in filter?.filterOptions" 
+                :key="option.value"
+              >
+                <v-btn
+                  :id="option?.id"
+                  :value="option"
+                  class="filter-button"
+                  rounded="lg"
+                >
+                  {{ option?.title }}
+                </v-btn>
+              </span>
+
               <span 
                 v-for="(option, i) in specialCaseSearchNames"
                 :key="option.value"
@@ -356,7 +353,7 @@ export default {
         session.assessments.forEach(assessment => {
           let existingItem = this.assessmentTypeSearchNames.find(item => item.id === assessment.assessmentTypeCode);
           if (!existingItem) {
-            this.assessmentTypeSearchNames.push({title: assessment.assessmentTypeName, id: assessment.assessmentTypeCode, value: assessment.assessmentTypeCode, displayOrder: assessment.displayOrder});
+            this.assessmentTypeSearchNames.push({title: assessment.assessmentTypeCode, id: assessment.assessmentTypeCode, value: assessment.assessmentTypeCode, displayOrder: assessment.displayOrder});
           }
         });
       });
@@ -365,10 +362,12 @@ export default {
     },
     setupSpecialCaseCodes() {
       this.specialCaseSearchNames = [];
+      console.log(this.specialCaseCodes);
       Object.keys(this.specialCaseCodes).forEach(key => {
         this.specialCaseSearchNames.push({title: this.specialCaseCodes[key], id: key, value: key});
       });
-      this.specialCaseSearchNames = sortBy(this.specialCaseSearchNames, ['title']); 
+      this.specialCaseSearchNames.push({title: 'No Result', id: 'noResults', value: 'false'});
+      this.specialCaseSearchNames = sortBy(this.specialCaseSearchNames, ['id']); 
     },
     setupSchoolLists() {
       this.schoolSearchNames = [];
@@ -465,7 +464,10 @@ export default {
   color: #003366;
   margin-top: 1em;
 }
-
+.filter-card {
+      height: 100%;
+      overflow-y: auto;
+    }
 .filter-button {
   color: #003366;
   padding: 5px;

frontend/src/utils/eas/StudentRegistrationTableConfiguration.js

@@ -20,41 +20,9 @@ export const ASSESSMENT_TYPE_CODE_FILTER = Object.freeze(
   }
 );
 
-export const SPECIAL_CASE_FILTER = Object.freeze(
-  {
-    heading: 'Special Case',
-    id: 'specialCaseCode',
-    multiple: true,
-    key: 'specialCaseCode',
-    filterOptions: [
-    ]
-  }
-);
-
-export const PROFICIENCY_SCORE_FILTER = Object.freeze(
-  {
-    heading: 'Proficiency Score',
-    id: 'proficiencyScore',
-    multiple: false,
-    key: 'proficiencyScore',
-    filterOptions: [
-      {
-        title: 'Have Results',
-        id: 'results',
-        value: 'true'
-      },
-      {
-        title: 'No Results Received',
-        id: 'noResults',
-        value: 'false'
-      }
-    ]
-  }
-);
-
 export const PROFICIENCY_SCORE_RANGE_FILTER = Object.freeze(
   {
-    heading: '',
+    heading: 'Score',
     id: 'proficiencyScoreValue',
     multiple: true,
     key: 'proficiencyScoreValue',
@@ -99,8 +67,6 @@ export const SCHOOL_YEAR_REGISTRATIONS_VIEW_DISTRICT = Object.freeze(
     allowedFilters: {
       session: SESSION_CODE_FILTER,
       assessmentTypeCode: ASSESSMENT_TYPE_CODE_FILTER,
-      specialCaseCode: SPECIAL_CASE_FILTER,
-      proficiencyScore: PROFICIENCY_SCORE_FILTER,
       proficiencyScoreValue: PROFICIENCY_SCORE_RANGE_FILTER
     }
   });
@@ -120,8 +86,6 @@ export const SCHOOL_YEAR_REGISTRATIONS_VIEW_SCHOOL = Object.freeze(
     allowedFilters: {
       session: SESSION_CODE_FILTER,
       assessmentTypeCode: ASSESSMENT_TYPE_CODE_FILTER,
-      specialCaseCode: SPECIAL_CASE_FILTER,
-      proficiencyScore: PROFICIENCY_SCORE_FILTER,
       proficiencyScoreValue: PROFICIENCY_SCORE_RANGE_FILTER
     }
   });