diff --git a/server/AyaNova/DataList/WorkOrderDataList.cs b/server/AyaNova/DataList/WorkOrderDataList.cs index e7a04639..dab948c6 100644 --- a/server/AyaNova/DataList/WorkOrderDataList.cs +++ b/server/AyaNova/DataList/WorkOrderDataList.cs @@ -16,7 +16,7 @@ namespace AyaNova.DataList + "left join acontract on (aworkorder.contractid=acontract.id)"; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; - DefaultColumns = new List() { "WorkOrderSerialNumber", "Customer", "WorkOrderServiceDate", "WorkOrderCloseByDate", "workordercity" }; + DefaultColumns = new List() { "WorkOrderSerialNumber", "Customer", "WorkOrderServiceDate", "WorkOrderCloseByDate", "WorkOrderStatus" }; DefaultSortBy = new Dictionary() { { "WorkOrderSerialNumber", "-" } }; FieldDefinitions = new List(); @@ -58,6 +58,7 @@ namespace AyaNova.DataList UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, SqlIdColumnName = "aworkorder.laststatusid", + SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index b07b716d..7641a75e 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -764,7 +764,7 @@ namespace AyaNova.Util o.Name = "XYZ Accounting"; o.HeadOfficeId = HeadOfficeIdForCustomer; - o.BillHeadOffice=true; + o.BillHeadOffice = true; o.Active = true; o.Notes = Fake.Company.CatchPhrase(); o.Tags = RandomTags(); @@ -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) @@ -2888,7 +2888,20 @@ namespace AyaNova.Util Created = ((DateTime)o.ServiceDate).AddHours(2) }; o.States.Add(WoState); - o.LastStatusId=WoState.WorkOrderStatusId;//simulate if user added state to wo so it gets set + + } + + + { + + var WoState = new WorkOrderState() + { + WorkOrderStatusId = (long)Fake.Random.Enum(SeedWOStatus.Scheduled), + UserId = RandomServiceTechUserId(), + Created = ((DateTime)o.ServiceDate).AddHours(2) + }; + o.States.Add(WoState); + o.LastStatusId = WoState.WorkOrderStatusId;//simulate if user added state to wo so it gets set }