From 0415565d1770fd17a383ca5bc9afb04c2f359b45 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 17 Jun 2021 15:54:26 +0000 Subject: [PATCH] --- server/AyaNova/DataList/WorkOrderDataList.cs | 15 +++++++++++++-- server/AyaNova/util/Seeder.cs | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/server/AyaNova/DataList/WorkOrderDataList.cs b/server/AyaNova/DataList/WorkOrderDataList.cs index cfc5c211..b8c0b25d 100644 --- a/server/AyaNova/DataList/WorkOrderDataList.cs +++ b/server/AyaNova/DataList/WorkOrderDataList.cs @@ -8,8 +8,9 @@ namespace AyaNova.DataList { DefaultListAType = AyaType.WorkOrder; SQLFrom = "from aworkorder " - + "left join acustomer on (aworkorder.customerid=acustomer.id)" - + "left join aproject on (aworkorder.projectid=aproject.id)" + + "left join acustomer on (aworkorder.customerid=acustomer.id) " + + "left join aheadoffice on (acustomer.headofficeid=aheadoffice.id) " + + "left join aproject on (aworkorder.projectid=aproject.id) " + "left join acontract on (aworkorder.contractid=acontract.id)"; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; @@ -38,6 +39,16 @@ namespace AyaNova.DataList SqlValueColumnName = "acustomer.name" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "HeadOffice", + FieldKey = "workorderheadoffice", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.HeadOffice, + SqlIdColumnName = "aheadoffice.id", + SqlValueColumnName = "aheadoffice.name" + }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderSummary", diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index e51e9bbc..13d2c9d9 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -2521,7 +2521,7 @@ namespace AyaNova.Util o.CompleteByDate = woDate.AddDays(5); - o.CustomerContactName = "contact name here"; + // o.CustomerContactName = "contact name here"; o.CustomerId = Fake.Random.Long(1, TotalSeededCustomers); using (AyContext ct = ServiceProviderProvider.DBContext)