@byu-oit/vue-decision-processing-components 8.27.2 → 8.27.3

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.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)
 
 

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>
@@ -72,11 +72,34 @@ import { sat2ActFilter } from './sat2Act'
 export default {
   name: 'DetailsTestScores',
   computed: {
-    ...mapGetters([ 'testScores' ])
+    ...mapGetters([ 'testScores' ]),
+
+    orderedTestScores() {
+      // sort test scores by test date
+      const scores = this.testScores.sort((a, b) => {
+        if (!a.testDate) return 1
+        if (a.testDate > b.testDate) return 1
+        else return 0
+      })
+
+      // 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.2",
+  "version": "8.27.3",
   "description": "Vue components shared between decision processing systems for the CES schools.",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",