Merge branch 'master' into feature-13011/installation_on_multiple_servers

application/models/codex/Aufenthaltfoerderung_model.php

@@ -0,0 +1,14 @@
+<?php
+class Aufenthaltfoerderung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_aufenthaltfoerderung';
+		$this->pk = 'aufenthaltfoerderung_code';
+	}
+}

application/models/codex/Bisio_model.php

@@ -11,4 +11,37 @@ class Bisio_model extends DB_Model
 		$this->dbTable = 'bis.tbl_bisio';
 		$this->pk = 'bisio_id';
 	}
+
+	/**
+	 * Gets duration of stay in days by bisio_id.
+	 * @param int $bisio_id
+	 * @return object success with number of days or error
+	 */
+	public function getAufenthaltsdauer($bisio_id)
+	{
+		// get from and to date
+		$this->addSelect('von, bis');
+		$bisioRes = $this->load($bisio_id);
+
+		if (isError($bisioRes))
+			return $bisioRes;
+
+		if (hasData($bisioRes))
+		{
+			$bisioData = getData($bisioRes)[0];
+
+			$avon = $bisioData->von;
+			$abis = $bisioData->bis;
+
+			if (is_null($avon) || is_null($abis))
+				return success("Von or bis date not set");
+
+			$vonDate = new DateTime($avon);
+			$bisDate = new DateTime($abis);
+			$interval = $vonDate->diff($bisDate);
+			return success($interval->days);
+		}
+		else
+			return success("Bisio not found");
+	}
 }

application/models/codex/Oehbeitrag_model.php

@@ -0,0 +1,107 @@
+<?php
+class Oehbeitrag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_oehbeitrag';
+		$this->pk = 'oehbeitrag_id';
+	}
+
+	/**
+	 * Gets oehbeitrag data valid for a certain Studiensemester.
+	 * @param string $studiensemester_kurzbz
+	 * @return object
+	 */
+	public function getByStudiensemester($studiensemester_kurzbz)
+	{
+		$qry = "WITH semstart AS (
+					SELECT start FROM public.tbl_studiensemester
+					WHERE studiensemester_kurzbz = ?
+				)
+				SELECT * FROM bis.tbl_oehbeitrag oehb
+				JOIN public.tbl_studiensemester semvon ON oehb.von_studiensemester_kurzbz = semvon.studiensemester_kurzbz
+				LEFT JOIN public.tbl_studiensemester sembis ON oehb.bis_studiensemester_kurzbz = sembis.studiensemester_kurzbz
+				JOIN semstart ON semstart.start::date >= semvon.start::date AND (sembis.studiensemester_kurzbz IS NULL OR semstart.start::date <= sembis.start::date)
+				ORDER BY semvon.start
+				LIMIT 1";
+
+		return $this->execQuery($qry, array($studiensemester_kurzbz));
+	}
+
+	/**
+	 * Gets all Studiensemester for which no Oehbeitrag value assignment exists.
+	 * @param string $start_studiensemester_kurzbz semester before the given semester are ignored
+	 * @param array $excluded_oehbeitrag_id oehbeitraege to be ignored, i.e. which are assigned
+	 * @return object
+	 */
+	public function getUnassignedStudiensemester($start_studiensemester_kurzbz, $excluded_oehbeitrag_id = array())
+	{
+		$params =  array($start_studiensemester_kurzbz);
+
+		$qry = "SELECT * FROM public.tbl_studiensemester sem
+				WHERE sem.start >= (SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz = ?)
+				AND NOT EXISTS (SELECT 1 FROM bis.tbl_oehbeitrag oeh
+                    JOIN public.tbl_studiensemester oeh_von ON oeh.von_studiensemester_kurzbz = oeh_von.studiensemester_kurzbz
+                    LEFT JOIN public.tbl_studiensemester oeh_bis ON oeh.bis_studiensemester_kurzbz = oeh_bis.studiensemester_kurzbz
+                    WHERE sem.start::date >= oeh_von.start::date AND (sem.start::date <= oeh_bis.start::date OR oeh_bis.studiensemester_kurzbz IS NULL)";
+
+		if (!isEmptyArray($excluded_oehbeitrag_id))
+		{
+			$qry .= " AND oehbeitrag_id NOT IN ?";
+			$params[] = $excluded_oehbeitrag_id;
+		}
+
+		$qry .= ") ORDER BY sem.start";
+
+		return $this->execQuery($qry, $params);
+	}
+
+	/**
+	 * Checks if a Öhbeitrag can be assigned for a Studiensemester range.
+	 * @param string $von_studiensemester_kurzbz
+	 * @param string $bis_studiensemester_kurzbz
+	 * @param array $excluded_oehbeitrag_id oehbeitraege to ignore, i.e. which are assignable
+	 * @return object array with true if assignable, with false if not
+	 */
+	public function checkIfStudiensemesterAssignable($von_studiensemester_kurzbz, $bis_studiensemester_kurzbz = null, $excluded_oehbeitrag_id = array())
+	{
+		$params = array($von_studiensemester_kurzbz);
+
+		$allStdSemSpanQry = "SELECT count(studiensemester_kurzbz) as number_assigned FROM public.tbl_studiensemester sem
+			WHERE start >= (SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz = ?)";
+
+		if ($bis_studiensemester_kurzbz != null)
+		{
+			$allStdSemSpanQry .= " AND (start <= (SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz = ?))";
+			$params[] = $bis_studiensemester_kurzbz;
+		}
+
+		$allStdSemSpanQry .= " AND EXISTS (SELECT 1 FROM bis.tbl_oehbeitrag
+            JOIN public.tbl_studiensemester sem_von ON tbl_oehbeitrag.von_studiensemester_kurzbz = sem_von.studiensemester_kurzbz
+            LEFT JOIN public.tbl_studiensemester sem_bis ON tbl_oehbeitrag.bis_studiensemester_kurzbz = sem_bis.studiensemester_kurzbz
+            WHERE sem.start >= sem_von.start AND (sem.start <= sem_bis.start OR sem_bis.studiensemester_kurzbz IS NULL)";
+
+		if (!isEmptyArray($excluded_oehbeitrag_id))
+		{
+			$allStdSemSpanQry .= " AND oehbeitrag_id NOT IN ?";
+			$params[] = $excluded_oehbeitrag_id;
+		}
+		
+		$allStdSemSpanQry .= ")";
+
+		$nrAssigned = $this->execQuery($allStdSemSpanQry, $params);
+
+		if (isError($nrAssigned))
+			return $nrAssigned;
+
+		if (!hasData($nrAssigned))
+			return error("Fehler bei Überprüfung der Möglichkeit der Semesterzuweisung");
+
+		return success(array(getData($nrAssigned)[0]->number_assigned == 0));
+	}
+}

