diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fd97968..0e2049e9 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": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "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/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index e61d0359..67bbc1d4 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -1680,9 +1680,12 @@ namespace AyaNova.Biz // private async Task LaborPopulateVizFields(WorkOrderItemLabor o) { - await Task.CompletedTask; - // if (o.WorkOrderOverseerId != null) - // o.WorkOrderOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.WorkOrderOverseerId).Select(x => x.Name).FirstOrDefaultAsync(); + if (o.UserId != null) + o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync(); + if (o.ServiceRateId != null) + o.ServiceRateViz = await ct.ServiceRate.AsNoTracking().Where(x => x.Id == o.ServiceRateId).Select(x => x.Name).FirstOrDefaultAsync(); + if (o.TaxCodeSaleId != null) + o.TaxCodeSaleViz = await ct.TaxCode.AsNoTracking().Where(x => x.Id == o.TaxCodeSaleId).Select(x => x.Name).FirstOrDefaultAsync(); } @@ -2946,7 +2949,6 @@ namespace AyaNova.Biz // private async Task ScheduledUserPopulateVizFields(WorkOrderItemScheduledUser o) { - await Task.CompletedTask; if (o.UserId != null) o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync(); if (o.ServiceRateId != null) diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index cde1d2ee..a3d5f7ed 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -2488,7 +2488,7 @@ namespace AyaNova.Util o.InternalReferenceNumber = "irf-" + Fake.Finance.Account(4); o.ServiceDate = woDate; - int woItemCount = Fake.Random.Int(1, 6); + int woItemCount = Fake.Random.Int(1, 3); for (int y = 0; y < woItemCount; y++) { var woItem = new WorkOrderItem() @@ -2496,7 +2496,9 @@ namespace AyaNova.Util Sequence = y + 1, Notes = $"itemnotes - {y} ", TechNotes = $"technotes - {y}", - RequestDate = woDate.AddMinutes(y) + RequestDate = woDate.AddMinutes(y), + WorkorderItemPriorityId=Fake.Random.Long(1, 5),//there are 5 different sample priorities + WorkorderItemStatusId=Fake.Random.Long(1, 3)//there are 3 different sample woitem status }; //SCHEDULED USERS