From 744cf8945a904833382d191ff2cb568f06e5ebc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 27 May 2020 12:06:52 +0200 Subject: [PATCH] =?UTF-8?q?Wartende=20Jobs=20angepasst=20damit=20Tage=20al?= =?UTF-8?q?s=20Parameter=20akzeptiert=20werden=20statt=20Monate=20Emfp?= =?UTF-8?q?=C3=A4nger=20korrigiert=20damit=20nur=20ein=20Infomail=20pro=20?= =?UTF-8?q?Person=20verschickt=20wird?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/jobs/OneTimeMessages.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/jobs/OneTimeMessages.php b/application/controllers/jobs/OneTimeMessages.php index 39e0a946c..58bc1fb7c 100644 --- a/application/controllers/jobs/OneTimeMessages.php +++ b/application/controllers/jobs/OneTimeMessages.php @@ -27,11 +27,11 @@ class OneTimeMessages extends JOB_Controller * - Status set as "Wartender" * - The given study course type (b = bachelor, m = master) * - The given semester (ex WS2020) - * - How long since applicant (months) + * - How long since applicant (days) * - The given template id to be used as message subject and body (vorlage_kurzbz) * The sender of all the messages is specified by the parameter senderId (sender person_id) */ - public function sendMessageToApplicantsStillWaiting($senderId, $studyCourseType, $semester, $months, $messageTemplate) + public function sendMessageToApplicantsStillWaiting($senderId, $studyCourseType, $semester, $days, $messageTemplate) { $this->logInfo('Send message to applicants still waiting start'); @@ -47,13 +47,13 @@ class OneTimeMessages extends JOB_Controller $dbModel = new DB_Model(); $dbPrestudents = $dbModel->execReadOnlyQuery( - 'SELECT p.prestudent_id + 'SELECT distinct on(person_id) p.prestudent_id FROM public.tbl_prestudent p JOIN public.tbl_prestudentstatus ps USING (prestudent_id) JOIN public.tbl_studiengang s USING (studiengang_kz) WHERE ps.status_kurzbz = \'Wartender\' AND ps.studiensemester_kurzbz = ? - AND ps.datum <= NOW() - \''.$months.' months\'::interval + AND ps.datum <= NOW() - \''.$days.' days\'::interval AND s.typ = ? AND NOT EXISTS ( SELECT pp.person_id