application/models/crm/Konto_model.php

@@ -18,45 +18,50 @@ class Konto_model extends DB_Model
 	public function setPaid($buchungsnr)
 	{
 		// get payment
-		$buchungResult =  $this->loadWhere(array('buchungsnr' => $buchungsnr));
+		$buchungResult = $this->loadWhere(array('buchungsnr' => $buchungsnr));
 
-		if(isSuccess($buchungResult) && hasData($buchungResult))
+		if (isSuccess($buchungResult) && hasData($buchungResult))
 		{
+			$buchung = getData($buchungResult)[0];
+
 			// get already paid amount
 			$this->addSelect('sum(betrag) as bezahlt');
 			$this->addGroupBy('buchungsnr_verweis');
-			$buchungVerweisResult =  $this->loadWhere(array('buchungsnr_verweis' => $buchungsnr));
+			$buchungVerweisResult = $this->loadWhere(array('buchungsnr_verweis' => $buchungsnr));
 
-			if(isSuccess($buchungVerweisResult))
+			if (isSuccess($buchungVerweisResult))
 			{
-				if(hasData($buchungVerweisResult))
-				{
-					$betragBezahltResult = getData($buchungVerweisResult);
-					$betragBezahlt = $betragBezahltResult->bezahlt;
-				}
-				else
-					$betragBezahlt = 0;
+				$betragBezahlt = 0;
 
-				$buchung = getData($buchungResult);
-				$buchung = $buchung[0];
+				if (hasData($buchungVerweisResult))
+				{
+					$betragBezahlt = getData($buchungVerweisResult)[0]->bezahlt;
+				}
 
 				// calculate open amount
-				$betragOffen = $betragBezahlt - $buchung->betrag*(-1);
+				$betragOffen = $betragBezahlt - $buchung->betrag * (-1);
 
-				$data = array(
-					'person_id' => $buchung->person_id,
-					'studiengang_kz' => $buchung->studiengang_kz,
-					'studiensemester_kurzbz' => $buchung->studiensemester_kurzbz,
-					'buchungsnr_verweis' => $buchungsnr,
-					'betrag' => str_replace(',','.',$betragOffen*(-1)),
-					'buchungsdatum' => date('Y-m-d'),
-					'buchungstext' => $buchung->buchungstext,
-					'insertamum' => date('Y-m-d H:i:s'),
-					'insertvon' => '',
-					'buchungstyp_kurzbz' => $buchung->buchungstyp_kurzbz,
-				);
+				if ($betragOffen != 0)
+				{
+					$data = array(
+						'person_id' => $buchung->person_id,
+						'studiengang_kz' => $buchung->studiengang_kz,
+						'studiensemester_kurzbz' => $buchung->studiensemester_kurzbz,
+						'buchungsnr_verweis' => $buchungsnr,
+						'betrag' => str_replace(',', '.', $betragOffen * (-1)),
+						'buchungsdatum' => date('Y-m-d'),
+						'buchungstext' => $buchung->buchungstext,
+						'insertamum' => date('Y-m-d H:i:s'),
+						'insertvon' => '',
+						'buchungstyp_kurzbz' => $buchung->buchungstyp_kurzbz,
+					);
 
-				return $this->insert($data);
+					return $this->insert($data);
+				}
+				else
+				{
+					return success();
+				}
 			}
 			else
 			{

application/models/crm/Prestudent_model.php

@@ -291,7 +291,7 @@ class Prestudent_model extends DB_Model
 			$prestudentdata->prestudentstatus = $lastStatusData;
 
 
-			if ($this->hasUDF())
+			if ($this->udfsExistAndDefined())
 			{
 				$prestudentdata->prestudentUdfs = $this->getUDFs($prestudent_id);
 			}
@@ -611,7 +611,7 @@ class Prestudent_model extends DB_Model
 		));
 	}
 
