@byu-oit/vue-decision-processing-components 9.6.0 → 9.6.2

package/DetailsGeopolitical.vue

@@ -50,7 +50,7 @@ export default {
     },
     statusClass() {
       if (this.flag != null) {
-        switch (this.flag.state.toLowerCase()) {
+        switch ((this.flag.state || '').toLowerCase()) {
           case 'pass':
             return { 'text-success': true }
           case 'fail':
@@ -66,7 +66,7 @@ export default {
     },
     flagIcon() {
       if (this.flag != null) {
-        switch (this.flag.state.toLowerCase()) {
+        switch ((this.flag.state || '').toLowerCase()) {
           case 'pass':
             return faCheck
           case 'fail':
@@ -85,17 +85,17 @@ export default {
         if (this.flag.message != null && this.flag.message.length > 0) {
           return this.flag.message
         }
-        switch (this.flag.state.toLowerCase()) {
+        switch ((this.flag.state || '').toLowerCase()) {
           case 'pass':
             return 'No geopolitical concerns.'
           case 'fail':
             return 'Geopolitical concerns.'
           case 'error':
-            return 'An error occurred. Could not find a unique match.'
+            return 'An error occurred. Probable geopolitical concerns.'
           case 'indeterminate':
             return 'No data available.'
           default:
-            return 'An error occurred. Could not find a unique match.'
+            return 'An error occurred. Probable geopolitical concerns.'
         }
       }
     },

package/Report.vue

@@ -25,11 +25,25 @@
 		<template v-if="!hideDescription">
 			<h1 v-if="metadata.description">{{metadata.description}}</h1>
 			<h4 v-if="metadata.long_description" class="no-uppercase">{{metadata.long_description}}</h4>
-			<ByuDateSelector
-					v-if="metadata.parameters.includes('admitPeriod')"
-					v-model="selectedAdmitPeriod"
-					@input="val => $emit('update:admitPeriod', val)"
-			/>
+
+      <!-- Admit Period Selector -->
+      <template v-if="metadata.parameters.includes('admitPeriod')">
+        <!-- Use custom dropdown if institution is EC -->
+        <select v-if="institution === 'EC'"
+                v-model="selectedAdmitPeriod"
+                @change="$emit('update:admitPeriod', selectedAdmitPeriod)">
+          <option disabled value="">Select Admit Period</option>
+          <option v-for="period in getEcAdmitPeriods()" :key="period" :value="period">
+            {{ getAdmitPeriodTextFilter(period) }}
+          </option>
+        </select>
+        <ByuDateSelector
+            v-else
+            v-model="selectedAdmitPeriod"
+            @input="val => $emit('update:admitPeriod', val)"
+        />
+      </template>
+
 			<date-picker
 					v-if="metadata.parameters.includes('date_start') && metadata.parameters.includes('date_end')"
 					v-model="dateRange"
@@ -83,9 +97,27 @@ import Reports from './vuexModules/reports'
 import DatePicker from 'vue2-datepicker'
 import ByuDateSelector from "./ByuDateSelector.vue"
 import { mapState } from 'vuex'
+import { yearTermLongFormatV2 } from './dateTimeFormat'
 
-let tabHiddenState = document.hidden
+function calculateECAdmitPeriods() { //calculate admit periods to show on EC custom drop down bar
+  const currentMonth = new Date().getMonth() + 1 // JavaScript months are 0-indexed
+  let currentYear = new Date().getFullYear()
 
+  let periodIndex = Math.floor(currentMonth / 2) // EC has 6 admit periods, each period covers 2 months
+  if (periodIndex === 0) periodIndex = 1 // Ensure period index starts at 1
+  let admitPeriods = []
+
+  for (let i = 0; i < 12; i++) { // display 12 admit periods
+    if (periodIndex > 6) { // If gone past period 6, reset to period 1 and increment the year
+      periodIndex = 1
+      currentYear++
+    }
+    admitPeriods.push(`${currentYear - 1}${periodIndex}`) //push admit periods from last year
+    periodIndex++
+  }
+  return admitPeriods.sort()
+}
+let tabHiddenState = document.hidden
 export default {
 	name: 'Report',
 	components: { ByuDateSelector, DatePicker, ReportDetail, ReportPhotos, ReportSvg },
@@ -156,6 +188,18 @@ export default {
 		}
 	},
 	methods: {
+    getEcAdmitPeriods() {
+      if (this.institution === 'EC') {
+        return calculateECAdmitPeriods()
+      }
+      return []
+    },
+    getAdmitPeriodTextFilter(period) {
+      if (this.institution === 'EC') {
+        return yearTermLongFormatV2(period)
+      }
+      return period
+    },
 		async loadReports () {
 			if(!this.metadata) {
 				// wait for metadata before trying to load report
@@ -303,7 +347,13 @@ export default {
 			return q
 		},
 		setDefaultAdmitPeriod() {
-			try {
+      try {
+        if (this.institution === 'EC') {
+          const defaultPeriod = calculateECAdmitPeriods()[0]
+          this.selectedAdmitPeriod = defaultPeriod
+          this.$emit('update:admitPeriod', defaultPeriod)
+          return
+        }
 				const today = new Date()
 				const future = this.configs
 						.filter(p => new Date(p.close) >= today)
@@ -362,4 +412,4 @@ export default {
 	color: var(--gray, gray);
 	font-size: 1rem;
 }
-</style>
+</style>

package/package.json

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