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
2020-12-10 18:45:33 +00:00
parent 1fc4247149
commit 4f9f7a79cf
6 changed files with 17 additions and 9 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": "false", "AYANOVA_SERVER_TEST_MODE": "true",
"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\\"

8
server/AyaNova/biz/HeadOfficeBiz.cs
View File

@@ -369,7 +369,7 @@ namespace AyaNova.Biz
private async Task ProcessBulkJobAsync(OpsJob job) private async Task ProcessBulkJobAsync(OpsJob job)
{ {
await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running); await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Running);
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} started..."); await JobsBiz.LogJobAsync(job.GId, $"LT:StartJob {job.SubType}");
List<long> idList = new List<long>(); List<long> idList = new List<long>();
long ProcessedObjectCount = 0; long ProcessedObjectCount = 0;
long FailedObjectCount = 0; long FailedObjectCount = 0;
@@ -402,7 +402,7 @@ namespace AyaNova.Biz
case JobSubType.Delete: case JobSubType.Delete:
if (!await DeleteAsync(id)) if (!await DeleteAsync(id))
{ {
await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id}): {GetErrorsAsString()}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id({id})");
FailedObjectCount++; FailedObjectCount++;
} }
break; break;
@@ -413,7 +413,7 @@ namespace AyaNova.Biz
{ {
o = await PutAsync(o); o = await PutAsync(o);
if (o == null) if (o == null)
await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id}): {GetErrorsAsString()}"); await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id({id})");
else else
ProcessedObjectCount++; ProcessedObjectCount++;
} }
@@ -427,7 +427,7 @@ namespace AyaNova.Biz
} }
} }
await JobsBiz.LogJobAsync(job.GId, $"Batch job {job.SubType} processed {ProcessedObjectCount} of {idList.Count} with {FailedObjectCount} failures"); await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {ProcessedObjectCount} / {idList.Count}{(FailedObjectCount > 0 ? " LT:Failed" + FailedObjectCount : "")}");
await JobsBiz.UpdateJobStatusAsync(job.GId, FailedObjectCount == 0 ? JobStatus.Completed : JobStatus.Failed); await JobsBiz.UpdateJobStatusAsync(job.GId, FailedObjectCount == 0 ? JobStatus.Completed : JobStatus.Failed);
} }

4
server/AyaNova/resource/de.json
View File

@@ -1961,5 +1961,7 @@
"VendorPopUpNotes": "Popup-Notizen", "VendorPopUpNotes": "Popup-Notizen",
"EraseMultipleObjectsWarning": "Warnung: Sie sind dabei, mehrere Objekte dauerhaft zu löschen.\nBist du sicher?", "EraseMultipleObjectsWarning": "Warnung: Sie sind dabei, mehrere Objekte dauerhaft zu löschen.\nBist du sicher?",
"Errors":"Fehler", "Errors":"Fehler",
"BatchDeleteJob": "Batch-Löschauftrag" "BatchDeleteJob": "Batch-Löschauftrag",
"BatchJob": "Batch-Job",
"Failed": "Fehlgeschlagen"
} }

4
server/AyaNova/resource/en.json
View File

@@ -1961,5 +1961,7 @@
"VendorPopUpNotes": "Pop-up notes", "VendorPopUpNotes": "Pop-up notes",
"EraseMultipleObjectsWarning": "Warning: you are about to permanently erase multiple objects.\r\nAre you sure?", "EraseMultipleObjectsWarning": "Warning: you are about to permanently erase multiple objects.\r\nAre you sure?",
"Errors": "Errors", "Errors": "Errors",
"BatchDeleteJob": "Batch delete job" "BatchDeleteJob": "Batch delete job",
"BatchJob": "Batch job",
"Failed": "Failed"
} }

4
server/AyaNova/resource/es.json
View File

@@ -1961,5 +1961,7 @@
"VendorPopUpNotes": "Notas emergentes", "VendorPopUpNotes": "Notas emergentes",
"EraseMultipleObjectsWarning": "Advertencia: está a punto de borrar de forma permanente varios objetos.\n¿Estás seguro?", "EraseMultipleObjectsWarning": "Advertencia: está a punto de borrar de forma permanente varios objetos.\n¿Estás seguro?",
"Errors": "Errores", "Errors": "Errores",
"BatchDeleteJob": "Trabajo de eliminación por lotes" "BatchDeleteJob": "Trabajo de eliminación por lotes",
"BatchJob": "Trabajo por lotes",
"Failed": "Fallido"
} }

4
server/AyaNova/resource/fr.json
View File

@@ -1961,5 +1961,7 @@
"VendorPopUpNotes": "Notes contextuelles", "VendorPopUpNotes": "Notes contextuelles",
"EraseMultipleObjectsWarning": "Attention: vous êtes sur le point d'effacer définitivement plusieurs objets.\nÊtes-vous sûr?", "EraseMultipleObjectsWarning": "Attention: vous êtes sur le point d'effacer définitivement plusieurs objets.\nÊtes-vous sûr?",
"Errors": "les erreurs", "Errors": "les erreurs",
"BatchDeleteJob": "Tâche de suppression par lots" "BatchDeleteJob": "Tâche de suppression par lots",
"BatchJob": "Travail par lots",
"Failed": "Échec"
} }