-	public function getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester)
+	public function getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt)
 	{
 		$query = "SELECT ps.prestudent_id
 					FROM public.tbl_prestudentstatus pss
@@ -621,8 +621,49 @@ class Prestudent_model extends DB_Model
 					WHERE ps.person_id = ?
 					AND UPPER((sg.typ || sg.kurzbz) || ':' || sp.orgform_kurzbz) = ?
 					AND pss.studiensemester_kurzbz = ?
-					";
+					AND";
+
+		if ($abgeschickt === 'true')
+			$query .= " EXISTS";
+		else
+			$query .= " NOT EXISTS";
+
+		$query .= " (SELECT 1 FROM public.tbl_prestudentstatus spss
+					JOIN public.tbl_prestudent sps USING(prestudent_id) 
+					WHERE sps.prestudent_id = ps.prestudent_id
+					AND spss.bewerbung_abgeschicktamum IS NOT NULL)";
 
 		return $this->execQuery($query, array($person, $studiengang, $studienSemester));
 	}
+
+	/**
+	 * Gets förderrelevant flag for a prestudent, from prestudent, or, if not set on prestudent level, from studiengang
+	 * @param int $prestudent_id
+	 * @return object
+	 */
+	public function getFoerderrelevant($prestudent_id)
+	{
+		$query = 'SELECT COALESCE (ps.foerderrelevant, stg.foerderrelevant) AS foerderrelevant
+					FROM public.tbl_prestudent ps
+					LEFT JOIN public.tbl_studiengang stg USING (studiengang_kz)
+					WHERE prestudent_id = ?';
+
+		return $this->execQuery($query, array($prestudent_id));
+	}
+
+	/**
+	 * Gets bis standort_code for a prestudent, from prestudent, or, if not set on prestudent level, from studiengang
+	 * @param int $prestudent_id
+	 * @return object
+	 */
+	public function getStandortCode($prestudent_id)
+	{
+		$query = 'SELECT COALESCE (ps.standort_code, stg.standort_code) AS standort_code
+					FROM public.tbl_prestudent ps
+					LEFT JOIN public.tbl_studiengang stg USING (studiengang_kz)
+					WHERE prestudent_id = ?';
+
+		return $this->execQuery($query, array($prestudent_id));
+	}
+
 }

application/models/crm/Statusgrund_model.php

@@ -12,7 +12,7 @@ class Statusgrund_model extends DB_Model
 		$this->pk = "statusgrund_id";
 	}
 
