diff --git a/server/AyaNova/Controllers/EnumListController.cs b/server/AyaNova/Controllers/EnumListController.cs index 3611eee4..a4881528 100644 --- a/server/AyaNova/Controllers/EnumListController.cs +++ b/server/AyaNova/Controllers/EnumListController.cs @@ -256,7 +256,7 @@ namespace AyaNova.Api.Controllers TranslationKeysToFetch.Add("NotifyEventWorkorderStatusAge"); TranslationKeysToFetch.Add("NotifyEventUnitWarrantyExpiry"); TranslationKeysToFetch.Add("NotifyEventUnitMeterReadingMultipleExceeded"); - // TranslationKeysToFetch.Add("NotifyEventDefaultNotification"); + TranslationKeysToFetch.Add("NotifyEventServerOperationsProblem"); var LT = TranslationBiz.GetSubsetStaticAsync(TranslationKeysToFetch, TranslationId).Result; @@ -286,7 +286,7 @@ namespace AyaNova.Api.Controllers ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderStatusAge"], Id = (long)NotifyEventType.WorkorderStatusAge }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventUnitWarrantyExpiry"], Id = (long)NotifyEventType.UnitWarrantyExpiry }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventUnitMeterReadingMultipleExceeded"], Id = (long)NotifyEventType.UnitMeterReadingMultipleExceeded }); - // ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventDefaultNotification"], Id = (long)NotifyEventType.DefaultNotification }); + ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventServerOperationsProblem"], Id = (long)NotifyEventType.ServerOperationsProblem }); } else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(NotifyDeliveryMethod).ToString()).ToLowerInvariant()) diff --git a/server/AyaNova/biz/NotifyEventType.cs b/server/AyaNova/biz/NotifyEventType.cs index 576e5eaa..d8e98f50 100644 --- a/server/AyaNova/biz/NotifyEventType.cs +++ b/server/AyaNova/biz/NotifyEventType.cs @@ -36,7 +36,8 @@ namespace AyaNova.Biz WorkorderStatusAge = 24,//sitting too long in same status UnitWarrantyExpiry = 25, UnitMeterReadingMultipleExceeded = 26, - DefaultNotification = 27//old quick notification, refers now to any direct text notification internal or user to user used for system notifications + DefaultNotification = 27,//old quick notification, refers now to any direct text notification internal or user to user used for system notifications + ServerOperationsProblem = 28//and serious issue with server operations requiring intervention //NEW ITEMS REQUIRE translation KEYS diff --git a/server/AyaNova/generator/CoreJobNotify.cs b/server/AyaNova/generator/CoreJobNotify.cs index fda90e7d..aab7b207 100644 --- a/server/AyaNova/generator/CoreJobNotify.cs +++ b/server/AyaNova/generator/CoreJobNotify.cs @@ -45,9 +45,7 @@ namespace AyaNova.Biz using (AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext) { //select all jobs with no deliver date or deliver date no longer in future - //Open question: what to do with failed deliveries? - //we dont' want them piling up but we don't want to just dump them do we? - //it should be only mail ones that fail, not app ones, there's no way for an app delivery to fail as it's just put in a table + //### PLAN if it's an smtp delivery that fails and it's to someone who can be delivered in app then it should send an inapp notification of //delivery failure and still delete the smtp delivery //If it's not possible to notify the person via in app of the failed smtp then perhaps it notifies OPS personnel and biz admin personnel diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 6aaa27d5..d77211f4 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1885,7 +1885,8 @@ "NotifyEventUnitMeterReadingMultipleExceeded": "Zählerstand überschritten (Vielfaches)", "NotifyEventDefaultNotification": "Standardbenachrichtigung", "NotifyDeliveryMethodApp": "In Anwendung liefern", - "NotifyDeliveryMethodSMTP": "An E-Mail-Adresse liefern", - "NotifyEventObjectAge":"Objektalter seit der Erstellung", + "NotifyDeliveryMethodSMTP": "An E-Mail-Adresse liefern", + "NotifyEventObjectAge": "Objektalter seit der Erstellung", + "NotifyEventServerOperationsProblem": "Problem mit dem Serverbetrieb", "Duration": "Dauer" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 7e1056c8..39fd3681 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1886,6 +1886,7 @@ "NotifyEventDefaultNotification": "Default notification", "NotifyDeliveryMethodApp": "Deliver in application", "NotifyDeliveryMethodSMTP": "Deliver to email address", - "NotifyEventObjectAge":"Object age since created", + "NotifyEventObjectAge": "Object age since created", + "NotifyEventServerOperationsProblem": "Server operations problem", "Duration": "Duration" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index ab9948d8..7ff020e9 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1885,7 +1885,8 @@ "NotifyEventUnitMeterReadingMultipleExceeded": "Lectura de medidor de unidad excedida (múltiple)", "NotifyEventDefaultNotification": "Notificación predeterminada", "NotifyDeliveryMethodApp": "Entregar en programa", - "NotifyDeliveryMethodSMTP": "Entregar a la dirección de correo electrónico", - "NotifyEventObjectAge":"Edad del objeto desde su creación", + "NotifyDeliveryMethodSMTP": "Entregar a la dirección de correo electrónico", + "NotifyEventObjectAge": "Edad del objeto desde su creación", + "NotifyEventServerOperationsProblem": "Problema de operaciones del servidor", "Duration": "Duración" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 0048e908..4296597b 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1886,6 +1886,7 @@ "NotifyEventDefaultNotification": "Notification par défaut", "NotifyDeliveryMethodApp": "Livrer dans le programme", "NotifyDeliveryMethodSMTP": "Livrer à l'adresse e-mail", - "NotifyEventObjectAge":"Âge de l'objet depuis sa création", + "NotifyEventObjectAge": "Âge de l'objet depuis sa création", + "NotifyEventServerOperationsProblem": "Problème de fonctionnement du serveur", "Duration": "Durée" } \ No newline at end of file