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-05-07 17:55:15 +00:00
parent 9151ac2ada
commit 7782259944
3 changed files with 15 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\\"

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

@@ -559,7 +559,7 @@ namespace AyaNova.Biz
o.AlertViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.PopUpNotes).FirstOrDefaultAsync(); o.AlertViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.PopUpNotes).FirstOrDefaultAsync();
//project viz //project viz
if (o.ProjectId != null) if (o.ProjectId != null)
o.ProjectViz = await ct.Project.AsNoTracking().Where(x => x.Id == o.ProjectId).Select(x => x.Name).FirstOrDefaultAsync(); o.ProjectViz = await ct.Project.AsNoTracking().Where(x => x.Id == o.ProjectId).Select(x => x.Name).FirstOrDefaultAsync();
} }
@@ -1144,15 +1144,19 @@ namespace AyaNova.Biz
AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderId"); AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderId");
} }
//summary is required now, this is a change from v7 //summary is required now, this is a change from v7
//I did this because it is required in terms of hiding on the form so it also //I did this because it is required in terms of hiding on the form so it also
//is required to have a value. This is really because the form field customization I took away the hideable field //is required to have a value. This is really because the form field customization I took away the hideable field
//maybe I should add that feature back? //maybe I should add that feature back?
if (proposedObj.WorkOrderId == 0) if (proposedObj.WorkOrderId == 0)
AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderId"); AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderId");
// // //TEST TEST TEST // // //TEST TEST TEST
if (string.IsNullOrWhiteSpace(proposedObj.Notes))
{
AddError(ApiErrorCode.VALIDATION_REQUIRED, "Notes");
}
// if (proposedObj.Notes.Contains("blah")) // if (proposedObj.Notes.Contains("blah"))
// { // {
// ; // ;

7
server/AyaNova/generator/CoreJobLicense.cs
View File

@@ -70,9 +70,10 @@ namespace AyaNova.Biz
var ServerState = (AyaNova.Api.ControllerHelpers.ApiServerState)ServiceProviderProvider.Provider.GetService(typeof(AyaNova.Api.ControllerHelpers.ApiServerState)); var ServerState = (AyaNova.Api.ControllerHelpers.ApiServerState)ServiceProviderProvider.Provider.GetService(typeof(AyaNova.Api.ControllerHelpers.ApiServerState));
var ret = await AyaNova.Core.License.FetchKeyAsync(ServerState, ct, log, true); var ret = await AyaNova.Core.License.FetchKeyAsync(ServerState, ct, log, true);
#if (DEBUG) //When this was enabled never saw a failed fetch, trying again without it
log.LogInformation("TEST FETCH OK"); // #if (DEBUG)
#endif // log.LogInformation("TEST FETCH OK");
// #endif
//most often the result will be "notfound" but in future might be other results //most often the result will be "notfound" but in future might be other results
if (ret == "ok") if (ret == "ok")
{ {