Changeset 40826 for trunk/ippMonitor

Timestamp:

Jul 3, 2019, 2:01:34 PM (7 years ago)

Author:

cclin33

Message:

add detRunSummary.accept value and add more WHERE constrains

File:

• trunk/ippMonitor/def/detRunActive.d (modified) (3 diffs)

trunk/ippMonitor/def/detRunActive.d

@@ -1 @@
-TABLE detRun
+TABLE detRun LEFT JOIN detRunSummary using(det_id) 
 TITLE Active Detrend Runs
 FILE  detRunActive.php
@@ -6 +6 @@
 # the following WHERE clauses are added to all queries joined by AND
 WHERE detRun.state != 'drop'
+WHERE detRun.state != 'ignore'
+WHERE detRun.state !='wait'
+WHERE detRun.mode != 'verify'
 
-ARGS  ARG1 detRunSummary.det_id=$det_id
+ARGS  ARG1 detRunSummary.det_id=$detRun.det_id
 
-ARGS  ARG2 detInputExp.det_id=$det_id
-ARGS  ARG2 detInputExp.iteration=$iteration
+ARGS  ARG2 detInputExp.det_id=$detRun.det_id
+ARGS  ARG2 detInputExp.iteration=$detRun.iteration
 
-ARGS  ARG3 detProcessedExp.det_id=$det_id
+ARGS  ARG3 detProcessedExp.det_id=$detRun.det_id
 
-ARGS  ARG4 detResidExp.det_id=$det_id
-ARGS  ARG4 detResidExp.iteration=$iteration
+ARGS  ARG4 detResidExp.det_id=$detRun.det_id
+ARGS  ARG4 detResidExp.iteration=$detRun.iteration
 
-ARGS  ARG5 detStackedImfile.det_id=$det_id
-ARGS  ARG6 detNormalizedImfile.det_id=$det_id
-ARGS  ARG7 detRegisteredImfile.det_id=$det_id
+ARGS  ARG5 detStackedImfile.det_id=$detRun.det_id
+ARGS  ARG6 detNormalizedImfile.det_id=$detRun.det_id
+ARGS  ARG7 detRegisteredImfile.det_id=$detRun.det_id
 
 #     field       size  format  name         show       link to                   extras
-FIELD det_id,        5, %s,     det ID,      value,     detRunSummary.php,        ARG1
-FIELD iteration,     3, %s,     iter
+FIELD detRun.det_id,        5, %s,     det ID,      value,     detRunSummary.php,        ARG1
+FIELD detRunSummary.accept,        5, %s,     accept
+FIELD detRun.iteration,     3, %s,     iter
 FIELD det_type,     12, %s,     type
 FIELD state,         5, %s,     state
@@ -48 +52 @@
 TD_CLASS list_off $state == 'drop'
 TD_CLASS list_run $state == 'run'
+