From f0db66a0fa5d961de937042c57fabe5355f866fe Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 May 2021 17:37:43 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/FormFieldReference.cs | 2 +- server/AyaNova/resource/de.json | 2 +- server/AyaNova/resource/en.json | 2 +- server/AyaNova/resource/es.json | 2 +- server/AyaNova/resource/fr.json | 2 +- server/AyaNova/util/Seeder.cs | 33 ++++++++++++++++++++++++ 7 files changed, 39 insertions(+), 6 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 0e2049e9..8fd97968 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index d72786a5..18fb5f9e 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -859,7 +859,7 @@ namespace AyaNova.Biz //WORKORDER ITEM l.Add(new FormField { TKey = "WorkOrderItemSummary", FieldKey = "WorkOrderItemSummary", TKeySection = "WorkOrderItem" }); - l.Add(new FormField { TKey = "WorkOrderItemSequence", FieldKey = "WorkOrderItemSequence", TKeySection = "WorkOrderItem" }); + l.Add(new FormField { TKey = "Sequence", FieldKey = "WorkOrderItemSequence", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "WorkOrderItemTechNotes", FieldKey = "WorkOrderItemTechNotes", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "WorkOrderItemScheduledUserList", FieldKey = "WorkOrderItemScheduledUserList", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemTags", TKeySection = "WorkOrderItem" }); diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 397f70df..9285e654 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -2188,7 +2188,7 @@ "NextPMNumber": "Nächste vorbeugende Wartung", "WorkOrderErrorLocked": "Der Arbeitsauftrag ist derzeit gesperrt und kann nicht geändert werden", "WorkOrderSerialNumber": "Nummer", - "WorkOrderItemSequence": "Reihenfolge", + "Sequence": "Reihenfolge", "SoftDelete": "Zum Löschen markieren", "Undelete": "Wiederherstellen", "NewStatus": "Neuer Status", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index a96757aa..2538c204 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -2188,7 +2188,7 @@ "NextPMNumber": "Next preventive maintenance", "WorkOrderErrorLocked": "Work order is set to a locked status and can't be changed", "WorkOrderSerialNumber": "Number", - "WorkOrderItemSequence": "Sequence", + "Sequence": "Sequence", "SoftDelete": "Mark for deletion", "Undelete": "Undelete", "NewStatus": "New status", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 2830fa30..820d3835 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -2188,7 +2188,7 @@ "NextPMNumber": "Siguiente mantenimiento preventivo", "WorkOrderErrorLocked": "La orden de trabajo está actualmente configurada en un estado bloqueado y no se puede cambiar", "WorkOrderSerialNumber": "Número", - "WorkOrderItemSequence": "Secuencia", + "Sequence": "Secuencia", "SoftDelete": "Marcar para borrar", "Undelete": "Recuperar", "NewStatus": "Nuevo estado", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index d84e14cf..d40a01d7 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -2188,7 +2188,7 @@ "NextPMNumber": "Prochaine maintenance préventive", "WorkOrderErrorLocked": "Le bon de travail est actuellement défini sur un statut verrouillé et ne peut pas être modifié", "WorkOrderSerialNumber": "Numéro", - "WorkOrderItemSequence": "Séquence", + "Sequence": "Séquence", "SoftDelete": "Marquer pour suppression", "Undelete": "Annuler la suppression", "NewStatus": "Nouveau statut", diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index ab070ecc..464170e9 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -2236,6 +2236,39 @@ namespace AyaNova.Util o.CompleteByDate = woDate.AddDays(5).ToUniversalTime(); o.CustomerContactName = "contact name here"; o.CustomerId = Fake.Random.Long(1, TotalSeededCustomers); + + using (AyContext ct = ServiceProviderProvider.DBContext) + { + var cust = await ct.Customer.AsNoTracking().FirstAsync(z => z.Id == o.CustomerId); + o.Latitude = cust.Latitude; + o.Longitude = cust.Longitude; + o.Address = cust.Address; + o.City = cust.City; + o.Region = cust.Region; + o.Country = cust.Country; + + + if (cust.BillHeadOffice && cust.HeadOfficeId != null) + { + var head = await ct.HeadOffice.AsNoTracking().FirstAsync(z => z.Id == cust.HeadOfficeId); + o.PostAddress = head.PostAddress; + o.PostCity = head.PostCity; + o.PostRegion = head.PostRegion; + o.PostCountry = head.PostCountry; + o.PostCode = head.PostCode; + } + else + { + + o.PostAddress = cust.PostAddress; + o.PostCity = cust.PostCity; + o.PostRegion = cust.PostRegion; + o.PostCountry = cust.PostCountry; + o.PostCode = cust.PostCode; + } + } + + o.CustomerReferenceNumber = "crf-" + Fake.Finance.Account(4); o.InternalReferenceNumber = "irf-" + Fake.Finance.Account(4); o.ServiceDate = woDate.ToUniversalTime();