-	public function getStatus($status_kurzbz = null, $aktiv = null)
+	public function getStatus($status_kurzbz = null, $aktiv = null, $statusgrund_kurzbz = null)
 	{
 		$this->addOrder('bezeichnung_mehrsprachig');
 		$where = array();
@@ -20,6 +20,8 @@ class Statusgrund_model extends DB_Model
 			$where['status_kurzbz'] = $status_kurzbz;
 		if (!is_null($aktiv))
 			$where['aktiv'] = $aktiv;
+		if (!is_null($statusgrund_kurzbz))
+			$where['statusgrund_kurzbz'] = $statusgrund_kurzbz;
 
 		$status = $this->loadWhere($where);
 

application/models/education/Lehrveranstaltung_model.php

@@ -169,18 +169,34 @@ class Lehrveranstaltung_model extends DB_Model
 	 */
 	public function getLecturersByLv($studiensemester_kurzbz, $lehrveranstaltung_id)
 	{
-		$query = "SELECT * FROM (SELECT distinct on(uid) vorname, nachname, tbl_benutzer.uid as uid,
-	    			CASE WHEN lehrfunktion_kurzbz='LV-Leitung' THEN true ELSE false END as lvleiter
-	    		FROM lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter, public.tbl_benutzer, public.tbl_person
-	    		WHERE
-	    			tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitmitarbeiter.lehreinheit_id AND
-					tbl_lehreinheitmitarbeiter.mitarbeiter_uid=tbl_benutzer.uid AND
-					tbl_person.person_id=tbl_benutzer.person_id AND
-					lehrveranstaltung_id=? AND
-					tbl_lehreinheitmitarbeiter.mitarbeiter_uid NOT like '_Dummy%' AND
-					tbl_benutzer.aktiv=true AND tbl_person.aktiv=true AND
-					studiensemester_kurzbz=?) AS a
-					ORDER BY lvleiter DESC, nachname, vorname";
+		$query = "SELECT
+					*
+				FROM
+					(SELECT distinct on(uid) vorname, nachname, tbl_benutzer.uid as uid,
+						CASE WHEN
+						EXISTS(
+							SELECT
+								1
+							FROM
+								lehre.tbl_lehreinheitmitarbeiter lvllem
+								JOIN lehre.tbl_lehreinheit lvlle USING(lehreinheit_id)
+							WHERE
+						 		lehrfunktion_kurzbz='LV-Leitung'
+								AND lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id
+								AND studiensemester_kurzbz=tbl_lehreinheit.studiensemester_kurzbz
+								AND mitarbeiter_uid=tbl_benutzer.uid
+						) THEN true ELSE false END as lvleiter
+		    		FROM lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter, public.tbl_benutzer, public.tbl_person
+		    		WHERE
+		    			tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitmitarbeiter.lehreinheit_id AND
+						tbl_lehreinheitmitarbeiter.mitarbeiter_uid=tbl_benutzer.uid AND
+						tbl_person.person_id=tbl_benutzer.person_id AND
+						lehrveranstaltung_id=? AND
+						tbl_lehreinheitmitarbeiter.mitarbeiter_uid NOT like '_Dummy%' AND
+						tbl_benutzer.aktiv=true AND tbl_person.aktiv=true AND
+						studiensemester_kurzbz=?
+					) AS a
+				ORDER BY lvleiter DESC, nachname, vorname";
 
 		return $this->execQuery($query, array($lehrveranstaltung_id, $studiensemester_kurzbz));
 	}
@@ -273,7 +289,7 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($query, $parametersarray);
 	}
-	
+
 	/**
 	 * Gets Lehrveranstaltung and its Lehreinheiten (multiple rows possible).
 	 * Returns empty array if student has no Lehrveranstaltung.
@@ -290,7 +306,7 @@ class Lehrveranstaltung_model extends DB_Model
 			AND studiensemester_kurzbz = ?
 			AND lehrveranstaltung_id = ?;
 		';
-		
+
 		return $this->execQuery($query, array($uid, $studiensemester_kurzbz, $lehrveranstaltung_id));
 	}
 }

application/models/education/Pruefung_model.php

@@ -11,4 +11,29 @@ class Pruefung_model extends DB_Model
 		$this->dbTable = 'campus.tbl_pruefung';
 		$this->pk = 'pruefung_id';
 	}
+
+	/**
+	 * Gets Pruefungen of a person for a Studiensemester.
+	 * @param int $person_id
+	 * @param string $studiensemester_kurzbz
+	 * @return object
+	 */
+	public function getByPerson($person_id, $studiensemester_kurzbz)
+	{
+		$qry = '
+		SELECT prfg.*, pers.matr_nr, lv.ects, stg.studiengang_kz, prst.prestudent_id,
+       			UPPER(stg.typ||stg.kurzbz) AS studiengang, stg.bezeichnung AS studiengang_bezeichnung
+		FROM public.tbl_person pers
+		JOIN public.tbl_prestudent prst USING (person_id)
+		JOIN public.tbl_student USING (prestudent_id)
+		JOIN lehre.tbl_pruefung prfg USING (student_uid)
+		JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
+		JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
+		JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz 
+		WHERE pers.person_id = ?
+		AND le.studiensemester_kurzbz = ?
+		ORDER BY prfg.datum, pruefung_id';
+
+		return $this->execQuery($qry, array($person_id, $studiensemester_kurzbz));
+	}
 }

application/models/education/Zeugnisnote_model.php

@@ -12,4 +12,132 @@ class Zeugnisnote_model extends DB_Model
 		$this->pk = array('studiensemester_kurzbz', 'student_uid', 'lehrveranstaltung_id');
 		$this->hasSequence = false;
 	}
