gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-15 06:01:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add ordering to all list in getDocumentList()

Browse Source
This commit is contained in:
Uwe Steinmann 2017-01-10 21:25:15 +01:00
parent 47f43a47ba
commit 2d2ebdc887
1 changed files with 73 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -809,6 +809,12 @@ class SeedDMS_Core_DMS {
break; // }}} break; // }}}
case 'ReviewByMe': // Documents I have to review {{{ case 'ReviewByMe': // Documents I have to review {{{
$user = $param1; $user = $param1;
$orderby = $param3;
if($param4 == 'desc')
$orderdir = 'DESC';
else
$orderdir = 'ASC';
// Get document list for the current user. // Get document list for the current user.
$reviewStatus = $user->getReviewStatus(); $reviewStatus = $user->getReviewStatus();
@ -834,14 +840,25 @@ class SeedDMS_Core_DMS {
if (strlen($docCSV)>0) { if (strlen($docCSV)>0) {
$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_EXPIRED.") ". $queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_EXPIRED.") ".
"AND `tblDocuments`.`id` IN (" . $docCSV . ") ". "AND `tblDocuments`.`id` IN (" . $docCSV . ") ";
"ORDER BY `statusDate` DESC"; //$queryStr .= "ORDER BY `statusDate` DESC";
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;
} else { } else {
$queryStr = ''; $queryStr = '';
} }
break; // }}} break; // }}}
case 'ApproveByMe': // Documents I have to approve {{{ case 'ApproveByMe': // Documents I have to approve {{{
$user = $param1; $user = $param1;
$orderby = $param3;
if($param4 == 'desc')
$orderdir = 'DESC';
else
$orderdir = 'ASC';
// Get document list for the current user. // Get document list for the current user.
$approvalStatus = $user->getApprovalStatus(); $approvalStatus = $user->getApprovalStatus();
@ -867,8 +884,13 @@ class SeedDMS_Core_DMS {
if (strlen($docCSV)>0) { if (strlen($docCSV)>0) {
$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_APP.", ".S_EXPIRED.") ". $queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_APP.", ".S_EXPIRED.") ".
"AND `tblDocuments`.`id` IN (" . $docCSV . ") ". "AND `tblDocuments`.`id` IN (" . $docCSV . ") ";
"ORDER BY `statusDate` DESC"; //$queryStr .= "ORDER BY `statusDate` DESC";
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;
} else { } else {
$queryStr = ''; $queryStr = '';
} }
@ -907,6 +929,12 @@ class SeedDMS_Core_DMS {
break; // }}} break; // }}}
case 'ReviseByMe': // Documents I have to receipt {{{ case 'ReviseByMe': // Documents I have to receipt {{{
$user = $param1; $user = $param1;
$orderby = $param3;
if($param4 == 'desc')
$orderdir = 'DESC';
else
$orderdir = 'ASC';
// Get document list for the current user. // Get document list for the current user.
$revisionStatus = $user->getRevisionStatus(); $revisionStatus = $user->getRevisionStatus();
@ -929,8 +957,13 @@ class SeedDMS_Core_DMS {
} }
if (strlen($docCSV)>0) { if (strlen($docCSV)>0) {
$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ". $queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ";
"ORDER BY `statusDate` DESC"; //$queryStr .= "ORDER BY `statusDate` DESC";
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;
} else { } else {
$queryStr = ''; $queryStr = '';
} }
@ -987,14 +1020,33 @@ class SeedDMS_Core_DMS {
break; // }}} break; // }}}
case 'RejectOwner': // Documents that has been rejected and I'm owning {{{ case 'RejectOwner': // Documents that has been rejected and I'm owning {{{
$user = $param1; $user = $param1;
$orderby = $param3;
if($param4 == 'desc')
$orderdir = 'DESC';
else
$orderdir = 'ASC';
$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ". $queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
"AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") ". "AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") ";
"ORDER BY `statusDate` DESC"; //$queryStr .= "ORDER BY `statusDate` DESC";
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;
break; // }}} break; // }}}
case 'LockedByMe': // Documents locked by me {{{ case 'LockedByMe': // Documents locked by me {{{
$user = $param1; $user = $param1;
$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ". $orderby = $param3;
"ORDER BY `statusDate` DESC"; if($param4 == 'desc')
$orderdir = 'DESC';
else
$orderdir = 'ASC';
$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ";
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;
break; // }}} break; // }}}
case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning {{{ case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning {{{
$user = $param1; $user = $param1;
@ -1018,6 +1070,11 @@ class SeedDMS_Core_DMS {
break; // }}} break; // }}}
case 'CheckedOutByMe': // Documents I have checked out {{{ case 'CheckedOutByMe': // Documents I have checked out {{{
$user = $param1; $user = $param1;
$orderby = $param3;
if($param4 == 'desc')
$orderdir = 'DESC';
else
$orderdir = 'ASC';
$qs = 'SELECT document FROM tblDocumentCheckOuts WHERE userID='.$user->getID(); $qs = 'SELECT document FROM tblDocumentCheckOuts WHERE userID='.$user->getID();
$ra = $this->db->getResultArray($qs); $ra = $this->db->getResultArray($qs);
@ -1030,8 +1087,12 @@ class SeedDMS_Core_DMS {
} }
if ($docs) { if ($docs) {
$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ". $queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
"ORDER BY `statusDate` DESC"; 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;
} else { } else {
$queryStr = ''; $queryStr = '';
} }