Skip to content

Commit

Permalink
fix: added VO selector
Browse files Browse the repository at this point in the history
  • Loading branch information
fstagni committed Feb 8, 2024
1 parent bff4a8e commit 7a287d8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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", ""):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
type: "date",
dateFormat: "Y-m-d H:i:s",
},
{
name: "VO",
},
{
name: "OwnerGroup",
},
Expand Down Expand Up @@ -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",
};
Expand All @@ -249,6 +252,7 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
["status", "status"],
["types", "jobType"],
["OwnerGroup", "OwnerGroup"],
["VO", "VO"],
];

me.leftPanel = Ext.create("Ext.dirac.utils.DiracBaseSelector", {
Expand Down Expand Up @@ -380,6 +384,9 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
Site: {
dataIndex: "Site",
},
VO: {
dataIndex: "VO",
},
JobName: {
dataIndex: "JobName",
properties: {
Expand Down Expand Up @@ -675,7 +682,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",
Expand Down

0 comments on commit 7a287d8

Please sign in to comment.