+
+	/**
+	 * Gets ECTS sums of completed courses (Zeugnisnoten) of a person for a Studiensemester.
+	 * If no valid Noten for the course were entered, 0 ects is returned.
+	 * @param int $person_id
+	 * @param string $studiensemester_kurzbz
+	 * @param bool $aktiv
+	 * @param bool $lehre
+	 * @param bool $offiziell
+	 * @param bool $positiv
+	 * @return object
+	 */
+	public function getEctsSumsByPerson($person_id, $studiensemester_kurzbz, $aktiv = true, $lehre = null, $offiziell = null, $positiv = null)
+	{
+		$params = array();
+
+		$qry = "SELECT DISTINCT ON (prst.prestudent_id) pers.matr_nr, stg.studiengang_kz, prst.prestudent_id, stg.erhalter_kz,
+       			UPPER(stg.typ||stg.kurzbz) AS studiengang, stg.bezeichnung AS studiengang_bezeichnung, COALESCE(summen.summe_ects, 0) AS summe_ects
+				FROM public.tbl_person pers
+				JOIN public.tbl_prestudent prst USING (person_id)
+				JOIN public.tbl_prestudentstatus prstst USING (prestudent_id)
+				JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz
+				LEFT JOIN (
+					SELECT zgnisnote.student_uid, prestudent_id, zgnisnote.studiensemester_kurzbz, sum(ects) AS summe_ects
+				    FROM public.tbl_student
+					LEFT JOIN lehre.tbl_zeugnisnote zgnisnote USING(student_uid)
+					LEFT JOIN lehre.tbl_note note ON zgnisnote.note = note.note
+					LEFT JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
+					WHERE TRUE";
+
+		if (isset($aktiv))
+		{
+			$qry .= ' AND (note.aktiv = ?)';
+			$params[] = $aktiv;
+		}
+
+		if (isset($lehre))
+		{
+			$qry .= ' AND (note.lehre = ?)';
+			$params[] = $lehre;
+		}
+
+		if (isset($offiziell))
+		{
+			$qry .= ' AND (note.offiziell = ?)';
+			$params[] = $offiziell;
+		}
+
+		if (isset($positiv))
+		{
+			$qry .= ' AND (note.positiv = ?)';
+			$params[] = $positiv;
+		}
+
+		$qry .= " GROUP BY zgnisnote.studiensemester_kurzbz, zgnisnote.student_uid, prestudent_id
+				) summen ON prst.prestudent_id = summen.prestudent_id AND prstst.studiensemester_kurzbz = summen.studiensemester_kurzbz
+				WHERE pers.person_id = ?
+				AND prstst.studiensemester_kurzbz = ?
+				ORDER BY prst.prestudent_id";
+
+		$params[] = $person_id;
+		$params[] = $studiensemester_kurzbz;
+
+		return $this->execQuery($qry, $params);
+	}
+
+	/**
+	 * Gets courses (Zeugnisnoten) of a person for a Studiensemester.
+	 * @param int $person_id
+	 * @param string $studiensemester_kurzbz
+	 * @param bool $aktiv
+	 * @param bool $lehre
+	 * @param bool $offiziell
+	 * @param bool $positiv
+	 * @param bool $zeugnis
+	 * @return object
+	 */
+	public function getByPerson($person_id, $studiensemester_kurzbz, $aktiv = true, $lehre = null, $offiziell = null, $positiv = null, $zeugnis = null)
+	{
+		$params = array($person_id, $studiensemester_kurzbz);
+
+		$qry = "SELECT zgnisnote.*, pers.matr_nr, lv.ects, stg.studiengang_kz, prst.prestudent_id, stg.erhalter_kz,
+       			UPPER(stg.typ||stg.kurzbz) AS studiengang, stg.bezeichnung AS studiengang_bezeichnung, note.note,
+       			note.bezeichnung AS note_bezeichnung
+				FROM public.tbl_person pers
+				JOIN public.tbl_prestudent prst USING (person_id)
+				JOIN public.tbl_student USING (prestudent_id)
+				JOIN lehre.tbl_zeugnisnote zgnisnote USING (student_uid)
+				JOIN lehre.tbl_note note ON zgnisnote.note = note.note
+				JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
+				JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz 
+				WHERE pers.person_id = ?
+				AND zgnisnote.studiensemester_kurzbz = ?";
+
+		if (isset($aktiv))
+		{
+			$qry .= ' AND note.aktiv = ?';
+			$params[] = $aktiv;
+		}
+
+		if (isset($lehre))
+		{
+			$qry .= ' AND note.lehre = ?';
+			$params[] = $lehre;
+		}
+
+		if (isset($offiziell))
+		{
+			$qry .= ' AND note.offiziell = ?';
+			$params[] = $offiziell;
+		}
+
+		if (isset($positiv))
+		{
+			$qry .= ' AND note.positiv = ?';
+			$params[] = $positiv;
+		}
+
+		if (isset($zeugnis))
+		{
+			$qry .= ' AND lv.zeugnis = ?';
+			$params[] = $zeugnis;
+		}
+
+		$qry .= ' ORDER BY zgnisnote.benotungsdatum';
+
+		return $this->execQuery($qry, $params);
+	}
 }

