From 24ef2b31faa0a63c5c2033e91439a223024b3d7b Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 12 May 2021 22:30:00 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 8 +++++--- server/AyaNova/resource/de.json | 3 ++- server/AyaNova/resource/en.json | 3 ++- server/AyaNova/resource/es.json | 3 ++- server/AyaNova/resource/fr.json | 3 ++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 279a1e89..d0d3b9fe 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -557,12 +557,14 @@ namespace AyaNova.Biz //popup Alert notes o.AlertViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.PopUpNotes).FirstOrDefaultAsync(); - + if (o.ProjectId != null) o.ProjectViz = await ct.Project.AsNoTracking().Where(x => x.Id == o.ProjectId).Select(x => x.Name).FirstOrDefaultAsync(); - - if (o.ContractId != null) + + if (o.ContractId != null) o.ContractViz = await ct.Contract.AsNoTracking().Where(x => x.Id == o.ContractId).Select(x => x.Name).FirstOrDefaultAsync(); + else + o.ContractViz = "-"; } diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index c0bc6ec4..82388c24 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2219,5 +2219,6 @@ "WorkOrderItemStatusColor": "Farbe", "WorkOrderItemPriorityList": "Prioritätsliste für Arbeitsauftragspositionen", "WorkOrderItemPriorityName": "Name", - "WorkOrderItemPriorityColor": "Farbe" + "WorkOrderItemPriorityColor": "Farbe", + "SaveRecordToProceed":"Dieser Datensatz muss gespeichert werden, um fortzufahren" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 3ef6749b..03e05c24 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2219,5 +2219,6 @@ "WorkOrderItemStatusColor": "Color", "WorkOrderItemPriorityList": "Work order item priority list", "WorkOrderItemPriorityName": "Name", - "WorkOrderItemPriorityColor": "Color" + "WorkOrderItemPriorityColor": "Color", + "SaveRecordToProceed":"This record must be saved to continue" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 0d05266c..1adb4c3d 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2219,5 +2219,6 @@ "WorkOrderItemStatusColor": "Color", "WorkOrderItemPriorityList": "Lista de prioridad de elementos de la orden de trabajo", "WorkOrderItemPriorityName": "Nombre", - "WorkOrderItemPriorityColor": "Color" + "WorkOrderItemPriorityColor": "Color", + "SaveRecordToProceed":"Este registro debe guardarse para continuar" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index a902b512..c8a65a5f 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2219,5 +2219,6 @@ "WorkOrderItemStatusColor": "Couleur", "WorkOrderItemPriorityList": "Liste de priorité des éléments de l'ordre de travail", "WorkOrderItemPriorityName": "Nom", - "WorkOrderItemPriorityColor": "Couleur" + "WorkOrderItemPriorityColor": "Couleur", + "SaveRecordToProceed":"Enregistrer pour continuer" } \ No newline at end of file