only consider row good if status agrees with file count

desihub · Aug 31, 2024 · f55d48f · f55d48f
1 parent 72115d7
commit f55d48f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/py/desispec/scripts/procdashboard.py b/py/desispec/scripts/procdashboard.py
@@ -470,7 +470,10 @@ def count_num_files(ftype, expid=None):
         elif nfiles[terminal_step] < nexpected:
             row_color = 'INCOMPLETE'
         elif nfiles[terminal_step] == nexpected:
-            row_color = 'GOOD'
+            if status in ['COMPLETED', 'NULL']:
+                row_color = 'GOOD'
+            else:
+                row_color = 'INCOMPLETE'
         else:
             row_color = 'OVERFULL'
 

diff --git a/py/desispec/scripts/zprocdashboard.py b/py/desispec/scripts/zprocdashboard.py
@@ -533,7 +533,10 @@ def populate_night_zinfo(night, doem=True, doqso=True, dotileqa=True, dozmtl=Tru
         elif nfiles[true_terminal_step] < npossible:
             row_color = 'INCOMPLETE'
         elif nfiles[true_terminal_step] == npossible:
-            row_color = 'GOOD'
+            if status in ['COMPLETED', 'NULL']:
+                row_color = 'GOOD'
+            else:
+                row_color = 'INCOMPLETE'
         else:
             row_color = 'OVERFULL'
 

diff --git a/py/desispec/workflow/proc_dashboard_funcs.py b/py/desispec/workflow/proc_dashboard_funcs.py
@@ -618,7 +618,7 @@ def _table_row(dictionary):
         ## If job is still running don't color things yet
         if idlabel.upper() in non_final_q_states:
             row_str += _table_element(elem)
-        elif key == 'STATUS' and elem in ['COMPLETED', 'NULL'] and idlabel == 'GOOD':
+        elif key == 'STATUS' and elem == 'COMPLETED' and idlabel in ['GOOD', 'NULL']:
             row_str += _table_element_id(elem, 'GOOD')
         elif key == 'STATUS' and elem not in ['COMPLETED', 'unprocessed', 'unrecorded'] \
               and elem not in non_final_q_states and idlabel != 'GOOD':