diff --git a/server/AyaNova/DataList/NotificationDeliveryLogDataList.cs b/server/AyaNova/DataList/NotificationDeliveryLogDataList.cs index b27c0355..f8ffc9f0 100644 --- a/server/AyaNova/DataList/NotificationDeliveryLogDataList.cs +++ b/server/AyaNova/DataList/NotificationDeliveryLogDataList.cs @@ -6,26 +6,26 @@ namespace AyaNova.DataList { public NotificationDeliveryLogDataList(long translationId) { - DefaultListAType = AyaType.Project; + DefaultListAType = AyaType.OpsNotificationSettings; SQLFrom = @"from anotifydeliverylog left join anotifysubscription on anotifysubscription.id = anotifydeliverylog.notifysubscriptionid left join auser on anotifysubscription.userid=auser.id"; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - DefaultColumns = new List() { "NotifySubscription", "Processed","User", "Failed", "Errors" }; + DefaultColumns = new List() { "Processed", "NotifyEventType", "AyaType", "User", "Failed", "Errors" }; DefaultSortBy = new Dictionary() { { "Processed", "-" } }; FieldDefinitions = new List(); - FieldDefinitions.Add(new DataListFieldDefinition - { - TKey = "NotifySubscription", - FieldKey = "NotifySubscription", - AType = (int)AyaType.NotifySubscription, - UiFieldDataType = (int)UiFieldDataType.Text, - SqlIdColumnName = "anotifysubscription.id", - SqlValueColumnName = "anotifysubscription.id", - IsRowId = true - }); + // FieldDefinitions.Add(new DataListFieldDefinition + // { + // TKey = "NotifySubscription", + // FieldKey = "NotifySubscription", + // AType = (int)AyaType.NotifySubscription, + // UiFieldDataType = (int)UiFieldDataType.Text, + // SqlIdColumnName = "anotifysubscription.id", + // SqlValueColumnName = "anotifysubscription.id", + // IsRowId = false + // }); FieldDefinitions.Add(new DataListFieldDefinition { @@ -35,6 +35,24 @@ namespace AyaNova.DataList SqlValueColumnName = "anotifydeliverylog.processed" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "NotifyEventType", + FieldKey = "NotifyEventType", + UiFieldDataType = (int)UiFieldDataType.Enum, + EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(NotifyEventType).ToString()), + SqlValueColumnName = "anotifysubscription.eventtype" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AyaType", + FieldKey = "AyaType", + UiFieldDataType = (int)UiFieldDataType.Enum, + EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AyaType).ToString()), + SqlValueColumnName = "anotifysubscription.ayatype" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "Failed", diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 12c21de6..3cf88f53 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -777,6 +777,7 @@ "Price": "Preis", "PriceOverride": "Preisüberschreibung", "Print": "Drucken", + "Processed":"Verarbeitet", "ProcessingJob": "Serverjob verarbeiten", "Project": "Projekt", "ProjectAccountNumber": "Kontonummer", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index b516b111..296b41f7 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -777,6 +777,7 @@ "Price": "Price", "PriceOverride": "Price override", "Print": "Print", + "Processed":"Processed", "ProcessingJob": "Processing server job", "Project": "Project", "ProjectAccountNumber": "Account Number", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index f40e067a..aa50c2c8 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -777,6 +777,7 @@ "Price": "Precio", "PriceOverride": "Anulación de precio", "Print": "Imprimir", + "Processed":"Fecha de procesamiento", "ProcessingJob": "Procesando trabajo del servidor", "Project": "Proyecto", "ProjectAccountNumber": "Número de cuenta", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 452402b1..b2fd170f 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -777,6 +777,7 @@ "Price": "Prix", "PriceOverride": "Remplacement de prix", "Print": "Imprimer", + "Processed":"Date de traitement", "ProcessingJob": "Traitement du travail du serveur", "Project": "Projet", "ProjectAccountNumber": "Numéro de compte",