From 49e9f5e57056790a7fa6a64577a60f985671cdc5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 6 Aug 2020 17:22:06 +0000 Subject: [PATCH] --- devdocs/specs/core-notification.txt | 2 +- docs/8.0/ayanova/docs/form-home-notify-subscriptions.md | 2 +- server/AyaNova/Controllers/EnumListController.cs | 4 ++-- server/AyaNova/biz/NotifyEventProcessor.cs | 4 ++-- server/AyaNova/biz/NotifyEventType.cs | 5 +++-- server/AyaNova/resource/de.json | 2 +- server/AyaNova/resource/en.json | 2 +- server/AyaNova/resource/es.json | 2 +- server/AyaNova/resource/fr.json | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/devdocs/specs/core-notification.txt b/devdocs/specs/core-notification.txt index 395a638c..736f168c 100644 --- a/devdocs/specs/core-notification.txt +++ b/devdocs/specs/core-notification.txt @@ -222,7 +222,7 @@ CSRAccepted [CUSTOMER] CSRRejected [CUSTOMER] NewWorkorder [CUSTOMER] WorkorderStatusChange [CUSTOMER] [CONDITION: WOSTATUS integer] -### DEPRECATED, WOSTATUS event now replaces this ### WorkorderClosed [CUSTOMER] +### DEPRECATED, WOSTATUS "Finished" status type event now replaces this ### WorkorderClosed [CUSTOMER] ### HOLD for v.next lots of cases around customer satisfaction survey etc not initial release though WorkorderFollowUp [CUSTOMER]###### QuoteStatusChanged [CUSTOMER] [CONDITION: QUOTESTATUS integer] ServiceBank[Currency/Hours/Incidents]Depleted [GENERAL] 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 3a01c79d..fc6d22e1 100644 --- a/docs/8.0/ayanova/docs/form-home-notify-subscriptions.md +++ b/docs/8.0/ayanova/docs/form-home-notify-subscriptions.md @@ -87,7 +87,7 @@ There are no settings adjustable for in app General notifications, however Users | ReminderImminent | A Reminder in AyaNova is about to reach it's specified date/time | | ScheduledOnWorkorder | User is scheduled on (added to) a Work order | | ScheduledOnWorkorderImminent | Scheduled date and time reached for workorder which User is scheduled | -| WorkorderCloseByPassed | Workorder not set to a completed type status by the pre-selected date/time | +| WorkorderFinishStatusOverdue | Workorder not set to a "Finished" type Status before the selected duration from created date | | 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 e9937156..ff86e24b 100644 --- a/server/AyaNova/Controllers/EnumListController.cs +++ b/server/AyaNova/Controllers/EnumListController.cs @@ -305,7 +305,7 @@ namespace AyaNova.Api.Controllers TranslationKeysToFetch.Add("NotifyEventReminderImminent"); TranslationKeysToFetch.Add("NotifyEventScheduledOnWorkorder"); TranslationKeysToFetch.Add("NotifyEventScheduledOnWorkorderImminent"); - TranslationKeysToFetch.Add("NotifyEventWorkorderCloseByPassed"); + TranslationKeysToFetch.Add("NotifyEventWorkorderFinishStatusOverdue"); TranslationKeysToFetch.Add("NotifyEventOutsideServiceOverdue"); TranslationKeysToFetch.Add("NotifyEventOutsideServiceReceived"); TranslationKeysToFetch.Add("NotifyEventPartRequestReceived"); @@ -337,7 +337,7 @@ namespace AyaNova.Api.Controllers ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventReminderImminent"], Id = (long)NotifyEventType.ReminderImminent }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventScheduledOnWorkorder"], Id = (long)NotifyEventType.ScheduledOnWorkorder }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventScheduledOnWorkorderImminent"], Id = (long)NotifyEventType.ScheduledOnWorkorderImminent }); - ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderCloseByPassed"], Id = (long)NotifyEventType.WorkorderCloseByPassed }); + ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderFinishStatusOverdue"], Id = (long)NotifyEventType.WorkorderFinishStatusOverdue }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventOutsideServiceOverdue"], Id = (long)NotifyEventType.OutsideServiceOverdue }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventOutsideServiceReceived"], Id = (long)NotifyEventType.OutsideServiceReceived }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventPartRequestReceived"], Id = (long)NotifyEventType.PartRequestReceived }); diff --git a/server/AyaNova/biz/NotifyEventProcessor.cs b/server/AyaNova/biz/NotifyEventProcessor.cs index 138eaf5f..2d41a51f 100644 --- a/server/AyaNova/biz/NotifyEventProcessor.cs +++ b/server/AyaNova/biz/NotifyEventProcessor.cs @@ -188,7 +188,7 @@ namespace AyaNova.Biz } //ScheduledOnWorkorder //ScheduledOnWorkorderImminent - //tentative WorkorderCloseByPassed + //tentative WorkorderFinishStatusOverdue //OutsideServiceOverdue //OutsideServiceReceived //PartRequestReceived @@ -321,7 +321,7 @@ namespace AyaNova.Biz } //ScheduledOnWorkorder (DELETE OLD, USER / DATE COULD CHANGE) //ScheduledOnWorkorderImminent (DELTE OLD) - //tentative WorkorderCloseByPassed (DELETE OLD) + //tentative WorkorderFinishStatusOverdue (DELETE OLD) //OutsideServiceOverdue (ALSO DELETE OLD) //OutsideServiceReceived //PartRequestReceived diff --git a/server/AyaNova/biz/NotifyEventType.cs b/server/AyaNova/biz/NotifyEventType.cs index 4a2d767c..06cc0b7e 100644 --- a/server/AyaNova/biz/NotifyEventType.cs +++ b/server/AyaNova/biz/NotifyEventType.cs @@ -24,7 +24,7 @@ namespace AyaNova.Biz ReminderImminent = 12,//*Reminder object, Advance notice setting tag conditional ScheduledOnWorkorder = 13,//*Workorder / WorkorderItemScheduledUser object, instant notification when current user is scheduled on a service workorder ScheduledOnWorkorderImminent = 14,//*Workorder / WorkorderItemScheduledUser object, advanced (settable) notification when current user's scheduled date/time is imminent - WorkorderCloseByPassed = 15,//* ##TODO Workorder object , need to rename this and rethink it in line with this is really related to not setting workorder to a finished or completed status type in time + WorkorderFinishStatusOverdue = 15,//* Workorder object not set to a "Finished" flagged workorder status type in selected time span from creation of workorderWorkorderSetToFinishedStatus OutsideServiceOverdue = 16,//* Workorder object , WorkorderItemOutsideService created / updated, sets advance notice on due date tag filterable OutsideServiceReceived = 17,//* Workorder object , WorkorderItemOutsideService updated, instant notification when item received, tag filterable PartRequestReceived = 18,//* Workorder object / workorderitempartrequest updated, sent to person who requested when parts received back @@ -38,7 +38,8 @@ namespace AyaNova.Biz UnitMeterReadingMultipleExceeded = 26,//* UnitMeterReading object, Created, conditional on DecValue as the Multiple threshold, if passed then notifies 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 + 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 //NEW ITEMS REQUIRE translation KEYS diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 2d0ef253..b6b95e1b 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1875,7 +1875,7 @@ "NotifyEventReminderImminent": "Erinnerung unmittelbar bevorsteht", "NotifyEventScheduledOnWorkorder": "Geplant auf Arbeitsauftrag", "NotifyEventScheduledOnWorkorderImminent": "Arbeitsauftragsplan steht kurz bevor", - "NotifyEventWorkorderCloseByPassed": "Abschlussdatum des Arbeitsauftrags abgelaufen", + "NotifyEventWorkorderFinishStatusOverdue": "Arbeitsauftrag nicht rechtzeitig erledigt", "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 8cd9f352..d1bff1a7 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1875,7 +1875,7 @@ "NotifyEventReminderImminent": "Reminder imminent", "NotifyEventScheduledOnWorkorder": "Scheduled on work order", "NotifyEventScheduledOnWorkorderImminent": "Work order scheduled service imminent", - "NotifyEventWorkorderCloseByPassed": "Work order close by date passed", + "NotifyEventWorkorderFinishStatusOverdue": "Work order not finished in time", "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 69744952..9ec7c0f1 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1875,7 +1875,7 @@ "NotifyEventReminderImminent": "Recordatorio inminente", "NotifyEventScheduledOnWorkorder": "Programado en orden de trabajo", "NotifyEventScheduledOnWorkorderImminent": "Servicio de orden de trabajo programado inminente", - "NotifyEventWorkorderCloseByPassed": "La fecha de cierre de la orden de trabajo ha pasado", + "NotifyEventWorkorderFinishStatusOverdue": "Orden de trabajo no terminada a tiempo", "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 d65228bd..6328c010 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1875,7 +1875,7 @@ "NotifyEventReminderImminent": "Rappel imminent", "NotifyEventScheduledOnWorkorder": "Planifié sur ordre de travail", "NotifyEventScheduledOnWorkorderImminent": "Service planifié d'un ordre de travail imminent", - "NotifyEventWorkorderCloseByPassed": "La date de clôture de l'ordre de travail est passée", + "NotifyEventWorkorderFinishStatusOverdue": "Bon de travail non terminé à temps", "NotifyEventOutsideServiceOverdue": "Le service tiers est en retard", "NotifyEventOutsideServiceReceived": "Service tiers terminé, unité reçue", "NotifyEventPartRequestReceived": "Pièce demandée reçue",