From ca0e2951439950ded18d79b53ba888a65634fd68 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 6 Aug 2020 17:29:02 +0000 Subject: [PATCH] --- docs/8.0/ayanova/docs/form-home-notify-subscriptions.md | 1 + server/AyaNova/Controllers/EnumListController.cs | 4 ++-- server/AyaNova/biz/NotifyEventType.cs | 2 +- server/AyaNova/resource/de.json | 3 ++- server/AyaNova/resource/en.json | 1 + server/AyaNova/resource/es.json | 1 + server/AyaNova/resource/fr.json | 1 + 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/8.0/ayanova/docs/form-home-notify-subscriptions.md b/docs/8.0/ayanova/docs/form-home-notify-subscriptions.md index fc6d22e1..005df3a5 100644 --- a/docs/8.0/ayanova/docs/form-home-notify-subscriptions.md +++ b/docs/8.0/ayanova/docs/form-home-notify-subscriptions.md @@ -88,6 +88,7 @@ There are no settings adjustable for in app General notifications, however Users | ScheduledOnWorkorder | User is scheduled on (added to) a Work order | | ScheduledOnWorkorderImminent | Scheduled date and time reached for workorder which User is scheduled | | WorkorderFinishStatusOverdue | Workorder not set to a "Finished" type Status before the selected duration from created date | +| WorkorderFinished | Service work order is set to any status that is flagged as a "Finished" type of status. (i.e. it's done, no more work will be done) | | OutsideServiceOverdue | An item sent for 3rd party service is overdue from projected repair time frame | | OutsideServiceReceived | An item sent for 3rd party service has been received back | | PartRequestReceived | An out of stock part requested via a Workorder has been received | diff --git a/server/AyaNova/Controllers/EnumListController.cs b/server/AyaNova/Controllers/EnumListController.cs index ff86e24b..e63155b9 100644 --- a/server/AyaNova/Controllers/EnumListController.cs +++ b/server/AyaNova/Controllers/EnumListController.cs @@ -297,7 +297,7 @@ namespace AyaNova.Api.Controllers TranslationKeysToFetch.Add("NotifyEventContractExpiring"); TranslationKeysToFetch.Add("NotifyEventCSRAccepted"); TranslationKeysToFetch.Add("NotifyEventCSRRejected"); - //TranslationKeysToFetch.Add("NotifyEventWorkorderClosed"); + TranslationKeysToFetch.Add("NotifyEventWorkorderFinished"); TranslationKeysToFetch.Add("NotifyEventQuoteStatusChange"); TranslationKeysToFetch.Add("NotifyEventQuoteStatusAge"); TranslationKeysToFetch.Add("NotifyEventObjectAge"); @@ -329,7 +329,7 @@ namespace AyaNova.Api.Controllers ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventContractExpiring"], Id = (long)NotifyEventType.ContractExpiring }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventCSRAccepted"], Id = (long)NotifyEventType.CSRAccepted }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventCSRRejected"], Id = (long)NotifyEventType.CSRRejected }); - // ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderClosed"], Id = (long)NotifyEventType.WorkorderClosed }); + ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderFinished"], Id = (long)NotifyEventType.WorkorderFinished }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusChange"], Id = (long)NotifyEventType.QuoteStatusChange }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusAge"], Id = (long)NotifyEventType.QuoteStatusAge }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventObjectAge"], Id = (long)NotifyEventType.ObjectAge }); diff --git a/server/AyaNova/biz/NotifyEventType.cs b/server/AyaNova/biz/NotifyEventType.cs index 06cc0b7e..70c1a677 100644 --- a/server/AyaNova/biz/NotifyEventType.cs +++ b/server/AyaNova/biz/NotifyEventType.cs @@ -39,7 +39,7 @@ namespace AyaNova.Biz GeneralNotification = 27,//* NO OBJECT old quick notification, refers now to any direct text notification internal or user to user used for system notifications (default delivers in app but user can opt to also get email) ServerOperationsProblem = 28,//* NO OBJECT and serious issue with server operations requiring intervention, QuoteStatusAge = 29,//* Quote object Created / Updated, conditional on exact status selected IdValue, Tags conditional, advance notice can be set - WorkorderSetToFinishedStatus = 30 //Service work order is set to any status that is flagged as a "Finished" type of status + WorkorderFinished = 30 //Service work order is set to any status that is flagged as a "Finished" type of status //NEW ITEMS REQUIRE translation KEYS diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index b6b95e1b..119158a2 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1875,7 +1875,8 @@ "NotifyEventReminderImminent": "Erinnerung unmittelbar bevorsteht", "NotifyEventScheduledOnWorkorder": "Geplant auf Arbeitsauftrag", "NotifyEventScheduledOnWorkorderImminent": "Arbeitsauftragsplan steht kurz bevor", - "NotifyEventWorkorderFinishStatusOverdue": "Arbeitsauftrag nicht rechtzeitig erledigt", + "NotifyEventWorkorderFinishStatusOverdue": "Arbeitsauftrag nicht rechtzeitig erledigt", + "NotifyEventWorkorderFinished":"Arbeitsauftrag beendet", "NotifyEventOutsideServiceOverdue": "Drittanbieter-Service überfällig", "NotifyEventOutsideServiceReceived": "Service von Drittanbietern abgeschlossen, Gerät erhalten", "NotifyEventPartRequestReceived": "Angeforderter Teil erhalten", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index d1bff1a7..c65d818e 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1876,6 +1876,7 @@ "NotifyEventScheduledOnWorkorder": "Scheduled on work order", "NotifyEventScheduledOnWorkorderImminent": "Work order scheduled service imminent", "NotifyEventWorkorderFinishStatusOverdue": "Work order not finished in time", + "NotifyEventWorkorderFinished":"Work order finished", "NotifyEventOutsideServiceOverdue": "Outside service overdue", "NotifyEventOutsideServiceReceived": "Outside service unit received back", "NotifyEventPartRequestReceived": "Requested part received", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 9ec7c0f1..e53c9108 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1876,6 +1876,7 @@ "NotifyEventScheduledOnWorkorder": "Programado en orden de trabajo", "NotifyEventScheduledOnWorkorderImminent": "Servicio de orden de trabajo programado inminente", "NotifyEventWorkorderFinishStatusOverdue": "Orden de trabajo no terminada a tiempo", + "NotifyEventWorkorderFinished":"Orden de trabajo terminada", "NotifyEventOutsideServiceOverdue": "El servicio de terceros está atrasado", "NotifyEventOutsideServiceReceived": "Servicio de terceros completado, unidad recibida de vuelta", "NotifyEventPartRequestReceived": "Parte solicitada recibida", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 6328c010..1157ab7f 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1876,6 +1876,7 @@ "NotifyEventScheduledOnWorkorder": "Planifié sur ordre de travail", "NotifyEventScheduledOnWorkorderImminent": "Service planifié d'un ordre de travail imminent", "NotifyEventWorkorderFinishStatusOverdue": "Bon de travail non terminé à temps", + "NotifyEventWorkorderFinished":"Bon de travail terminé", "NotifyEventOutsideServiceOverdue": "Le service tiers est en retard", "NotifyEventOutsideServiceReceived": "Service tiers terminé, unité reçue", "NotifyEventPartRequestReceived": "Pièce demandée reçue",