From b6ae809b56005ed40f3c7055ff651778d7a85cb5 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Tue, 15 Jun 2021 16:06:16 +0300
Subject: [PATCH] job ui fix

---
 .../Espo/Resources/i18n/en_US/Job.json        |  3 +++
 .../Espo/Resources/layouts/Job/detail.json    | 20 ++++++++++---------
 .../Resources/layouts/Job/detailSmall.json    | 20 ++++++++++---------
 .../Espo/Resources/layouts/Job/filters.json   |  3 ++-
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/application/Espo/Resources/i18n/en_US/Job.json b/application/Espo/Resources/i18n/en_US/Job.json
index e5a510c302..e7b4d8f6d5 100644
--- a/application/Espo/Resources/i18n/en_US/Job.json
+++ b/application/Espo/Resources/i18n/en_US/Job.json
@@ -16,6 +16,9 @@
         "targetId": "Target ID",
         "number": "Number",
         "queue": "Queue",
+        "group": "Group",
+        "className": "Class Name",
+        "targetGroup": "Target Group",
         "job": "Job"
     },
     "options": {
diff --git a/application/Espo/Resources/layouts/Job/detail.json b/application/Espo/Resources/layouts/Job/detail.json
index 667eea760a..9645a1cd0a 100644
--- a/application/Espo/Resources/layouts/Job/detail.json
+++ b/application/Espo/Resources/layouts/Job/detail.json
@@ -1,14 +1,15 @@
 [
     {
-        "label":"",
-        "rows":[
+        "label": "",
+        "rows": [
             [{"name":"name"}, {"name": "status"}],
-            [{"name":"queue"}, {"name":"number"}]
+            [{"name":"queue"}, {"name":"number"}],
+            [{"name":"group"}, false]
         ]
     },
     {
-        "label":"",
-        "rows":[
+        "label": "",
+        "rows": [
             [{"name":"executeTime"}, {"name": "createdAt"}],
             [{"name":"startedAt"}, {"name": "modifiedAt"}],
             [{"name":"executedAt"}, false],
@@ -17,11 +18,12 @@
         ]
     },
     {
-        "label":"",
-        "rows":[
+        "label": "",
+        "rows": [
             [{"name":"scheduledJob"}, {"name":"targetType"}],
-            [{"name":"serviceName"}, {"name":"targetId"}],
-            [{"name":"methodName"}, {"name":"job"}],
+            [{"name":"className"}, {"name":"targetId"}],
+            [{"name":"serviceName"}, {"name":"job"}],
+            [{"name":"methodName"}, false],
             [{"name": "data", "fullWidth": true}]
         ]
     }
diff --git a/application/Espo/Resources/layouts/Job/detailSmall.json b/application/Espo/Resources/layouts/Job/detailSmall.json
index 667eea760a..9645a1cd0a 100644
--- a/application/Espo/Resources/layouts/Job/detailSmall.json
+++ b/application/Espo/Resources/layouts/Job/detailSmall.json
@@ -1,14 +1,15 @@
 [
     {
-        "label":"",
-        "rows":[
+        "label": "",
+        "rows": [
             [{"name":"name"}, {"name": "status"}],
-            [{"name":"queue"}, {"name":"number"}]
+            [{"name":"queue"}, {"name":"number"}],
+            [{"name":"group"}, false]
         ]
     },
     {
-        "label":"",
-        "rows":[
+        "label": "",
+        "rows": [
             [{"name":"executeTime"}, {"name": "createdAt"}],
             [{"name":"startedAt"}, {"name": "modifiedAt"}],
             [{"name":"executedAt"}, false],
@@ -17,11 +18,12 @@
         ]
     },
     {
-        "label":"",
-        "rows":[
+        "label": "",
+        "rows": [
             [{"name":"scheduledJob"}, {"name":"targetType"}],
-            [{"name":"serviceName"}, {"name":"targetId"}],
-            [{"name":"methodName"}, {"name":"job"}],
+            [{"name":"className"}, {"name":"targetId"}],
+            [{"name":"serviceName"}, {"name":"job"}],
+            [{"name":"methodName"}, false],
             [{"name": "data", "fullWidth": true}]
         ]
     }
diff --git a/application/Espo/Resources/layouts/Job/filters.json b/application/Espo/Resources/layouts/Job/filters.json
index a960dd9c21..3b31b78b65 100644
--- a/application/Espo/Resources/layouts/Job/filters.json
+++ b/application/Espo/Resources/layouts/Job/filters.json
@@ -4,5 +4,6 @@
     "executeTime",
     "startedAt",
     "executedAt",
-    "queue"
+    "queue",
+    "group"
 ]