diff --git a/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py index f4b3ba7f..0aa78ec8 100644 --- a/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py @@ -4,7 +4,6 @@ from DIRAC import gConfig, gLogger from DIRAC.Core.Utilities import DictCache from DIRAC.Core.Utilities.Graphs.Palette import Palette -from DIRAC.RequestManagementSystem.Client.Request import Request from DIRAC.RequestManagementSystem.Client.ReqClient import ReqClient from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient from DIRAC.WorkloadManagementSystem.Client.JobManagerClient import JobManagerClient @@ -256,6 +255,10 @@ def _request(self): if ownerGroup: req["OwnerGroup"] = ownerGroup + vo = list(json.loads(self.get_argument("vo", "[]"))) + if vo: + req["vo"] = vo + if self.get_argument("startDate", ""): req["FromDate"] = self.get_argument("startDate") if self.get_argument("startTime", ""): diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js index be231f9f..c015fc5c 100755 --- a/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js +++ b/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js @@ -145,6 +145,9 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", { type: "date", dateFormat: "Y-m-d H:i:s", }, + { + name: "VO", + }, { name: "OwnerGroup", }, @@ -223,7 +226,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", { minorStatus: "Minor Status", appStatus: "Application Status", owner: "Owner", - OwnerGroup: "OwnerGroup", + VO: "VO", jobGroup: "Job Group", jobType: "Job Type", }; @@ -248,7 +251,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", { ["site", "site"], ["status", "status"], ["types", "jobType"], - ["OwnerGroup", "OwnerGroup"], + ["VO", "VO"], ]; me.leftPanel = Ext.create("Ext.dirac.utils.DiracBaseSelector", { @@ -380,6 +383,9 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", { Site: { dataIndex: "Site", }, + VO: { + dataIndex: "VO", + }, JobName: { dataIndex: "JobName", properties: { @@ -675,7 +681,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", { mode: "local", store: new Ext.data.ArrayStore({ fields: ["category"], - data: [["Status"], ["Site"], ["Minor Status"], ["Application Status"], ["Owner"], ["Owner Group"], ["Job Group"], ["Job Type"]], + data: [["Status"], ["Site"], ["Minor Status"], ["Application Status"], ["Owner"], ["VO"], ["Job Group"], ["Job Type"]], }), triggerAction: "all", value: "Status",