list only documents to approve which have passed review

previously all documents that need to be approved some time were
listed. Even those documents which haven't passed review and cannot
be approved currently.
This commit is contained in:
Uwe Steinmann 2015-07-08 06:51:15 +02:00
parent 4ae913e307
commit 9ce168b4b6

View File

@ -181,7 +181,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
foreach ($approvalStatus["indstatus"] as $st) { foreach ($approvalStatus["indstatus"] as $st) {
if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]])) { if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP) {
$document = $dms->getDocument($st["documentID"]); $document = $dms->getDocument($st["documentID"]);
if ($printheader){ if ($printheader){
@ -217,7 +217,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
} }
foreach ($approvalStatus["grpstatus"] as $st) { foreach ($approvalStatus["grpstatus"] as $st) {
if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) { if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
$document = $dms->getDocument($st["documentID"]); $document = $dms->getDocument($st["documentID"]);
if ($printheader){ if ($printheader){
print "<table class=\"table table-condensed\">"; print "<table class=\"table table-condensed\">";