From 052e2b1fde2e4a2481dc5006d06a2b7f299f31af Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 14 Nov 2022 18:38:42 +0000 Subject: [PATCH] case 4244 --- .vscode/launch.json | 2 +- server/AyaNova/biz/WorkOrderBiz.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index bdabcf8e..4f5b3cca 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -63,7 +63,7 @@ "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=300;", "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_USE_URLS": "http://*:7575;", - "AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", + //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", //"AYANOVA_REMOVE_LICENSE_FROM_DB":"true", //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin" diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index f6fbbc50..2edd2d64 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -195,7 +195,7 @@ namespace AyaNova.Biz //https://docs.microsoft.com/en-us/ef/core/querying/related-data //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections return await ct.WorkOrder.AsSplitQuery().AsNoTracking() - .Include(s => s.States) + .Include(s => s.States.OrderBy(item=> item.Id)) .Include(w => w.Items.OrderBy(item => item.Sequence)) .ThenInclude(wi => wi.Expenses) .Include(w => w.Items)