@byu-oit/vue-decision-processing-components 8.27.1 → 8.27.4

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [8.27.4](https://github.com/byu-oit/vue-decision-processing-components/compare/v8.27.3...v8.27.4) (2022-07-13)
+
+
+### Bug Fixes
+
+* sorting of test scores (was comparing strings instead of dates) ([308fb72](https://github.com/byu-oit/vue-decision-processing-components/commit/308fb728f1a5eb525472d2e438d5ddd787f09771))
+
+### [8.27.3](https://github.com/byu-oit/vue-decision-processing-components/compare/v8.27.2...v8.27.3) (2022-06-29)
+
+### [8.27.2](https://github.com/byu-oit/vue-decision-processing-components/compare/v8.27.1...v8.27.2) (2022-06-24)
+
+
+### Bug Fixes
+
+* some applications have a 3rd field for GPA ([e18e15f](https://github.com/byu-oit/vue-decision-processing-components/commit/e18e15fe8a64303c92691e8e4b2cded06dfd9586))
+
 ### [8.27.1](https://github.com/byu-oit/vue-decision-processing-components/compare/v8.27.0...v8.27.1) (2022-06-15)
 
 

package/DetailsHighSchool.vue

@@ -87,7 +87,7 @@
               return highSchool.gpaCalculated
             }
           } else {
-            return highSchool.highSchoolGpa
+            return highSchool.highSchoolGpa || highSchool.officialGpa
           }
         } else {
           return ''

package/DetailsTestScores.vue

@@ -25,7 +25,7 @@
       </tr>
     </thead>
     <tbody>
-      <tr v-for="(ts, i) in testScores">
+      <tr v-for="(ts, i) in orderedTestScores">
         <td>
           {{ts.testName}}
           <template v-if="ts.selfReported">
@@ -45,7 +45,7 @@
           <span class="bold">({{ts.compositeScore | sat2ActFilter}} ACT)</span>
         </td>
         <td v-else class="composite">
-          <span class="badge badge-primary x-lg">{{ts.compositeScore}}</span>
+          <span class="badge badge-primary x-lg">{{ts.compositeScore | removeLeadingZeros}}</span>
         </td>
         <td>
           <table class="table table-borderless table-sm" v-if="ts.testComponents.length > 0">
@@ -53,7 +53,7 @@
               <th v-for="sub in ts.testComponents" :key="sub.name">{{sub.name}}</th>
             </thead>
             <tbody>
-              <td v-for="sub in ts.testComponents" :key="sub.name">{{sub.score}}</td>
+              <td v-for="sub in ts.testComponents" :key="sub.name">{{sub.score | removeLeadingZeros}}</td>
             </tbody>
           </table>
         </td>
@@ -69,14 +69,50 @@ import { mapGetters } from 'vuex'
 import { dateFormat } from './dateTimeFormat'
 import { sat2ActFilter } from './sat2Act'
 
+function yearMonth2Date (yearMonth) {
+  if (!/^[0-9]{4}-[0-9]{2}$/.test(yearMonth)) {
+    return yearMonth
+  }
+  const year = yearMonth.slice(0, 4)
+  const month = yearMonth.slice(5, 7)
+  return new Date(year, parseInt(month) - 1)
+}
+
 export default {
   name: 'DetailsTestScores',
   computed: {
-    ...mapGetters([ 'testScores' ])
+    ...mapGetters([ 'testScores' ]),
+
+    orderedTestScores() {
+      // sort test scores by test date
+      const scores = this.testScores.slice().sort((a, b) => {
+        const dt1 = yearMonth2Date(a.testDate)
+        const dt2 = yearMonth2Date(b.testDate)
+        if (!dt1 instanceof Date && !dt2 instanceof Date) return 0
+        if (!dt1 instanceof Date) return 1
+        if (!dt2 instanceof Date) return -1
+
+        return dt1 < dt2 ? 1 : -1
+      })
+
+      // sort 'reading' before 'listening' for TOEFL test
+      for (let score of scores) {
+        if (!score.testComponents || score.testName !== 'TOEFL') continue
+        score.testComponents = score.testComponents.sort((a, b) => {
+          if (a.name === 'listening' && b.name === 'reading') return 1
+          return 0
+        })
+      }
+      return scores
+    }
   },
   filters: {
     dateFormat,
-    sat2ActFilter
+    sat2ActFilter,
+    removeLeadingZeros: function (value) {
+      if ( (!value) || !(/^\d+$/.test(value)) ) return value // leave as is if not a string of numbers
+      return parseInt(value, 10) // remove leading zeros
+    }
   }
 }
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byu-oit/vue-decision-processing-components",
-  "version": "8.27.1",
+  "version": "8.27.4",
   "description": "Vue components shared between decision processing systems for the CES schools.",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",

package/parsers/application.js

@@ -185,6 +185,7 @@ export const parseHighSchoolSummaries = a => {
       graduationStatus: get(h, 'graduation_status.value'),
       graduationDate: get(h, 'graduation_date.value'),
       highSchoolGpa: get(h, 'high_school_gpa.value'),
+      officialGpa: get(h, 'official_gpa.value'),
       gpaCalculated: get(h, 'gpa_calculated.value'),
       concurrentEnrollment: get(h, 'concurrent_enrollment.value'),
       updatedDateTime: get(h, 'updated_date_time.value'),

package/vuexModules/application/highSchoolSummaries.js

@@ -9,6 +9,7 @@
  *   graduationStatus: '',
  *   graduationDate: '',
  *   highSchoolGpa: '',
+ *   officialGpa: '',
  *   gpaCalculated: '',
  *   concurrentEnrollment: '',
  *   updatedDateTime: '',