This commit is contained in:
2021-06-18 19:26:39 +00:00
parent ccd706a966
commit 4245f77fe2
3 changed files with 38 additions and 21 deletions

View File

@@ -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) {

View File

@@ -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" }