admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-04-29 23:59:52 +00:00
parent bfeec42018
commit 1f9891eb0d
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -53,7 +53,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "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_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

19
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -153,7 +153,7 @@ namespace AyaNova.Biz
var ret = var ret =
await ct.WorkOrder.AsNoTracking() await ct.WorkOrder.AsNoTracking()
.Include(s => s.States) .Include(s => s.States)
.Include(w => w.Items.OrderBy(item=>item.Sequence)) .Include(w => w.Items.OrderBy(item => item.Sequence))
.ThenInclude(wi => wi.Expenses) .ThenInclude(wi => wi.Expenses)
.Include(w => w.Items) .Include(w => w.Items)
.ThenInclude(wi => wi.Labors) .ThenInclude(wi => wi.Labors)
@@ -514,8 +514,8 @@ namespace AyaNova.Biz
foreach (WorkOrder w in orderedList) foreach (WorkOrder w in orderedList)
{ {
//populate entire workorder graph //populate entire workorder graph
//await WorkOrderPopulateVizFields(w); //await WorkOrderPopulateVizFields(w);
//this is done by the initial fetch now //this is done by the initial fetch now
var jo = JObject.FromObject(w); var jo = JObject.FromObject(w);
@@ -554,8 +554,9 @@ namespace AyaNova.Biz
await StatePopulateVizFields(v); await StatePopulateVizFields(v);
foreach (var v in o.Items) foreach (var v in o.Items)
await ItemPopulateVizFields(v); await ItemPopulateVizFields(v);
// if (o.WorkOrderOverseerId != null)
// o.WorkOrderOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.WorkOrderOverseerId).Select(x => x.Name).FirstOrDefaultAsync(); //popup Alert notes
o.AlertViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.PopUpNotes).FirstOrDefaultAsync();
} }
@@ -1145,10 +1146,10 @@ namespace AyaNova.Biz
// { // {
// ; // ;
// } // }
// if (proposedObj.Notes != null && proposedObj.Notes.Contains("generalerror")) if (proposedObj.Notes != null && proposedObj.Notes.Contains("generalerror"))
// { {
// AddError(ApiErrorCode.API_SERVER_ERROR, "generalerror", "Test general error"); AddError(ApiErrorCode.API_SERVER_ERROR, "generalerror", "Test general error");
// } }
// if (proposedObj.Notes != null && proposedObj.Notes.Contains("aytesterror")) // if (proposedObj.Notes != null && proposedObj.Notes.Contains("aytesterror"))
// { // {
// AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Notes", "SAVE TEST ERROR"); // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Notes", "SAVE TEST ERROR");

2
server/AyaNova/models/WorkOrder.cs
View File

@@ -73,6 +73,8 @@ namespace AyaNova.Models
public bool IsDirty { get; set; } = false;//never dirty coming from the server public bool IsDirty { get; set; } = false;//never dirty coming from the server
[NotMapped] [NotMapped]
public bool IsLockedAtServer { get; set; } = false;//signal to client that it came from the server in a locked state public bool IsLockedAtServer { get; set; } = false;//signal to client that it came from the server in a locked state
[NotMapped]
public string AlertViz { get; set; } = null;
[NotMapped, JsonIgnore] [NotMapped, JsonIgnore]