Changeset 40974 for branches/ccl_branches/ipp-20190806/ippMonitor/def/chipPendingImfile.d

Timestamp:

Oct 27, 2019, 9:47:12 PM (7 years ago)

Author:

cclin33

Message:

sync from trunk with r40973

Location:

branches/ccl_branches/ipp-20190806/ippMonitor

Files:

• . (modified) (1 prop)
• def/chipPendingImfile.d (modified) (2 diffs)

branches/ccl_branches/ipp-20190806/ippMonitor/def/chipPendingImfile.d

@@ -1 @@
-TABLE chipRun, rawExp, rawImfile
+TABLE chipRun JOIN rawExp using (exp_id) JOIN rawImfile using (exp_id)
 TITLE Chip Pending Imfiles
 FILE  chipPendingImfile.php
@@ -9 +9 @@
 # limit this table to OBJECT types of images
 WHERE chipRun.state = 'new'
-WHERE chipRun.exp_id = rawExp.exp_id
-WHERE rawImfile.exp_id = rawExp.exp_id
+
+RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
+UNRESTRICTED AND rawExp.dateobs >= CURDATE()
 
 ARGS  ARG1 rawImfile.exp_id=$rawExp.exp_id