Possible downtime vs program time

Fixes #15
JeffersonLab · Apr 8, 2024 · 4e65260 · 4e65260
1 parent 8d7701e
commit 4e65260
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/main/java/org/jlab/btm/persistence/projection/CcAccShiftTotals.java b/src/main/java/org/jlab/btm/persistence/projection/CcAccShiftTotals.java
@@ -62,4 +62,8 @@ public void setAccSeconds(Integer accSeconds) {
     public Integer calculateProgramSeconds() {
         return restoreSeconds + accSeconds + upSeconds + studiesSeconds + downSeconds;
     }
+
+    public Integer calculatePossibleDowntimeSeconds() {
+        return upSeconds + downSeconds;
+    }
 }
diff --git a/src/main/java/org/jlab/btm/persistence/projection/CcDowntimeCrossCheck.java b/src/main/java/org/jlab/btm/persistence/projection/CcDowntimeCrossCheck.java
@@ -8,25 +8,22 @@
  */
 public class CcDowntimeCrossCheck {
 
+    private static final int TEN_MINUTES_OF_SECONDS = 600;
 
     private final boolean passed;
     private final boolean lowProgramPassed;
-    private final boolean lowDownHardPassed;
 
     private final String lowProgramMessage;
-    private final String lowDownHardMessage;
 
     public CcDowntimeCrossCheck(CcAccShiftTotals acc, long dtmEventDownSeconds) {
 
-        int programSeconds = acc.getUpSeconds() + acc.getDownSeconds() + acc.getRestoreSeconds() + acc.getStudiesSeconds() + acc.getAccSeconds();
+        int possibleDowntimeSeconds = acc.calculatePossibleDowntimeSeconds();
 
-        lowProgramMessage = "DTM event down (" + BtmFunctions.formatDuration((int) dtmEventDownSeconds, DurationUnits.HOURS) + " hours) is greater than BTM program time [PHYSICS + STUDIES + RESTORE + ACC + DOWN] (" + BtmFunctions.formatDuration(programSeconds, DurationUnits.HOURS) + " hours)";
-        lowDownHardMessage = "";
+        lowProgramMessage = "DTM event down (" + BtmFunctions.formatDuration((int) dtmEventDownSeconds, DurationUnits.HOURS) + " hours) is significantly greater than BTM possible down time [PHYSICS + INTERNAL DOWN] (" + BtmFunctions.formatDuration(possibleDowntimeSeconds, DurationUnits.HOURS) + " hours)";
 
-        lowProgramPassed = programSeconds >= dtmEventDownSeconds;
-        lowDownHardPassed = true;
+        lowProgramPassed = possibleDowntimeSeconds >= dtmEventDownSeconds - TEN_MINUTES_OF_SECONDS;
 
-        passed = lowProgramPassed && lowDownHardPassed;
+        passed = lowProgramPassed;
     }
 
     public boolean isPassed() {

diff --git a/src/main/webapp/WEB-INF/includes/cross-check-panel.jsp b/src/main/webapp/WEB-INF/includes/cross-check-panel.jsp
@@ -12,18 +12,18 @@
     </ul>
     <div id="cross-check-summary-tab" data-signature="${fn:length(signatureList) > 0}">
         <div id="cross-check-summary-panel">
-            <h5>DTM vs BTM</h5>
+            <h5>BTM vs DTM</h5>
             <table id="dtm-btm-table" class="data-table">
                 <thead>
                 <tr>
-                    <th>BTM Program</th>
-                    <th>DTM Event</th>
+                    <th>BTM Possible Downtime</th>
+                    <th>DTM Event Downtime</th>
                     <th>Cross Check Status</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr>
-                    <td>${btm:formatDurationLossy(accAvailability.shiftTotals.calculateProgramSeconds(), durationUnits)}</td>
+                    <td>${btm:formatDurationLossy(accAvailability.shiftTotals.calculatePossibleDowntimeSeconds(), durationUnits)}</td>
                     <td>${btm:formatDurationLossy(dtmTotals.eventSeconds, durationUnits)}</td>
                     <td class="${downCrossCheck.isPassed() ? '' : 'ui-state-error'}">${downCrossCheck.isPassed() ? '✔' : 'X'}</td>
                 </tr>