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

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 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.28.0](https://github.com/byu-oit/vue-decision-processing-components/compare/v8.27.4...v8.28.0) (2022-07-20)
+
+
+### Features
+
+* filter reports from new app svc based on institution -- WIP ([b64110a](https://github.com/byu-oit/vue-decision-processing-components/commit/b64110af2bef04c2185e3d96ee47aaf4aeda5339))
+
+
+### Bug Fixes
+
+* make a spot for institution in the vuex store ([bbf1e45](https://github.com/byu-oit/vue-decision-processing-components/commit/bbf1e45aeaa78bd62250e1af018c488b9b7ccb97))
+* reports in the new application service that are requested through a proxy call have a different url pattern ([d781980](https://github.com/byu-oit/vue-decision-processing-components/commit/d7819803dde7cc8ba4104355f8f54005be4a1126))
+
+### [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)
 
 

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/Report.vue

@@ -169,6 +169,12 @@ export default {
       if (this.metadata.parameters.includes('setById')) {
         q.append('set_by_id', this.setById)
       }
+      // appends institution if available to url search params
+      if(this.metadata.parameters.includes('institutions')) {
+        if(this.metadata.parameters.institutions.includes(state.institution))
+          q.append('institution', state.institution)
+      }
+
       const url = this.baseUrl + '?' + q.toString()
       const loadRequested = () => {
         let promises = []

package/ReportList.vue

@@ -53,20 +53,22 @@ export default {
   },
   computed: {
     ...mapState({
-      reports: state => state.reports.list
+      reports: state => state.reports.list,
+      institution: state => state.ui.institution
     }),
     categories () {
-      const reports = this.reports
+      let reports = this.reports
+      // Filters reports to have reports specefic to dp institution
+      reports.filter(ins => ins.institution.includes(state.institution)).map(ins => ins.institution)
       const allObjectCategories = reports.map(o => o.category)
-      const addToSet = (set, o) => set.add(o)
-      const uniqueCategories = Array.from(allObjectCategories.reduce(addToSet, new Set()))
+      let uniqueCategories = new Set()
+      allObjectCategories.forEach((category) => uniqueCategories.add(category))
       return uniqueCategories.filter(c => c && c !== 'system')
     }
   },
   methods: {
     reportsWithCategory(category) {
-      const allReports = Object.values(this.reports)
-      return allReports.filter(o => o.category === category)
+      return this.reports.filter(o => o.category === category)
     }
   }
 }

package/ReportViewer.vue

@@ -40,7 +40,7 @@
       <Report
         v-if="selectedReport"
         :report-name="selectedReport.name"
-        :base-url="selectedReport.appService ? appBaseUrl : packetBaseUrl"
+        :base-url="calculatedBaseUrl"
         :detail="showDetail"
         :chart="showChart"
       />
@@ -94,6 +94,18 @@ export default {
       } else {
         return false
       }
+    },
+    calculatedBaseUrl () {
+      let reportUrl = ''
+      if (this.selectedReport.appService) {
+        reportUrl = this.appBaseUrl
+      } else {
+        reportUrl = this.packetBaseUrl
+      }
+      if (this.selectedReport.proxy) {
+        reportUrl = reportUrl + '/proxy'
+      }
+      return reportUrl + '/report'
     }
   },
   methods: {

package/package.json

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

package/parsers/reports.js

@@ -1,13 +1,13 @@
 'use strict'
 /*
- * Converts array of reportMetadata objects into an object with the report name as their key.
- * example reports.admitCandidates = metadata for the admitCandidates report.
- *
- * use case: to retrieve meta-data from state for a single report.
+ * Add a field to each report metadata item that remembers if it's part
+ * of the application service (so that we can call the right service
+ * when we retrieve the report data)
  */
-export default function parse (reportMetadata, appService) {
+export default function parse (reportMetadata, appService = false, proxy = false) {
   reportMetadata.values.forEach(function (element) {
-    element['appService'] = appService
+    element.appService = appService
+    element.proxy = proxy
   })
   return reportMetadata.values
 }

package/vuexModules/ui/index.js

@@ -2,13 +2,15 @@ const KEY = 'edu.byu.dp.hawaii.ui'
 
 export const state = {
   viewedApplications: [],
-  admitPeriod: ''
+  admitPeriod: '',
+  institution: ''
 }
 
 export const mutations = {
   resetUi (state) {
     state.viewedApplications = []
     state.admitPeriod = ''
+    state.institution = ''
   },
   setUi (state, ui) {
     if (Array.isArray(ui.viewedApplications)) {
@@ -17,6 +19,9 @@ export const mutations = {
     if (ui.admitPeriod !== undefined) {
       state.admitPeriod = ui.admitPeriod
     }
+    if (ui.institution !== undefined) {
+      state.institution = ui.institution
+    }
   },
   viewApplication (state, { appId, name }) {
     if (state.viewedApplications.find(i => i.appId === appId)) {
@@ -30,6 +35,9 @@ export const mutations = {
   },
   selectAdmitPeriod (state, admitPeriod) {
     state.admitPeriod = admitPeriod
+  },
+  setInstitution (state, institution) {
+    state.institution = institution
   }
 }