From e20d4e492f5dcee8847b13717639eb55182d22fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Nov 2019 10:03:55 +0100
Subject: [PATCH] output processes in old versions

---
 .../class.RemoveUserFromProcesses.php         | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index cf01299d1..db1f8ad60 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -81,7 +81,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 
 		$receiptStatus = $rmuser->getReceiptStatus();
 		$tmpb = array();
+		$cb = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0);
 		foreach($receiptStatus['indstatus'] as $ai) {
+			$doc = $dms->getDocument($ai['documentID']);
+			$ai['latest'] = $doc->getLatestContent()->getVersion();
+			if($ai['latest'] == $ai['version'])
+				$cb[$ai['status']]++;
 			if(isset($tmpb[$ai['status']]))
 				$tmpb[$ai['status']][] = $ai;
 			else
@@ -90,7 +95,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 
 		$revisionStatus = $rmuser->getRevisionStatus();
 		$tmpc = array();
+		$cc = array("-3"=>0, "-2"=>0, '-1'=>0, '0'=>0, '1'=>0);
 		foreach($revisionStatus['indstatus'] as $ai) {
+			$doc = $dms->getDocument($ai['documentID']);
+			$ai['latest'] = $doc->getLatestContent()->getVersion();
+			if($ai['latest'] == $ai['version'])
+				$cc[$ai['status']]++;
 			if(isset($tmpc[$ai['status']]))
 				$tmpc[$ai['status']][] = $ai;
 			else
@@ -157,7 +167,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[receipt][]" value="0" checked> <?php echo getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))); ?>
+	<input type="checkbox" name="status[receipt][]" value="0" checked> <?php echo getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))); ?> <?php echo getMLText('receipts_not_touched_latest', array('no_receipts' => $cb["0"])); ?>
 		</label>
 	</div>
 </div>
@@ -166,7 +176,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[receipt][]" value="1"> <?php echo getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))); ?><br />
+	<input type="checkbox" name="status[receipt][]" value="1"> <?php echo getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))); ?> <?php echo getMLText('receipts_accepted_latest', array('no_receipts' => $cb["1"])); ?><br />
 		</label>
 	</div>
 </div>
@@ -175,7 +185,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[receipt][]" value="-1"> <?php echo getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))); ?><br />
+	<input type="checkbox" name="status[receipt][]" value="-1"> <?php echo getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))); ?> <?php echo getMLText('receipts_rejected_latest', array('no_receipts' => $cb["-1"])); ?><br />
 		</label>
 	</div>
 </div>
@@ -185,7 +195,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="0" checked> <?php echo getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))); ?>
+	<input type="checkbox" name="status[revision][]" value="0" checked> <?php echo getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))); ?> <?php echo getMLText('revisions_not_touched_latest', array('no_revisions' => $cc["0"])); ?>
 		</label>
 	</div>
 </div>
@@ -194,7 +204,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="-3" checked> <?php echo getMLText('revisions_pending', array('no_revisions' => count($tmpc["-3"]))); ?>
+	<input type="checkbox" name="status[revision][]" value="-3" checked> <?php echo getMLText('revisions_pending', array('no_revisions' => count($tmpc["-3"]))); ?> <?php echo getMLText('revisions_pending_latest', array('no_revisions' => $cc["-3"])); ?>
 		</label>
 	</div>
 </div>
@@ -203,7 +213,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="1"> <?php echo getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))); ?><br />
+	<input type="checkbox" name="status[revision][]" value="1"> <?php echo getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))); ?> <?php echo getMLText('revisions_accepted_latest', array('no_revisions' => $cc["1"])); ?><br />
 		</label>
 	</div>
 </div>
@@ -212,7 +222,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="-1"> <?php echo getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))); ?><br />
+	<input type="checkbox" name="status[revision][]" value="-1"> <?php echo getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))); ?> <?php echo getMLText('revisions_rejected_latest', array('no_revisions' => $cc["-1"])); ?><br />
 		</label>
 	</div>
 </div>