diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fd97968..0e2049e9 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": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "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 94981c7d..6cf04683 100644 --- a/server/AyaNova/biz/HeadOfficeBiz.cs +++ b/server/AyaNova/biz/HeadOfficeBiz.cs @@ -402,7 +402,7 @@ namespace AyaNova.Biz case JobSubType.Delete: if (!await DeleteAsync(id)) { - await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id({id})"); + 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 {GetErrorsAsString()} id({id})"); + await JobsBiz.LogJobAsync(job.GId, $"LT:Errors {GetErrorsAsString()} id {id}"); else ProcessedObjectCount++; } @@ -427,7 +427,7 @@ namespace AyaNova.Biz } } - await JobsBiz.LogJobAsync(job.GId, $"LT:BatchJob {job.SubType} {ProcessedObjectCount} / {idList.Count}{(FailedObjectCount > 0 ? " LT:Failed" + FailedObjectCount : "")}"); + 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 2976922c..6e812053 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1963,5 +1963,6 @@ "Errors":"Fehler", "BatchDeleteJob": "Batch-Löschauftrag", "BatchJob": "Batch-Job", - "Failed": "Fehlgeschlagen" + "Failed": "Fehlgeschlagen", + "Processing job": "Serverjob verarbeiten" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 7cecdd5c..1ad74a46 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1963,5 +1963,6 @@ "Errors": "Errors", "BatchDeleteJob": "Batch delete job", "BatchJob": "Batch job", - "Failed": "Failed" + "Failed": "Failed", + "Processing job": "Processing job" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 1cecc2a9..9008621b 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1963,5 +1963,6 @@ "Errors": "Errores", "BatchDeleteJob": "Trabajo de eliminación por lotes", "BatchJob": "Trabajo por lotes", - "Failed": "Fallido" + "Failed": "Fallido", + "Processing job": "Procesando trabajo del servidor" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index aeb0ff52..3f5f8967 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1963,5 +1963,6 @@ "Errors": "les erreurs", "BatchDeleteJob": "Tâche de suppression par lots", "BatchJob": "Travail par lots", - "Failed": "Échec" + "Failed": "Échec", + "Processing job": "Traitement du travail du serveur" } \ No newline at end of file