From 3a62afd084ee0ee4640770a515c33f3558b4d6e7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Nov 2019 09:34:41 +0100
Subject: [PATCH] count processes in latest version

---
 .../class.RemoveUserFromProcesses.php          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index 0d1e7c5ca..ab3d8d27a 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -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
@@ -77,7 +83,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>
@@ -86,7 +92,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>
@@ -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="-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>
@@ -105,7 +111,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>
@@ -114,7 +120,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>
@@ -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="-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>