diff --git a/.vscode/launch.json b/.vscode/launch.json index 0e2049e9..8fd97968 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": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "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/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs index df558f13..94981c7d 100644 --- a/server/AyaNova/biz/HeadOfficeBiz.cs +++ b/server/AyaNova/biz/HeadOfficeBiz.cs @@ -369,7 +369,7 @@ namespace AyaNova.Biz private async Task ProcessBulkJobAsync(OpsJob job) { 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 idList = new List(); long ProcessedObjectCount = 0; long FailedObjectCount = 0; @@ -402,7 +402,7 @@ namespace AyaNova.Biz case JobSubType.Delete: 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++; } break; @@ -413,7 +413,7 @@ namespace AyaNova.Biz { o = await PutAsync(o); if (o == null) - await JobsBiz.LogJobAsync(job.GId, $"LT:Errors id({id}): {GetErrorsAsString()}"); + await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id({id})"); else 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); } diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 55f1c5a9..2976922c 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1961,5 +1961,7 @@ "VendorPopUpNotes": "Popup-Notizen", "EraseMultipleObjectsWarning": "Warnung: Sie sind dabei, mehrere Objekte dauerhaft zu löschen.\nBist du sicher?", "Errors":"Fehler", - "BatchDeleteJob": "Batch-Löschauftrag" + "BatchDeleteJob": "Batch-Löschauftrag", + "BatchJob": "Batch-Job", + "Failed": "Fehlgeschlagen" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 481bfa3f..7cecdd5c 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1961,5 +1961,7 @@ "VendorPopUpNotes": "Pop-up notes", "EraseMultipleObjectsWarning": "Warning: you are about to permanently erase multiple objects.\r\nAre you sure?", "Errors": "Errors", - "BatchDeleteJob": "Batch delete job" + "BatchDeleteJob": "Batch delete job", + "BatchJob": "Batch job", + "Failed": "Failed" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 48e160e7..1cecc2a9 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1961,5 +1961,7 @@ "VendorPopUpNotes": "Notas emergentes", "EraseMultipleObjectsWarning": "Advertencia: está a punto de borrar de forma permanente varios objetos.\n¿Estás seguro?", "Errors": "Errores", - "BatchDeleteJob": "Trabajo de eliminación por lotes" + "BatchDeleteJob": "Trabajo de eliminación por lotes", + "BatchJob": "Trabajo por lotes", + "Failed": "Fallido" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 6dfa1094..aeb0ff52 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1961,5 +1961,7 @@ "VendorPopUpNotes": "Notes contextuelles", "EraseMultipleObjectsWarning": "Attention: vous êtes sur le point d'effacer définitivement plusieurs objets.\nÊtes-vous sûr?", "Errors": "les erreurs", - "BatchDeleteJob": "Tâche de suppression par lots" + "BatchDeleteJob": "Tâche de suppression par lots", + "BatchJob": "Travail par lots", + "Failed": "Échec" } \ No newline at end of file