From 3570b2c04dd80e222ebc0e77454db999fbd262bc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 21 Sep 2022 12:54:41 +0200
Subject: [PATCH] =?UTF-8?q?BT:=20Adaptierung=20Pr=C3=BCfung=20auf=20Abbrec?=
 =?UTF-8?q?her=20auf=20aktuellen=20Prestudentstatus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/prestudent.class.php | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index cc48cd17d..9ba52dccd 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -2336,15 +2336,10 @@ class prestudent extends person
 		}
 
 		$qry = "SELECT count(*) as anzahl
-				FROM 	public.tbl_prestudent pt
+				FROM public.tbl_prestudent
 				JOIN public.tbl_prestudentstatus USING (prestudent_id)
 				JOIN public.tbl_studiengang USING (studiengang_kz)
 				WHERE person_id = ".$this->db_add_param($person_id, FHC_INTEGER)."
-				AND NOT EXISTS
-					(SELECT * FROM public.tbl_prestudentstatus ps
-					WHERE ps.prestudent_id = pt.prestudent_id
-					AND status_kurzbz not in ('Abbrecher'))
-				AND status_kurzbz in ('Absolvent','Diplomand','Unterbrecher','Student')
 				AND typ in ('b','m','d')";
 
 		if ($this->db_query($qry))
@@ -2378,11 +2373,11 @@ class prestudent extends person
 	/**
  * Prueft, ob eine Person Abbrecher war
  * @param int $person_id ID der zu überprüfenden Person.
- * @return true wenn vorhanden
+ * @return true wenn letzter Status Abbrecher und nicht Student ist
  *		 false wenn nicht vorhanden
  *		 false und errormsg wenn Fehler aufgetreten ist
  */
-public function isPastAbbrecher($person_id)
+public function isAbbrecher($person_id)
 {
 	if (!is_numeric($person_id))
 	{
@@ -2390,20 +2385,22 @@ public function isPastAbbrecher($person_id)
 		return false;
 	}
 
-	$qry = "SELECT count(*) as anzahl
-		FROM 	public.tbl_prestudent pt
-		JOIN public.tbl_prestudentstatus USING (prestudent_id)
-		JOIN public.tbl_studiengang USING (studiengang_kz)
-		WHERE person_id = ".$this->db_add_param($person_id, FHC_INTEGER)."
-		AND status_kurzbz in ('Abbrecher')
-		AND typ in ('b','m','d')
+	$qry = "SELECT s.status_kurzbz
+			FROM public.tbl_prestudent
+			JOIN public.tbl_prestudentstatus s USING (prestudent_id)
+			JOIN public.tbl_studiengang USING (studiengang_kz)
+			WHERE person_id = ".$this->db_add_param($person_id)."
+			AND status_kurzbz in ('Abbrecher','Student')
+			AND typ in ('b','m','d')
+			ORDER BY s.bestaetigtam DESC NULLS LAST, s.insertamum DESC
+			LIMIT 1
 	 ";
 
 	if ($this->db_query($qry))
 	{
 		if ($row = $this->db_fetch_object())
 		{
-			if ($row->anzahl > 0)
+			if ($row->status_kurzbz == 'Abbrecher')
 			{
 				$this->errormsg = '';
 				return true;