diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index a11154b6..e3a6ec01 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -384,15 +384,6 @@ todo: many biz objects are not using new PUT methodology CURRENTLY DOING: wo completion list - - -todo: notify subscription list table needs to show status of workorder (all fields) ideally - otherwise if you have multiple wostatusage notifications they all appear the same - Also it shows the email address even when it's set to in-app delivery which looks concerning and should not happen - this one might be tricky to get right, if can't then remove it entirely and just show if email or inapp delivery only not the address - or some kind of sumary field that aggregates several things of relevance - - todo 3: signature: report helper display signature and form ui control to capture /display signature for both tech and customer case 3682 implies code to steal to make signatures better so look into that diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue index 7646755d..93e33b29 100644 --- a/ayanova/src/views/home-notify-subscription.vue +++ b/ayanova/src/views/home-notify-subscription.vue @@ -352,7 +352,7 @@ export default { return this.obj.eventType == 9; }, showDecValue() { - return this.obj.eventType == 23 || this.obj.eventType == 11; //service bank threshold + return this.obj.eventType == 23; // || this.obj.eventType == 11; //service bank threshold }, showAyaType() { switch (this.obj.eventType) { diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue index ee53ad13..b3106ab9 100644 --- a/ayanova/src/views/home-notify-subscriptions.vue +++ b/ayanova/src/views/home-notify-subscriptions.vue @@ -75,21 +75,47 @@ export default { window.$gz.form.setErrorBoxErrors(vm); } else { if (res.data) { - /* z.Id, - z.UserId, - z.EventType, - z.AyaType, - z.DeliveryMethod, - z.DeliveryAddress, - z.Tags, - info */ let ret = []; + //const timeZoneName = window.$gz.locale.getResolvedTimeZoneName(); + const languageName = window.$gz.locale.getResolvedLanguage(); + //const hour12 = window.$gz.store.state.userOptions.hour12; + const currencyName = window.$gz.locale.getCurrencyName(); + for (let i = 0; i < res.data.length; i++) { let o = res.data[i]; + let info = ""; + if (o.status != "") { + info += o.status; + } + if (o.decValue && o.decValue != 0) { + //currently is only currency for "The Andy" so format as currency + let t = window.$gz.locale.currencyLocalized( + o.decValue, + languageName, + currencyName + ); + if (info != "" && t != "") { + info += ` - ${t}`; + } + } + if (o.ageValue) { + let t = window.$gz.locale.durationLocalized(o.ageValue); + if (info != "" && t != "") { + info += ` - ${t}`; + } + } + + let eventDisplay = window.$gz.enums.get( + "NotifyEventType", + o.eventType + ); + if (info && info != "") { + eventDisplay += ` - ${info}`; + } + ret.push({ id: o.id, - eventType: window.$gz.enums.get("NotifyEventType", o.eventType), - info: o.info, + eventType: eventDisplay, ayaType: window.$gz.enums.get("coreview", o.ayaType), deliveryMethod: window.$gz.enums.get( "NotifyDeliveryMethod", @@ -219,8 +245,8 @@ async function createTableHeaders(vm) { vm.headers = [ { text: vm.$ay.t("ID"), value: "id" }, { text: vm.$ay.t("NotifyEventType"), value: "eventType" }, + // { value: "info" }, { text: vm.$ay.t("AyaType"), value: "ayaType" }, - { value: "info" }, { text: vm.$ay.t("NotifyDeliveryMethod"), value: "deliveryMethod" }, { text: vm.$ay.t("NotifyDeliveryAddress"), value: "deliveryAddress" }, { text: vm.$ay.t("Tags"), value: "tags" }