Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter

application/models/crm/Prestudentstatus_model.php

@@ -267,7 +267,7 @@ class Prestudentstatus_model extends DB_Model
 		return $this->loadWhere($where);
 	}
 
-	public function loadLastWithStgDetails($prestudent_id, $studiensemester_kurzbz = null)
+	public function loadLastWithStgDetails($prestudent_id, $studiensemester_kurzbz = null, $max_date = null)
 	{
 		$this->load->config('studierendenantrag');
 
@@ -304,7 +304,8 @@ class Prestudentstatus_model extends DB_Model
 
 		$this->addLimit(1);
 
-		$this->db->where_in($this->dbTable . '.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist'));
+		if ($max_date)
+			$this->db->where($this->dbTable . '.insertamum <', $max_date);
 
 		$whereArr = [
 			$this->dbTable . '.prestudent_id' => $prestudent_id,

application/models/education/Pruefung_model.php

@@ -87,7 +87,13 @@ class Pruefung_model extends DB_Model
         $this->addJoin('public.tbl_person pers', 'person_id');
         $this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
         $this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
-        $this->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id=ps.prestudent_id AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)', 'LEFT');
+        $this->addJoin(
+        	'public.tbl_prestudentstatus pss',
+        	'pss.prestudent_id=ps.prestudent_id 
+        	AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz 
+        	AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)',
+        	'LEFT'
+        );
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
 		$this->db->join('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ = ?', 'LEFT', false);
@@ -164,8 +170,10 @@ class Pruefung_model extends DB_Model
 		$this->addSelect('ps.prestudent_id');
 		$this->addSelect('lv.bezeichnung as lvbezeichnung');
 		$this->addSelect('le.studiensemester_kurzbz');
+		$this->addSelect('a.studierendenantrag_id');
 		$this->addSelect('a.typ');
 		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
+		$this->addSelect('pss.ausbildungssemester');
 
 		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
@@ -174,12 +182,20 @@ class Pruefung_model extends DB_Model
 		$this->addJoin('public.tbl_person pers', 'person_id');
 		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
 		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
-		$this->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id=ps.prestudent_id AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)', 'LEFT');
+		$this->addJoin(
+			'public.tbl_prestudentstatus pss',
+			'pss.prestudent_id=ps.prestudent_id 
+			AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz 
+			AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)',
+			'LEFT'
+		);
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
-		$this->addJoin('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ=' . $this->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG), 'LEFT');
-
-		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
+		$this->addJoin(
+			'campus.tbl_studierendenantrag a',
+			'ps.prestudent_id=a.prestudent_id and a.typ=' . $this->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG),
+			'LEFT'
+		);
 
 		$this->db->where("g.aktiv", true);
 
