From e639bb367482fdf963f5741f1444a6a97f573e53 Mon Sep 17 00:00:00 2001
From: Federico Stagni <federico.stagni@cern.ch>
Date: Mon, 2 Jun 2025 11:51:34 +0200
Subject: [PATCH 1/2] fix: remove CPUTime column

---
 .../WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js b/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js
index d4358e9e..937263f2 100755
--- a/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js
+++ b/src/WebAppDIRAC/WebApp/static/DIRAC/JobMonitor/classes/JobMonitor.js
@@ -120,9 +120,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
     {
       name: "RescheduleTime",
     },
-    {
-      name: "CPUTime",
-    },
     {
       name: "JobGroup",
     },
@@ -419,12 +416,6 @@ Ext.define("DIRAC.JobMonitor.classes.JobMonitor", {
           hidden: true,
         },
       },
-      CPUTime: {
-        dataIndex: "CPUTime",
-        properties: {
-          hidden: true,
-        },
-      },
       JobGroup: {
         dataIndex: "JobGroup",
         properties: {

From 69dccb892169b0748833a48dfb07c8d3be5da5bb Mon Sep 17 00:00:00 2001
From: Federico Stagni <federico.stagni@cern.ch>
Date: Mon, 2 Jun 2025 14:45:02 +0200
Subject: [PATCH 2/2] fix: proper casting for csv data

---
 src/WebAppDIRAC/WebApp/handler/AccountingHandler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WebAppDIRAC/WebApp/handler/AccountingHandler.py b/src/WebAppDIRAC/WebApp/handler/AccountingHandler.py
index f866005c..e9505450 100644
--- a/src/WebAppDIRAC/WebApp/handler/AccountingHandler.py
+++ b/src/WebAppDIRAC/WebApp/handler/AccountingHandler.py
@@ -282,7 +282,7 @@ def web_getCsvPlotData(self, typeName, plotName, timeSelector: int, grouping, **
             for timeSlot in range(timeStart, int(TimeUtilities.toEpoch(end)), granularity):
                 lineData = [str(timeSlot)]
                 for key in groupKeys:
-                    lineData.append(str(data[key][timeSlot]) if timeSlot in data[key] else "")
+                    lineData.append(str(data[key][str(timeSlot)]) if str(timeSlot) in data[key] else "")
                 strData += f"{','.join(lineData)}\n"
         else:
             strData = f"{','.join(groupKeys)}\n"