From 08fac559c9ade23fa22acdb149e963b8927d9acd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Feb 2019 12:33:50 +0100 Subject: [PATCH] add new list type 'DueRevision' in getDocumentList --- SeedDMS_Core/Core/inc.ClassDMS.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index ca6469110..904baa010 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1331,7 +1331,7 @@ class SeedDMS_Core_DMS { } } break; // }}} - case 'ReviseByMe': // Documents I have to receipt {{{ + case 'ReviseByMe': // Documents I have to revise {{{ if (!$this->db->createTemporaryTable("ttrevisionid")) { return false; } @@ -1403,6 +1403,27 @@ class SeedDMS_Core_DMS { } } break; // }}} + case 'DueRevision': // Documents with a due revision, which is not started {{{ + if (!$this->db->createTemporaryTable("ttrevisionid")) { + return false; + } + $user = $param1; + $orderby = $param3; + if($param4 == 'desc') + $orderdir = 'DESC'; + else + $orderdir = 'ASC'; + + $selectStr .= ", `tblDocumentContent`.`revisiondate` "; + $queryStr .= "WHERE `tblDocumentContent`.`revisiondate` IS NOT NULL AND `tblDocumentContent`.`revisiondate` <= ".$this->db->getCurrentDatetime()." "; + $queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_RELEASED." "; + if ($orderby=='e') $queryStr .= "ORDER BY `expires`"; + else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`"; + else if ($orderby=='s') $queryStr .= "ORDER BY `status`"; + else $queryStr .= "ORDER BY `name`"; + $queryStr .= " ".$orderdir; + $queryStr .= ", `tblDocumentContent`.`revisiondate` ASC"; + break; // }}} case 'WorkflowByMe': // Documents I to trigger in Worklflow {{{ $queryStr .= "WHERE 1=1 ";