@byu-oit/vue-decision-processing-components 9.1.0 → 9.3.0

package/DetailsMission.vue

@@ -101,10 +101,13 @@ export default {
     formatEndDate () {
       if (!this.mission) return ''
       const yyyyMmDd = /^[0-9]{4}-([0][1-9]||[1][0-2])-([0][1-9]||[1-2][0-9]||[3][0-1])$/
+      const yyyyMm = /^[0-9]{4}-([0][1-9]||[1][0-2])$/
       if (this.mission.endMonth === 'Ongoing') return 'Ongoing'
       const endDate = this.mission.endMonth
-      if (!endDate || !yyyyMmDd.test(endDate)) return ''
-      console.log(`END_DATE: ${dayjs(endDate).format('YYYY/MM/DD')}`)
+      const yyyyMmDdResult = yyyyMmDd.test(endDate)
+      const yyyyMmResult = yyyyMm.test(endDate)
+      if (!endDate || (!yyyyMmDdResult && !yyyyMmResult)) return ''
+      if (!yyyyMmDdResult) return dayjs(endDate).format('YYYY/MM')
       return dayjs(endDate).format('YYYY/MM/DD')
     },
     estimateStartDate() {

package/FilterButtonAdmitPeriod.vue

@@ -14,45 +14,61 @@
    limitations under the License.
 -->
 <template>
-  <FilterButton @show="show = true" @hide="show = false" :show="show">
-    <FontAwesomeIcon slot="icon" :icon="calendarIcon" />
-    <span slot="label">Admit Period</span>
-    <button class="dropdown-item" @click="clearFilter">Show All</button>
-    <div
-      v-for="(admitPeriod, i) of admitPeriods"
-      :key="i"
-      class="dropdown-item"
-    >
-      <input
-        type="checkbox"
-        :id="`filter-button-admit-period-option-${i}`"
-        :value="admitPeriod"
-        :checked="selectedPeriods.includes(admitPeriod)"
-        @change="toggle(admitPeriod)"
-      ></input>
-      <label :for="`filter-button-admit-period-option-${i}`">{{ admitPeriod | yearTerm }}</label>
-    </div>
-  </FilterButton>
+    <FilterButton @show="show = true" @hide="show = false" :show="show">
+        <FontAwesomeIcon slot="icon" :icon="calendarIcon" />
+        <span slot="label">Admit Period</span>
+        <button class="dropdown-item" @click="clearFilter">Show All</button>
+        <div
+                v-for="(admitPeriod, i) of getAdmitPeriodList()"
+                :key="i"
+                class="dropdown-item"
+        >
+            <input
+                    type="checkbox"
+                    :id="`filter-button-admit-period-option-${i}`"
+                    :value="admitPeriod"
+                    :checked="selectedPeriods.includes(admitPeriod)"
+                    @change="toggle(admitPeriod)"
+            ></input>
+            <label :for="`filter-button-admit-period-option-${i}`">{{getAdmitPeriodTextFilter(admitPeriod) }}</label>
+        </div>
+    </FilterButton>
 </template>
 <script>
 import FilterButton from './FilterButton'
-import { yearTermLongFormat } from './dateTimeFormat'
+import { yearTermLongFormat, yearTermLongFormatV2 } from './dateTimeFormat'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { faCalendarAlt } from '@fortawesome/free-solid-svg-icons'
-import { mapGetters, mapMutations, mapActions } from 'vuex'
+import { mapGetters, mapMutations, mapActions, mapState } from 'vuex'
+
+
+function calcAdmitPeriodV2() {
+  const currentMonth = new Date().getMonth() + 1 // JavaScript months are 0-indexed
+  let currentYear = new Date().getFullYear()
+  // EC has 6 admit periods. This feels cleaner than a bunch of if statements.
+  let startAdmitPeriod = Math.floor(currentMonth / 2);
+  if (startAdmitPeriod === 0) startAdmitPeriod = 1;
+  let admitPeriods = []
+  for (let i = 0; i < 6; i ++) {
+    if (startAdmitPeriod > 6) {
+      startAdmitPeriod = 1
+      currentYear++
+    }
+    admitPeriods.push(`${currentYear}${startAdmitPeriod}`)
+    startAdmitPeriod++
+  }
+  return admitPeriods
+}
 
 function calcAdmitPeriods () {
   const currentMonth = new Date().getMonth() + 1 // JavaScript months are 0-indexed
   const currentYear = new Date().getFullYear()
-
   if (currentMonth >= 1 && currentMonth <= 4) { // Spring Evaluated: January-April
     return [`${currentYear}1`, `${currentYear}3`, `${currentYear}5`, `${currentYear + 1}1`]
-  }
-  else if (currentMonth >= 5 && currentMonth <= 8) { // Fall Evaluated: May - August
+  } else if (currentMonth >= 5 && currentMonth <= 8) { // Fall Evaluated: May - August
     return [`${currentYear}3`, `${currentYear}5`, `${currentYear + 1}1`, `${currentYear + 1}3`]
-  }
-  else if (currentMonth >= 9 && currentMonth <= 12) { // Winter Evaluated: September - December
-    return [`${currentYear}5`, `${currentYear+1}1`, `${currentYear+1}3`, `${currentYear + 1}5`]
+  } else if (currentMonth >= 9 && currentMonth <= 12) { // Winter Evaluated: September - December
+    return [`${currentYear}5`, `${currentYear + 1}1`, `${currentYear + 1}3`, `${currentYear + 1}5`]
   }
   return []
 }
@@ -60,17 +76,20 @@ function calcAdmitPeriods () {
 export default {
   name: 'FilterButtonAdmitPeriod',
   components: { FilterButton, FontAwesomeIcon },
-  filters: { yearTerm: yearTermLongFormat },
   props: {
     admitPeriods: {
       type: Array,
       default() {
-        return calcAdmitPeriods()
+        return []
       }
     }
+  },
+  mounted () {
+
   },
   computed: {
     ...mapGetters(['packetListFilters']),
+    ...mapState({institution: state => state?.ui?.institution}),
     calendarIcon: () => faCalendarAlt,
     activeFilter () {
       const filters = this.packetListFilters
@@ -110,6 +129,19 @@ export default {
       this.clearPacketListFilter({type: 'admitPeriod'})
       this.fetchPacketList({force: true})
       this.show = false
+    },
+    getAdmitPeriodList() {
+      if (this.institution === 'EC') {
+        return calcAdmitPeriodV2()
+      }
+      return calcAdmitPeriods()
+    },
+    getAdmitPeriodTextFilter(period) {
+      if (this.institution === 'EC') {
+        return yearTermLongFormatV2(period)
+
+      }
+      return yearTermLongFormat(period)
     }
   }
 }

package/dateTimeFormat.js

@@ -42,6 +42,7 @@ export const timeFormat = value => {
   return fmt(new Date(value))
 }
 
+// V2 versions of these functions were written to allow Ensign to view applications based on their new block schedule.
 export const yearTermFormat = value => {
   if (!value) return value
   if (!/^[0-9]{4}[1345]$/.test(value)) return value
@@ -54,6 +55,20 @@ export const yearTermFormat = value => {
   return value.substr(0, 4).concat(term)
 }
 
+export const yearTermFormatV2 = value => {
+  if (!value) return value
+  if (!/^[0-9]{4}[1-6]$/.test(value)) return value
+  const term = {
+    1: 'W1',
+    2: 'W2',
+    3: 'S1',
+    4: 'S2',
+    5: 'F1',
+    6: 'F2'
+  }[value.substr(-1)]
+  return value.substr(0, 4).concat(term)
+}
+
 export const yearTermLongFormat = value => {
   if (!value) return value
   if (!/^[0-9]{4}[1345]$/.test(value)) return value
@@ -65,3 +80,17 @@ export const yearTermLongFormat = value => {
   }[value.substr(-1)]
   return `${term} ${value.substr(0, 4)}`
 }
+
+export const yearTermLongFormatV2 = value => {
+  if (!value) return value
+  if (!/^[0-9]{4}[1-6]$/.test(value)) return value
+  const term = {
+    1: 'Winter 1',
+    2: 'Winter 2',
+    3: 'Spring 1',
+    4: 'Spring 2',
+    5: 'Fall 1',
+    6: 'Fall 2'
+  }[value.substr(-1)]
+  return `${term} ${value.substr(0, 4)}`
+}

package/package.json

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