From 41eaee41affe657a50c7a5b6311fad15aa2bd6f5 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Thu, 1 Dec 2022 17:18:18 +0100
Subject: [PATCH] getIncomingOrGsFoerderrelevant: studiensemester is checked
 only for prestudent status

---
 .../libraries/issues/PlausicheckLib.php       | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/application/libraries/issues/PlausicheckLib.php b/application/libraries/issues/PlausicheckLib.php
index 07f091208..5105169dd 100644
--- a/application/libraries/issues/PlausicheckLib.php
+++ b/application/libraries/issues/PlausicheckLib.php
@@ -1169,9 +1169,9 @@ class PlausicheckLib
 	 * @param prestudent_id int if check is to be executed only for one prestudent
 	 * @return object success or error
 	 */
-	public function getIncomingOrGsFoerderrelevant($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null)
+	public function getIncomingOrGsFoerderrelevant($studiensemester_kurzbz = null, $studiengang_kz = null, $prestudent_id = null)
 	{
-		$params = array($studiensemester_kurzbz, $studiensemester_kurzbz);
+		$params = array();
 
 		$qry = "
 			SELECT
@@ -1184,19 +1184,11 @@ class PlausicheckLib
 				JOIN public.tbl_benutzer ON(student_uid=uid)
 				JOIN public.tbl_person pers USING(person_id)
 				JOIN public.tbl_prestudent ps USING(prestudent_id)
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
 				JOIN public.tbl_studiengang stg ON(stg.studiengang_kz=stud.studiengang_kz)
 			WHERE
 				(
-					EXISTS
-					(
-						SELECT 1
-						FROM
-							public.tbl_prestudentstatus
-						WHERE
-							prestudent_id = ps.prestudent_id
-							AND status_kurzbz = 'Incoming'
-							AND studiensemester_kurzbz = ?
-					)
+					status.status_kurzbz = 'Incoming'
 					OR EXISTS (
 						SELECT 1
 						FROM
@@ -1205,13 +1197,18 @@ class PlausicheckLib
 						WHERE
 							prestudent_id = ps.prestudent_id
 							AND gsstudientyp_kurzbz = 'Extern'
-							AND studiensemester_kurzbz = ?
 					)
 				)
 				AND (ps.foerderrelevant <> FALSE OR ps.foerderrelevant IS NULL)
 				AND bismelden=TRUE
 				AND stg.melderelevant";
 
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .= " AND status.studiensemester_kurzbz = ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
 		if (isset($studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz = ?";