application/models/organisation/Studiengang_model.php

@@ -448,10 +448,11 @@ class Studiengang_model extends DB_Model
 
 		return $this->execQuery($query, array($typ));
 	}
-	
+
 	/**
-	 * Get Studiengangsleitung
-	 * @param null $studiengang_kz
+	 * Get Studiengangsleitung/en of Studiengang/Studiengaenge.
+     *
+	 * @param null $studiengang_kz Numeric or Array
 	 * @return array
 	 */
 	public function getLeitung($studiengang_kz = null)
@@ -460,7 +461,12 @@ class Studiengang_model extends DB_Model
 		$this->addJoin('public.tbl_benutzerfunktion', 'oe_kurzbz');
 		$this->addJoin('public.tbl_benutzer', 'uid');
 		$this->addJoin('public.tbl_person', 'person_id');
-		
+
+		if (!is_numeric($studiengang_kz) && !is_array($studiengang_kz))
+		{
+			return error('Studiengangskennzahl ungültig');
+		}
+
 		if (is_null($studiengang_kz))
 		{
 			$condition = '
@@ -469,16 +475,21 @@ class Studiengang_model extends DB_Model
                 AND ( datum_bis >= NOW() OR datum_bis IS NULL )
             ';
 		}
-		elseif (is_numeric($studiengang_kz))
+		elseif (is_numeric($studiengang_kz) || is_array($studiengang_kz))
 		{
+            if (is_array($studiengang_kz))
+            {
+				$studiengang_kz = array_map(array($this,'escape'), $studiengang_kz);
+                $studiengang_kz = implode(', ', $studiengang_kz);
+            }
 			$condition =  '
                funktion_kurzbz = \'Leitung\'
                 AND ( datum_von <= NOW() OR datum_von IS NULL )
                 AND ( datum_bis >= NOW() OR datum_bis IS NULL )
-                AND studiengang_kz = ' . $this->db->escape($studiengang_kz)
+                AND studiengang_kz IN (' . $studiengang_kz. ')';
 			;
 		}
-		
+
 		return $this->loadWhere($condition);
 	}
 

application/models/person/Notiz_model.php

