From e186e56470c9ee81e39bf0b40af2f371971bd8cd Mon Sep 17 00:00:00 2001
From: Nikodemas Tuckus <ntuckus@gmail.com>
Date: Tue, 7 May 2024 15:23:28 +0200
Subject: [PATCH] Add badput description

---
 .../static/templates/condor_detailed.tmpl     | 31 ++---------------
 .../static/templates/condor_main.tmpl         | 34 ++-----------------
 .../templates/condor_row_site_detailed.tmpl   |  2 +-
 3 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/cpueff-goweb/static/templates/condor_detailed.tmpl b/cpueff-goweb/static/templates/condor_detailed.tmpl
index fe3f7338..c1c6b66d 100644
--- a/cpueff-goweb/static/templates/condor_detailed.tmpl
+++ b/cpueff-goweb/static/templates/condor_detailed.tmpl
@@ -161,7 +161,7 @@
             <th>Tier</th>
             <th>Cpu Efficiency Outlier</th>
             <th>Cpu Eff</th>
-            <th>Non Eviction Eff</th>
+            <th id="badput">Badput (Non Eviction Eff) <span><a href="#star" style="text-decoration: none; color: inherit;">*</a></span></th>
             <th>Eviction Aware Eff Diff</th>
             <th>Schedule Eff</th>
             <th>Cmssw Read Time Pct</th>
@@ -177,36 +177,11 @@
             <th>Max WMAgent Job Id</th>
         </tr>
         </thead>
-        <tfoot hidden>
-        <tr>
-            <th>Links</th>
-            <th>Type</th>
-            <th>Workflow</th>
-            <th>WMAgent Request Name</th>
-            <th>Site</th>
-            <th>Tier</th>
-            <th>Cpu Efficiency Outlier</th>
-            <th>Cpu Eff</th>
-            <th>Non Eviction Eff</th>
-            <th>Eviction Aware Eff Diff</th>
-            <th>Schedule Eff</th>
-            <th>Cmssw Read Time Pct</th>
-            <th>Cpus</th>
-            <th>Cpu Time Hr</th>
-            <th>Wall Clock Hr</th>
-            <th>Core Time Hr</th>
-            <th>Committed Core Hr</th>
-            <th>Committed Wall Clock Hr</th>
-            <th>Wasted Cpu Time Hr</th>
-            <th>Committed Over Max Wall Time Avg</th>
-            <th>Schedds</th>
-            <th>Max WMAgent Job Id</th>
-        </tr>
-        </tfoot>
     </table>
 </div>
-<div class="footer" style="bottom: 0px; width: 100%;background-color: #262626;border-top: 1px solid #333;">
+<div class="footer" style="display: flex; justify-content: space-between; align-items: center; width: 100%; background-color: #262626; border-top: 1px solid #333; padding-right: 20px;">
     <img alt='CERN' src='/{{.govar_BASE_EP}}/static/img/LogoOutline-White.svg' style="height: 70px;margin: 20px;">
+    <p style="color: white; text-align: center; font-size: 12px; margin-top: -10px;">Badput is calculated by dividing the sum of CpuTimeHr by the sum of CommittedCoreHr. In case of evictions, CommittedCoreHr indicates the CPU time of the last retry, while CpuTimeHr is the total walltime for all the job retries.<a id="star" href="#badput">*</a></p>
 </div>
 
 <!-- prepared using https://datatables.net/download/ -->
diff --git a/cpueff-goweb/static/templates/condor_main.tmpl b/cpueff-goweb/static/templates/condor_main.tmpl
index 3ac628fc..e339e963 100644
--- a/cpueff-goweb/static/templates/condor_main.tmpl
+++ b/cpueff-goweb/static/templates/condor_main.tmpl
@@ -166,7 +166,7 @@
             <th>WMAgent Request Name</th>
             <th>Cpu Efficiency Outlier</th>
             <th>Cpu Eff</th>
-            <th>Non Eviction Eff</th>
+            <th id="badput">Badput (Non Eviction Eff) <span><a href="#star" style="text-decoration: none; color: inherit;">*</a></span></th>
             <th>Eviction Aware Eff Diff</th>
             <th>Schedule Eff</th>
             <th>Cmssw Read Time Pct</th>
@@ -186,40 +186,12 @@
             <th>Wasted Cpu Time Hr T1T2</th>
         </tr>
         </thead>
-        <tfoot hidden>
-        <tr>
-            <th></th>
-            <th>Links</th>
-            <th>Type</th>
-            <th>Workflow</th>
-            <th>WMAgent Request Name</th>
-            <th>Cpu Efficiency Outlier</th>
-            <th>Cpu Eff</th>
-            <th>Non Eviction Eff</th>
-            <th>Eviction Aware Eff Diff</th>
-            <th>Schedule Eff</th>
-            <th>Cmssw Read Time Pct</th>
-            <th>Cpus</th>
-            <th>Cpu Time Hr</th>
-            <th>Wall Clock Hr</th>
-            <th>Core Time Hr</th>
-            <th>Committed Core Hr</th>
-            <th>Committed Wall Clock Hr</th>
-            <th>Wasted Cpu Time Hr</th>
-            <th>Committed Over Max Wall Time Avg</th>
-            <th>Cpu Eff T1T2</th>
-            <th>Cpus T1T2</th>
-            <th>Cpu Time Hr T1T2</th>
-            <th>Wall Clock Hr T1T2</th>
-            <th>Core Time Hr T1T2</th>
-            <th>Wasted Cpu Time Hr T1T2</th>
-        </tr>
-        </tfoot>
     </table>
 </div>
 
-<div class="footer" style="bottom: 0px; width: 100%;background-color: #262626;border-top: 1px solid #333;">
+<div class="footer" style="display: flex; justify-content: space-between; align-items: center; width: 100%; background-color: #262626; border-top: 1px solid #333; padding-right: 20px;">
     <img alt='CERN' src='/{{.govar_BASE_EP}}/static/img/LogoOutline-White.svg' style="height: 70px;margin: 20px;">
+    <p style="color: white; text-align: center; font-size: 12px; margin-top: -10px;">Badput is calculated by dividing the sum of CpuTimeHr by the sum of CommittedCoreHr. In case of evictions, CommittedCoreHr indicates the CPU time of the last retry, while CpuTimeHr is the total walltime for all the job retries.<a id="star" href="#badput">*</a></p>
 </div>
 
 <!-- prepared using https://datatables.net/download/ -->
diff --git a/cpueff-goweb/static/templates/condor_row_site_detailed.tmpl b/cpueff-goweb/static/templates/condor_row_site_detailed.tmpl
index cb8d0406..b5ee8a8a 100644
--- a/cpueff-goweb/static/templates/condor_row_site_detailed.tmpl
+++ b/cpueff-goweb/static/templates/condor_row_site_detailed.tmpl
@@ -10,7 +10,7 @@
             <th scope="col" style="text-align: left;font-weight: bold;">Site</th>
             <th scope="col" style="text-align: left;">Tier</th>
             <th scope="col" style="text-align: right;">Cpu Eff</th>
-            <th scope="col" style="text-align: right;">Non Eviction Eff</th>
+            <th scope="col" style="text-align: right;">Badput (Non Eviction Eff)</th>
             <th scope="col" style="text-align: right;">Eviction Aware Eff Diff</th>
             <th scope="col" style="text-align: right;">Schedule Eff</th>
             <th scope="col" style="text-align: right;">Cmssw Read Time Pct</th>