From 181a002f175da8858767928c03d904046b882c86 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 5 Aug 2021 20:16:27 +0000
Subject: [PATCH]

---
 ayanova/src/api/enums.js                        | 13 ++++---------
 ayanova/src/components/days-of-week-control.vue |  2 +-
 ayanova/src/views/svc-pm.vue                    |  5 ++++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ayanova/src/api/enums.js b/ayanova/src/api/enums.js
index 0d7d7266..dee1dc0e 100644
--- a/ayanova/src/api/enums.js
+++ b/ayanova/src/api/enums.js
@@ -30,7 +30,7 @@ export default {
   // Used by forms to fetch selection list data
   // Sorts alphabetically by default but can be turned off with do not sort
   //
-  getSelectionList(enumKey) {
+  getSelectionList(enumKey, noSort) {
     enumKey = enumKey.toLowerCase();
     let e = window.$gz.store.state.enums[enumKey];
     if (!e) {
@@ -42,19 +42,14 @@ export default {
     }
     let ret = [];
 
-    //de-lodash
-    // //turn it into an array suitable for selection lists
-    // window.$gz. _.forOwn(e, function(value, key) {
-    //   ret.push({ id: Number(key), name: value });
-    // });
-    //return window.$gz. _.sortBy(ret, "name");
-
     //turn it into an array suitable for selection lists
     for (const [key, value] of Object.entries(e)) {
       ret.push({ id: Number(key), name: value });
     }
     //sort by name
-    ret.sort(window.$gz.util.sortByKey("name"));
+    if (!noSort) {
+      ret.sort(window.$gz.util.sortByKey("name"));
+    }
     return ret;
   },
   ///////////////////////////////////
diff --git a/ayanova/src/components/days-of-week-control.vue b/ayanova/src/components/days-of-week-control.vue
index 340d0335..f629ef51 100644
--- a/ayanova/src/components/days-of-week-control.vue
+++ b/ayanova/src/components/days-of-week-control.vue
@@ -24,7 +24,7 @@
 export default {
   async created() {
     await window.$gz.enums.fetchEnumList("AyaDaysOfWeek");
-    this.daysOfWeek = window.$gz.enums.getSelectionList("AyaDaysOfWeek");
+    this.daysOfWeek = window.$gz.enums.getSelectionList("AyaDaysOfWeek", true);
   },
   data() {
     return {
diff --git a/ayanova/src/views/svc-pm.vue b/ayanova/src/views/svc-pm.vue
index d9746fd3..991d3d76 100644
--- a/ayanova/src/views/svc-pm.vue
+++ b/ayanova/src/views/svc-pm.vue
@@ -2180,7 +2180,10 @@ async function populateSelectionLists(vm) {
   );
 
   await window.$gz.enums.fetchEnumList("PMTimeUnit"); //prefetch
-  vm.selectLists.pmTimeUnits = window.$gz.enums.getSelectionList("PMTimeUnit");
+  vm.selectLists.pmTimeUnits = window.$gz.enums.getSelectionList(
+    "PMTimeUnit",
+    true
+  );
 
   await window.$gz.enums.fetchEnumList("LoanUnitRateUnit"); //prefetch
   vm.selectLists.loanUnitRateUnits = window.$gz.enums.getSelectionList(