diff --git a/ayanova/src/views/ops-notification-settings.vue b/ayanova/src/views/ops-notification-settings.vue
index e95d17c3..5ec6d1f8 100644
--- a/ayanova/src/views/ops-notification-settings.vue
+++ b/ayanova/src/views/ops-notification-settings.vue
@@ -479,4 +479,3 @@ async function populateSelectionLists(vm) {
);
}
-
diff --git a/ayanova/src/views/ops-notify-queue.vue b/ayanova/src/views/ops-notify-queue.vue
index 4ec0a9f6..a907e22b 100644
--- a/ayanova/src/views/ops-notify-queue.vue
+++ b/ayanova/src/views/ops-notify-queue.vue
@@ -10,15 +10,21 @@
| {{ $ay.t("TimeStamp") }} |
- {{ $ay.t("ID") }} |
- {{ $ay.t("Status") }} |
+ {{ $ay.t("DeliverAfter") }} |
+ {{ $ay.t("NotifyEventType") }} |
+ {{ $ay.t("AyaType") }} |
+ {{ $ay.t("User") }} |
| {{ item.created }} |
- {{ item.jobId }} |
- {{ item.status }} |
+ {{ item.deliverAfter }} |
+ {{ item.eventType }} |
+ {{ item.ayaType }} |
+
+ {{ item.name }} |
+ {{ item.user }} |
@@ -97,24 +103,39 @@ export default {
} else {
if (res.data) {
vm.rawObj = res.data;
+
+ /*{"data":[{"id":6,"created":"2020-07-24T17:52:05.777883Z","eventDate":"2020-07-24T17:52:05.777886Z","deliverAfter":"2021-07-24T17:52:05.777886Z",
+"userId":1,"eventType":10,"ayaType":2,"name":"Small Frozen Chicken 117-1"}]} */
let ret = [];
for (let i = 0; i < res.data.length; i++) {
let o = res.data[i];
ret.push({
- id: i,
+ id: o.id,
created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
o.created,
this.timeZoneName,
this.languageName,
this.hour12
),
- status: o.statusText,
- jobId:
- o.jobId == "00000000-0000-0000-0000-000000000000"
- ? ""
- : o.jobId
+ eventDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+ o.eventDate,
+ this.timeZoneName,
+ this.languageName,
+ this.hour12
+ ),
+ deliverAfter: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+ o.deliverAfter,
+ this.timeZoneName,
+ this.languageName,
+ this.hour12
+ ),
+ eventType: window.$gz.enums.get("NotifyEventType", o.eventType),
+ ayaType: window.$gz.enums.get("core", o.ayaType),
+ name: o.name,
+ userId: o.userId
});
}
+
vm.obj = ret;
} else {
vm.rawObj = [];
@@ -209,6 +230,7 @@ function clickHandler(menuItem) {
//
async function initForm(vm) {
await fetchTranslatedText(vm);
+ await cacheEnums(vm);
}
//////////////////////////////////////////////////////////
@@ -218,4 +240,13 @@ async function initForm(vm) {
async function fetchTranslatedText(vm) {
await window.$gz.translation.cacheTranslations([]);
}
+
+//////////////////////
+//
+//
+async function cacheEnums(vm) {
+ //ensure the enum values required are pre-fetched
+ await window.$gz.enums.fetchEnumList("NotifyEventType");
+ await window.$gz.enums.fetchEnumList("core");
+}