From cf423add2e02531ba080b78636c0f2c2277066b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 14 Sep 2020 21:09:48 +0200
Subject: [PATCH] Reminders visible on edit page too

---
 htdocs/comm/action/card.php | 46 ++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index ff44a23319b..4ea9f3ef6f3 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1662,24 +1662,42 @@ if ($id > 0)
 		// Reminders
 		if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
 		{
-			$object->loadReminders();
+			$filtreuserid = $user->id;
+			if ($user->rights->agenda->allactions->read) $filtreuserid = 0;
+			$object->loadReminders('', $filteruserid);
+
+			print '<hr>';
+
+			print '<table class="border tableforfield centpercent">';
+
+			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Reminders").'</td><td>';
 
 			if (count($object->reminders) > 0) {
-				//checkbox create reminder
-				print '<hr>';
-
-				print '<table class="border tableforfield centpercent">';
-
-				print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Reminders").'</td><td>';
-
-				foreach($object->reminders as $actioncommreminderid => $actioncommreminder) {
-					print $TRemindTypes[$actioncommreminder->typeremind].' - '.$actioncommreminder->offsetvalue.' '.$TDurationTypes[$actioncommreminder->offsetunit];
+				if (count($object->reminders) > 0) {
+					$tmpuserstatic = new User($db);
+					foreach($object->reminders as $actioncommreminderid => $actioncommreminder) {
+						print $TRemindTypes[$actioncommreminder->typeremind];
+						if ($actioncommreminder->fk_user > 0) {
+							$tmpuserstatic->fetch($actioncommreminder->fk_user);
+							print ' ('.$tmpuser->getNomUrl(0, '', 0, 0, 16).')';
+						}
+						print ' - '.$actioncommreminder->offsetvalue.' '.$TDurationTypes[$actioncommreminder->offsetunit];
+						if ($actioncommreminder->status == $actioncommreminder::STATUS_TODO) {
+							print ' - <span class="opacitymedium">';
+							print $langs->trans("NotSent");
+							print ' </span>';
+						} elseif ($actioncommreminder->status == $actioncommreminder::STATUS_DONE) {
+							print ' - <span class="opacitymedium">';
+							print $langs->trans("Done");
+							print ' </span>';
+						}
+					}
 				}
-
-				print '</td></tr>';
-
-				print '</table>';
 			}
+
+			print '</td></tr>';
+
+			print '</table>';
 		}
 
 		dol_fiche_end();