From dfad2e581b9c5fb847dab2269058176a5cccca5b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 23 Sep 2020 07:25:31 +0200 Subject: [PATCH] nicer layout for list of revisors and recepients --- views/bootstrap/class.ViewDocument.php | 104 +++++++++++++++++-------- 1 file changed, 72 insertions(+), 32 deletions(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index f91ed2cea..9ed04e789 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -851,6 +851,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "\n"; foreach ($reviewStatus as $r) { + $class = ''; + switch($r['status']) { + case '-1': + $class = 'error'; + break; + case '1': + $class = 'success'; + break; + } $required = null; $is_reviewer = false; $accesserr = ''; @@ -890,7 +899,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { break; } if($user->isAdmin() || $r["status"] > -2) { - print "\n"; + print "\n"; print "".$reqName."\n"; print "".$r["date"]." - "; /* $updateUser is the user who has done the review */ @@ -904,17 +913,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } } print "\n"; - print "".getReviewStatusText($r["status"])."\n"; + print ""; + if($class) + echo " "; + print getReviewStatusText($r["status"])."\n"; print "
    "; if($accesserr) - echo "
  • ".$accesserr."
    • "; + echo "
  • ".$accesserr."
    • "; if($accessobject->mayReview($latestContent->getDocument())) { if ($is_reviewer) { if ($r["status"]==0) { - print "
  • ".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("add_review"), false, true)."
    • "; + print "
  • ".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_review"), false, true)."
    • "; } elseif ($accessobject->mayUpdateReview($latestContent->getDocument(), $updateUser) && (($r["status"]==1)||($r["status"]==-1))){ - print "
  • ".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
    • "; + print "
  • ".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."
    • "; } } } @@ -943,6 +955,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "\n"; foreach ($approvalStatus as $a) { + $class = ''; + switch($a['status']) { + case '-1': + $class = 'error'; + break; + case '1': + $class = 'success'; + break; + } $required = null; $is_approver = false; $accesserr = ''; @@ -982,7 +1003,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { break; } if($user->isAdmin() || $a["status"] > -2) { - print "\n"; + print "\n"; print "".$reqName."\n"; print "
    • ".$a["date"]."
      • "; /* $updateUser is the user who has done the approval */ @@ -996,17 +1017,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } } echo "\n"; - print "".getApprovalStatusText($a["status"])."\n"; + print ""; + if($class) + echo " "; + print getApprovalStatusText($a["status"])."\n"; print "
        "; if($accesserr) - echo "
      • ".$accesserr."
        • "; + echo "
      • ".$accesserr."
        • "; if($accessobject->mayApprove($latestContent->getDocument())) { if ($is_approver) { if ($a['status'] == 0) { - print "
      • ".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("add_approval"), false, true)."
        • "; + print "
      • ".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_approval"), false, true)."
        • "; } elseif ($accessobject->mayUpdateApproval($latestContent->getDocument(), $updateUser) && (($a["status"]==1)||($a["status"]==-1))){ - print "
      • ".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
        • "; + print "
      • ".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."
        • "; } } } @@ -1270,12 +1294,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { ".getMLText('info_recipients_tab_not_released').""; - $this->contentContainerStart(); - print "\n"; - - print ""; +// $this->contentContainerStart(); + print "
        \n"; - $this->contentSubHeading(getMLText("recipients")); - print "
        \n"; print "\n"; print "\n"; @@ -1329,6 +1349,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { * unless admin is logged in. */ if($user->isAdmin() || $r["status"] > -2) { + $class = ''; + switch($r['status']) { + case '-1': + $class = 'error'; + break; + case '1': + $class = 'success'; + break; + } print "\n"; print "\n"; print ""; print "\n"; - print "\n"; + print "\n"; print "
        ".getMLText("name")."
        ".$reqName."
        • ".$r["date"]."
          • "; @@ -1336,16 +1365,19 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { $updateUser = $dms->getUser($r["userID"]); print "
        • ".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."
        		".htmlspecialchars($r["comment"])."".getReceiptStatusText($r["status"]).""; + if($class) + echo " "; + print getReceiptStatusText($r["status"])."
          "; if($accesserr) - echo "
        • ".$accesserr."
          • "; + echo "
        • ".$accesserr."
          • "; if($accessobject->mayReceipt($document)) { if ($is_recipient) { if($r["status"]==0) { - print "
        • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."
          • "; + print "
        • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_receipt"), false, true)."
          • "; } elseif ($accessobject->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1 && $enablereceiptreject)||($r["status"]==-1))) { - print "
        • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
          • "; + print "
        • ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."
          • "; } } } @@ -1357,7 +1389,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { ?>
        contentContainerEnd(); +// $this->contentContainerEnd(); if($accessobject->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) { /* Do not count entries '-2' as they are removed userŅ• */ $totalreceipts = $stat['-1'] + $stat['0'] + $stat['1']; @@ -1403,12 +1435,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
        contentContainerStart(); - print "\n"; - - print ""; +// $this->contentContainerStart(); + print "
        \n"; - $this->contentSubHeading(getMLText("revisors")); - print "
        \n"; print "\n"; print "\n"; @@ -1419,6 +1447,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "\n"; foreach ($revisionStatus as $r) { + $class = ''; + switch($r['status']) { + case '-1': + $class = 'error'; + break; + case '1': + $class = 'success'; + break; + } $required = null; $is_recipient = false; $accesserr = ''; @@ -1462,15 +1499,18 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } print ""; print "\n"; - print "\n"; + print "\n"; print "
        ".getMLText("name")."
        ".htmlspecialchars($r["comment"])."".getRevisionStatusText($r["status"]).""; + if($class) + echo " "; + print getRevisionStatusText($r["status"])."
          "; if($accesserr) - echo "
        • ".$accesserr."
          • "; + echo "
        • ".$accesserr."
          • "; if($accessobject->mayRevise($document)) { if ($is_recipient && $r["status"]==0) { - print "
        • ".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."
          • "; + print "
        • ".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_revision"), false, true)."
          • "; } elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){ - print "
        • ".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
          • "; + print "
        • ".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."
          • "; } } @@ -1481,7 +1521,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { ?>
        contentContainerEnd(); +// $this->contentContainerEnd(); if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) { ?>