fixed mark as send in Notify

SE/se-lib/Route/Cron.php

@@ -117,9 +117,9 @@ class Route_Cron extends RouteBase {
 				foreach ($listWhen as $when => $listWhat) {
 					if (!empty($listWhat)) {
 						$reminders = array_keys($listWhat);
-						echo "<p>Sending to {$who} reminders [" . implode(",", $reminders) . "]</p>" . "\n";
+						echo "<p>Sending to {$who} reminders [" . implode(",", $reminders) . "] at '{$when}'</p>" . "\n";
 						$notify->send($who, $listWhat, $when, $forceMail = 'plabudda@biall-net.pl');
-						$notify->markAsSent($who, $reminders);
+						$notify->markAsSent($who, $listWhat, $when);
 					}
 				}
 			}

SE/se-lib/Route/Notify.php

@@ -61,8 +61,9 @@ class Route_Notify extends RouteBase {
 		}
 
 		if ('1' == V::get('send', 0, $_POST, 'int')) {
-			$this->send($usrLogin, $notifyTypeList);
-			$this->markAsSent($usrLogin, $notifyTypeList);
+			SE_Layout::alert('warning', "TODO: fix send, mark as sent");
+			//$this->send($usrLogin, $notifyTypeList);
+			//$this->markAsSent($usrLogin, $notifyTypeList);
 		}
 
 		$urlParts = array();// index.php?_route=Notify&_task=generateUserReminders&usrLogin=magdalena.cichosz&reminder[]=msgs
@@ -247,15 +248,18 @@ function refreshPreview() {
 		return reset($aliasy);
 	}
 
-	public function markAsSent($usrLogin, $notifyTypeList) {
-		$sqlReminderTypes = "'" . implode("','", $notifyTypeList) . "'";
+	public function markAsSent($usrLogin, $reminders, $when) {
+//		$sqlReminderTypes = "'" . implode("','", $notifyTypeList) . "'";
+		$sqlReminderTypes = "'" . implode("','", array_keys($reminders)) . "'";
 		$sth = DB::getPDO()->prepare("
 			update CRM_NOTIFY
 			set `last_exec_time` = NOW()
 			where `who` = :login
+				and `when` = :when
 				and `what` in({$sqlReminderTypes})
 		");
 		$sth->bindValue(':login', $usrLogin, PDO::PARAM_STR);
+		$sth->bindValue(':when', $when, PDO::PARAM_STR);
 		$sth->execute();
 	}
 
@@ -860,6 +864,7 @@ function refreshPreview() {
 				and u.EMPLOYEE_TYPE = 'Pracownik'
 				and n.`who` is not null
 			group by u.ADM_ACCOUNT
+			order by n.last_exec_time asc
 			limit :limit
 		");
 		$sth->bindValue(':limit', $limit, PDO::PARAM_INT);
@@ -884,6 +889,7 @@ function refreshPreview() {
 			from CRM_NOTIFY n
 			where n.`who` in({$sqlUsers})
 				and {$sqlWhenFltr}
+			order by n.last_exec_time asc
 		");
 		$sth->execute();
 		$rawReminders = $sth->fetchAll();