@@ -210,7 +226,7 @@ class Pruefung_model extends DB_Model
 		$this->db->where('ps.prestudent_id', $prestudent_id);
 
 		if ($max_date !== null) {
-			$this->db->where('p.datum <', $max_date);
+			$this->db->where('p.datum <=', $max_date);
 		}
 		if ($studiensemester_kurzbz !== null) {
 			$this->db->where('le.studiensemester_kurzbz', $studiensemester_kurzbz);
@@ -237,6 +253,8 @@ class Pruefung_model extends DB_Model
 
 		$this->db->where("b.aktiv", true);
 
+		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
+
 		if (is_array($status)) {
 			if (in_array(null, $status)) {
 				$status = array_filter($status);

application/models/education/Studierendenantrag_model.php

@@ -46,6 +46,8 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('datum_wiedereinstieg');
 		$this->addSelect($this->dbTable . '.typ');
 		$this->addSelect('st.studierendenantrag_statustyp_kurzbz as status');
+		$this->addSelect('s.insertvon as status_insertvon');
+		$this->addSelect('s.insertamum as status_insertamum');
 		$this->addSelect('dms_id');
 		$this->addSelect('st.bezeichnung[(' . $sql . ')] as statustyp');
 
@@ -54,7 +56,13 @@ class Studierendenantrag_model extends DB_Model
 		$this->addJoin('public.tbl_person', 'person_id');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
 		$this->addJoin('public.tbl_studiensemester ss', 'studiensemester_kurzbz');
-		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=ss.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ss.studiensemester_kurzbz)');
+		$this->addJoin(
+			'public.tbl_prestudentstatus ps',
+			'ps.prestudent_id=p.prestudent_id 
+			AND ps.studiensemester_kurzbz=ss.studiensemester_kurzbz 
+			AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ss.studiensemester_kurzbz)',
+			'LEFT'
+		);
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)');
 		$this->addJoin(
@@ -76,7 +84,9 @@ class Studierendenantrag_model extends DB_Model
 
 	public function loadActiveForStudiengaenge($studiengaenge)
 	{
-		// NOTE(chris): get language before changing things in the global db object because getUserLanguage() might use it and it should not have been tampered with
+		// NOTE(chris): get language before changing things in the global
+		// db object because getUserLanguage() might use it and it should
+		// not have been tampered with
 		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
 
 		$this->db->group_start();
@@ -85,7 +95,8 @@ class Studierendenantrag_model extends DB_Model
 			Studierendenantragstatus_model::STATUS_APPROVED,
 			Studierendenantragstatus_model::STATUS_REJECTED,
 			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
-			Studierendenantragstatus_model::STATUS_DEREGISTERED
+			Studierendenantragstatus_model::STATUS_DEREGISTERED,
+			Studierendenantragstatus_model::STATUS_PAUSE
 		]);
 		$this->db->or_group_start();
 		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
@@ -133,12 +144,18 @@ class Studierendenantrag_model extends DB_Model
 		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
 
 		$this->addSelect('*');
-		$this->addSelect('campus.get_status_studierendenantrag(studierendenantrag_id) status');
+		$this->addSelect($this->dbTable . '.grund AS grund');
+		$this->addSelect('s.studierendenantrag_statustyp_kurzbz status');
+		$this->addSelect('s.insertvon status_insertvon');
 		$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
 
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status s',
+			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id'
+		);
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_statustyp t',
-			'campus.get_status_studierendenantrag(studierendenantrag_id)=t.studierendenantrag_statustyp_kurzbz'
+			's.studierendenantrag_statustyp_kurzbz=t.studierendenantrag_statustyp_kurzbz'
 		);
 
 		if ($types && is_array($types)) {
@@ -168,7 +185,11 @@ class Studierendenantrag_model extends DB_Model
 
 		$this->addJoin(
 			'public.tbl_prestudentstatus s',
-			$this->dbTable . '.prestudent_id=s.prestudent_id AND ' . $this->dbTable . '.studiensemester_kurzbz=s.studiensemester_kurzbz'
+			$this->dbTable . '.prestudent_id=s.prestudent_id 
+			AND ' .
+			$this->dbTable . '.studiensemester_kurzbz=s.studiensemester_kurzbz 
+			AND ' .
+			$this->dbTable . '.insertamum > s.insertamum'
 		);
 		$this->addJoin('public.tbl_prestudent p', $this->dbTable . '.prestudent_id=p.prestudent_id');
 		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
@@ -180,8 +201,6 @@ class Studierendenantrag_model extends DB_Model
 
 		$this->addLimit(1);
 
-		$this->db->where_in('s.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist'));
-
 		return $this->loadWhere([
 			$this->pk => $antrag_id
 		]);
@@ -233,20 +252,45 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect($this->dbTable . '.datum_wiedereinstieg');
 		$this->addSelect($this->dbTable . '.grund');
 		$this->addSelect($this->dbTable . '.dms_id');
-		$this->addSelect("(SELECT count(1) FROM campus.tbl_studierendenantrag_status WHERE studierendenantrag_id = " . $this->dbTable . ".studierendenantrag_id AND studierendenantrag_statustyp_kurzbz = 'Genehmigt') AS isapproved", false);
+		$this->addSelect('s.insertvon AS status_insertvon');
+		$this->addSelect(
+			"(SELECT count(1) FROM campus.tbl_studierendenantrag_status WHERE studierendenantrag_id = " .
+			$this->dbTable .
+			".studierendenantrag_id AND studierendenantrag_statustyp_kurzbz = 'Genehmigt') AS isapproved",
+			false
+		);
 
 		$this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
