From 379673981f4d4e9f4c68c65e2ecc4b7c3a7bfae9 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 10 Dec 2020 18:58:31 +0000
Subject: [PATCH]

---
 .vscode/launch.json                                   | 2 +-
 server/AyaNova/Controllers/JobOperationsController.cs | 2 +-
 server/AyaNova/biz/JobsBiz.cs                         | 2 +-
 server/AyaNova/resource/de.json                       | 2 +-
 server/AyaNova/resource/en.json                       | 2 +-
 server/AyaNova/resource/es.json                       | 2 +-
 server/AyaNova/resource/fr.json                       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

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/Controllers/JobOperationsController.cs b/server/AyaNova/Controllers/JobOperationsController.cs
index 8bcb2b0e..7bed9488 100644
--- a/server/AyaNova/Controllers/JobOperationsController.cs
+++ b/server/AyaNova/Controllers/JobOperationsController.cs
@@ -215,7 +215,7 @@ namespace AyaNova.Api.Controllers
             if (dataListSelection.SelectedRowIds.Length == 0)
                 return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_REQUIRED, null, "List of ids"));
 
-            var JobName = $"LT:BatchDeleteJob - LT:{dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength})";
+            var JobName = $"LT:BatchDeleteJob - LT:{dataListSelection.ObjectType} ({dataListSelection.SelectedRowIds.LongLength}) LT:User {UserNameFromContext.Name(HttpContext.Items)}";
             JObject o = JObject.FromObject(new
             {
                 idList = dataListSelection.SelectedRowIds
diff --git a/server/AyaNova/biz/JobsBiz.cs b/server/AyaNova/biz/JobsBiz.cs
index 53cf5358..cceb7bbb 100644
--- a/server/AyaNova/biz/JobsBiz.cs
+++ b/server/AyaNova/biz/JobsBiz.cs
@@ -287,7 +287,7 @@ namespace AyaNova.Biz
             var JobDescription = $"{job.Name} - {job.JobType.ToString()}";
             if (job.SubType != JobSubType.NotSet)
                 JobDescription += $":{job.SubType}";
-            await LogJobAsync(job.GId, $"Processing job \"{JobDescription}\"");
+            await LogJobAsync(job.GId, $"LT:ProcessingJob \"{JobDescription}\"");
             log.LogDebug($"ProcessJobAsync -> Processing job {JobDescription}");
             IJobObject o = null;
             using (AyContext ct = ServiceProviderProvider.DBContext)
diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json
index 6e812053..e8a8636a 100644
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -1964,5 +1964,5 @@
   "BatchDeleteJob": "Batch-Löschauftrag",
   "BatchJob": "Batch-Job",
   "Failed": "Fehlgeschlagen",
-  "Processing job": "Serverjob verarbeiten"
+  "ProcessingJob": "Serverjob verarbeiten"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index 1ad74a46..4c815aba 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -1964,5 +1964,5 @@
   "BatchDeleteJob": "Batch delete job",
   "BatchJob": "Batch job",
   "Failed": "Failed",
-  "Processing job": "Processing job"
+  "ProcessingJob": "Processing server job"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json
index 9008621b..633dc009 100644
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -1964,5 +1964,5 @@
   "BatchDeleteJob": "Trabajo de eliminación por lotes",
   "BatchJob": "Trabajo por lotes",
   "Failed": "Fallido",
-  "Processing job": "Procesando trabajo del servidor"
+  "ProcessingJob": "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 3f5f8967..b4d87efb 100644
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -1964,5 +1964,5 @@
   "BatchDeleteJob": "Tâche de suppression par lots",
   "BatchJob": "Travail par lots",
   "Failed": "Échec",
-  "Processing job": "Traitement du travail du serveur"
+  "ProcessingJob": "Traitement du travail du serveur"
 }
\ No newline at end of file