@@ -152,6 +152,7 @@ class Notiz_model extends DB_Model
 	 */
 	public function getNotizByTitel($person_id, $titel)
 	{
+		$this->addSelect('public.tbl_notiz.insertamum as insertnotiz, *');
 		// Join with the table public.tbl_notizzuordnung using notiz_id
 		$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
 		$this->addJoin('public.tbl_prestudent', 'prestudent_id', 'LEFT');

application/models/person/Person_model.php

@@ -152,34 +152,36 @@ class Person_model extends DB_Model
 	 */
 	public function getPersonStammdaten($person_id, $zustellung_only = false)
 	{
-		$this->addSelect('public.tbl_person.*, s.kurztext as staatsbuergerschaft, g.kurztext as geburtsnation');
+		$this->addSelect('public.tbl_person.*, tbl_person.staatsbuergerschaft AS staatsbuergerschaft_code, tbl_person.geburtsnation AS geburtsnation_code, 
+		s.kurztext as staatsbuergerschaft, g.kurztext as geburtsnation');
 		$this->addJoin('bis.tbl_nation s', 'public.tbl_person.staatsbuergerschaft = s.nation_code', 'LEFT');
 		$this->addJoin('bis.tbl_nation g', 'public.tbl_person.geburtsnation = g.nation_code', 'LEFT');
 
 		$person = $this->load($person_id);
 
-		if($person->error) return $person;
+		if (isError($person)) return $person;
 
 		//return null if not found
-		if(count($person->retval) < 1)
+		if (!hasData($person))
 			return success(null);
 
-		$this->KontaktModel->addDistinct();
-		$this->KontaktModel->addSelect('kontakttyp, anmerkung, kontakt, zustellung');
+		$this->KontaktModel->addSelect('kontakt_id, kontakttyp, anmerkung, kontakt, zustellung');
 		$this->KontaktModel->addOrder('kontakttyp');
+		$this->KontaktModel->addOrder('insertamum', 'DESC');
 		$where = $zustellung_only === true ? array('person_id' => $person_id, 'zustellung' => true) : array('person_id' => $person_id);
 		$kontakte = $this->KontaktModel->loadWhere($where);
-		if($kontakte->error) return $kontakte;
+		if (isError($kontakte)) return $kontakte;
 
 		$where = $zustellung_only === true ? array('person_id' => $person_id, 'zustelladresse' => true) : array('person_id' => $person_id);
 		$this->AdresseModel->addSelect('public.tbl_adresse.*, bis.tbl_nation.kurztext AS nationkurztext');
 		$this->AdresseModel->addJoin('bis.tbl_nation', 'tbl_adresse.nation = tbl_nation.nation_code', 'LEFT');
+		$this->AdresseModel->addOrder('insertamum', 'DESC');
 		$adressen = $this->AdresseModel->loadWhere($where);
-		if($adressen->error) return $adressen;
+		if (isError($adressen)) return $adressen;
 
-		$stammdaten = $person->retval[0];
-		$stammdaten->kontakte = $kontakte->retval;
-		$stammdaten->adressen = $adressen->retval;
+		$stammdaten = getData($person)[0];
+		$stammdaten->kontakte = hasData($kontakte) ? getData($kontakte) : array();
+		$stammdaten->adressen = hasData($adressen) ? getData($adressen) : array();
 
 		return success($stammdaten);
 	}
@@ -263,4 +265,64 @@ class Person_model extends DB_Model
 		
 		return success($result->vorname. ' '. $result->nachname);
 	}
+
+	public function checkDuplicate($person_id)
+	{
+		$qry = "SELECT person_id
+				FROM public.tbl_prestudent p
+				JOIN 
+				(
+					SELECT DISTINCT ON(prestudent_id) *
+					FROM public.tbl_prestudentstatus
+					WHERE prestudent_id IN 
+						(
+							SELECT prestudent_id 
+							FROM public.tbl_prestudent 
+							WHERE person_id IN 
+							(
+								SELECT p2.person_id
+								FROM public.tbl_person p
+								JOIN public.tbl_person p2
+								ON p.vorname = p2.vorname
+								AND p.nachname = p2.nachname
+								AND p.gebdatum = p2.gebdatum
+								AND p.person_id = ?
+							)
+						)
+					ORDER BY prestudent_id, datum DESC, insertamum DESC
+				) ps USING(prestudent_id)
+				JOIN public.tbl_status USING(status_kurzbz)
+				WHERE status_kurzbz = 'Interessent' 
+				AND studiengang_kz IN 
+				(
+					SELECT studiengang_kz
+					FROM public.tbl_prestudent p
+					JOIN
+					(
+						SELECT DISTINCT ON(prestudent_id) *
+						FROM public.tbl_prestudentstatus
+						WHERE prestudent_id IN
+						(
+							SELECT prestudent_id
+							FROM public.tbl_prestudent
+							WHERE person_id IN
+							(
+								SELECT p2.person_id
+								FROM public.tbl_person p
+								JOIN public.tbl_person p2
+								ON p.vorname = p2.vorname
+								AND p.nachname = p2.nachname
+								AND p.gebdatum = p2.gebdatum
+								AND p.person_id = ?
+							)
+						)
+						ORDER BY prestudent_id, datum DESC, insertamum DESC
+					) ps USING(prestudent_id)
+					JOIN public.tbl_status USING(status_kurzbz)
+					WHERE status_kurzbz = 'Abbrecher'
+				)
+				";
+
+		return $this->execQuery($qry, array($person_id, $person_id));
+	}
 }

application/models/ressource/Betriebsmittelperson_model.php

@@ -18,7 +18,7 @@ class Betriebsmittelperson_model extends DB_Model
 	 * @param bool $isRetourniert   False to retrieve only active Betriebsmittel.
 	 * @return array|bool
 	 */
