From f67a6d31309705ccea7bae42ae8c84711318be11 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 10 Jun 2021 16:11:21 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 10 +++++----- server/AyaNova/generator/CoreJobNotify.cs | 15 +++++++++++++-- server/AyaNova/resource/de.json | 2 +- server/AyaNova/resource/en.json | 2 +- server/AyaNova/resource/es.json | 2 +- server/AyaNova/resource/fr.json | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 1782d485..0c63f4a5 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -1076,7 +1076,7 @@ namespace AyaNova.Biz #region CustomerServiceImminent - if (ayaEvent == AyaEvent.Created && oProposed.CompleteByDate != null) + if (ayaEvent == AyaEvent.Created && oProposed.ServiceDate != null) { var subs = await ct.NotifySubscription.AsNoTracking().Where(z => z.EventType == NotifyEventType.CustomerServiceImminent).ToListAsync(); @@ -1091,11 +1091,11 @@ namespace AyaNova.Biz { EventType = NotifyEventType.CustomerServiceImminent, UserId = sub.UserId, - AyaType = proposedObj.AyaType, - ObjectId = proposedObj.Id, + AyaType = AyaType.NoType, + ObjectId =0, NotifySubscriptionId = sub.Id, - Name = oProposed.Serial.ToString(), - EventDate = (DateTime)oProposed.CompleteByDate + Name = oProposed.Serial.ToString(),//NO: this needs to be a customer notification string + EventDate = (DateTime)oProposed.ServiceDate }; await ct.NotifyEvent.AddAsync(n); log.LogDebug($"Adding NotifyEvent: [{n.ToString()}]"); diff --git a/server/AyaNova/generator/CoreJobNotify.cs b/server/AyaNova/generator/CoreJobNotify.cs index 48920a19..7e5eaba4 100644 --- a/server/AyaNova/generator/CoreJobNotify.cs +++ b/server/AyaNova/generator/CoreJobNotify.cs @@ -172,7 +172,18 @@ namespace AyaNova.Biz //subscription name translation var SubscriptionTypeName = LT[EventTypeTranslationKey]; - var subject = $"AY:{AyaTypeTranslated}:{name}:{SubscriptionTypeName}"; + string subject = ""; + //Special notification handling + switch (ne.EventType) + { + case NotifyEventType.CustomerServiceImminent: + subject = SubscriptionTypeName; + break; + default: + subject = $"AY:{AyaTypeTranslated}:{name}:{SubscriptionTypeName}"; + break; + } + //Age relevant notification string AgeDisplay = ""; @@ -208,7 +219,7 @@ namespace AyaNova.Biz { await m.SendEmailAsync(deliveryAddress, subject, body, ServerGlobalOpsSettingsCache.Notify); } - } + } } catch (Exception ex) { diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index c4571c33..bdc6dd7d 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2056,7 +2056,7 @@ "NotifyEventPartRequestReceived": "Angeforderter Teil erhalten", "NotifyEventNotifyHealthCheck": "Integritätsprüfung des Benachrichtigungssystems", "NotifyEventBackupStatus": "Status der Sicherung", - "NotifyEventCustomerServiceImminent": "Kundenservice steht unmittelbar bevor", + "NotifyEventCustomerServiceImminent": "Servicetermin", "NotifyEventPartRequested": "Teil angefordert", "NotifyEventWorkorderTotalExceedsThreshold": "Der Gesamtbetrag des Arbeitsauftrags überschreitet den Schwellenwert", "NotifyEventWorkorderStatusAge": "Arbeitsauftragsstatus für die Zeitspanne unverändert", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index aed82839..efe1439b 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2056,7 +2056,7 @@ "NotifyEventPartRequestReceived": "Requested part received", "NotifyEventNotifyHealthCheck": "Notification system health check", "NotifyEventBackupStatus": "Backup status", - "NotifyEventCustomerServiceImminent": "Customer service imminent", + "NotifyEventCustomerServiceImminent": "Service appointment", "NotifyEventPartRequested": "Part requested", "NotifyEventWorkorderTotalExceedsThreshold": "Work order total exceeds threshold", "NotifyEventWorkorderStatusAge": "Work order status age", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index a037acb8..671add90 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2056,7 +2056,7 @@ "NotifyEventPartRequestReceived": "Parte solicitada recibida", "NotifyEventNotifyHealthCheck": "Verificación del estado del sistema de notificación", "NotifyEventBackupStatus": "Estado de copia de seguridad", - "NotifyEventCustomerServiceImminent": "Servicio al cliente inminente", + "NotifyEventCustomerServiceImminent": "Cita de servicio", "NotifyEventPartRequested": "Parte de servicio solicitada", "NotifyEventWorkorderTotalExceedsThreshold": "El monto total de la orden de trabajo excede el umbral", "NotifyEventWorkorderStatusAge": "Estado de la orden de trabajo sin cambios durante el período de tiempo", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 5003b489..4ab101b1 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2056,7 +2056,7 @@ "NotifyEventPartRequestReceived": "Pièce demandée reçue", "NotifyEventNotifyHealthCheck": "Vérification de l'état du système de notification", "NotifyEventBackupStatus": "Statut de sauvegarde", - "NotifyEventCustomerServiceImminent": "Le service client est imminent", + "NotifyEventCustomerServiceImminent": "Rendez-vous de service", "NotifyEventPartRequested": "Pièce demandée", "NotifyEventWorkorderTotalExceedsThreshold": "Le montant total de l'ordre de travail dépasse le seuil", "NotifyEventWorkorderStatusAge": "Statut de l'ordre de travail inchangé pour la période de temps",