-		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' . $this->dbTable . '.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' . $this->dbTable . '.studiensemester_kurzbz)', 'LEFT');
+		$this->addJoin(
+			'public.tbl_prestudentstatus ps',
+			'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' .
+			$this->dbTable .
+			'.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' .
+			$this->dbTable .
+			'.studiensemester_kurzbz)',
+			'LEFT'
+		);
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 		$this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)');
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status s',
+			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id',
+			'LEFT'
+		);
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_statustyp st',
-			'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz',
+			's.studierendenantrag_statustyp_kurzbz=st.studierendenantrag_statustyp_kurzbz',
 			'LEFT'
 		);
 		
-		$this->db->where("(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=p.prestudent_id AND status_kurzbz='Student' LIMIT 1) IS NOT NULL", null, false);
+		$this->db->where("(
+			SELECT status_kurzbz 
+			FROM public.tbl_prestudentstatus 
+			WHERE prestudent_id=p.prestudent_id 
+			AND status_kurzbz='Student' 
+			LIMIT 1
+		) IS NOT NULL", null, false);
 
 
 		return $this->loadWhere([
@@ -287,4 +331,144 @@ class Studierendenantrag_model extends DB_Model
 
 		return $this->loadWhere($where);
 	}
+
+	/**
+	 * Checks if the Prestudent has an active Unterbrechung between
+	 * the start of the given semester and the given enddate.
+	 * If the enddate is omitted the end of the given semester is used.
+	 *
+	 * @param integer		$prestudent_id
+	 * @param string		$studiensemester_kurzbz
+	 * @param string		$enddate					(optional)
+	 *
+	 * @return boolean
+	 */
+	public function hasRunningUnterbrechungBetween($prestudent_id, $studiensemester, $enddate = null)
+	{
+		$start = '(SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=' . $this->db->escape($studiensemester) . ')';
+		$end = $enddate
+			? $this->db->escape($enddate)
+			: '(SELECT ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=' . $this->db->escape($studiensemester) . ')';
+
+		$this->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
+		$this->db->where([
+			'prestudent_id' => $prestudent_id,
+			'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
+			'campus.get_status_studierendenantrag(studierendenantrag_id) !=' => Studierendenantragstatus_model::STATUS_CANCELLED,
+			'start < ' . $end => null,
+			'datum_wiedereinstieg > ' . $start => null,
+		]);
+		return (boolean)$this->db->count_all_results($this->dbTable);
+	}
+
+	/**
+	 * Gets free semester slots for a new Unterbrechung.
+	 *
+	 * @param integer		$prestudent_id
+	 * @param string		$studiensemester_kurzbz		(optional)
+	 *
+	 * @return stdClass
+	 */
+	public function getFreeSlotsForUnterbrechung($prestudent_id, $studiensemester = null)
+	{
+		$max_starters = 2;
+		$max_length = max(
+			2,
+			(integer)$this->config->item('unterbrecher_semester_max_length')
+		);
+
+
+		$subquery = '';
+		if ($studiensemester)
+			$subquery = 'SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=?';
+		else
+			$subquery = 'SELECT start FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=public.get_stdsem_prestudent (?, null)';
+
+		$sql = "WITH numbered_sems AS (
+		    SELECT
+		        a.studienjahr_kurzbz AS studienjahr_kurzbz,
+		        a.studiensemester_kurzbz AS von,
+		        b.studiensemester_kurzbz AS bis,
+		        a.start AS start,
+		        b.start AS ende,
+		        ROW_NUMBER() OVER (
+		            PARTITION BY a.studiensemester_kurzbz
+		            ORDER BY b.start
+		        ) AS row_number
+		    FROM public.tbl_studiensemester a
+		    LEFT JOIN public.tbl_studiensemester b ON (b.start > a.ende)
+		),
+		last_sems AS (
+		    SELECT *
+		    FROM numbered_sems 
+		    WHERE numbered_sems.row_number <= ?
+		)
+		SELECT s.von, s.bis, s.start, s.ende, studierendenantrag_id, studienjahr_kurzbz
+		FROM last_sems s
+		LEFT JOIN (
+			SELECT studierendenantrag_id, start, datum_wiedereinstieg AS ende 
+			FROM campus.tbl_studierendenantrag 
+			LEFT JOIN public.tbl_studiensemester USING(studiensemester_kurzbz) 
+			WHERE typ=? 
+			AND campus.get_status_studierendenantrag(studierendenantrag_id) != ?
+			AND prestudent_id=?
+		) a ON (s.start < a.ende AND s.ende > a.start)
+		WHERE s.start >= (" . $subquery . ")
+		ORDER BY s.start, s.ende
+		LIMIT ?;";
+
+		return $this->execQuery($sql, [
+			$max_length,
+			self::TYP_UNTERBRECHUNG,
+			Studierendenantragstatus_model::STATUS_CANCELLED,
+			$prestudent_id,
+			$studiensemester ?: $prestudent_id,
+			$max_length * $max_starters
+		]);
+	}
+
+	/**
+	 * Returns if an Antrag is manually paused
+	 *
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isManuallyPaused($antrag_id)
+	{
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status s',
+			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id'
+		);
+
+		$this->db->where([
+			's.studierendenantrag_id' => $antrag_id,
+			's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
+		]);
+
+		$this->db->group_start();
+		$this->db->where_not_in('s.insertvon', [
+			Studierendenantragstatus_model::INSERTVON_DEREGISTERED,
+			Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL
+		]);
+		$this->db->or_group_start();
+		$this->db->where('s.insertvon', Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL);
+		$this->db->where('1 !=', '(
+			SELECT COUNT(*)%2 
+			FROM campus.tbl_studierendenantrag_status i 
+			WHERE i.studierendenantrag_id = s.studierendenantrag_id 
+			AND i.insertamum > (
+				SELECT ii.insertamum 
+				FROM campus.tbl_studierendenantrag_status ii 
+				WHERE ii.studierendenantrag_id = s.studierendenantrag_id 
+				AND ii.insertvon <> ' . $this->escape(Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL) . ' 
+				ORDER BY ii.insertamum DESC 
+				LIMIT 1
+			)
+		)', false);
+		$this->db->group_end();
+		$this->db->group_end();
+		
+		return hasData($this->load());
+	}
 }

application/models/education/Studierendenantragstatus_model.php

@@ -15,6 +15,10 @@ class Studierendenantragstatus_model extends DB_Model
 	const STATUS_OBJECTED = 'Beeinsprucht';
 	const STATUS_OBJECTION_DENIED = 'EinspruchAbgelehnt';
 	const STATUS_DEREGISTERED = 'Abgemeldet';
+	const STATUS_PAUSE = 'Pause';
+
+	const INSERTVON_ABMELDUNGSTGL = "AbmeldungStgl";
+	const INSERTVON_DEREGISTERED = "Studienabbruch";
 
 	/**
 	 * Constructor
@@ -49,4 +53,157 @@ class Studierendenantragstatus_model extends DB_Model
 
 		return $this->loadWhere($where);
 	}
+
+	public function stopAntraegeForAbmeldungStgl($antrag_id)
+	{
+		$sql = 'INSERT INTO campus.tbl_studierendenantrag_status 
+		(studierendenantrag_id, studierendenantrag_statustyp_kurzbz, insertvon, insertamum)
+		SELECT studierendenantrag_id, ?, ?, (
+			SELECT insertamum 
+			FROM campus.tbl_studierendenantrag_status 
+			WHERE studierendenantrag_status_id = campus.get_status_id_studierendenantrag(?)
+		) 
+		FROM campus.tbl_studierendenantrag 
+		WHERE prestudent_id = (
+			SELECT prestudent_id 
+			FROM campus.tbl_studierendenantrag 
+			WHERE studierendenantrag_id = ?
+		)
+		AND studierendenantrag_id <> ? 
+		AND  (
+			(
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) IN ?
+			)
+		)';
+		
+		return $this->execQuery($sql, [
+			self::STATUS_PAUSE,
+			self::INSERTVON_ABMELDUNGSTGL,
+			$antrag_id,
+			$antrag_id,
+			$antrag_id,
+			Studierendenantrag_model::TYP_ABMELDUNG,
+			[
+				Studierendenantragstatus_model::STATUS_CREATED
+			],
+			Studierendenantrag_model::TYP_UNTERBRECHUNG,
+			[
+				Studierendenantragstatus_model::STATUS_CREATED
+			],
+			Studierendenantrag_model::TYP_WIEDERHOLUNG,
+			[
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
+				Studierendenantragstatus_model::STATUS_CREATED,
+				Studierendenantragstatus_model::STATUS_LVSASSIGNED,
+				Studierendenantragstatus_model::STATUS_PAUSE
+			],
+		]);
+	}
+
+	public function resumeAntraegeForAbmeldungStgl($antrag_id)
+	{
+		$sql = 'INSERT INTO campus.tbl_studierendenantrag_status 
+		(studierendenantrag_id, studierendenantrag_statustyp_kurzbz, insertvon, insertamum)
+		SELECT studierendenantrag_id, (
+			SELECT studierendenantrag_statustyp_kurzbz
+			FROM campus.tbl_studierendenantrag_status s 
+			WHERE s.studierendenantrag_id=a.studierendenantrag_id 
+			AND campus.get_status_id_studierendenantrag(a.studierendenantrag_id) <> studierendenantrag_status_id 
+			ORDER BY insertamum DESC 
+			LIMIT 1
+		), ?, (
+			SELECT insertamum 
+			FROM campus.tbl_studierendenantrag_status 
+			WHERE studierendenantrag_status_id = campus.get_status_id_studierendenantrag(?)
+		)
+		FROM campus.tbl_studierendenantrag a
+		WHERE prestudent_id = (
+			SELECT prestudent_id 
+			FROM campus.tbl_studierendenantrag 
+			WHERE studierendenantrag_id = ?
+		)
+		AND typ <> ?
+		AND campus.get_status_studierendenantrag(studierendenantrag_id) = ?
+		';
+		
+		return $this->execQuery($sql, [
+			self::INSERTVON_ABMELDUNGSTGL,
+			$antrag_id,
+			$antrag_id,
+			Studierendenantrag_model::TYP_ABMELDUNG_STGL,
+			Studierendenantragstatus_model::STATUS_PAUSE
+		]);
+	}
+
+	public function stopAntraegeForAbbruchBy($antrag_id)
+	{
+		$sql = 'INSERT INTO campus.tbl_studierendenantrag_status 
+		(studierendenantrag_id, studierendenantrag_statustyp_kurzbz, insertvon, insertamum)
+		SELECT studierendenantrag_id, ?, ?, (
+			SELECT insertamum 
+			FROM campus.tbl_studierendenantrag_status 
+			WHERE studierendenantrag_status_id = campus.get_status_id_studierendenantrag(?)
+		)
+		FROM campus.tbl_studierendenantrag 
+		WHERE prestudent_id = (
+			SELECT prestudent_id 
+			FROM campus.tbl_studierendenantrag 
+			WHERE studierendenantrag_id = ?
+		)
+		AND studierendenantrag_id <> ? 
+		AND (
+			(
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
+			) OR (
+				typ = ?
+				AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
+			)
+		)';
+		
+		return $this->execQuery($sql, [
+			self::STATUS_PAUSE,
+			self::INSERTVON_DEREGISTERED,
+			$antrag_id,
+			$antrag_id,
+			$antrag_id,
+			Studierendenantrag_model::TYP_ABMELDUNG,
+			[
+				Studierendenantragstatus_model::STATUS_APPROVED,
+				Studierendenantragstatus_model::STATUS_CANCELLED
+			],
+			Studierendenantrag_model::TYP_UNTERBRECHUNG,
+			[
+				Studierendenantragstatus_model::STATUS_APPROVED,
+				Studierendenantragstatus_model::STATUS_CANCELLED,
+				Studierendenantragstatus_model::STATUS_REMINDERSENT,
+				Studierendenantragstatus_model::STATUS_REJECTED
+			],
+			Studierendenantrag_model::TYP_ABMELDUNG_STGL,
+			[
+				Studierendenantragstatus_model::STATUS_CANCELLED,
+				Studierendenantragstatus_model::STATUS_DEREGISTERED,
+				Studierendenantragstatus_model::STATUS_OBJECTION_DENIED
+			],
+			Studierendenantrag_model::TYP_WIEDERHOLUNG,
+			[
+				Studierendenantragstatus_model::STATUS_DEREGISTERED,
+				Studierendenantragstatus_model::STATUS_APPROVED
+			],
+		]);
+	}
 }

application/models/person/Kennzeichen_model.php

@@ -0,0 +1,15 @@
+<?php
+class Kennzeichen_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_kennzeichen';
+		$this->pk = 'kennzeichen_id';
+	}
+
+}

application/models/vertragsbestandteil/Dienstverhaeltnis_model.php

@@ -18,7 +18,7 @@ class Dienstverhaeltnis_model extends DB_Model
         $result = null;
 
 		$qry = "
-        SELECT 
+        SELECT
             dv.dienstverhaeltnis_id,
             tbl_benutzer.uid,
             tbl_mitarbeiter.personalnummer,
@@ -30,8 +30,8 @@ class Dienstverhaeltnis_model extends DB_Model
             org.oe_kurzbz,
             org.bezeichnung oe_bezeichnung,
             dv.von,
-            dv.bis,     
-            dv.vertragsart_kurzbz,       
+            dv.bis,
+            dv.vertragsart_kurzbz,
             dv.updateamum,
             dv.updatevon
         FROM tbl_mitarbeiter
@@ -59,13 +59,13 @@ class Dienstverhaeltnis_model extends DB_Model
         ";
 
         return $this->execQuery($qry, $data);
-		
+
     }
 
     public function getDVByID($dvid) {
         $this->addSelect('hr.tbl_dienstverhaeltnis.*, public.tbl_organisationseinheit.bezeichnung as unternehmen');
 		$this->addJoin('public.tbl_organisationseinheit', 'hr.tbl_dienstverhaeltnis.oe_kurzbz = public.tbl_organisationseinheit.oe_kurzbz');
-		$result = $this->load($dvid); 
+		$result = $this->load($dvid);
 
 		if (hasData($result)) {
             return $result;
@@ -81,7 +81,7 @@ class Dienstverhaeltnis_model extends DB_Model
         $datestring = $date->format("Y-m-d");
 
 		$qry = "
-        SELECT 
+        SELECT
             dv.dienstverhaeltnis_id,
             tbl_benutzer.uid,
             tbl_mitarbeiter.personalnummer,
@@ -115,26 +115,26 @@ class Dienstverhaeltnis_model extends DB_Model
 			$params = array_merge($params, array($dvid, $dvid));
 			$dvidclause = <<<EODVIDC
             AND (
-				SELECT 
-					COUNT(*) AS karenzen 
-				FROM 
-					hr.tbl_vertragsbestandteil vb 
-				WHERE 
+				SELECT
+					COUNT(*) AS karenzen
+				FROM
+					hr.tbl_vertragsbestandteil vb
+				WHERE
 					vb.dienstverhaeltnis_id = ?
-				AND 
-					vb.vertragsbestandteiltyp_kurzbz = 'karenz' 
-				AND 
-					dv.von::date >= COALESCE(vb.von, '1970-01-01'::date) 
-				AND 
-					COALESCE(dv.bis::date, '2170-12-31'::date) <= COALESCE(vb.bis, '2170-12-31') 
+				AND
+					vb.vertragsbestandteiltyp_kurzbz = 'karenz'
+				AND
+					dv.von::date >= COALESCE(vb.von, '1970-01-01'::date)
+				AND
+					COALESCE(dv.bis::date, '2170-12-31'::date) <= COALESCE(vb.bis, '2170-12-31')
 			) = 0
 			AND dv.dienstverhaeltnis_id != ?
 EODVIDC;
-		
+
 		}
-		
+
 		$query = <<<EOSQL
-			SELECT 
+			SELECT
 				count(*) AS dvcount
 			FROM
 				hr.tbl_dienstverhaeltnis dv
@@ -142,35 +142,86 @@ EODVIDC;
 				dv.mitarbeiter_uid = ?
 			AND
 				dv.oe_kurzbz = ?
-			AND 
-				dv.vertragsart_kurzbz != 'werkvertrag' 
+			AND
+				dv.vertragsart_kurzbz != 'werkvertrag'
 			AND
 				?::date <= COALESCE(dv.bis, '2170-12-31'::date)
-			AND 
-				COALESCE(?::date, '2170-12-31'::date) >= dv.von 
+			AND
+				COALESCE(?::date, '2170-12-31'::date) >= dv.von
 			AND (
-				SELECT 
-					COUNT(*) AS karenzen 
-				FROM 
-					hr.tbl_vertragsbestandteil vb 
-				WHERE 
+				SELECT
+					COUNT(*) AS karenzen
+				FROM
+					hr.tbl_vertragsbestandteil vb
+				WHERE
 					vb.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
-				AND 
-					vb.vertragsbestandteiltyp_kurzbz = 'karenz' 
-				AND 
-					?::date >= COALESCE(vb.von, '1970-01-01'::date) 
-				AND 
-					COALESCE(?::date, '2170-12-31'::date) <= COALESCE(vb.bis, '2170-12-31') 
-			) = 0 
+				AND
+					vb.vertragsbestandteiltyp_kurzbz = 'karenz'
+				AND
+					?::date >= COALESCE(vb.von, '1970-01-01'::date)
+				AND
+					COALESCE(?::date, '2170-12-31'::date) <= COALESCE(vb.bis, '2170-12-31')
+			) = 0
 			{$dvidclause}
 EOSQL;
-		
+
 		$ret = $this->execReadOnlyQuery($query, $params);
-		
+
 		if( ($dvcount = getData($ret)) && ($dvcount[0]->dvcount > 0) ) {
 			return true;
 		}
-		
-		return false;	
+
+		return false;
 	}
-}
+
+	public function getDVByPersonUIDOverlapping($uid, $oe_kurzbz=null, $beginn=null, $ende=null)
+    {
+        $result = null;
+
+		$qry = "
+        SELECT
+            dv.dienstverhaeltnis_id,
+            tbl_benutzer.uid,
+            tbl_mitarbeiter.personalnummer,
+            tbl_mitarbeiter.kurzbz,
+            tbl_mitarbeiter.lektor,
+            tbl_mitarbeiter.fixangestellt,
+            tbl_person.person_id,
+            tbl_benutzer.alias,
+            org.oe_kurzbz,
+            org.bezeichnung oe_bezeichnung,
+            dv.von,
+            dv.bis,
+            dv.vertragsart_kurzbz,
+            dv.updateamum,
+            dv.updatevon
+        FROM tbl_mitarbeiter
+            JOIN tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
+            JOIN tbl_person USING (person_id)
+            JOIN hr.tbl_dienstverhaeltnis dv ON(tbl_benutzer.uid::text = dv.mitarbeiter_uid::text)
+            JOIN public.tbl_organisationseinheit org USING(oe_kurzbz)
+        WHERE tbl_benutzer.uid=?";
+		$data = array($uid);
+
+		if(!is_null($oe_kurzbz))
+		{
+			$qry.=" AND oe_kurzbz=?";
+			$data[] = $oe_kurzbz;
+		}
+
+		if (!is_null($beginn) && !is_null($ende))
+		{
+			$qry.=" AND (?,?) OVERLAPS (dv.von, COALESCE(dv.bis, '2999-12-31'))";
+			$data[] = $beginn;
+			$data[] = $ende;
+		}
+
+		$qry .="
+        ORDER BY dv.von desc
+        ";
+
+        return $this->execQuery($qry, $data);
+
+    }
+
+}