Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2019-11-19 09:35:33 +01:00
commit 1d521fd97e

View File

@ -53,9 +53,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
<?php
$reviewStatus = $rmuser->getReviewStatus();
$tmpr = array();
$cr = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0);
foreach($reviewStatus['indstatus'] as $ri) {
$doc = $dms->getDocument($ri['documentID']);
$ri['latest'] = $doc->getLatestContent()->getVersion();
if($ri['latest'] == $ri['version'])
$cr[$ri['status']]++;
if(isset($tmpr[$ri['status']]))
$tmpr[$ri['status']][] = $ri;
else
@ -64,9 +67,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
$approvalStatus = $rmuser->getApprovalStatus();
$tmpa = array();
$ca = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0);
foreach($approvalStatus['indstatus'] as $ai) {
$doc = $dms->getDocument($ri['documentID']);
$ai['latest'] = $doc->getLatestContent()->getVersion();
if($ai['latest'] == $ai['version'])
$ca[$ai['status']]++;
if(isset($tmpa[$ai['status']]))
$tmpa[$ai['status']][] = $ai;
else
@ -95,7 +101,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" name="status[review][]" value="0" checked> <?php echo getMLText('reviews_not_touched', array('no_reviews' => count($tmpr["0"]))); ?>
<input type="checkbox" name="status[review][]" value="0" checked> <?php echo getMLText('reviews_not_touched', array('no_reviews' => count($tmpr["0"]))); ?> <?php echo getMLText('reviews_not_touched_latest', array('no_reviews' => $cr["0"])); ?>
</label>
</div>
</div>
@ -104,7 +110,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" name="status[review][]" value="1"> <?php echo getMLText('reviews_accepted', array('no_reviews' => count($tmpr["1"]))); ?><br />
<input type="checkbox" name="status[review][]" value="1"> <?php echo getMLText('reviews_accepted', array('no_reviews' => count($tmpr["1"]))); ?> <?php echo getMLText('reviews_accepted_latest', array('no_reviews' => $cr["1"])); ?><br />
</label>
</div>
</div>
@ -113,7 +119,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" name="status[review][]" value="-1"> <?php echo getMLText('reviews_rejected', array('no_reviews' => count($tmpr["-1"]))); ?><br />
<input type="checkbox" name="status[review][]" value="-1"> <?php echo getMLText('reviews_rejected', array('no_reviews' => count($tmpr["-1"]))); ?> <?php echo getMLText('reviews_rejected_latest', array('no_reviews' => $cr["-1"])); ?><br />
</label>
</div>
</div>
@ -123,7 +129,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" name="status[approval][]" value="0" checked> <?php echo getMLText('approvals_not_touched', array('no_approvals' => count($tmpa["0"]))); ?>
<input type="checkbox" name="status[approval][]" value="0" checked> <?php echo getMLText('approvals_not_touched', array('no_approvals' => count($tmpa["0"]))); ?> <?php echo getMLText('approvals_not_touched_latest', array('no_approvals' => $ca["0"])); ?>
</label>
</div>
</div>
@ -132,7 +138,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" name="status[approval][]" value="1"> <?php echo getMLText('approvals_accepted', array('no_approvals' => count($tmpa["1"]))); ?><br />
<input type="checkbox" name="status[approval][]" value="1"> <?php echo getMLText('approvals_accepted', array('no_approvals' => count($tmpa["1"]))); ?> <?php echo getMLText('approvals_accepted_latest', array('no_approvals' => $ca["1"])); ?><br />
</label>
</div>
</div>
@ -141,7 +147,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" name="status[approval][]" value="-1"> <?php echo getMLText('approvals_rejected', array('no_approvals' => count($tmpa["-1"]))); ?><br />
<input type="checkbox" name="status[approval][]" value="-1"> <?php echo getMLText('approvals_rejected', array('no_approvals' => count($tmpa["-1"]))); ?> <?php echo getMLText('approvals_rejected_latest', array('no_approvals' => $ca["-1"])); ?><br />
</label>
</div>
</div>