-	public function getBetriebsmittel($person_id, $betriebsmitteltyp = null, $isRetourniert = null)
+	public function getBetriebsmittel($person_id, $betriebsmitteltyp = null, $isRetourniert = null, $onlyAktiveBenutzer=false)
 	{
 		if (!is_numeric($person_id))
 		{
@@ -28,8 +28,12 @@ class Betriebsmittelperson_model extends DB_Model
 		
 		$this->addJoin('wawi.tbl_betriebsmittel', 'betriebsmittel_id');
 		
+		if( $onlyAktiveBenutzer ) {
+			$this->addJoin('public.tbl_benutzer b', 'b.uid = wawi.tbl_betriebsmittelperson.uid AND b.aktiv = \'t\'');
+		}
+
 		$condition = '
-			person_id = '. $this->escape($person_id). '
+			wawi.tbl_betriebsmittelperson.person_id = '. $this->escape($person_id). '
 		';
 		
 		if (is_string($betriebsmitteltyp)) {

application/models/system/Fehler_model.php

@@ -0,0 +1,14 @@
+<?php
+class Fehler_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_fehler';
+		$this->pk = 'fehlercode';
+	}
+}

application/models/system/Filters_model.php

@@ -57,19 +57,34 @@ class Filters_model extends DB_Model
 	/**
 	 * Loads all filters by their app and dataset_name
 	 */
-	public function getFiltersByAppDatasetName($app, $dataset_name)
+	public function getFiltersByAppDatasetNamePersonId($app, $dataset_name, $person_id)
 	{
-		$this->resetQuery(); // reset any previous built query
+		$query = '
+		(
+			-- Global filters
+			SELECT gs.filter_id,
+				gs.person_id,
+				gs.description
+			  FROM system.tbl_filters gs
+			 WHERE gs.app = ?
+			   AND gs.dataset_name = ?
+			   AND gs.person_id IS NULL
+		      ORDER BY gs.person_id DESC, gs.sort ASC
+		)
+		UNION ALL
+		(
+			-- Personal filters
+			SELECT ps.filter_id,
+				ps.person_id,
+				ps.description
+			  FROM system.tbl_filters ps
+			 WHERE ps.app = ?
+			   AND ps.dataset_name = ?
+			   AND ps.person_id = ?
+		      ORDER BY ps.person_id DESC, ps.sort ASC
+		)';
 
-		$this->addSelect('filter_id, person_id, description');
-		$this->addOrder('person_id', 'DESC'); // sort descending on column person_id
-		$this->addOrder('sort', 'ASC'); // sort on column sort
-
-		$filterParametersArray = array(
-			'app' => $app,
-			'dataset_name' => $dataset_name
-		);
-
-		return $this->loadWhere($filterParametersArray);
+		return $this->execQuery($query, array($app, $dataset_name, $app, $dataset_name, $person_id));
 	}
 }
+

application/models/system/Issue_model.php

@@ -0,0 +1,90 @@
+<?php
+class Issue_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_issue';
+		$this->pk = 'issue_id';
+	}
+
+	/**
+	 * Gets issues which are open, i.e. not resolved.
+	 * @param array $fehlercodes only issues for given fehler are retrieved
+	 * @param int $person_id
+	 * @param string $oe_kurzbz
+	 * @param string $fehlercode_extern
+	 * @return object success with issues or error
+	 */
+	public function getOpenIssues($fehlercodes, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
+	{
+		$params = array($fehlercodes);
+		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
+		$qry = 'SELECT issue_id, fehlercode, inhalt, fehlercode_extern, inhalt_extern, person_id, oe_kurzbz,
+       					behebung_parameter, datum, verarbeitetvon, verarbeitetamum
+				FROM system.tbl_issue
+				WHERE fehlercode IN ?
+				AND verarbeitetamum IS NULL';
+
+		if (!isEmptyString($fehlercode_extern))
+		{
+			$qry .= ' AND fehlercode_extern = ?';
+			$params[] = $fehlercode_extern;
+		}
+
+		if (isset($person_id))
+		{
+			$qry .= ' AND person_id = ?';
+			$params[] = $person_id;
+		}
+
+		if (isset($oe_kurzbz))
+		{
+			$qry .= ' AND oe_kurzbz = ?';
+			$params[] = $oe_kurzbz;
+		}
+
+		return $this->execQuery($qry, $params);
+	}
+
+	/**
+	 * Gets number of open (non-resolved) issues.
+	 * @param string $fehlercode unique error code
+	 * @param int $person_id if provided, only issues with this person_id are counted.
+	 * @param string $oe_kurzbz if provided, only issues with this oe_kurzbz are counted.
+	 * @param string $fehlercode_extern if provided, only issues with this external fehlercode are counted (for identifying issues from external systems).
+	 * @return Object success with number of issues or error
+	 */
+	public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
+	{
+		$params = array($fehlercode);
+		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
+		$qry = 'SELECT count(*) as anzahl_open_issues FROM system.tbl_issue
+				WHERE fehlercode = ?
+				AND verarbeitetamum IS NULL';
+
+		if (!isEmptyString($fehlercode_extern))
+		{
+			$qry .= ' AND fehlercode_extern = ?';
+			$params[] = $fehlercode_extern;
+		}
+
+		if (isset($person_id))
+		{
+			$qry .= ' AND person_id = ?';
+			$params[] = $person_id;
+		}
+
+		if (isset($oe_kurzbz))
+		{
+			$qry .= ' AND oe_kurzbz = ?';
+			$params[] = $oe_kurzbz;
+		}
+
+		return $this->execQuery($qry, $params);
+	}
+}