Merge branch 'master' into feature-13011/installation_on_multiple_servers

application/libraries/AnrechnungLib.php

@@ -37,19 +37,30 @@ class AnrechnungLib
 	 * @param $lv_id
 	 * @return StdClass
 	 */
-	public function getAntragData($prestudent_id, $studiensemester_kurzbz, $lv_id)
+	public function getAntragData($prestudent_id, $studiensemester_kurzbz, $lv_id, $anrechnung_id = null)
 	{
 		$antrag_data = new StdClass();
 		
 		// Get students UID.
 		$uid = $this->ci->StudentModel->getUID($prestudent_id);
-		
-		// Get lehrveranstaltung data. Break, if course is not assigned to student.
-		if(!$lv = getData($this->ci->LehrveranstaltungModel->getLvByStudent($uid, $studiensemester_kurzbz, $lv_id))[0])
+
+		// If Anrechnung exists
+		if (is_numeric($anrechnung_id))
 		{
-			show_error('You are not assigned to this course yet.');
+			// Just load LV by lv_id
+			$result = $this->ci->LehrveranstaltungModel->load($lv_id);
+			$lv = getData($result)[0];
 		}
-		
+		// If Anrechnung not exists
+		else
+		{
+			// Load LV, but check if student is assigned to that LV. Break, if not.
+			if(!$lv = getData($this->ci->LehrveranstaltungModel->getLvByStudent($uid, $studiensemester_kurzbz, $lv_id))[0])
+			{
+				show_error('You are not assigned to this course yet.');
+			}
+		}
+
 		// Get the students personal data
 		if (!$person = getData($this->ci->PersonModel->getByUid($uid))[0])
 		{
@@ -163,6 +174,8 @@ class AnrechnungLib
 		$anrechnung_data->insertvon = '';
 		$anrechnung_data->studiensemester_kurzbz = '';
 		$anrechnung_data->empfehlung = '';
+		$anrechnung_data->begruendung_ects = '';
+		$anrechnung_data->begruendung_lvinhalt = '';
 		$anrechnung_data->status_kurzbz = '';
 		$anrechnung_data->status = getUserLanguage() == 'German' ? 'neu' : 'new';
 		$anrechnung_data->dokumentname = '';
@@ -274,14 +287,21 @@ class AnrechnungLib
 		if (hasData($result))
 		{
 			$empfehlung_data->empfehlungsanfrageAm = (new DateTime($result->retval[0]->insertamum))->format('d.m.Y');
-			
-			// Get lectors who received request for recommendation
-			$lector_arr = self::getLectors($anrechnung_id);
-			
-			if (!isEmptyArray($lector_arr))
-			{
-				$empfehlung_data->empfehlungsanfrageAn = implode(', ', array_column($lector_arr, 'fullname'));
-			}
+
+            // Get users who received request for recommendation
+            if($this->ci->config->item('fbl') === TRUE)
+            {
+                $res = $this->getLeitungOfLvOe($anrechnung_id);
+            }
+            else
+            {
+                $res = $this->getLectors($anrechnung_id);
+            }
+
+            if (!isEmptyArray($res))
+            {
+                $empfehlung_data->empfehlungsanfrageAn = implode(', ', array_column($res, 'fullname'));
+            }
 		}
 
 		if (is_null($anrechnung->empfehlung_anrechnung))
@@ -741,6 +761,25 @@ class AnrechnungLib
 		// Continue, if LV has no lector (there is no one to ask for recommendation)
 		return hasData($result) ? true : false;
 	}
+
+    /**
+     * Check if user is allowed to recommend Anrechnung.
+     *
+     * @param $anrechnung_id
+     * @return bool
+     */
+    public function isEmpfehlungsberechtigt($anrechnung_id)
+    {
+        if($this->ci->config->item('fbl') === TRUE)
+        {
+            return true;
+        }
+        // Get lv-leitungen or, if not present, all lectors of lv.
+        $lector_arr = $this->getLectors($anrechnung_id);
+
+        // Return false if lv-leitung is present and user is not lv-leitung. Otherways return always true.
+        return in_array(getAuthUID(), array_column($lector_arr, 'uid'));
+    }
 	
 	/**
 	 * Get LV Leitung. If not present, get all LV lectors.
@@ -774,11 +813,14 @@ class AnrechnungLib
 		
 		// Check if lv has LV-Leitung
 		$key = array_search(true, array_column($result, 'lvleiter'));
-		
-		// If lv has LV-Leitung, keep only the one
+
+		// If lv has 1 or more LV-Leitungen, keep only them
 		if ($key !== false)
 		{
-			$lector_arr[]= $result[$key];
+            foreach ($result as $lector)
+            {
+                if ($lector->lvleiter) $lector_arr[]= $lector;
+            }
 		}
 		// ...otherwise keep all lectors
 		else
@@ -803,6 +845,40 @@ class AnrechnungLib
 		return $lector_arr;
 	}
 
+    /**
+     * Get Leitung of Lehrveranstaltungs-Organisationseinheit.
+     *
+     * @param $anrechnung_id
+     * @return false|mixed|null
+     */
+    public function getLeitungOfLvOe($anrechnung_id)
+    {
+        $this->ci->AnrechnungModel->addSelect('lehrveranstaltung_id');
+        $result = $this->ci->AnrechnungModel->load($anrechnung_id);
+
+        $lehrveranstaltung_id = getData($result)[0]->lehrveranstaltung_id;
+
+        // Get Leitungen
+        $result = $this->ci->LehrveranstaltungModel->getLeitungOfLvOe($lehrveranstaltung_id);
+
+        if (!hasData($result))
+        {
+            return false;
+        }
+
+        $oeLeitung_arr = getData($result);
+
+        foreach ($oeLeitung_arr as $oeLeitung)
+        {
+            $oeLeitung->fullname = $oeLeitung->vorname. ' '. $oeLeitung->nachname;
+        }
+
+        // Now make the array unique
+        $oeLeitung_arr = array_unique($oeLeitung_arr, SORT_REGULAR);
+
+        return $oeLeitung_arr;
+    }
+
 	// Return an object with Anrechnungdata
 	private function _setAnrechnungDataObject($anrechnung)
 	{
@@ -820,6 +896,8 @@ class AnrechnungLib
 		$anrechnung_data->insertvon= $anrechnung->insertvon;
 		$anrechnung_data->studiensemester_kurzbz= $anrechnung->studiensemester_kurzbz;
 		$anrechnung_data->empfehlung= $anrechnung->empfehlung_anrechnung;
+        $anrechnung_data->begruendung_ects = $anrechnung->begruendung_ects;
+        $anrechnung_data->begruendung_lvinhalt = $anrechnung->begruendung_lvinhalt;
 
 		// Get last status_kurzbz
 		$result = $this->ci->AnrechnungModel->getLastAnrechnungstatus($anrechnung->anrechnung_id);

application/libraries/AuthLib.php

@@ -551,10 +551,7 @@ class AuthLib
 		// Needed information
 		$this->_ci->PersonModel->addSelect('person_id, vorname, nachname, uid');
 		// Retrieves the uid if it is possible for active users
-		$this->_ci->PersonModel->addJoin(
-			'(SELECT uid, person_id FROM public.tbl_benutzer WHERE aktiv = TRUE) tb', 'person_id',
-			'LEFT'
-		);
+		$this->_ci->PersonModel->addJoin('public.tbl_benutzer', 'person_id', 'LEFT');
 
 		// Execute query with where clause
 		$personResult = $this->_ci->PersonModel->loadWhere($queryParamsArray);

application/libraries/CmsLib.php

@@ -0,0 +1,309 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+use \DOMDocument as DOMDocument;
+use \XSLTProcessor as XSLTProcessor;
+
+/**
+ * TODO(chris): NEWS: edit & delete button links and confirm
+ * TODO(chris): NEWS: news_infoscreen xlst
+ */
+class CmsLib
+{
+	/**
+	 * @var object
+	 */
+	protected $ci;
+
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->ci =& get_instance();
+
+		// Load Models
+		$this->ci->load->model('content/Content_model', 'ContentModel');
+		$this->ci->load->model('content/Contentgruppe_model', 'ContentgruppeModel');
+		$this->ci->load->model('content/Template_model', 'TemplateModel');
+		if (defined('LOG_CONTENT') && LOG_CONTENT)
+			$this->ci->load->model('system/Webservicelog_model', 'WebservicelogModel');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param int		$content_id
+	 * @param int		$version
+	 * @param string	$sprache
+	 * @param boolean	$sichtbar
+	 * 
+	 * @return stdClass
+	 */
+	public function getContent($content_id, $version = null, $sprache = null, $sichtbar = true)
+	{
+		if (!is_numeric($content_id))
+			return error('ContentID ist ungueltig');
+
+		if ($sprache === null)
+			$sprache = getUserLanguage();
+
+		$islocked = $this->ci->ContentgruppeModel->loadWhere(['content_id' => $content_id]);
+		if (isError($islocked))
+			return $islocked;
+
+		if (getData($islocked)) {
+			$uid = getAuthUID();
+			$isberechtigt = $this->ci->ContentgruppeModel->berechtigt($content_id, $uid);
+			if (isError($isberechtigt))
+				return $isberechtigt;
+
+			if (!getData($isberechtigt))
+				return error('global/keineBerechtigungFuerDieseSeite');
+		}
+		$content = $this->ci->ContentModel->getContent($content_id, $sprache, $version, $sichtbar, true);
+
+		if (isError($content))
+			return $content;
+
+		// Legt einen Logeintrag für die Klickstatistik an
+		if (defined('LOG_CONTENT') && LOG_CONTENT) {
+			// Nur eingeloggte User werden geloggt, das sonst auch alle Infoscreenaufrufe und dgl. mitgeloggt werden
+			if (isLogged()) {
+				$request_data = 'content_id=' . $content_id;
+				if ($version !== null)
+					$request_data .= '&version=' . $version;
+				if ($sichtbar !== true)
+					$request_data .= '&sichtbar=' . $sichtbar;
+				$this->ci->WebservicelogModel->insert([
+					'webservicetyp_kurzbz' => 'content',
+					'request_id' => $content_id,
+					'beschreibung' => 'content',
+					'request_data' => $request_data . '&sprache=' . $sprache,
+					'execute_time' => 'now()',
+					'execute_user' => getAuthUID()
+				]);
+			}
+		}
+
+		$content = getData($content);
+
+		//XSLT Vorlage laden
+		$template = $this->ci->TemplateModel->load($content->template_kurzbz);
+		if (isError($template))
+			return $template;
+		$template = current(getData($template));
+
+		$XML = new DOMDocument();
+		$XML->loadXML($content->content);
+
+		if($content->titel){
+			$betreff = $content->titel;
+		}else{
+			//DomDocument getElementsByTagName returns a DomNodeList
+			$betreff = $XML->getElementsByTagName('betreff');
+			//check if any betreff was found and if it is not empty
+			if($betreff->length > 0 && !empty($betreff->item(0)->nodeValue))
+			{
+				//DomNodeList item() return a DomNode, property nodeValue contains the value of the node
+				$betreff = $betreff->item(0)->nodeValue;
+
+			}
+			else
+			{
+				return error('no betreff found for the content');
+			}
+		}
+
+		$xsltemplate = new DOMDocument();
+		$xsltemplate->loadXML($template->xslt_xhtml_c4);
+
+		//Transformation
+		$processor = new XSLTProcessor();
+		$processor->importStylesheet($xsltemplate);
+
+		
+		$transformed_content = $processor->transformToXML($XML);
+		//replaces all the dms.php with the new CIS4 Controller
+		$transformed_content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $transformed_content);
+		//replaces all the cms.php with the new CIS4 Controller
+		$transformed_content = preg_replace('/content\.php\?content\_id\=([0-9]+)/', APP_ROOT.'cis.php/CisVue/Cms/content/$1', $transformed_content);
+		
+		return success([
+			"betreff"=>$betreff,
+			"type"=>$content->template_kurzbz,
+			"content"=>$transformed_content
+		]);
+	}
+
+	/**
+	 * @param stdClass		$stg_obj
+	 * 
+	 * @return stdClass
+	 */
+	protected function getNewsExtras($stg_obj, $semester)
+	{
+		$this->ci->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+
+		$stg_ltg = $this->ci->StudiengangModel->getLeitungDetailed($stg_obj->studiengang_kz);
+		if (isError($stg_ltg))
+			return $stg_ltg;
+		$stg_ltg = getData($stg_ltg) ?: [];
+
+		$gf_ltg = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('gLtg', $stg_obj->oe_kurzbz);
+		if (isError($gf_ltg))
+			return $gf_ltg;
+		$gf_ltg = getData($gf_ltg) ?: [];
+
+		$stv_ltg = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
+		if (isError($stv_ltg))
+			return $stv_ltg;
+		$stv_ltg = getData($stv_ltg) ?: [];
+
+		$ass = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
+		if (isError($ass))
+			return $ass;
+		$ass = getData($ass) ?: [];
+
+		$hochschulvertr = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('hsv');
+		if (isError($hochschulvertr))
+			return $hochschulvertr;
+		$hochschulvertr = getData($hochschulvertr) ?: [];
+
+		$stdv = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stdv', $stg_obj->oe_kurzbz);
+		if (isError($stdv))
+			return $stdv;
+		$stdv = getData($stdv) ?: [];
+
+		$jahrgangsvertr = $this->ci->BenutzerfunktionModel->getBenutzerFunktionenDetailed('jgv', $stg_obj->oe_kurzbz, $semester);
+		if (isError($jahrgangsvertr))
+			return $jahrgangsvertr;
+		$jahrgangsvertr = getData($jahrgangsvertr) ?: [];
+
+		return success($this->ci->load->view('Cis/Cms/News/Xml/NewsExtras', [
+			'studiengang' => $stg_obj,
+			'semester' => $semester,
+			'stg_ltg' => $stg_ltg,
+			'gf_ltg' => $gf_ltg,
+			'stv_ltg' => $stv_ltg,
+			'ass' => $ass,
+			'hochschulvertr' => $hochschulvertr,
+			'stdv' => $stdv,
+			'jahrgangsvertr' => $jahrgangsvertr
+		], true));
+	}
+
+	/**
+	 * @param string			$studiengang_kz
+	 * @param string			$semester
+	 * 
+	 * @return array			queried studiengang_kz and semester
+	 */
+	public function getStgAndSem($studiengang_kz, $semester)
+	{
+		$this->ci->load->model('crm/Student_model', 'StudentModel');
+
+		//Zum anzeigen der Studiengang-Details neben den News
+		$student = $this->ci->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
+		if (isError($student))
+			return $student;
+		if (getData($student)) {
+			$student = current(getData($student));
+			if ($studiengang_kz === null)
+				$studiengang_kz = $student->studiengang_kz;
+			if ($semester === null)
+				$semester = $student->semester;
+		}
+		return [$studiengang_kz, $semester];
+	}
+
+	/**
+	 * @param boolean			$infoscreen
+	 * @param string | null		$studiengang_kz
+	 * @param int | null		$semester
+	 * @param boolean			$mischen
+	 * @param string			$titel
+	 * @param boolean			$edit
+	 * @param boolean			$sichtbar
+	 * 
+	 * @return void
+	 */
+	public function getNews($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true, $page = 1, $page_size = 10, $sprache)
+	{
+		$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		list($studiengang_kz, $semester) = $this->getStgAndSem($studiengang_kz, $semester);
+		$all = $edit;
+
+		$xml = '<?xml version="1.0" encoding="UTF-8"?><content>';
+
+		$this->ci->load->model('content/News_model', 'NewsModel');
+		$news = $this->ci->NewsModel->getNewsWithContent($sprache, $studiengang_kz, $semester, null, $sichtbar, 0, $page, $page_size, $all, $mischen);
+
+		if (isError($news))
+			return $news;
+
+		$news = getData($news);
+		
+		foreach ($news as $newsobj) {
+			if ($studiengang_kz && $edit && !$newsobj->studiengang_kz)
+				continue;
+			$date = new DateTime($newsobj->datum);
+			$datum = '<datum><![CDATA[' . $date->format('d.m.Y') . ']]></datum>';
+			$datum .= '<datumdetail><![CDATA[' . $date->format('Y-m-d H:i') . ']]></datumdetail>';
+			$id = $edit ? '<news_id><![CDATA[' . $newsobj->news_id . ']]></news_id>' : '';
+			$xml .= "<newswrapper>" . $newsobj->content . $datum . $id . "</newswrapper>";
+		}
+
+		/* if ($studiengang_kz != 0) {
+			$stg_obj = $this->ci->StudiengangModel->load($studiengang_kz);
+			if (isError($stg_obj))
+				return $stg_obj;
+			$stg_obj = current(getData($stg_obj) ?: []);
+
+			if ($stg_obj) {
+				if (!$edit && !$infoscreen) {
+					$extras = $this->getNewsExtras($stg_obj, $semester);
+					if (isError($extras))
+						return $extras;
+					$xml .= getData($extras);
+				}
+				$xml .= '<studiengang_bezeichnung><![CDATA[' . $stg_obj->bezeichnung . ']]></studiengang_bezeichnung>';
+			}
+		} */
+
+		if ($titel != '') {
+			$xml .= '<news_titel>' . $titel . '</news_titel>';
+		}
+
+		$xml .= '</content>';
+
+		//XSLT Vorlage laden
+		$template = $this->ci->TemplateModel->load($infoscreen ? 'news_infoscreen' : 'news');
+		if (isError($template))
+			return $template;
+		$template = current(getData($template));
+
+		$XML = new DOMDocument();
+		$XML->loadXML($xml);
+
+		$xsltemplate = new DOMDocument();
+		$xsltemplate->loadXML($template->xslt_xhtml_c4);
+
+		//Transformation
+		$processor = new XSLTProcessor();
+		$processor->importStylesheet($xsltemplate);
+
+		$content = $processor->transformToDoc($XML);
+		$content->formatOutput = true;
+
+		$content = $content->saveHTML();
+		$content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $content);
+
+		return success($content);
+	}
+}

application/libraries/DmsLib.php

@@ -595,6 +595,8 @@ class DmsLib
 		if (isError($insDmsResult)) return $insDmsResult;
 
 		$upload_data['dms_id'] = getData($insDmsResult);
+		if(isset($upload_data['file_type']) && !isset($dms['mimetype']))
+			$dms['mimetype'] = $upload_data['file_type'];
 
 		// Insert DMS version
 		$insVersionResult = $this->_ci->DmsVersionModel->insert(
@@ -668,7 +670,7 @@ class DmsLib
 			$fileObj = new stdClass();
 			$fileObj->filename = getData($result)[0]->filename;
 			$fileObj->file = DMS_PATH.getData($result)[0]->filename;
-			$fileObj->name = DMS_PATH.getData($result)[0]->name;   // original user filename
+			$fileObj->name = getData($result)[0]->name;   // original user filename
 			$fileObj->mimetype = getData($result)[0]->mimetype;
 
 			return success($fileObj);

application/libraries/DocumentExportLib.php

@@ -0,0 +1,719 @@
+<?php
+/* Copyright (C) 2024 fhcomplete.net
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use stdClass as stdClass;
+use DOMDocument as DOMDocument;
+use XSLTProcessor as XSLTProcessor;
+use SimpleXMLElement as SimpleXMLElement;
+
+/**
+ * This library replaces the old document_export.class except for the convert
+ * function which is located in the DocumentLib library.
+ *
+ * The usage differs a little bit from the old library:
+ * In the old library you had to call create() then some optional function
+ * for adding data (addDataArray()/addDataXML()/addDataURL()/setFilename()),
+ * modifiing said data (sign()/setXMLTag_archivierbar()) or adding
+ * images (addImage()) and then call output() and close().
+ * Now the create, output and close functions are combined into one function and adding data and images is done via parameters.
+ * There are now two functions getContent() and showContent() where showContent() equals to output(false) and getContent equals to output(true)
+ * Instead of calling addDataArray, addDataXML or addDataURL just call
+ * getDataArray, getDataXML or getDataURL respectevily and use the return
+ * value as $xml_data parameter in the showContent and getContent calls.
+ * Instead of calling addImages just create an array and pass it as $images
+ * parameter to the showContent/getContent function.
+ * The old setFilename() function is now a parameter in showContent(). It is
+ * not needed in getContent() since that function does not do anything that
+ * requires a filename.
+ * To get/show a signed document just pass a valid uid as $sign_user
+ * parameter.
+ *
+ * Example:
+ * Old:
+ * $doc = new document_export($vorlage->vorlage_kurzbz, $oe_kurzbz, $version);
+ * $doc->setFilename($filename);
+ * $doc->addDataXML($data);
+ * $doc->addImage($imagepath, $imagename, $imagecontenttype);
+ * $doc->create($outputformat);
+ * $doc->output(true);
+ * $doc->close();
+ *
+ * New:
+ * $xml_data = $this->documentexportlib->getDataXML($data);
+ * $images = [[
+ * 	'path' => $imagepath,
+ * 	'name' => $imagename,
+ * 	'contenttype' => $imagecontenttype
+ * ]];
+ * $this->documentexportlib->showContent(
+ * 	$filename,
+ * 	$vorlage,
+ * 	$xml_data,
+ * 	$oe_kurzbz,
+ * 	$version,
+ * 	$outputformat,
+ * 	null,
+ * 	null,
+ * 	$images
+ * );
+ */
+class DocumentExportLib
+{
+	private $unoconv_version;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		// Gets CI instance
+		$this->ci =& get_instance();
+
+		// Load Phrases
+		$this->ci->load->library('PhrasesLib', ['document_export', null], 'documentExportPhrases');
+
+		// Which document converter has to be used
+		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
+		{
+			// Use docsbox!!
+		}
+		else
+		{
+			exec('unoconv --version', $ret_arr);
+
+			if(isset($ret_arr[0]))
+			{
+				$hlp = explode(' ', $ret_arr[0]);
+				if(isset($hlp[1]))
+				{
+					$this->unoconv_version = $hlp[1];
+				}
+				else
+					show_error($this->ci->documentExportPhrases->t("document_export", "error_unoconv_version"));
+			}
+			else
+				show_error($this->ci->documentExportPhrases->t("document_export", "error_unoconv"));
+		}
+	}
+
+	/**
+	 * Laedt die XML Daten fuer die XSL Transformation anhand eines Arrays
+	 *
+	 * @param array					$data Array mit Daten
+	 * @param string	 			$root Bezeichnung des Root Nodes
+	 *
+	 * @return DOMDocument
+	 */
+	public function getDataArray($data, $root)
+	{
+		$xml_data = new DOMDocument();
+		$xml_data->loadXML($this->convertArrayToXML($data, $root));
+		return $xml_data;
+	}
+
+	/**
+	 * XML Daten fuer die XSL Transformation
+	 *
+	 * @param string				$xml
+	 *
+	 * @return DOMDocument
+	 */
+	public function getDataXML($xml)
+	{
+		$xml_data = new DOMDocument();
+		$xml_data->loadXML($xml);
+		return $xml_data;
+	}
+
+	/**
+	 * URL zu XML Datei die fuer XSLTransformation verwendet werden soll
+	 *
+	 * @param string				$xml URL to XML
+	 * @param string				$params GET parameter
+	 *
+	 * @return stdClass
+	 */
+	public function getDataURL($xml, $params)
+	{
+		$xml_found = false;
+
+		$aktive_addons = array_filter(array_map('trim', explode(";", ACTIVE_ADDONS)));
+		foreach($aktive_addons as $addon) {
+			$xmlfile = DOC_ROOT . 'addons/' . $addon . '/rdf/' . $xml;
+			if (file_exists($xmlfile)) {
+				$xml_found = true;
+				$xml_url = XML_ROOT . '../addons/' . $addon . '/rdf/' . $xml . '?' . $params;
+				break;
+			}
+		}
+		if (!$xml_found)
+			$xml_url = XML_ROOT . $xml . '?' . $params;
+
+
+		// Load the XML source
+		$xml_data = new DOMDocument;
+
+		if (!$xml_data->load($xml_url))
+			return error($this->ci->documentExportPhrases->t("document_export", "error_xml_load", [
+				"url" => $xml_url,
+				"xml" => $xml,
+				"params" => $params
+			]));
+
+		return success($xml_data);
+	}
+
+	/**
+	 * Adds a XML Tag for signatur to the document
+	 *
+	 * @param DomDocument			$xml_data
+	 *
+	 * @return void
+	 */
+	protected function addSignToData($xml_data)
+	{
+		$signblock = $xml_data->createElement("signed", "true");
+		$xml_data->documentElement->appendChild($signblock);
+	}
+
+	/**
+	 * Adds a XML Tag for archive to the document
+	 *
+	 * @param DomDocument			$xml_data
+	 *
+	 * @return void
+	 */
+	public function addArchiveToData($xml_data)
+	{
+		$archiv = $xml_data->createElement("archivierbar", "true");
+		$xml_data->documentElement->appendChild($archiv);
+	}
+
+	/**
+	 * Get the contents of a Document
+	 *
+	 * @param stdClass				$vorlage A db entry from tbl_vorlage
+	 * @param DomDocument			$xml_data
+	 * @param string				$oe_kurzbz
+	 * @param integer|null			$version (optional)
+	 * @param string				$outputformat (optional)
+	 * @param string				$sign_user (optional) Must be a valid uid
+	 * @param string				$sign_profile (optional) Signatureprofile for signing
+	 * @param array					$images (optional) Each element should have a property path, name & contenttype which are all strings
+	 *
+	 * @return stdClass
+	 */
+	public function getContent(
+		$vorlage,
+		$xml_data,
+		$oe_kurzbz,
+		$version = null,
+		$outputformat = null,
+		$sign_user = null,
+		$sign_profile = null,
+		$images = []
+	) {
+		$source_folder = getcwd();
+		$temp_folder = sys_get_temp_dir() . '/fhcunoconv-' . uniqid();
+
+		$outputformat = $this->getDefaultOutputFormat($outputformat, $vorlage->mimetype);
+
+		$result = $this->createAndSignContent(
+			$temp_folder,
+			$outputformat,
+			$vorlage,
+			$oe_kurzbz,
+			$version,
+			$xml_data,
+			$images,
+			$sign_user,
+			$sign_profile
+		);
+		if (isError($result)) {
+			$this->close($temp_folder, $source_folder);
+			return $result;
+		}
+		$temp_filename = getData($result);
+
+		$fsize = filesize($temp_filename);
+		$handle = fopen($temp_filename, 'r');
+		if (!$handle)
+			return error($this->ci->documentExportPhrases->t("document_export", "error_file_load"));
+		$result = fread($handle, $fsize);
+		fclose($handle);
+
+		$this->close($temp_folder, $source_folder);
+
+		return success($result);
+	}
+
+	/**
+	 * Sets the headers and displays the Document.
+	 * On failure the exit() function will be called
+	 *
+	 * @param string				$filename
+	 * @param stdClass				$vorlage A db entry from tbl_vorlage
+	 * @param DomDocument			$xml_data
+	 * @param string				$oe_kurzbz
+	 * @param integer|null			$version (optional)
+	 * @param string				$outputformat (optional)
+	 * @param string				$sign_user (optional) Must be a valid uid
+	 * @param string				$sign_profile (optional) Signatureprofile for signing
+	 * @param array					$images (optional) Each element should have a property path, name & contenttype which are all strings
+	 *
+	 * @return void
+	 */
+	public function showContent(
+		$filename,
+		$vorlage,
+		$xml_data,
+		$oe_kurzbz,
+		$version = null,
+		$outputformat = null,
+		$sign_user = null,
+		$sign_profile = null,
+		$images = []
+	) {
+		$source_folder = getcwd();
+		$temp_folder = sys_get_temp_dir() . '/fhcunoconv-' . uniqid();
+
+		$outputformat = $this->getDefaultOutputFormat($outputformat, $vorlage->mimetype);
+
+		$result = $this->createAndSignContent(
+			$temp_folder,
+			$outputformat,
+			$vorlage,
+			$oe_kurzbz,
+			$version,
+			$xml_data,
+			$images,
+			$sign_user,
+			$sign_profile
+		);
+		if (isError($result)) {
+			$this->close($temp_folder, $source_folder);
+			exit(getError($result));
+		}
+		$temp_filename = getData($result);
+
+		$fsize = filesize($temp_filename);
+		$handle = fopen($temp_filename, 'r');
+		if (!$handle) {
+			$this->close($temp_folder, $source_folder);
+			exit($this->ci->documentExportPhrases->t("document_export", "error_file_load"));
+		}
+
+		if (headers_sent()) {
+			$this->close($temp_folder, $source_folder);
+			exit($this->ci->documentExportPhrases->t("document_export", "error_headers"));
+		}
+
+		switch ($outputformat) {
+			case 'pdf':
+				header('Content-type: application/pdf');
+				header('Content-Disposition: attachment; filename="' . $filename . '.pdf"');
+				header('Content-Length: ' . $fsize);
+				break;
+
+			case 'doc':
+				header('Content-type: application/vnd.ms-word');
+				header('Content-Disposition: attachment; filename="' . $filename . '.doc"');
+				header('Content-Length: ' . $fsize);
+				break;
+
+			case 'odt':
+				header('Content-type: application/vnd.oasis.opendocument.text');
+				header('Content-Disposition: attachment; filename="' . $filename . '.odt"');
+				header('Content-Length: ' . $fsize);
+				break;
+			default:
+				$this->close($temp_folder, $source_folder);
+				exit($this->ci->documentExportPhrases->t("document_export", "error_outputformat_missing"));
+		}
+
+		while (!feof($handle)) {
+			echo fread($handle, 8192);
+		}
+		fclose($handle);
+
+		$this->close($temp_folder, $source_folder);
+	}
+
+	/**
+	 * Helper function for getContent and showContent.
+	 * Creates the temp folder and calls create and sign functions.
+	 *
+	 * @param string				$temp_folder
+	 * @param string				$outputformat
+	 * @param stdClass				$vorlage
+	 * @param string				$oe_kurzbz
+	 * @param integer				$version
+	 * @param DomDocument			$xml_data
+	 * @param array					$images Each element should have a property path, name and contenttype which are all strings
+	 * @param string				$sign_user Must be a valid uid
+	 * @param string				$sign_profile Signatureprofile for signing
+	 *
+	 * @return stdClass
+	 */
+	protected function createAndSignContent(
+		$temp_folder,
+		$outputformat,
+		$vorlage,
+		$oe_kurzbz,
+		$version,
+		$xml_data,
+		$images,
+		$sign_user,
+		$sign_profile
+	) {
+		mkdir($temp_folder);
+		chdir($temp_folder);
+
+		$this->ci->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+
+		$result = $this->ci->VorlagestudiengangModel->getCurrent($vorlage->vorlage_kurzbz, $oe_kurzbz, $version);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->ci->documentExportPhrases->t("document_export", "error_template_missing"));
+		$vorlage_stg = current(getData($result));
+		foreach ($vorlage_stg as $k => $v)
+			$vorlage->$k = $v;
+
+		if ($sign_user)
+		{
+			$this->addSignToData($xml_data);
+		}
+
+		$result = $this->create($temp_folder, $outputformat, $vorlage, $xml_data, $images);
+		if (isError($result))
+			return $result;
+
+		$temp_filename = getData($result);
+
+		if ($sign_user)
+		{
+			$result = $this->sign($temp_folder, $temp_filename, $outputformat, $sign_user, $sign_profile);
+			if (isError($result))
+				return $result;
+
+			$temp_filename = getData($result);
+		}
+
+		return success($temp_filename);
+	}
+
+	/**
+	 * Helper function for createAndSignContent.
+	 * Creates the files in the temp folder.
+	 *
+	 * @param string				$temp_folder
+	 * @param string				$outputformat
+	 * @param stdClass				$vorlage
+	 * @param DomDocument			$xml_data
+	 * @param array					$images Each element should have a property path, name and contenttype which are all strings
+	 *
+	 * @return stdClass
+	 */
+	protected function create($temp_folder, $outputformat, $vorlage, $xml_data, $images)
+	{
+		$content_xsl = new DOMDocument();
+		if (!$content_xsl->loadXML($vorlage->text))
+			return error($this->ci->documentExportPhrases->t("document_export", "error_xsl_load"));
+
+		$proc = new XSLTProcessor();
+		$proc->importStyleSheet($content_xsl);
+
+		$contentbuffer = $proc->transformToXml($xml_data);
+
+		file_put_contents($temp_folder . '/content.xml', $contentbuffer);
+
+		if ($xml_data->firstChild->tagName == 'error')
+			return error($xml_data->firstChild->textContent);
+
+		$styles_xsl = null;
+		// styles.xml erstellen
+		if ($vorlage->style) {
+			$styles_xsl = new DOMDocument();
+			if (!$styles_xsl->loadXML($vorlage->style))
+				return error($this->ci->documentExportPhrases->t("document_export", "error_styles_load"));
+			$style_proc = new XSLTProcessor();
+			$style_proc->importStyleSheet($styles_xsl);
+
+			$stylesbuffer = $style_proc->transformToXml($xml_data);
+
+			file_put_contents($temp_folder . '/styles.xml', $stylesbuffer);
+		}
+
+		// Template holen
+		$vorlage_found = false;
+		$vorlage_filename = $vorlage->vorlage_kurzbz . ($vorlage->mimetype == 'application/vnd.oasis.opendocument.spreadsheet' ? '.ods' : '.odt');
+
+		$aktive_addons = array_filter(array_map('trim', explode(";", ACTIVE_ADDONS)));
+		foreach($aktive_addons as $addon) {
+			$zipfile = DOC_ROOT . 'addons/' . $addon . '/system/vorlage_zip/' . $vorlage_filename;
+
+			if (file_exists($zipfile)) {
+				$vorlage_found = true;
+				break;
+			}
+		}
+		if (!$vorlage_found)
+			$zipfile = DOC_ROOT . 'system/vorlage_zip/' . $vorlage_filename;
+
+		$tempname_zip = $temp_folder . '/out.zip';
+
+		if (!copy($zipfile, $tempname_zip))
+			return error($this->ci->documentExportPhrases->t("document_export", "error_file_copy"));
+
+		exec("zip $tempname_zip content.xml");
+		if (!is_null($styles_xsl))
+			exec("zip $tempname_zip styles.xml");
+
+		// bilder hinzufuegen
+		if (count($images) > 0)
+		{
+			// Unterordner fuer die Bilder erstellen
+			mkdir('Pictures');
+
+			// Manifest Datei holen
+			exec('unzip ' . $tempname_zip . ' META-INF/manifest.xml');
+
+			// Bild zur Manifest Datei hinzufuegen
+			$manifest = file_get_contents('META-INF/manifest.xml');
+
+			$manifest_xml = new DOMDocument;
+			if (!$manifest_xml->loadXML($manifest))
+				return error($this->ci->documentExportPhrases->t("document_export", "error_manifest"));
+
+			//root-node holen
+			$root = $manifest_xml->getElementsByTagName('manifest')->item(0);
+
+			foreach ($images as $bild) {
+				copy($bild['path'], 'Pictures/' . $bild['name']);
+
+				//Neues Element unterhalb des Root Nodes anlegen
+				$node = $manifest_xml->createElement("manifest:file-entry");
+				$node->setAttribute("manifest:full-path", 'Pictures/' . $bild['name']);
+				$node->setAttribute("manifest:media-type", $bild['contenttype']);
+				$root->appendChild($node);
+			}
+
+			$out = $manifest_xml->saveXML();
+
+			//geaenderte Manifest Datei speichern und wieder ins Zip packen
+			file_put_contents('META-INF/manifest.xml', $out);
+			exec('zip ' . $tempname_zip . ' META-INF/*');
+
+			// Bilder zum ZIP-File hinzufuegen
+			exec('zip ' . $tempname_zip . ' Pictures/*');
+		}
+
+		clearstatcache();
+
+		switch ($outputformat) {
+			case 'pdf':
+			case 'doc':
+				$ret = 0;
+				$temp_filename = $temp_folder . '/out.' . $outputformat;
+
+				if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true) {
+					// Use docsbox
+
+					$this->ci->load->library("DocsboxLib");
+
+					$docboxlib = get_class($this->ci->docboxlib);
+
+					$ret = $docboxlib::convert($tempname_zip, $temp_filename, $outputformat);
+				} else {
+					// Use unoconv
+
+					// Unoconv Version 0.6 hat eine Bug wodurch die Berechtigungen des PDF/Doc nicht korrekt gesetzt
+					// werden. Deshalb wird dies hier speziell behandelt.
+					// Die 2. Variante hat den Vorteil dass hier eine bessere Fehlerbehandlung moeglich ist
+					if ($this->unoconv_version == '0.6')
+						$command = 'unoconv -e IsSkipEmptyPages=false -f ' . $outputformat . '  %2$s > %1$s';
+					else
+						$command = 'unoconv -e IsSkipEmptyPages=false -f ' . $outputformat . ' --output %s %s 2>&1';
+
+					$command = sprintf($command, $temp_filename, $tempname_zip);
+
+					exec($command, $out, $ret);
+				}
+
+				if ($ret)
+					return error($this->ci->documentExportPhrases->t("document_export", "error_conv_timeout"));
+				break;
+			case 'odt':
+			default:
+				$temp_filename = $tempname_zip;
+		}
+
+		return success($temp_filename);
+	}
+
+	/**
+	 * Helper function for createAndSignContent.
+	 * Signs the main file in the temp folder.
+	 *
+	 * @param string				$temp_folder
+	 * @param string				$temp_filename
+	 * @param string				$outputformat
+	 * @param string				$user Must be a valid uid
+	 * @param string				$profile Signatureprofile for signing
+	 *
+	 * @return stdClass
+	 */
+	protected function sign($temp_folder, $temp_filename, $outputformat, $user, $profile)
+	{
+		if ($outputformat != 'pdf')
+			return error($this->ci->documentExportPhrases->t("document_export", "error_sign_pdf"));
+
+		// Load the File
+		$file_data = file_get_contents($temp_filename);
+
+		$data = new stdClass();
+		$data->document = base64_encode($file_data);
+
+		// Signatur Profil
+		if (!is_null($profile))
+			$data->profile = $profile;
+		else
+			$data->profile = SIGNATUR_DEFAULT_PROFILE;
+
+		// Username des Endusers der die Signatur angefordert hat
+		$data->user = $user;
+
+		$ch = curl_init();
+
+		curl_setopt($ch, CURLOPT_URL, SIGNATUR_URL . '/' . SIGNATUR_SIGN_API);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 7);
+		curl_setopt($ch, CURLOPT_USERAGENT, "FH-Complete");
+
+		// SSL Zertifikatsprüfung deaktivieren
+		// Besser ist es das Zertifikat am Server zu installieren!
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+
+		$data_string = json_encode($data, JSON_FORCE_OBJECT);
+
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, [
+			'Content-Type: application/json',
+			'Content-Length:' . mb_strlen($data_string),
+			'Authorization: Basic ' . base64_encode(SIGNATUR_USER . ":" . SIGNATUR_PASSWORD)
+		]);
+
+		$result = curl_exec($ch);
+		if (curl_errno($ch)) {
+			curl_close($ch);
+			return error($this->ci->documentExportPhrases->t("document_export", "error_sign_timeout"));
+		}
+		curl_close($ch);
+		$resultdata = json_decode($result);
+
+		// If it is success
+		if (isset($resultdata->error) && $resultdata->error == 0) {
+			$signed_filename = $temp_folder . '/signed.pdf';
+			file_put_contents($signed_filename, base64_decode($resultdata->retval));
+			return success($signed_filename);
+		}
+
+		// otherwise if it is an error
+		return error($resultdata->retval ?? $this->ci->documentExportPhrases->t("global", "unknown_error", ["error" => $result]));
+	}
+
+	/**
+	 * Deletes all files in the $temp_folder and changes back to the source_folder
+	 *
+	 * @param string				$temp_folder
+	 * @param string				$source_folder
+	 *
+	 * @return void
+	 */
+	protected function close($temp_folder, $source_folder)
+	{
+		$files = glob($temp_folder . '/*'); // get all file names
+		foreach ($files as $file)
+			if (is_file($file))
+				unlink($file);
+
+		chdir($source_folder);
+		rmdir($temp_folder);
+	}
+
+	/**
+	 * Convert an array to XML
+	 *
+	 * @param array					$data
+	 * @param string				$root
+	 * @param SimpleXMLElement		$xml_data
+	 *
+	 * @return string|boolean
+	 */
+	private function convertArrayToXML($data, $root = null, $xml_data = null)
+	{
+		$_xml_data = $xml_data;
+		if ($_xml_data === null)
+			$_xml_data = new SimpleXMLElement($root !== null ? '<' . $root . ' />' : '<root/>');
+
+		foreach ($data as $key => $value) {
+			if (is_array($value)) {
+				if (is_numeric($key)) {
+					$key = 'item' . $key; // dealing with <0/>..<n/> issues
+					$this->convertArrayToXML($value, null, $_xml_data);
+				} else {
+					$subnode = $_xml_data->addChild($key);
+					$this->convertArrayToXML($value, null, $subnode);
+				}
+			} else {
+				// Remove UTF8 Control Characters (breaking XML)
+				$value = preg_replace('/[\x00-\x1F\x7F]/u', '', $value);
+				$_xml_data->addChild((string)$key, htmlspecialchars("$value"));
+			}
+		}
+
+		return $_xml_data->asXML();
+	}
+
+	/**
+	 * Get default outputformat from mimetype if its not set
+	 *
+	 * @param string				$outputformat
+	 * @param string				$mimetype
+	 *
+	 * @return string
+	 */
+	private function getDefaultOutputFormat($outputformat, $mimetype)
+	{
+		if ($outputformat)
+			return $outputformat;
+
+		if ($mimetype == 'application/vnd.oasis.opendocument.spreadsheet')
+			return 'ods';
+		if ($mimetype == 'application/vnd.oasis.opendocument.text')
+			return 'odt';
+
+		return 'pdf';
+	}
+}

application/libraries/FilterCmptLib.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2022 fhcomplete.org
  *
@@ -36,6 +37,7 @@ class FilterCmptLib
 	const SESSION_METADATA = 'datasetMetadata';
 	const SESSION_ROW_NUMBER = 'rowNumber';
 	const SESSION_TIMEOUT = 'sessionTimeout';
+	const SESSION_ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// Session dataset elements
 	const SESSION_DATASET = 'dataset';
@@ -62,6 +64,7 @@ class FilterCmptLib
 
 	// ...to specify permissions that are needed to use this FilterCmpt
 	const REQUIRED_PERMISSIONS = 'requiredPermissions';
+	const ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// ...stament to retrieve the dataset
 	const QUERY = 'query';
@@ -102,6 +105,7 @@ class FilterCmptLib
 	private $_filterKurzbz;
 	private $_query;
 	private $_requiredPermissions;
+	private $_encryptedColumns;
 	private $_reloadDataset;
 	private $_sessionTimeout;
 
@@ -367,21 +371,21 @@ class FilterCmptLib
 			foreach ($filterFields as $filterField)
 			{
 				// If not an empty array
-				if ($filterField != null)
+				if (!isEmptyArray($filterField))
 				{
 					//
-					if (isset($filterField->name) && isset($filterField->operation) && isset($filterField->condition)
-						&& !isEmptyString($filterField->name) && !isEmptyString($filterField->operation)
-						&& !isEmptyString($filterField->condition))
+					if (isset($filterField['name']) && isset($filterField['operation']) && isset($filterField['condition'])
+						&& !isEmptyString($filterField['name']) && !isEmptyString($filterField['operation'])
+						&& !isEmptyString((string)$filterField['condition']))
 					{
 						// Fine
 						$filter = new stdClass();
-						$filter->name = $filterField->name;
-						$filter->operation = $filterField->operation;
-						$filter->condition = $filterField->condition;
-						if (isset($filterField->option) && !isEmptyString($filterField->option))
+						$filter->name = $filterField['name'];
+						$filter->operation = $filterField['operation'];
+						$filter->condition = $filterField['condition'];
+						if (isset($filterField['option']) && !isEmptyString($filterField['option']))
 						{
-							$filter->option = $filterField->option;
+							$filter->option = $filterField['option'];
 						}
 						else
 						{
@@ -504,10 +508,12 @@ class FilterCmptLib
 			$saveCustomFilter = true;
 		}
 
-		if ($saveCustomFilter === true) 
+		if ($saveCustomFilter === true)
 		{
-			$this->_setSessionElement(FilterCmptLib::SESSION_SIDE_MENU, 
-				$this->_generateFilterMenu($this->_app, $this->_datasetName));	
+			$this->_setSessionElement(
+				FilterCmptLib::SESSION_SIDE_MENU,
+				$this->_generateFilterMenu($this->_app, $this->_datasetName)
+			);
 		}
 		
 		return $saveCustomFilter;
@@ -559,6 +565,7 @@ class FilterCmptLib
 			getAuthPersonId()
 		);
 
+
 		// If filters were loaded
 		if (hasData($filters))
 		{
@@ -717,6 +724,7 @@ class FilterCmptLib
 		$this->_filterKurzbz = null;
 		$this->_query = null;
 		$this->_requiredPermissions = null;
+		$this->_encryptedColumns = null;
 
 		$this->_reloadDataset = true; // by default the dataset is NOT cached in session
 		$this->_sessionTimeout = FilterCmptLib::SESSION_DEFAULT_TIMEOUT;
@@ -727,6 +735,12 @@ class FilterCmptLib
 			$this->_requiredPermissions = $filterCmptArray[FilterCmptLib::REQUIRED_PERMISSIONS];
 		}
 
+		// Retrieved the encrypted columns parameter if present
+		if (isset($filterCmptArray[FilterCmptLib::ENCRYPTED_COLUMNS]))
+		{
+			$this->_encryptedColumns = $filterCmptArray[FilterCmptLib::ENCRYPTED_COLUMNS];
+		}
+
 		// Parameters needed to retrieve univocally a filter from DB
 		if (isset($filterCmptArray[FilterCmptLib::APP]))
 		{
@@ -1129,7 +1143,7 @@ class FilterCmptLib
 			$this->_ci->load->model('system/Filters_model', 'FiltersModel');
 
 			// Execute the given SQL statement suppressing error messages
-			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery);
+			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery, null, $this->_encryptedColumns);
 		}
 
 		return $dataset;
@@ -1160,4 +1174,3 @@ class FilterCmptLib
 		return $filterName;
 	}
 }
-

application/libraries/FilterWidgetLib.php

@@ -1,7 +1,26 @@
 <?php
 
+/**
+ * Copyright (C) 2023 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \stdClass as stdClass;
+
 /**
  * FilterWidget logic
  */
@@ -16,6 +35,7 @@ class FilterWidgetLib
 	const SESSION_SELECTED_FIELDS = 'selectedFields';
 	const SESSION_COLUMNS_ALIASES = 'columnsAliases';
 	const SESSION_ADDITIONAL_COLUMNS = 'additionalColumns';
+	const SESSION_ENCRYPTED_COLUMNS = 'encryptedColumns';
 	const SESSION_CHECKBOXES = 'checkboxes';
 	const SESSION_FILTERS = 'filters';
 	const SESSION_METADATA = 'datasetMetadata';
@@ -56,6 +76,7 @@ class FilterWidgetLib
 	const ADDITIONAL_COLUMNS = 'additionalColumns';
 	const CHECKBOXES = 'checkboxes';
 	const COLUMNS_ALIASES = 'columnsAliases';
+	const ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// ...to format/mark records of a dataset
 	const FORMAT_ROW = 'formatRow';
@@ -120,7 +141,7 @@ class FilterWidgetLib
 	/**
 	 * Gets the CI instance and loads message helper
 	 */
-	public function __construct($params = null)
+	public function __construct()
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 	}
@@ -367,7 +388,7 @@ class FilterWidgetLib
 	/**
 	 * Retrieves the dataset from the DB
 	 */
-	public function getDataset($datasetQuery)
+	public function getDataset($datasetQuery, $encryptedColumns)
 	{
 		$dataset = null;
 
@@ -376,7 +397,7 @@ class FilterWidgetLib
 			$this->_ci->load->model('system/Filters_model', 'FiltersModel');
 
 			// Execute the given SQL statement suppressing error messages
-			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery);
+			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery, null, $encryptedColumns);
 		}
 
 		return $dataset;
@@ -390,7 +411,7 @@ class FilterWidgetLib
 	public function getFilterName($filterJson)
 	{
 		$filterName = $filterJson->name; // always present, used as default
-		$trimedname = (isset($filterJson->namePhrase)?trim($filterJson->namePhrase):'');
+
 		// Filter name from phrases system
 		if (isset($filterJson->namePhrase) && !isEmptyString($filterJson->namePhrase))
 		{
@@ -451,7 +472,8 @@ class FilterWidgetLib
 			if (in_array($selectedField, $fields))
 			{
 				// If the selected field is present in the list of the selected fields by the current filter
-				if (($pos = array_search($selectedField, $selectedFields)) !== false)
+				$pos = array_search($selectedField, $selectedFields);
+				if ($pos !== false)
 				{
 					// Then remove it and shift the rest of elements by one if needed
 					array_splice($selectedFields, $pos, 1);
@@ -750,7 +772,6 @@ class FilterWidgetLib
 		$this->_ci->load->library('NavigationLib', array(self::NAVIGATION_PAGE => $navigationPage));
 
 		$filterMenu = null;
-		$currentMenu = $this->_ci->navigationlib->getSessionMenu(); // The navigation menu currently stored in session
 
 		$session = $this->getSession(); // The filter currently stored in session (the one that is currently used)
 		if ($session != null)

application/libraries/IssuesLib.php

@@ -246,7 +246,27 @@ class IssuesLib
 				$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
 			}
 
-			$openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount($fehlercode, $person_id, $oe_kurzbz, $fehlercode_extern);
+			if (isset($resolution_params))
+			{
+				if (is_array($resolution_params))
+				{
+					foreach ($resolution_params as $resolution_key => $resolution_param)
+					{
+						if (!is_string($resolution_key))
+							return error("Invalid parameter for resolution, must be an associative array");
+					}
+				}
+				else
+					return error("Invalid parameters for resolution");
+			}
+
+			$openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount(
+				$fehlercode,
+				$person_id,
+				$oe_kurzbz,
+				$fehlercode_extern,
+				$resolution_params
+			);
 
 			if (hasData($openIssuesCountRes))
 			{
@@ -256,20 +276,6 @@ class IssuesLib
 
 				if ($openIssueCount == 0)
 				{
-					if (isset($resolution_params))
-					{
-						if (is_array($resolution_params))
-						{
-							foreach ($resolution_params as $resolution_key => $resolution_param)
-							{
-								if (!is_string($resolution_key))
-									return error("Invalid parameter for resolution, must be an associative array");
-							}
-						}
-						else
-							return error("Invalid parameters for resolution");
-					}
-
 					// insert new issue
 					return $this->_ci->IssueModel->insert(
 						array(

application/libraries/MailLib.php

@@ -182,6 +182,7 @@ class MailLib
 	{
 		if ($this->sended == $this->email_number_per_time_range)
 		{
+			$this->sended = 0;
 			sleep($this->email_time_range); // Wait!!!
 		}
 	}

application/libraries/PermissionLib.php

@@ -21,6 +21,8 @@ require_once(FHCPATH.'include/functions.inc.php');
 require_once(FHCPATH.'include/wawi_kostenstelle.class.php');
 require_once(FHCPATH.'include/benutzerberechtigung.class.php');
 
+use \benutzerberechtigung as benutzerberechtigung;
+
 class PermissionLib
 {
 	// Available rights in the DB
@@ -65,8 +67,10 @@ class PermissionLib
 		if (!is_cli())
 		{
 			// API Caller rights initialization
+			$authObj = $this->_ci->authlib->getAuthObj();
 			self::$bb = new benutzerberechtigung();
-			self::$bb->getBerechtigungen(($this->_ci->authlib->getAuthObj())->{AuthLib::AO_USERNAME});
+			if ($authObj)
+				self::$bb->getBerechtigungen($authObj->{AuthLib::AO_USERNAME});
 		}
 	}
 
@@ -91,6 +95,33 @@ class PermissionLib
 		return $isBerechtigt;
 	}
 
+	/**
+	 * Prueft ob die Berechtigung zumindest fuer eine der angegebenen OE vorhanden ist.
+	 * @param $berechtigung_kurzbz
+	 * @param $oe_kurzbz
+	 * @param $art
+	 * @param $kostenstelle_id
+	 * @return boolean
+	 */
+	public function isBerechtigtMultipleOe($berechtigung_kurzbz, $oe_kurzbz, $art=null, $kostenstelle_id=null)
+	{
+		$results = array();
+
+		foreach($oe_kurzbz as $value)
+		{
+			$results[] = $this->isBerechtigt($berechtigung_kurzbz, $art, $value, $kostenstelle_id);
+		}
+
+		if(!in_array(true, $results))
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
 	/**
 	 * Checks if the caller is allowed to access to this content with the given permissions
 	 * - if it's called from command line than it's trusted
@@ -143,19 +174,7 @@ class PermissionLib
 							if (strpos($permissions[$pCounter], PermissionLib::PERMISSION_SEPARATOR) !== false)
 							{
 								// Retrieves permission and required access type from the $requiredPermissions array
-								list($permission, $requiredAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permissions[$pCounter]);
-
-								$accessType = '';
-
-								// Set the access type
-								if (strpos($requiredAccessType, PermissionLib::READ_RIGHT) !== false)
-								{
-									$accessType = PermissionLib::SELECT_RIGHT; // S
-								}
-								if (strpos($requiredAccessType, PermissionLib::WRITE_RIGHT) !== false)
-								{
-									$accessType .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
-								}
+								list($permission, $accessType) = $this->convertAccessType($permissions[$pCounter]);
 
 								if (!isEmptyString($accessType)) // if compliant
 								{
@@ -166,6 +185,16 @@ class PermissionLib
 									if ($checkPermissions === true) break;
 								}
 							}
+							elseif ($permissions[$pCounter] == Auth_Controller::PERM_ANONYMOUS)
+							{
+								$checkPermissions = true;
+								break;
+							}
+							elseif ($permissions[$pCounter] == Auth_Controller::PERM_LOGGED)
+							{
+								$checkPermissions = isLogged();
+								break;
+							}
 							else
 							{
 								show_error('The given permission does not use the correct format');
@@ -195,6 +224,24 @@ class PermissionLib
 		return $checkPermissions;
 	}
 
+	/**
+	 * Retrieves permission and required access type from the newly formatted permission string
+	 *
+	 * @param string $permission
+	 *
+	 * @return array
+	 */
+	public function convertAccessType($permission)
+	{
+		list($permission, $reqAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permission);
+		$accessType = '';
+		if (strpos($reqAccessType, PermissionLib::READ_RIGHT) !== false)
+			$accessType = PermissionLib::SELECT_RIGHT;
+		if (strpos($reqAccessType, PermissionLib::WRITE_RIGHT) !== false)
+			$accessType = PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT;
+		return [$permission, $accessType];
+	}
+
 	/**
 	 * Checks if at least one of the permissions given as parameter (requiredPermissions) belongs to the authenticated user
 	 * It checks the given permissions against a given method (controller method name) and a given permission type (R and/or W)

application/libraries/PersonLogLib.php

@@ -7,9 +7,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class PersonLogLib
 {
-	const PARKED_LOGNAME = 'Parked';
-	const ONHOLD_LOGNAME = 'Onhold';
-
 	/**
 	 * Constructor
 	 */
@@ -78,168 +75,6 @@ class PersonLogLib
 		else
 			show_error(getError($result));
 	}
-
-	/**
-	 * Parks a person, i.e. marks a person so no actions are expected for the person (e.g. as a prestudent)
-	 * Done by adding a logentry in the future
-	 * @param $person_id
-	 * @param $date
-	 * @param $taetigkeit_kurzbz
-	 * @param string $app
-	 * @param null $oe_kurzbz
-	 * @param null $user
-	 * @return insert object
-	 */
-	public function park($person_id, $date, $taetigkeit_kurzbz, $app = 'core', $oe_kurzbz = null, $user = null)
-	{
-		$onhold = $this->getOnHoldDate($person_id);
-
-		if (hasData($onhold))
-			return error("Person already on hold");
-
-		$logjson = array(
-			'name' => self::PARKED_LOGNAME
-		);
-
-		return $this->_savePsLog($person_id, $date, $taetigkeit_kurzbz, $logjson, $app, $oe_kurzbz, $user);
-	}
-
-	/**
-	 * Unparks a person, i.e. removes all log entries in the future with logname for parking
-	 * @param $person_id
-	 * @return array with deleted logids
-	 */
-	public function unPark($person_id)
-	{
-		$deleted = array();
-
-		$result = $this->ci->PersonLogModel->getLogsInFuture($person_id);
-		if (hasData($result))
-		{
-			foreach ($result->retval as $log)
-			{
-				$logdata = json_decode($log->logdata);
-				if (isset($logdata->name) && $logdata->name === self::PARKED_LOGNAME)
-				{
-					$delresult = $this->ci->PersonLogModel->deleteLog($log->log_id);
-					if (isSuccess($delresult))
-					{
-						$deleted[] = $log->log_id;
-					}
-				}
-			}
-		}
-
-		return success($deleted);
-	}
-
-	/**
-	 * Gets date until which a person is parked
-	 * @param $person_id
-	 * @return the date if person is parked, null otherwise
-	 */
-	public function getParkedDate($person_id)
-	{
-		$result = $this->ci->PersonLogModel->getLogsInFuture($person_id);
-
-		$parkeddate = null;
-
-		if (hasData($result))
-		{
-			foreach ($result->retval as $log)
-			{
-				$logdata = json_decode($log->logdata);
-				if (isset($logdata->name) && $logdata->name === self::PARKED_LOGNAME)
-				{
-					$parkeddate = $log->zeitpunkt;
-					break;
-				}
-			}
-		}
-
-		return $parkeddate;
-	}
-
-	/**
-	 * Sets person on hold, i.e. marks a person so no actions are expected for the person (e.g. as a prestudent).
-	 * Done by adding a logentry with a special name. can be undone only manually by clicking button.
-	 * @param $person_id
-	 * @param $date
-	 * @param $taetigkeit_kurzbz
-	 * @param string $app
-	 * @param null $oe_kurzbz
-	 * @param null $user
-	 * @return array
-	 */
-	public function setOnHold($person_id, $date, $taetigkeit_kurzbz, $app = 'core', $oe_kurzbz = null, $user = null)
-	{
-		$parked = $this->getParkedDate($person_id);
-
-		if (hasData($parked))
-			return error("Person already parked");
-
-		$logjson = array(
-			'name' => self::ONHOLD_LOGNAME
-		);
-
-		return $this->_savePsLog($person_id, $date, $taetigkeit_kurzbz, $logjson, $app, $oe_kurzbz, $user);
-	}
-
-	/**
-	 * Removes on hold status, i.e. removes all log entries with logname for on hold
-	 * @param $person_id
-	 * @return array
-	 */
-	public function removeOnHold($person_id)
-	{
-		$deleted = array();
-
-		$result = $this->ci->PersonLogModel->filterLog($person_id);
-		if (hasData($result))
-		{
-			foreach ($result->retval as $log)
-			{
-				$logdata = json_decode($log->logdata);
-				if (isset($logdata->name) && $logdata->name === self::ONHOLD_LOGNAME)
-				{
-					$delresult = $this->ci->PersonLogModel->deleteLog($log->log_id);
-					if (isSuccess($delresult))
-					{
-						$deleted[] = $log->log_id;
-					}
-				}
-			}
-		}
-		return success($deleted);
-	}
-
-	/**
-	 * Gets date until which a person is on hold
-	 * @param $person_id
-	 * @return the date if person is on hold, null otherwise
-	 */
-	public function getOnHoldDate($person_id)
-	{
-		$result = $this->ci->PersonLogModel->filterLog($person_id);
-
-		$onholddate = null;
-
-		if (hasData($result))
-		{
-			foreach ($result->retval as $log)
-			{
-				$logdata = json_decode($log->logdata);
-				if (isset($logdata->name) && $logdata->name === self::ONHOLD_LOGNAME)
-				{
-					$onholddate = $log->zeitpunkt;
-					break;
-				}
-			}
-		}
-
-		return $onholddate;
-	}
-
 	/**
 	 * Saves a processstate log with specified parameters, including a specified log date.
 	 * @param $person_id

application/libraries/PhrasesLib.php

@@ -122,6 +122,7 @@ class PhrasesLib
 								$tmpText = substr($tmpText, 0, strlen($tmpText) - 4);
 							}
 						}
+						$tmpText = str_replace(['<span class="caps">', '</span>'], '', $tmpText);
 
 						$result->retval[$i]->text = $tmpText;
 					}
@@ -200,6 +201,17 @@ class PhrasesLib
 		return '<< PHRASE '.$phrase.' >>';
 	}
 
+	/**
+	 * Workaround to reload the phrases array on an already constructed library.
+	 * @parameters -> look for _setPhrases docs
+	 */
+	public function setPhrases($categories, $language)
+	{
+		if (count($categories) > 0) $this->_setPhrases($categories, $language);
+
+		return $this->_phrases;
+	}
+
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -319,6 +331,7 @@ class PhrasesLib
 		{
 			$this->_phrases = $phrases->retval;
 		}
+
 	}
 
 	/**
@@ -329,4 +342,4 @@ class PhrasesLib
 	{
 		return json_encode($this->_phrases);
 	}
-}
+}

application/libraries/PrestudentLib.php

@@ -0,0 +1,929 @@
+<?php
+
+/**
+ * FH-Complete
+ *
+ * @package             FHC-Helper
+ * @author              FHC-Team
+ * @copyright           Copyright (c) 2023 fhcomplete.net
+ * @license             GPLv3
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class PrestudentLib
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		// // Configs
+		// $this->_ci->load->config('studierendenantrag');
+
+		// // Models
+		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->_ci->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+
+	public function setAbbrecher(
+		$prestudent_id,
+		$studiensemester_kurzbz,
+		$insertvon = null,
+		$statusgrund_id = null,
+		$datum = null,
+		$bestaetigtam = null,
+		$bestaetigtvon = null
+	) {
+		if (!$insertvon)
+			$insertvon = getAuthUID();
+		if (!$bestaetigtvon)
+			$bestaetigtvon = $insertvon;
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+				'prestudent_id' => $prestudent_id,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			]));
+
+		$prestudent_status = current($result);
+
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current($result);
+
+		if(!$datum)
+			$datum = date('c');
+
+		if(!$bestaetigtam)
+			$bestaetigtam = date('c');
+
+		// Status und Statusgrund updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER,
+			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
+			'ausbildungssemester' => $prestudent_status->ausbildungssemester,
+			'datum' => $datum,
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $bestaetigtvon,
+			'bestaetigtam' => $bestaetigtam,
+			'statusgrund_id' => $statusgrund_id
+		]);
+
+		if (isError($result))
+			return $result;
+
+		//Verband anlegen
+		$result = $this->_ci->LehrverbandModel->load([
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'A',
+			'gruppe' => ''
+		]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+			$result = $this->_ci->LehrverbandModel->load([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => '',
+				'gruppe' => ''
+			]);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			if(!$result)
+			{
+				$this->_ci->LehrverbandModel->insert([
+					'studiengang_kz' => $student->studiengang_kz,
+					'semester' => 0,
+					'verband' => '',
+					'gruppe' => '',
+					'bezeichnung' => 'Ab-Unterbrecher',
+					'aktiv' => true,
+				]);
+			}
+
+			$this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'A',
+				'gruppe' => '',
+				'bezeichnung' => 'Abbrecher',
+				'aktiv' => true
+			]);
+		}
+
+		// noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result) ?: [];
+
+		foreach ($result as $lv)
+		{
+			if (!$lv->note)
+			{
+				$result = $this->_ci->ZeugnisnoteModel->insert([
+					'note' => 9,
+					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+					'student_uid' => $lv->uid,
+					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+				]);
+				if (isError($result)) {
+					$result = $this->_ci->ZeugnisnoteModel->update([
+						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+						'student_uid' => $lv->uid,
+						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+					], [
+						'note' => 9
+					]);
+
+					if (isError($result))
+						return $result;
+				}
+			}
+		}
+
+
+		// Update Aktionen
+
+		// StudentModel updaten
+		$this->_ci->StudentModel->update([
+			'student_uid' => $student->student_uid
+		], [
+			'verband' => 'A',
+			'gruppe' => '',
+			'semester' => 0,
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
+		//Studentlehrverband setzen
+		$this->_ci->StudentlehrverbandModel->update([
+			'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz,
+			'student_uid' => $student->student_uid
+		], [
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'A',
+			'gruppe' => '',
+			'updateamum' => date('c'),
+			'updatevon' => $insertvon
+		]);
+
+		// Benutzer inaktiv setzen
+		$this->_ci->BenutzerModel->update([
+			'uid' =>  $student->student_uid
+		], [
+			'aktiv' => false,
+			'updateaktivvon' => $insertvon,
+			'updateaktivam' => date('c'),
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
+		return success();
+	}
+
+	public function setUnterbrecher(
+		$prestudent_id,
+		$studiensemester_kurzbz,
+		$studierendenantrag_id = null,
+		$insertvon = null,
+		$ausbildungssemester = null,
+		$statusgrund_id = null
+	) {
+		$ausbildungssemester_plus = 0;
+		
+		if (!$insertvon)
+			$insertvon = getAuthUID();
+
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		
+		if (isError($result))
+			return $result;
+		
+		$result = getData($result);
+		
+		if (!$result) { // NOTE(chris): no status in target stdsem
+			//NOTE(manu): only valid if nextSemester focus max
+
+			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			// check if ausbildungssemester is last
+			$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+			$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
+			if(isError($res))
+				return $res;
+			if(!hasData($res))
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
+					'prestudent_id' => $prestudent_id
+				]));
+
+			$studiengang = current(getData($res));
+			$prestudent_status = current($result);
+			if ($prestudent_status->status_kurzbz != Prestudentstatus_model::STATUS_UNTERBRECHER && $prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+				$ausbildungssemester_plus = 1;
+
+			if(!$result)
+			{
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+					'prestudent_id' => $prestudent_id,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				]));
+			}
+		} elseif (current($result)->status_kurzbz == Prestudentstatus_model::STATUS_UNTERBRECHER) {
+			if ($studierendenantrag_id)
+			{
+				$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+				if (isError($resultAntrag))
+					return $resultAntrag;
+				$resultAntrag = getData($resultAntrag);
+				if (!$resultAntrag)
+					return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
+
+				$antrag = current($resultAntrag);
+				$anmerkung = current($result)->anmerkung . ' Wiedereinstieg ' . $antrag->datum_wiedereinstieg;
+
+				$result = $this->_ci->PrestudentstatusModel->update([
+					'prestudent_id' => $prestudent_id,
+					'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz,
+					'ausbildungssemester' => current($result)->ausbildungssemester
+				], [
+					'updatevon' => $insertvon,
+					'updateamum' => date('c'),
+					'anmerkung'=> $anmerkung
+				]);
+
+				if (isError($result))
+					return $result;
+			}
+
+			return success();
+		}
+
+		$prestudent_status = current($result);
+
+
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+
+		$result = getData($result);
+		
+		if (!$result)
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current($result);
+
+
+		if ($studierendenantrag_id)
+		{
+			$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+			if (isError($resultAntrag))
+				return $resultAntrag;
+			$resultAntrag = getData($resultAntrag);
+			if (!$resultAntrag)
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
+
+			$antrag = current($resultAntrag);
+			$anmerkung = 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg;
+		}
+		else
+			$anmerkung = '';
+
+		if ($ausbildungssemester)
+			$semester = $ausbildungssemester;
+		else
+			$semester = $prestudent_status->ausbildungssemester + $ausbildungssemester_plus;
+
+		// Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $semester,
+			'datum' => date('c'),
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $insertvon,
+			'bestaetigtam' => date('c'),
+			'anmerkung'=> $anmerkung,
+			'statusgrund_id' => $statusgrund_id
+		]);
+
+		if (isError($result))
+			return $result;
+
+		//Verband anlegen
+		$result = $this->_ci->LehrverbandModel->load([
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'B',
+			'gruppe' => ''
+		]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+			$result = $this->_ci->LehrverbandModel->load([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => '',
+				'gruppe' => ''
+			]);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			if(!$result)
+			{
+				$this->_ci->LehrverbandModel->insert([
+					'studiengang_kz' => $student->studiengang_kz,
+					'semester' => 0,
+					'verband' => '',
+					'gruppe' => '',
+					'bezeichnung' => 'Ab-Unterbrecher',
+					'aktiv' => true,
+				]);
+			}
+
+			$this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'bezeichnung' => 'Unterbrecher',
+				'aktiv' => true
+			]);
+		}
+
+		// noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result) ?: [];
+
+		foreach ($result as $lv)
+		{
+			if (!$lv->note)
+			{
+				$result = $this->_ci->ZeugnisnoteModel->insert([
+					'note' => 9,
+					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+					'student_uid' => $lv->uid,
+					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+				]);
+				if (isError($result)) {
+					$result = $this->_ci->ZeugnisnoteModel->update([
+						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+						'student_uid' => $lv->uid,
+						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+					], [
+						'note' => 9
+					]);
+
+					if (isError($result))
+						return $result;
+				}
+			}
+		}
+
+		// Update Aktionen
+
+		// StudentModel updaten
+		$this->_ci->StudentModel->update([
+			'student_uid' => $student->student_uid
+		], [
+			'verband' => 'B',
+			'gruppe' => '',
+			'semester' => 0,
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
+		//Studentlehrverband setzen
+		$result = $this->_ci->StudentlehrverbandModel->loadWhere([
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'student_uid' => $student->student_uid
+		]);
+		if (hasData($result)) {
+			$this->_ci->StudentlehrverbandModel->update([
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'student_uid' => $student->student_uid
+			], [
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'updateamum' => date('c'),
+				'updatevon' => $insertvon
+			]);
+		} else {
+			$this->_ci->StudentlehrverbandModel->insert([
+				'student_uid' => $student->student_uid,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'insertamum' => date('c'),
+				'insertvon' => $insertvon
+			]);
+		}
+
+		return success();
+	}
+
+	public function setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+	{
+		$authUID = getAuthUID();
+		$now = date('c');
+
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+				'prestudent_id' => $prestudent_id
+			]));
+
+		$prestudent_status = current(getData($result));
+
+
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current(getData($result));
+
+		// Update Aktionen
+
+		// Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'statusgrund_id' => $statusgrund_id,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => $now,
+			'insertvon' => $authUID,
+			'insertamum' => $now,
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $authUID,
+			'bestaetigtam' => $now
+		]);
+
+		if (isError($result))
+			return $result;
+
+
+		// Student updaten
+		$result = $this->_ci->StudentModel->update([
+			'student_uid' => $student->student_uid
+		], [
+			'semester' => $ausbildungssemester,
+			'verband' => '',
+			'gruppe' => '',
+			'updatevon' => $authUID,
+			'updateamum' => $now
+		]);
+
+		if (isError($result))
+			return $result;
+
+
+		// Studentlehrverband updaten
+		$result = $this->_ci->StudentlehrverbandModel->update([
+			'student_uid' => $student->student_uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+			], [
+			'semester' => $ausbildungssemester,
+			'verband' => '',
+			'gruppe' => '',
+			'updatevon' => $authUID,
+			'updateamum' => $now
+		]);
+
+		if (isError($result))
+			return $result;
+
+
+		// Benutzer updaten
+		$result = $this->_ci->BenutzerModel->load([$student->student_uid]);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('person', 'error_noBenutzer'));
+
+		$benutzer = current(getData($result));
+		$updateData = [
+			'aktiv' => true,
+			'updateamum' => $now,
+			'updatevon' => $authUID
+		];
+		if (!$benutzer->aktiv) {
+			$updateData['updateaktivam'] = $now;
+			$updateData['updateaktivvon'] = $authUID;
+		}
+
+
+		$this->_ci->BenutzerModel->update([$student->student_uid], $updateData);
+
+		return success();
+	}
+
+	public function setFirstStudent(
+		$prestudent_id,
+		$studiensemester_kurzbz,
+		$ausbildungssemester,
+		$orgform_kurzbz,
+		$studienplan_id,
+		$statusgrund_id
+	) {
+		$this->_ci->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->_ci->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+		$result = $this->_ci->PrestudentModel->load($prestudent_id);
+
+		if (isError($result))
+			return $result;
+
+		if (!hasData($result))
+			return error('No prestudent');
+
+		$student_data = current(getData($result));
+
+
+		$authUID = getAuthUID();
+		$now = date('c');
+		$today = date('Y-m-d');
+
+		$jahr = mb_substr($studiensemester_kurzbz, 4, 2);
+
+
+		// Genererate Personenkennzeichen
+		$personenkennzeichen = $this->_ci->StudentModel->generateMatrikelnummer2(
+			$student_data->studiengang_kz,
+			$studiensemester_kurzbz,
+			$student_data->typ
+		);
+		if (isError($personenkennzeichen))
+			return $personenkennzeichen;
+		$personenkennzeichen = getData($personenkennzeichen);
+		
+		
+		// Generate UID
+		$uid = $this->_ci->StudentModel->generateUID(
+			$student_data->kurzbz,
+			$jahr,
+			$student_data->typ,
+			$personenkennzeichen,
+			$student_data->vorname,
+			$student_data->nachname
+		);
+		if (isError($uid))
+			return $uid;
+		$uid = getData($uid);
+
+
+		// Generate Matrikelnummer
+		$matrikelnummer = $this->_ci->BenutzerModel->generateMatrikelnummer(
+			$student_data->oe_kurzbz
+		);
+		if (isError($matrikelnummer))
+			return $matrikelnummer;
+		$matrikelnummer = getData($matrikelnummer);
+
+
+		// Generate Alias
+		$alias = '';
+		if (!defined('GENERATE_ALIAS_STUDENT')
+			|| GENERATE_ALIAS_STUDENT === true
+		) {
+			$result = $this->_ci->BenutzerModel->generateAliasFromName($student_data->vorname, $student_data->nachname);
+			if (isError($result))
+				return $result;
+			$alias = getData($result);
+		}
+
+		// Generate Activation Key
+		$activationkey = $this->_ci->BenutzerModel->generateActivationkey();
+
+
+		// Overwrite stuff
+		if (defined('SET_UID_AS_MATRIKELNUMMER')
+			&& SET_UID_AS_MATRIKELNUMMER)
+			$matrikelnummer = $uid;
+		if (defined('SET_UID_AS_PERSONENKENNZEICHEN')
+			&& SET_UID_AS_PERSONENKENNZEICHEN)
+			$personenkennzeichen = $uid;
+
+
+		// Update Person
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+		$result = $this->_ci->PersonModel->update([
+			'person_id' => $student_data->person_id,
+			'matr_nr' => null
+		], [
+			'matr_nr' => $matrikelnummer
+		]);
+
+		if (isError($result))
+			return $result;
+
+
+		// Add Benutzer
+		$result = $this->_ci->BenutzerModel->insert([
+			'uid' => $uid,
+			'person_id' => $student_data->person_id,
+			'aktiv' => true,
+			'aktivierungscode' => $activationkey,
+			'alias' => $alias,
+			'insertvon' => $authUID,
+			'insertamum' => $now,
+		]);
+
+		if (isError($result))
+			return $result;
+		
+
+		// Add Student
+		$result = $this->_ci->StudentModel->insert([
+			'student_uid' => $uid,
+			'matrikelnr' => $personenkennzeichen,
+			'prestudent_id' => $prestudent_id,
+			'studiengang_kz' => $student_data->studiengang_kz,
+			'semester' => $ausbildungssemester,
+			'verband' => ' ',
+			'gruppe' => ' ',
+			'insertvon' => $authUID,
+			'insertamum' => $now
+		]);
+
+		if (isError($result))
+			return $result;
+		
+
+		// Add Lehrverband if it does not exist
+		$result = $this->_ci->LehrverbandModel->load([' ', ' ', $ausbildungssemester, $student_data->studiengang_kz]);
+		
+		if (isError($result))
+			return $result;
+		
+		if (!hasData($result)) {
+			$result = $this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student_data->studiengang_kz,
+				'semester' => $ausbildungssemester,
+				'verband' => ' ',
+				'gruppe' => ' ',
+				'aktiv' => true
+			]);
+
+			if (isError($result))
+				return $result;
+		}
+
+
+		// Add Rolle
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_STUDENT,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'orgform_kurzbz'=> $orgform_kurzbz,
+			'studienplan_id'=> $studienplan_id,
+			'datum' => $today,
+			'insertamum' => $now,
+			'insertvon' => $authUID,
+			'bestaetigtam' => $today,
+			'bestaetigtvon' => $authUID,
+			'statusgrund_id' => $statusgrund_id
+		]);
+
+		if (isError($result))
+			return $result;
+
+
+		// Add Studentlehrverband
+		$result = $this->_ci->StudentlehrverbandModel->insert([
+			'student_uid' => $uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $student_data->studiengang_kz,
+			'semester' => $ausbildungssemester,
+			'verband' => ' ',
+			'gruppe' => ' ',
+			'insertamum' => $now,
+			'insertvon' => $authUID
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success();
+	}
+
+	public function setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+	{
+		return $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_DIPLOMAND,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
+	}
+
+	public function setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+	{
+		$authUID = getAuthUID();
+		$now = date('c');
+
+
+		$result = $this->setBasic(
+			$authUID,
+			$now,
+			Prestudentstatus_model::STATUS_ABSOLVENT,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
+
+		if (isError($result))
+			return $result;
+
+		
+		// Load Student
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
+
+		$student = current(getData($result));
+
+
+		// Benutzer inaktiv setzen
+		$this->_ci->BenutzerModel->update([
+			'uid' =>  $student->student_uid
+		], [
+			'aktiv' => false,
+			'updateaktivvon' => $authUID,
+			'updateaktivam' => $now,
+			'updatevon' => $authUID,
+			'updateamum' => $now
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success();
+	}
+
+	public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+	{
+		$result = $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_BEWERBER,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
+
+		if (isError($result))
+			return $result;
+
+		if (SEND_BEWERBER_INFOMAIL) {
+			// TODO(chris): IMPLEMENT!
+		}
+
+		return success();
+	}
+
+	public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+	{
+		return $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_AUFGENOMMENER,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
+	}
+
+	public function setAbgewiesener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+	{
+		return $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_ABGEWIESENER,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
+	}
+
+	public function setWartender($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id)
+	{
+		return $this->setBasic(
+			getAuthUID(),
+			date('c'),
+			Prestudentstatus_model::STATUS_WARTENDER,
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$statusgrund_id
+		);
+	}
+
+	protected function setBasic($authUID, $now, $status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id = null)
+	{
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+				'prestudent_id' => $prestudent_id
+			]));
+
+		$prestudent_status = current(getData($result));
+
+
+		// Update Aktionen
+
+		// Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester,
+			'datum' => $now,
+			'insertvon' => $authUID,
+			'insertamum' => $now,
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $authUID,
+			'bestaetigtam' => $now,
+			'statusgrund_id' => $statusgrund_id
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success();
+	}
+}

application/libraries/PrestudentstatusCheckLib.php

@@ -0,0 +1,922 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class PrestudentstatusCheckLib
+{
+	const INTERESSENT_STATUS = 'Interessent';
+	const BEWERBER_STATUS = 'Bewerber';
+	const AUFGENOMMENER_STATUS = 'Aufgenommener';
+	const UNTERBRECHER_STATUS = 'Unterbrecher';
+	const STUDENT_STATUS = 'Student';
+	const DIPLOMAND_STATUS = 'Diplomand';
+	const ABSOLVENT_STATUS = 'Absolvent';
+	const ABBRECHER_STATUS = 'Abbrecher';
+
+	private $_ci;
+	private $_statusAbfolgeVorStudent = [self::INTERESSENT_STATUS, self::BEWERBER_STATUS, self::AUFGENOMMENER_STATUS];
+	private $_endStatusArr = [self::ABSOLVENT_STATUS, self::ABBRECHER_STATUS];
+
+	private $_cache_history = [];
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->_ci->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+	}
+
+	/**
+	 * Checks if a status add is valid.
+	 * @return object error if invalid
+	 */
+	public function checkStatusAdd(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_status_studiensemester_kurzbz,
+		$new_status_datum,
+		$new_status_ausbildungssemester,
+		$new_studienplan_id
+	) {
+		$studentName = '';
+
+		$nameRes = $this->_ci->PersonModel->loadPrestudent($prestudent_id);
+
+		if (hasData($nameRes))
+		{
+			$nameData = getData($nameRes)[0];
+			$studentName = $nameData->vorname.' '.$nameData->nachname;
+		}
+
+		// Datum des neuen Status darf nicht in Vergangenheit liegen, sonst Probleme wenn neues Datum < Bismeldedatum
+		if (new DateTime($new_status_datum) < new DateTime('today'))
+			return error($studentName . $this->_ci->p->t('lehre', 'error_entryInPast'));
+
+		return $this->_checkIfValidStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_status_studiensemester_kurzbz,
+			$new_status_datum,
+			$new_status_ausbildungssemester,
+			$new_studienplan_id
+		);
+	}
+
+	/**
+	 * Checks if a status update is valid.
+	 * @return error if invalid
+	 */
+	public function checkStatusUpdate(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_status_studiensemester_kurzbz,
+		$new_status_datum,
+		$new_status_ausbildungssemester,
+		$new_studienplan_id,
+		$old_status_studiensemester,
+		$old_status_ausbildungssemester
+	) {
+
+		return $this->_checkIfValidStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_status_studiensemester_kurzbz,
+			$new_status_datum,
+			$new_status_ausbildungssemester,
+			$new_studienplan_id,
+			$old_status_studiensemester,
+			$old_status_ausbildungssemester
+		);
+	}
+
+	/**
+	 * Checks if a student already exists.
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfExistingStudent($prestudent_id)
+	{
+		$result = $this->_ci->StudentModel->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success(hasData($result));
+	}
+
+	/**
+	 * Check if Reihungstest was admitted
+	 *
+	 * @param stdClass $prestudent
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfAngetreten($prestudent)
+	{
+		return success($prestudent->reihungstestangetreten);
+	}
+
+	/**
+	 * Check if ZGV-Code is registered
+	 *
+	 * @param stdClass $prestudent
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfZGVEingetragen($prestudent_person)
+	{
+		return success((boolean)$prestudent_person->zgv_code);
+	}
+
+	/**
+	 * Check if Master ZGV-Code is registered
+	 *
+	 * @param stdClass $prestudent
+	 *
+	 * @return booleans $zgv_code, error if not registered
+	 */
+	public function checkIfZGVEingetragenMaster($prestudent)
+	{
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$result = $this->_ci->StudiengangModel->load($prestudent->studiengang_kz);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg', ['studiengang_kz' => $prestudent->studiengang_kz]));
+
+		if (current($result->retval)->typ != 'm')
+			return success(true); // NOTE(chris): we only test master stgs, all other stgs should default to true
+
+		return success((boolean)$prestudent->zgvmas_code);
+	}
+
+	/**
+	 * Checks if a bewerber status already exists.
+	 *
+	 * @param integer $prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfExistingBewerberstatus($prestudent_id)
+	{
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER
+		]);
+		if (isError($result))
+			return $result;
+
+		return success(hasData($result));
+	}
+
+
+	/**
+	 * Checks if status aufgenommen already exists.
+	 *
+	 * @param integer $prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfExistingAufgenommenerstatus($prestudent_id)
+	{
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
+		]);
+		if (isError($result))
+			return $result;
+
+		return success(hasData($result));
+	}
+
+	/**
+	 * Checks if the last Bewerber status and the last Aufgenommener status
+	 * have the same studiensemester and ausbildungssemester.
+	 *
+	 * Attention:
+	 * If one of those two status is missing the function returns true!
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfLastBewerberAndAufgenommenerShareSemesters($prestudent_id)
+	{
+		$this->_ci->PrestudentstatusModel->addOrder('datum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addOrder('insertamum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addLimit(1);
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER
+		]);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(true);
+
+		$bewerber = current(getData($result));
+
+		$this->_ci->PrestudentstatusModel->addOrder('datum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addOrder('insertamum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addLimit(1);
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_AUFGENOMMENER
+		]);
+
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(true);
+
+		$aufgenommener = current(getData($result));
+
+		return success(
+			$bewerber->studiensemester_kurzbz == $aufgenommener->studiensemester_kurzbz
+			&& $bewerber->ausbildungssemester == $aufgenommener->ausbildungssemester
+		);
+	}
+
+	/**
+	 * Check if Bismeldestichtag erreicht
+	 *
+	 * @param DateTime				$statusDatum
+	 * @param string				$studiensemester_kurzbz
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz = null)
+	{
+		$result = $this->_ci->BismeldestichtagModel->checkIfMeldestichtagErreicht($statusDatum, $studiensemester_kurzbz);
+		
+		if (isError($result))
+			return $result;
+		
+		return success(getData($result) == "1");
+	}
+
+	/**
+	 * Runs all checks on Status History and saves it in cache.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	protected function prepareStatusHistory(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		// Generate key for caching
+		$primary = implode('|', [
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date->format('Y-m-d'),
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		]);
+
+		if (isset($this->_cache_history[$primary]))
+			return $this->_cache_history[$primary];
+
+		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		// Get the history
+		$result = $this->_ci->PrestudentstatusModel->getHistoryWithNewOrEditedState(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		if (!hasData($result))
+			return error('This is impossible');
+
+		$history = getData($result);
+		$historyCount = count($history);
+
+		// Run checks
+		$checks = [
+			'timesequence' => true,
+			'laststatus' => true,
+			'unterbrechersemester' => true,
+			'abbrechersemester' => true,
+			'diplomant' => true,
+			'student' => true
+		];
+
+		for ($n = 0, $c = 1; $c < $historyCount; $n++, $c++) {
+			if (!$checks['timesequence']
+				&& !$checks['laststatus']
+				&& !$checks['unterbrechersemester']
+				&& !$checks['abbrechersemester']
+				&& !$checks['diplomant']
+				&& !$checks['student']
+			)
+				break; // early out
+
+			$next = $history[$n];
+			$current = $history[$c];
+
+			// Zeitabfolge ungültig?
+			if ($checks['timesequence']
+				&& $next->start < $current->start
+			)
+				$checks['timesequence'] = false;
+
+			// Abbrecher- oder Absolventenstatus muss Endstatus sein
+			if ($checks['laststatus']
+				&& in_array($current->status_kurzbz, [self::ABSOLVENT_STATUS, self::ABBRECHER_STATUS])
+			)
+				$checks['laststatus'] = false;
+
+			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			if ($checks['unterbrechersemester']
+				&& $current->status_kurzbz == self::UNTERBRECHER_STATUS
+				&& $next->status_kurzbz == self::UNTERBRECHER_STATUS
+				&& $current->ausbildungssemester != $next->ausbildungssemester
+			)
+				$checks['unterbrechersemester'] = false;
+
+			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			if ($checks['abbrechersemester']
+				&& $current->status_kurzbz == self::UNTERBRECHER_STATUS
+				&& $next->status_kurzbz == self::ABBRECHER_STATUS
+				&& $current->ausbildungssemester != $next->ausbildungssemester
+			)
+				$checks['abbrechersemester'] = false;
+
+			if (($checks['diplomant']
+				|| $checks['student'])
+				&& $next->status_kurzbz == self::STUDENT_STATUS
+			) {
+				$restl_stati = array_unique(array_column(array_slice($history, $c), 'status_kurzbz'));
+
+				// keine Studenten nach Diplomand Status
+				if ($checks['diplomant']
+					&& in_array(self::DIPLOMAND_STATUS, $restl_stati)
+				)
+					$checks['diplomant'] = false;
+
+				// vor Studentenstatus müssen bestimmte Status vorhanden sein
+				if ($checks['student']
+					&& array_values(array_intersect($restl_stati, $this->_statusAbfolgeVorStudent)) != array_values($this->_statusAbfolgeVorStudent)
+				)
+					$checks['student'] = false;
+			}
+		}
+
+		$this->_cache_history[$primary] = success($checks);
+
+		return success($checks);
+	}
+
+	/**
+	 * Checks if the time sequence of the status history is valid.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryTimesequence(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['timesequence']);
+	}
+
+	/**
+	 * Checks if the last status of the status history is not Abbrecher or
+	 * Absolvent.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryLaststatus(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['laststatus']);
+	}
+
+	/**
+	 * Checks if two consecutively Unterbrecher have the same
+	 * ausbildungssemester in the status history.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryUnterbrechersemester(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['unterbrechersemester']);
+	}
+
+	/**
+	 * Checks if an Unterbrecher followed by an Abbrecher have the same
+	 * ausbildungssemester in the status history.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryAbbrechersemester(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['abbrechersemester']);
+	}
+
+	/**
+	 * Checks if no Diplomant is followed by a Student in the status history.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryDiplomant(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['diplomant']);
+	}
+
+	/**
+	 * Checks if a Student precedes given stati in the status history.
+	 *
+	 * @param integer				$prestudent_id
+	 * @param string				$status_kurzbz
+	 * @param DateTime				$new_date
+	 * @param string				$new_studiensemester_kurzbz
+	 * @param integer				$new_ausbildungssemester
+	 * @param string				$old_studiensemester_kurzbz
+	 * @param integer				$old_ausbildungssemester
+	 *
+	 * @return stdClass
+	 */
+	public function checkStatusHistoryStudent(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		// TODO(chris): TEST
+		$result = $this->prepareStatusHistory(
+			$prestudent_id,
+			$status_kurzbz,
+			$new_date,
+			$new_studiensemester_kurzbz,
+			$new_ausbildungssemester,
+			$old_studiensemester_kurzbz,
+			$old_ausbildungssemester
+		);
+
+		if (isError($result))
+			return $result;
+
+		return success(getData($result)['student']);
+	}
+
+	/**
+	 * Checks if Personenkennzeichen is set correctly.
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkPersonenkennzeichen($prestudent_id)
+	{
+		// TODO(chris): TEST
+		$this->_ci->PrestudentstatusModel->addSelect('tbl_prestudentstatus.prestudent_id');
+		$this->_ci->PrestudentstatusModel->addSelect('tbl_student.matrikelnr');
+
+		$this->_ci->PrestudentstatusModel->addJoin('public.tbl_student', 'prestudent_id');
+
+		$this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.datum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
+		$this->_ci->PrestudentstatusModel->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
+		
+		$this->_ci->PrestudentstatusModel->addLimit(1);
+		
+		$result = $this->_ci->PrestudentstatusModel->loadWhere([
+			'tbl_prestudentstatus.prestudent_id' => $prestudent_id,
+			'tbl_prestudentstatus.status_kurzbz' => self::STATUS_STUDENT
+		]);
+
+		if (isError($result))
+			return $result;
+
+		if (!hasData($result))
+			return success(true); // Not a student yet so no wrong personenkennzeichen
+
+		$data = current(getData($result));
+
+		$jahr = $this->_ci->StudiensemesterModel->getStudienjahrNumberFromStudiensemester($data->studiensemester_kurzbz);
+
+
+		return success($jahr == mb_substr($data->matrikelnr, 0, 2));
+	}
+
+	/**
+	 * Checks if Orgform of Student status and Bewerber status match.
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function checkStudentOrgform($prestudent_id)
+	{
+		// TODO(chris): TEST
+		$result = $this->_ci->PrestudentstatusModel->getBewerberWhereOrgformNotStudent($prestudent_id);
+
+		if (isError($result))
+			return $result;
+
+		return success(!hasData($result));
+	}
+
+	/**
+	 * Check if History of StatusData is valid
+	 * @param integer $prestudent_id
+	 * @return error if not valid, array StatusArr if valid
+	 */
+	private function _checkIfValidStatusHistory(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_status_studiensemester_kurzbz,
+		$new_status_datum,
+		$new_status_ausbildungssemester,
+		$new_studienplan_id,
+		$old_status_studiensemester = null,
+		$old_status_ausbildungssemester = null
+	) {
+		//get start studiensemester
+		$semResult = $this->_ci->StudiensemesterModel->load([
+			'studiensemester_kurzbz' => $new_status_studiensemester_kurzbz
+		]);
+
+		if (isError($semResult))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($semResult));
+		}
+
+		if (!hasData($semResult)) {
+			return error($this->_ci->p->t('lehre', 'error_noStudiensemester') . $new_status_studiensemester_kurzbz);
+		}
+
+		$studiensemester = getData($semResult)[0];
+		$new_status_semesterstart = $studiensemester->start;
+
+		// get studienplan orgform
+		$new_studienplan_orgform_kurzbz = '';
+		$this->_ci->StudienplanModel->addSelect('orgform_kurzbz');
+		$stplResult = $this->_ci->StudienplanModel->load([
+			'studienplan_id' => $new_studienplan_id
+		]);
+
+		if (isError($stplResult))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson(getError($stplResult));
+		}
+
+		if (hasData($stplResult)) $new_studienplan_orgform_kurzbz = getData($stplResult)[0]->orgform_kurzbz;
+
+
+		//get all prestudentstati
+		$resultPs = $this->_ci->PrestudentstatusModel->getAllPrestudentstatiWithStudiensemester($prestudent_id);
+
+		if (isError($resultPs)) return $resultPs;
+
+		$resultArr = hasData($resultPs) ? getData($resultPs) : [];
+		$statusArr = [];
+
+		$newStatusInserted = false;
+		$new_status_datum_form = new DateTime($new_status_datum);
+		$new_status_semesterstart_form = new DateTime($new_status_semesterstart);
+
+		if (!isEmptyArray($resultArr))
+		{
+			// neuen Status zum Hinzufügen
+			$first_status = $resultArr[0];
+			$neuer_status = new stdClass();
+			$neuer_status->status_kurzbz = $status_kurzbz;
+			$neuer_status->studiensemester_kurzbz = $new_status_studiensemester_kurzbz;
+			$neuer_status->datum = $new_status_datum;
+			$neuer_status->ausbildungssemester = $new_status_ausbildungssemester;
+			$neuer_status->studienplan_orgform_kurzbz = $new_studienplan_orgform_kurzbz;
+			$neuer_status->matrikelnr = $first_status->matrikelnr;
+			$neuer_status->vorname = $first_status->vorname;
+			$neuer_status->nachname = $first_status->nachname;
+
+			// Status, welcher gerade geändert wird, holen
+			$status_to_change = array_filter(
+				$resultArr,
+				function ($status) use ($status_kurzbz, $old_status_studiensemester, $old_status_ausbildungssemester) {
+					return
+						$status->status_kurzbz == $status_kurzbz
+						&& $status->studiensemester_kurzbz == $old_status_studiensemester
+						&& $status->ausbildungssemester == $old_status_ausbildungssemester;
+				}
+			);
+
+			if (!isEmptyArray($status_to_change))
+			{
+				$status_to_change_index = key($status_to_change);
+
+				// wenn sich Studiensemester und Ausbildungssemester nicht geändert haben...
+				if ($new_status_studiensemester_kurzbz == $old_status_studiensemester
+					&& $new_status_ausbildungssemester == $old_status_ausbildungssemester)
+				{
+					// ...neuen status an selber stelle einfügen wie zu ändernder Status
+					$resultArr[$status_to_change_index] = (object)array_merge((array)$resultArr[$status_to_change_index], (array)$neuer_status);
+					$newStatusInserted = true;
+				}
+				else
+				{
+					// bei Status mit neuem Semester: alten Status entfernen
+					unset($resultArr[$status_to_change_index]);
+				}
+			}
+		}
+
+		foreach ($resultArr as $row)
+		{
+			$studiensemester_start = new DateTime($row->studiensemester_start);
+			$status_datum = new DateTime($row->datum);
+
+			if ($new_status_datum_form >= $status_datum && $new_status_semesterstart_form >= $studiensemester_start)
+			{
+				if (!$newStatusInserted)
+				{
+					// neuer Status erstmals größer als Datum eines bestehenden Status -> neuen Status EINMALIG einfügen für spätere Statusprüfung
+					$statusArr[] = $neuer_status;
+					$newStatusInserted = true;
+				}
+				$statusArr[] = $row;
+			}
+			elseif ($new_status_datum_form <= $status_datum && $new_status_semesterstart_form <= $studiensemester_start)
+			{
+				$statusArr[] = $row;
+			}
+			else
+			{
+				// Zeitabfolge ungültig, Fehler
+				return error($this->_ci->p->t('lehre', 'error_statuseintrag_zeitabfolge'));
+			}
+		}
+
+		// erster Studentstatus
+		$ersterStudent = null;
+
+		// Über alle gespeicherten Status gehen und Statusabfolge prüfen
+		for ($i = 0; $i < count($statusArr); $i++)
+		{
+			$curr_status = $statusArr[$i];
+			$curr_status_kurzbz = $curr_status->status_kurzbz;
+			$curr_status_ausbildungssemester = $curr_status->ausbildungssemester;
+			$next_idx = $i - 1; //absteigend sortiert, nächster Status ist vorheriger Eintrag
+			$next_status = isset($statusArr[$next_idx]) ? $statusArr[$next_idx] : null;
+
+			$studentName = $curr_status->vorname . ' ' . $curr_status->nachname;
+
+			if ($curr_status_kurzbz == self::STUDENT_STATUS) $ersterStudent = $curr_status;
+
+			// Abbrecher- oder Absolventenstatus muss Endstatus sein
+			if (isset($next_status) && in_array($curr_status_kurzbz, $this->_endStatusArr))
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_endstatus'));
+			}
+
+			// wenn Unterbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			if
+				($curr_status_kurzbz == self::UNTERBRECHER_STATUS && isset($next_status) && $next_status->status_kurzbz == self::UNTERBRECHER_STATUS
+				&& $curr_status_ausbildungssemester != $next_status->ausbildungssemester)
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_consecutiveUnterbrecher'));
+			}
+
+			// wenn Abbrecher auf Unterbrecher folgt, muss Ausbildungssemester gleich sein
+			if (isset($next_status)
+				&& $curr_status_kurzbz == self::UNTERBRECHER_STATUS
+				&& $next_status->status_kurzbz == self::ABBRECHER_STATUS && $curr_status_ausbildungssemester != $next_status->ausbildungssemester)
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_consecutiveUnterbrecherAbbrecher'));
+			}
+
+			if (isset($next_status) && $next_status->status_kurzbz == self::STUDENT_STATUS)
+			{
+				$restliche_status_obj = array_slice($statusArr, $i);
+				$restliche_status = array_unique(array_column($restliche_status_obj, 'status_kurzbz'));
+				$status_intersected = array_intersect($restliche_status, $this->_statusAbfolgeVorStudent);
+
+				// Vor Studentstatus darf kein Diplomand Status vorhanden sein
+				if (in_array(self::DIPLOMAND_STATUS, $restliche_status))
+				{
+					return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_consecutiveDiplomandStudent'));
+				}
+
+				// Vor Studentstatus müssen bestimmte Status vorhanden sein
+				if (array_values($status_intersected) != array_values(array_reverse($this->_statusAbfolgeVorStudent)))
+				{
+					return error(
+						$studentName . ' '
+						. $this->_ci->p->t('lehre', 'error_wrongStatusOrderBeforeStudent', array(implode(', ', $this->_statusAbfolgeVorStudent)))
+					);
+				}
+			}
+		}
+
+		if (isset($ersterStudent))
+		{
+			$studentName = $ersterStudent->vorname . ' ' . $ersterStudent->nachname;
+
+			// wenn erster Studentstatus, checken ob Personenkennzeichen passt
+			$studienjahrNumber = $this->_ci->StudiensemesterModel->getStudienjahrNumberFromStudiensemester($ersterStudent->studiensemester_kurzbz);
+
+			if ($studienjahrNumber != mb_substr($ersterStudent->matrikelnr, 0, 2))
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_personenkennzeichenPasstNichtZuStudiensemester'));
+			}
+
+			// wenn erster Studentstatus, checken ob Orgform des Bewerbers mit Studenten übereinstimmt
+			if (!isEmptyArray(
+				array_filter(
+					$restliche_status_obj,
+					function ($s) use ($ersterStudent) {
+						return
+							$s->status_kurzbz == self::BEWERBER_STATUS
+							&& (
+								$s->studienplan_orgform_kurzbz != $ersterStudent->studienplan_orgform_kurzbz
+							);
+					}
+				)
+			)
+			)
+			{
+				return error($studentName . ' ' . $this->_ci->p->t('lehre', 'error_bewerberOrgformUngleichStudentOrgform'));
+			}
+		}
+
+		return $resultPs;
+	}
+}

application/libraries/ProfilLib.php

@@ -0,0 +1,600 @@
+<?php
+
+if (! defined("BASEPATH")) exit("No direct script access allowed");
+
+class ProfilLib{
+	public function __construct()
+	{
+		$this->ci =& get_instance();
+
+		
+	}
+
+	public function getView($uid)
+	{
+		// loading required models
+		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
+		$this->ci->load->model("person/Person_model","PersonModel");
+
+		$res = new stdClass();
+
+		// checking the uid
+		if ($uid == getAuthUID()) {
+			$isMitarbeiter = $this->ci->MitarbeiterModel->isMitarbeiter(getAuthUID());
+			if(isError($isMitarbeiter))
+			{
+				return error(getData($isMitarbeiter));
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			if ($isMitarbeiter) {
+				$res->view = "MitarbeiterProfil";
+				$res->data = $this->mitarbeiterProfil();
+				$res->data->pid = getAuthPersonId();
+			} else {
+				$res->view = "StudentProfil";
+				$res->data = $this->studentProfil();
+				$res->data->pid = getAuthPersonId();
+			}
+			$res->data->fotoStatus=$this->isFotoAkzeptiert(getAuthPersonId());
+		}
+		// UID is availabe when accessing Profil/View/:uid
+		else {
+			$isMitarbeiter = $this->ci->MitarbeiterModel->isMitarbeiter($uid);
+			if(isError($isMitarbeiter))
+			{
+				return error(getData($isMitarbeiter));
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			if ($isMitarbeiter) {
+				$res->view = "ViewMitarbeiterProfil";
+				$res->data = $this->viewMitarbeiterProfil($uid);
+
+			} else {
+				$res->view = "ViewStudentProfil";
+				$res->data = $this->viewStudentProfil($uid);
+			}
+		}
+		
+		return success($res);
+	}
+
+	//PRIVATE METHODS ###############################################
+
+	/**
+	 * function that returns the data used for the student profile
+	 * @access private 
+	 * @return stdClass student data
+	 */
+	private function studentProfil()
+	{
+		$pid = getAuthPersonId();
+		$uid = getAuthUID();
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($pid);
+		$kontakte_res = $this->getKontaktInfo($pid);
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($uid);
+		$adresse_res = $this->getAdressenInfo($pid);
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid, true);
+		$zutrittsgruppe_res = $this->getZutrittsgruppen($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
+		$profilUpdates = $this->getProfilUpdates($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = trim($value);
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN :"";
+
+		$res->emails = [$intern_email];
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->zuttritsgruppen = $zutrittsgruppe_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for the mitarbeiter profile
+	 * @access private 
+	 * @return stdClass mitarbeiter data
+	 */
+	private function mitarbeiterProfil()
+	{
+		$pid = getAuthPersonId();
+		$uid = getAuthUID();
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($uid);
+		$adresse_res = $this->getAdressenInfo($pid);
+		$kontakte_res = $this->getKontaktInfo($pid);
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid, true);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($pid);
+		$profilUpdates = $this->getProfilUpdates($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Mitarbeiter Information
+		foreach ($mitarbeiter_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->mailverteiler = $mailverteiler_res;
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN : "";
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		
+		$extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email["email"]?[$intern_email, $extern_email]:[$intern_email];
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->standort_telefon = $telefon_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+	/**
+	 * gets the date of issue of the FH access card corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the date of issue of the FH access card
+	 * @return string the date of issue of the FH access card corresponding to a userID
+	 */
+	private function getZutrittskarteDatum($uid)
+	{
+		$this->ci->load->model("ressource/Betriebsmittelperson_model","BetriebsmittelpersonModel");
+		$zutrittskarte_ausgegebenam = $this->ci->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
+		
+		if(isError($zutrittskarte_ausgegebenam)){
+			return error(getData($zutrittskarte_ausgegebenam));
+		}
+		$zutrittskarte_ausgegebenam = getData($zutrittskarte_ausgegebenam);
+		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
+		
+		//? formats date from 01-01-2000 to 01.01.2000
+		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+		return $zutrittskarte_ausgegebenam;
+	}
+
+	/**
+	 * gets the address information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the address information
+	 * @return array all the address information corresponding to a userID
+	 */
+	private function getAdressenInfo($pid)
+	{
+		$this->ci->load->model("person/Adresse_model","AdresseModel");
+		$adresse_res = $this->ci->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
+		$adresse_res = $this->ci->AdresseModel->addOrder("zustelladresse", "DESC");
+		$adresse_res = $this->ci->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
+
+		$adresse_res = $this->ci->AdresseModel->loadWhere(["person_id" => $pid]);
+		if(isError($adresse_res)){
+			return error(getData($adresse_res));
+		}
+		$adresse_res = getData($adresse_res) ?? [];
+		return $adresse_res;
+	}
+
+	/**
+	 * gets the kontakt information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the kontakt information
+	 * @return array all the kontakt information corresponding to a userID
+	 */
+	private function getKontaktInfo($pid)
+	{
+		$this->ci->load->model("person/Kontakt_model","KontaktModel");
+		$this->ci->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
+		$this->ci->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
+		$this->ci->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
+		$this->ci->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
+
+		$kontakte_res = $this->ci->KontaktModel->loadWhere(['person_id' => $pid]);
+		if(isError($kontakte_res)){
+			return error(getData($kontakte_res));
+		}
+		$kontakte_res = getData($kontakte_res);
+		return $kontakte_res;
+	}
+
+	/**
+	 * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the mailverteiler 
+	 * @return array returns the mailvertailer corresponding to a userID 
+	 */
+	private function getMailverteiler($uid)
+	{
+		$this->ci->load->model("person/Person_model","PersonModel");
+		$this->ci->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
+		$this->ci->PersonModel->addJoin('tbl_benutzer', 'person_id');
+		$this->ci->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
+		$this->ci->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$mailverteiler_res = $this->ci->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+		if(isError($mailverteiler_res)){
+			return error(getData($mailverteiler_res));
+		}
+		$mailverteiler_res = getData($mailverteiler_res) ?? [];
+		$mailverteiler_res = gettype($mailverteiler_res) === 'array' ? $mailverteiler_res : [];
+		$mailverteiler_res = array_map(function ($element) {
+			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+			return $element;
+		}, $mailverteiler_res);
+		return $mailverteiler_res;
+	}
+
+	/**
+	 * gets the person information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the person information
+	 * @param  integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
+	 * @return array all the person informaion corresponding to a userID
+	 */
+	private function getPersonInfo($uid, $geburtsInfo = null)
+	{
+		$this->ci->load->model("person/Benutzer_model","BenutzerModel");
+		$selectClause = ["foto", "foto_sperre", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
+		/** @param integer $geburtsInfo */
+		if ($geburtsInfo) {
+			array_push($selectClause, "gebort");
+			array_push($selectClause, "TO_CHAR(gebdatum, 'DD.MM.YYYY') as gebdatum");
+		}
+		$this->ci->BenutzerModel->addSelect($selectClause);
+		$this->ci->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$person_res = $this->ci->BenutzerModel->load([$uid]);
+		if(isError($person_res)){
+			return error(getData($person_res));
+		}
+		$person_res = getData($person_res);
+		$person_res = $person_res ? current($person_res) : null;
+
+		if(isset($person_res)){
+			if( ($person_res->foto === null) || ((getAuthUID() !== $uid) && ($person_res->foto_sperre !== false)) )
+			{
+				$dummy_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
+				$person_res->foto = $dummy_foto;
+			}
+		}
+
+		return $person_res;
+	}
+
+	/**
+	 * gets all the Benutzerfunktionen of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Benutzerfunktionen 
+	 * @return array returns the Benutzerfunktionen corresponding to a userID 
+	 */
+	private function getBenutzerFunktion($uid)
+	{
+		$this->ci->load->model("person/Benutzerfunktion_model","BenutzerfunktionModel");
+		$this->ci->BenutzerfunktionModel->addSelect([
+			"CASE WHEN (tbl_benutzerfunktion.bezeichnung IS NOT NULL AND tbl_benutzerfunktion.bezeichnung <> '' AND tbl_benutzerfunktion.bezeichnung <> tbl_funktion.beschreibung) THEN tbl_funktion.beschreibung || ' - ' || tbl_benutzerfunktion.bezeichnung ELSE tbl_funktion.beschreibung END as \"Bezeichnung\"",
+			"tbl_organisationseinheit.bezeichnung as Organisationseinheit",
+			"datum_von as Gültig_von",
+			"datum_bis as Gültig_bis",
+			"COALESCE(wochenstunden, '0'::numeric(5,2)) AS \"Wochenstunden\""
+		]);
+		$this->ci->BenutzerfunktionModel->addJoin("tbl_funktion", "funktion_kurzbz");
+		$this->ci->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
+
+		$benutzer_funktion_res = $this->ci->BenutzerfunktionModel->loadWhere(
+			array(
+				'uid' => $uid,
+				'NOW()::date BETWEEN COALESCE(datum_von, \'1970-01-01\'::date) AND COALESCE(datum_bis, \'2170-12-01\'::date)' => null
+			)
+		);
+		if(isError($benutzer_funktion_res)){
+			return error(getData($benutzer_funktion_res));
+		}
+		$benutzer_funktion_res = getData($benutzer_funktion_res);
+		return $benutzer_funktion_res;
+	}
+
+	/**
+	 * gets all the Betriebsmittel of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Betriebsmittel 
+	 * @return array returns the Betriebsmittel corresponding to a userID 
+	 */
+	private function getBetriebsmittelInfo($pid)
+	{
+		$this->ci->load->model("ressource/Betriebsmittelperson_model","BetriebsmittelpersonModel");
+		$this->ci->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
+
+		//? betriebsmittel are not needed in a view
+		$betriebsmittelperson_res = $this->ci->BetriebsmittelpersonModel->getBetriebsmittel($pid);
+		if(isError($betriebsmittelperson_res)){
+			return error(getData($betriebsmittelperson_res));
+		}
+		$betriebsmittelperson_res = getData($betriebsmittelperson_res);
+		return $betriebsmittelperson_res;
+	}
+
+	/**
+	 * gets the profil updates corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the profil updates
+	 * @return array all the profil updates corresponding to a userID
+	 */
+	private function getProfilUpdates($uid)
+	{
+		$this->ci->load->model("person/Profil_update_model","ProfilUpdateModel");
+		$profilUpdates = $this->ci->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
+		if(isError($profilUpdates)){
+			return error(getData($profilUpdates));
+		}
+		$profilUpdates = getData($profilUpdates);
+		return $profilUpdates;
+	}
+
+	/**
+	 * gets the telefon information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the telefon information
+	 * @return array all the telefon informaion corresponding to a userID
+	 */
+	private function getTelefonInfo($uid)
+	{
+		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
+		$this->ci->MitarbeiterModel->addSelect(["kontakt"]);
+		$this->ci->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
+		$this->ci->MitarbeiterModel->addLimit(1);
+		$telefon_res = $this->ci->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+		if(isError($telefon_res)){
+			return error(getData($telefon_res));
+		}
+		$telefon_res = getData($telefon_res);
+		$telefon_res = $telefon_res ? current($telefon_res) : null;
+		return $telefon_res;
+	}
+
+	/**
+	 * gets the mitarbeiter information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the mitarbeiter information
+	 * @return array all the mitarbeiter informaion corresponding to a userID
+	 */
+	private function getMitarbeiterInfo($uid)
+	{
+		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
+		$this->ci->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
+		$this->ci->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
+		$mitarbeiter_res = $this->ci->MitarbeiterModel->load($uid);
+		if(isError($mitarbeiter_res)){
+			return error(getData($mitarbeiter_res));
+		}
+		$mitarbeiter_res = getData($mitarbeiter_res);
+		$mitarbeiter_res = $mitarbeiter_res ? current($mitarbeiter_res) : null;
+
+		return $mitarbeiter_res;
+	}
+
+	/**
+	 * gets the Zutrittsgruppen corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Zutrittsgruppen
+	 * @return array all the Zutrittsgruppen corresponding to a userID
+	 */
+	private function getZutrittsgruppen($uid)
+	{
+		$this->ci->load->model("person/Benutzergruppe_model","BenutzergruppeModel");
+		$this->ci->BenutzergruppeModel->addSelect(['bezeichnung']);
+		$this->ci->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$zutrittsgruppe_res = $this->ci->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
+		if(isError($zutrittsgruppe_res)){
+			return error(getData($zutrittsgruppe_res));	
+		}
+		$zutrittsgruppe_res = getData($zutrittsgruppe_res);
+		return $zutrittsgruppe_res;
+	}
+
+	/**
+	 * gets the student information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the student information
+	 * @return array all the student informaion corresponding to a userID
+	 */
+	private function getStudentInfo($uid)
+	{
+		$this->ci->load->model("crm/Student_model","StudentModel");
+		$this->ci->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_studiengang.studiengang_kz as studiengang_kz', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
+		$this->ci->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
+
+		$student_res = $this->ci->StudentModel->load([$uid]);
+		
+		if(isError($student_res)){
+			return error(getData($student_res));
+		}
+		$student_res = getData($student_res);
+		$student_res = $student_res ? current($student_res) : null;
+		return $student_res;
+	}
+
+	/**
+	 * gets the Matrikelnummer corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Matrikelnummer
+	 * @return object the Matrikelnummer corresponding to a userID
+	 */
+	private function getMatrikelNummer($uid)
+	{
+		$this->ci->load->model("person/Benutzer_model","BenutzerModel");
+		$this->ci->BenutzerModel->addSelect(["matr_nr"]);
+		$this->ci->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$matr_res = $this->ci->BenutzerModel->load([$uid]);
+		
+		if(isError($matr_res)){
+			return error(getData($matr_res));
+		}
+		$matr_res = getData($matr_res);
+		$matr_res = $matr_res ? current($matr_res) : [];
+		return $matr_res;
+	}
+
+	/**
+	 * checks whether the foto of a user is accepted or not
+	 * @access private
+	 * @param  integer $pid the personId of the student or mitarbeiter
+	 * @return bool whether the foto is accepted or not
+	 */
+	private function isFotoAkzeptiert($pid)
+	{
+		$this->ci->load->model('person/Fotostatusperson_model','FotostatusModel');
+		$fotostatus = $this->ci->FotostatusModel->execReadOnlyQuery("
+		select distinct on (person_id) person_id, insertamum, fotostatus_kurzbz
+		from public.tbl_person_fotostatus
+		where person_id = ? 
+		order by person_id, insertamum desc",[$pid]);
+		if(isError($fotostatus)){
+			return error(getData($fotostatus));
+		}
+		$fotostatus = getData($fotostatus);
+		if(is_array($fotostatus) && count($fotostatus) > 0){
+			$fotostatus = current($fotostatus)->fotostatus_kurzbz == 'akzeptiert';
+		}
+		else
+			$fotostatus = false;
+		return $fotostatus;
+	}
+
+	/**
+	 * function that returns the data used for viewing another mitarbeiter profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the mitarbeiter data
+	 * @return stdClass restricted mitarbeiter data
+	 */
+	private function viewMitarbeiterProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$benutzer_res = $this->getBenutzerAlias($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Info
+		foreach ($person_res as $key => $val) {
+			$res->$key = $val;
+		}
+
+		//? Mitarbeiter Info
+		foreach ($mitarbeiter_res as $key => $val) {
+			$res->$key = $val;
+
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN:"";
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		
+		$extern_email["email"] = $benutzer_res->alias ? ($benutzer_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email?[$intern_email, $extern_email]:[$intern_email];
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
+
+		return $res;
+	}
+
+	/**
+	 * gets the alias of a corresponding user
+	 * @access private
+	 * @param  integer $uid the userID used to get the alias
+	 * @return string the alias of the userID
+	 */
+	private function getBenutzerAlias($uid)
+	{
+		$this->ci->load->model("person/Benutzer_model","BenutzerModel");
+		$this->ci->BenutzerModel->addSelect(["alias"]);
+		$benutzer_res = $this->ci->BenutzerModel->load([$uid]);
+		if(isError($benutzer_res)){
+			return error(getData($benutzer_res));
+		}
+
+		$benutzer_res = getData($benutzer_res);
+		$benutzer_res = $benutzer_res ? current($benutzer_res) : null;
+			
+		return $benutzer_res;
+	}
+
+	/**
+	 * function that returns the data used for viewing another student profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the student data
+	 * @return stdClass restricted student data
+	 */
+	private function viewStudentProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN:"";
+
+		$res->emails = [$intern_email];
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->mailverteiler = $mailverteiler_res;
+
+		return $res;
+	}
+}

application/libraries/SearchBarLib.php

@@ -30,9 +30,10 @@ class SearchBarLib
 	const ERROR_WRONG_SEARCHSTR = 'ERR002';
 	const ERROR_NO_TYPES = 'ERR003';
 	const ERROR_WRONG_TYPES = 'ERR004';
+	const ERROR_NOT_AUTH = 'ERR005';
 
 	// List of allowed types of search
-	const ALLOWED_TYPES = ['mitarbeiter', 'organisationunit', 'raum', 'person', 'student', 'prestudent', 'document', 'cms'];
+	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student','studentStv', 'prestudent', 'document', 'cms'];
 
 	const PHOTO_IMG_URL = '/cis/public/bild.php?src=person&person_id=';
 
@@ -108,6 +109,94 @@ class SearchBarLib
 		return $result;
 	}
 
+	private function _mitarbeiter_ohne_zuordnung($searchstr, $type) 
+	{
+		$dbModel = new DB_Model();
+
+		$sql = '
+			SELECT
+				\'employee\' AS renderer,
+				\''.$type.'\' AS type,
+				b.uid AS uid,
+				p.person_id AS person_id,
+				p.vorname || \' \' || p.nachname AS name,
+				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
+				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
+				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
+				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
+				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
+			  FROM public.tbl_mitarbeiter m
+			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
+			  LEFT JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) stdkst ON stdkst.uid = b.uid 
+			  JOIN public.tbl_person p USING(person_id)
+			  LEFT JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) org ON org.uid = b.uid 
+		     LEFT JOIN (
+				SELECT kontakt, standort_id
+				  FROM public.tbl_kontakt
+				 WHERE kontakttyp = \'telefon\'
+			) k ON(k.standort_id = m.standort_id)
+			 WHERE 
+				(stdkst.bezeichnung IS NULL 
+				OR org.bezeichnung IS NULL) 
+				AND (
+			' .
+			$this->buildSearchClause(
+				$dbModel, 
+				array('b.uid', 'p.vorname', 'p.nachname'), 
+				$searchstr
+			) .
+			'
+				)
+		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
+		';
+
+		$employees = $dbModel->execReadOnlyQuery($sql);
+		
+		// If something has been found then return it
+		if (hasData($employees)) return getData($employees);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
+	{
+		$searchstr = preg_replace('/[[:punct:]]/', ' ', $searchstr);
+		$document			 = implode(' || \' \' || ', $columns);
+		$query				 = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
+		$reversequery		 = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
+		$nospacequery		 = '\'' . implode('', explode(' ', trim($searchstr))) . ':*\'';
+
+		$searchclause = <<<EOSC
+			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$query}))
+			OR
+			to_tsvector(reverse(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g')))) @@ to_tsquery(reverse(lower({$reversequery})))
+			OR
+			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$nospacequery}))
+	
+EOSC;
+
+		return $searchclause;
+	}
+
 	/**
 	 * Search for employees
 	 */
@@ -117,6 +206,7 @@ class SearchBarLib
 
 		$employees = $dbModel->execReadOnlyQuery('
 			SELECT
+				\'employee\' AS renderer,
 				\''.$type.'\' AS type,
 				b.uid AS uid,
 				p.person_id AS person_id,
@@ -129,34 +219,38 @@ class SearchBarLib
 			  FROM public.tbl_mitarbeiter m
 			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
 			  JOIN (
-				SELECT o.bezeichnung, bf.uid
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
 				  FROM public.tbl_benutzerfunktion bf
 				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
 				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
 				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
 				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, bf.uid
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
 			) stdkst ON stdkst.uid = b.uid 
 			  JOIN public.tbl_person p USING(person_id)
 			  JOIN (
-				SELECT o.bezeichnung, bf.uid
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
 				  FROM public.tbl_benutzerfunktion bf
 				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
 				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
 				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
 				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, bf.uid
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
 			) org ON org.uid = b.uid 
 		     LEFT JOIN (
 				SELECT kontakt, standort_id
 				  FROM public.tbl_kontakt
 				 WHERE kontakttyp = \'telefon\'
 			) k ON(k.standort_id = m.standort_id)
-			 WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-			    OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-			    OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-			    OR org.bezeichnung ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-			    OR stdkst.bezeichnung ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			 WHERE ' .
+			$this->buildSearchClause(
+				$dbModel, 
+				array('b.uid', 'p.vorname', 'p.nachname', 'org.bezeichnung', 'stdkst.bezeichnung'), 
+				$searchstr
+			) .
+			'
 		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
 		');
 
@@ -176,17 +270,20 @@ class SearchBarLib
 
 		$ous = $dbModel->execReadOnlyQuery('
 			SELECT
+				\'' . $type . '\' AS renderer,
 				\''.$type.'\' AS type,
 				o.oe_kurzbz AS oe_kurzbz,
-				o.bezeichnung AS name,
+				\'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS name,
 				oParent.oe_kurzbz AS parentoe_kurzbz,
-				oParent.bezeichnung AS parentoe_name,
+				(CASE WHEN oParent.bezeichnung IS NOT NULL THEN \'[\' || otParent.bezeichnung || \'] \' || oParent.bezeichnung END) AS parentoe_name,
 				ARRAY_AGG(DISTINCT(bfLeader.uid)) AS leader_uid,
 				ARRAY_AGG(DISTINCT(bfLeader.vorname || \' \' || bfLeader.nachname)) AS leader_name,
 				COUNT(bfCount.benutzerfunktion_id) AS number_of_people,
 				(CASE WHEN o.mailverteiler = TRUE THEN o.oe_kurzbz || \''.'@'.DOMAIN.'\' END) AS mailgroup
 			  FROM public.tbl_organisationseinheit o
+			  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
 		     LEFT JOIN public.tbl_organisationseinheit oParent ON(oParent.oe_kurzbz = o.oe_parent_kurzbz)
+			 LEFT JOIN public.tbl_organisationseinheittyp otParent ON(oParent.organisationseinheittyp_kurzbz = otParent.organisationseinheittyp_kurzbz)
 		     LEFT JOIN (
 				SELECT benutzerfunktion_id, oe_kurzbz
 				  FROM public.tbl_benutzerfunktion
@@ -204,9 +301,16 @@ class SearchBarLib
 				   AND (datum_bis IS NULL OR datum_bis >= NOW())
 				   AND b.aktiv = TRUE
 			) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz)
-			 WHERE o.oe_kurzbz ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-			    OR o.bezeichnung ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-		      GROUP BY type, o.oe_kurzbz, o.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung
+			 WHERE 
+				o.aktiv = true
+				AND (' .
+			$this->buildSearchClause(
+				$dbModel, 
+				array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), 
+				$searchstr
+			) .
+			') 
+		      GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung
 		');
 
 		// If something has been found
@@ -260,6 +364,93 @@ class SearchBarLib
 	 */
 	private function _student($searchstr, $type)
 	{
+		$dbModel = new DB_Model();
+		$gesperrtes_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
+		$students = $dbModel->execReadOnlyQuery('
+		SELECT
+			\'' . $type . '\' AS renderer,
+			\''.$type.'\' AS type,
+			s.student_uid AS uid,
+			CONCAT(s.student_uid,\'@'.DOMAIN.'\') AS email,
+			s.matrikelnr,
+			CONCAT(UPPER(stg.typ),UPPER(stg.kurzbz),\'-\',s.semester,s.verband) as verband,
+			stg.bezeichnung AS studiengang,
+			p.person_id AS person_id,
+			p.vorname || \' \' || p.nachname AS name,
+			CASE 
+				when s.student_uid = \''.getAuthUID().'\' then p.foto
+				when p.foto IS NULL then \''.$gesperrtes_foto.'\' 
+				when p.foto_sperre = false then p.foto
+				else \''.$gesperrtes_foto.'\'
+			end as foto,
+			b.aktiv
+			FROM public.tbl_student s
+			JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+			JOIN public.tbl_person p USING(person_id)
+			LEFT JOIN (
+				SELECT kontakt, person_id
+				FROM public.tbl_kontakt
+					WHERE kontakttyp = \'email\'
+			) as k USING(person_id)
+				WHERE 
+			b.aktiv = TRUE 
+			AND (b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\')
+			GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, 
+				email, p.foto, s.verband, s.semester, stg.bezeichnung, 
+				stg.typ, stg.kurzbz, b.aktiv
+			ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC
+	');
+
+		// If something has been found then return it
+		if (hasData($students)) return getData($students);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	private function _studentStv($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+
+		$students = $dbModel->execReadOnlyQuery('
+		SELECT
+			\'student\' AS renderer,
+			\''.$type.'\' AS type,
+			s.student_uid AS uid,
+			s.matrikelnr,
+			CONCAT(UPPER(stg.typ),UPPER(stg.kurzbz),\'-\',s.semester,s.verband) as verband,
+			stg.bezeichnung AS studiengang,
+			p.person_id AS person_id,
+			p.vorname || \' \' || p.nachname AS name,
+			k.kontakt AS email,
+			p.foto,
+			b.aktiv
+			FROM public.tbl_student s
+			JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+			JOIN public.tbl_person p USING(person_id)
+			LEFT JOIN (
+				SELECT kontakt, person_id
+				FROM public.tbl_kontakt
+					WHERE kontakttyp = \'email\'
+			) as k USING(person_id)
+				WHERE 
+			b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, 
+				k.kontakt, p.foto, s.verband, s.semester, stg.bezeichnung, 
+				stg.typ, stg.kurzbz, b.aktiv
+			ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC
+	');
+
+		// If something has been found then return it
+		if (hasData($students)) return getData($students);
+
+		// Otherwise return an empty array
 		return array();
 	}
 
@@ -268,6 +459,42 @@ class SearchBarLib
 	 */
 	private function _prestudent($searchstr, $type)
 	{
+		$dbModel = new DB_Model();
+
+		$prestudent = $dbModel->execReadOnlyQuery('
+		SELECT
+			\'' . $type . '\' AS renderer,
+			\''.$type.'\' AS type,
+			ps.prestudent_id,
+			ps.studiengang_kz,
+			p.person_id AS person_id,
+			b.uid,
+			p.vorname || \' \' || p.nachname AS name,
+			(
+				SELECT kontakt
+				FROM public.tbl_kontakt
+				WHERE kontakttyp = \'email\'
+				AND person_id = p.person_id
+				LIMIT 1
+			) as email,
+			p.foto,
+			sg.bezeichnung
+			FROM public.tbl_prestudent ps
+			LEFT JOIN public.tbl_student s USING (prestudent_id)
+			LEFT JOIN public.tbl_benutzer b ON (b.uid = s.student_uid)
+			JOIN public.tbl_person p ON (p.person_id = ps.person_id)
+			LEFT JOIN public.tbl_studiengang sg ON (sg.studiengang_kz = ps.studiengang_kz)
+			WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				or cast(ps.prestudent_id as text) ILIKE \'%'.$dbModel->escapeLIKE($searchstr).'%\'
+			GROUP BY type, b.uid, ps.prestudent_id, ps.studiengang_kz, sg.bezeichnung, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
+			');
+
+		// If something has been found then return it
+		if (hasData($prestudent)) return getData($prestudent);
+
+		// Otherwise return an empty array
 		return array();
 	}
 
@@ -292,6 +519,81 @@ class SearchBarLib
 	 */
 	private function _raum($searchstr, $type)
 	{
+		$dbModel = new DB_Model();
+
+		$rooms = $dbModel->execReadOnlyQuery('
+			SELECT
+				\'room\' AS renderer,
+				\''.$type.'\' AS type,
+				COALESCE(ort.ort_kurzbz, \'N/A\') as ort_kurzbz,
+				COALESCE(ort.gebteil, \'N/A\') as building,
+				COALESCE(ort.ausstattung, \'N/A\') as austattung,
+				COALESCE(CAST(ort.stockwerk AS VARCHAR), \'N/A\') as floor,
+				COALESCE(CAST(ort.dislozierung AS VARCHAR), \'N/A\') as room_number,
+				COALESCE(CAST(ort.content_id AS VARCHAR), \'N/A\') as content_id,
+				
+				CASE
+					WHEN standort.plz IS NULL OR standort.ort IS NULL THEN 
+						CASE
+							WHEN standort.strasse IS NULL THEN
+								CASE
+									WHEN ort.stockwerk IS NULL THEN \'N/A\'
+									ELSE CONCAT(ort.stockwerk,\' Stockwerk\')
+								END
+							ELSE 
+								CASE
+									WHEN ort.stockwerk IS NULL THEN standort.strasse
+									ELSE CONCAT(standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+						END
+					ELSE 
+						CASE 
+							WHEN standort.strasse IS NULL THEN
+								CASE
+									WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort)
+									ELSE CONCAT(standort.plz,\' \',standort.ort,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+							ELSE 
+								CASE
+									WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort,\' / \',standort.strasse)
+									ELSE CONCAT(standort.plz,\' \',standort.ort,\', \',standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+						END
+				END as standort,
+				
+				
+				CASE
+					WHEN ort.max_person IS NULL OR ort.arbeitsplaetze IS NULL THEN \'N/A\'
+					ELSE CONCAT(ort.max_person,\', davon \',ort.arbeitsplaetze,\' PC-Plätze\')
+				END as sitzplaetze
+				
+				FROM public.tbl_ort as ort
+				LEFT JOIN (
+					select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort USING(standort_id)
+			 WHERE 
+				ort.aktiv = true 
+				AND 
+				ort.lehre = true
+				AND (' .
+					$this->buildSearchClause(
+						$dbModel, 
+						array('ort.ort_kurzbz', 'ort.bezeichnung'), 
+						$searchstr
+					) . 
+			')' 
+		);
+
+		// If something has been found
+		if (hasData($rooms))
+		{
+			// Returns the dataset
+			return getData($rooms);
+		}
+
+		// Otherwise return an empty array
 		return array();
 	}
 }

application/libraries/SignatureLib.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ *  Copyright (C) 2022 fhcomplete.net
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+require_once(dirname(__FILE__).'/../../vendor/nategood/httpful/bootstrap.php');
+
+/**
+ * Simple client to call the signature server
+ */
+class SignatureLib
+{
+	// -------------------------------------------------------------------------------------------------
+	// Public static methods
+
+	/**
+	 * Returns the list of signature inside the given file
+	 */
+	public static function list($inputFileName)
+	{
+		try
+		{
+			// Dont send Document if it is bigger than 30 MB (Limit of Signature Server)
+			if (filesize($inputFileName) > 30000000)
+			{
+				$returnObject = new stdClass();
+				$returnObject->code = 1;
+				$returnObject->error = 1;
+				$returnObject->retval = 'File to big';
+
+				return $returnObject;
+			}
+
+			// Get the content of the given file
+			$inputFileContent = file_get_contents($inputFileName);
+			if ($inputFileContent === false) // if failed
+			{
+				error_log('An error occurred while getting the content from: '.$inputFileName);
+			}
+			else
+			{
+				// Posts the given file content + file name and expects a response in JSON format
+				$resultPost = \Httpful\Request::post(SIGNATUR_URL.'/'.SIGNATUR_LIST_API)
+					->sendsJson()
+					->authenticateWith(SIGNATUR_USER, SIGNATUR_PASSWORD)
+					->body('{"filename": "'.basename($inputFileName).'", "content": "'.base64_encode($inputFileContent).'"}')
+					->expectsJson()
+					->send();
+			}
+		}
+		catch(\Httpful\Exception\ConnectionErrorException $cee) // Httpful exception
+		{
+			error_log($cee->getMessage());
+		}
+		catch (Exception $e) // any other exception
+		{
+			error_log($e->getMessage());
+		}
+
+		// If the response is fine
+		if (isset($resultPost->body) && is_object($resultPost->body)
+			&& isset($resultPost->body->retval) && is_array($resultPost->body->retval))
+		{
+			return $resultPost->body->retval;
+		}
+
+		// Otherwise return a null as error
+		return null;
+	}
+}

application/libraries/StundenplanLib.php

@@ -0,0 +1,791 @@
+<?php
+
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+use \DateTimeZone as DateTimeZone;
+use \DateInterval as DateInterval;
+use \DatePeriod as DatePeriod;
+
+class StundenplanLib
+{
+
+	private $_ci; // Code igniter instance
+	
+
+	/**
+	 * fetches Stundenplan events for the loggedin user between start and end
+	 * or for a lv
+	 *
+	 * @param string		$start
+	 * @param string		$end
+	 * @param string|null	$lehrveranstaltung_id
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getStundenplan($start, $end, $lehrveranstaltung_id = null)
+	{
+		if (!$lehrveranstaltung_id && $lehrveranstaltung_id !== 0)
+			return $this->getEventsUser($start, $end);
+
+		return $this->getEventsLv($lehrveranstaltung_id, $start, $end);
+	}
+
+	/**
+	 * fetches Stundenplan events for the loggedin user between start and end
+	 *
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsUser($start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+		$uid = getAuthUID();
+		if (is_null($uid))
+			return error("No UID");
+		
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid));
+
+		if ($is_mitarbeiter)
+			return $this->getEventsEmployee($uid, $start, $end);
+
+		return $this->getEventsStudent($uid, $start, $end);
+	}
+
+	/**
+	 * fetches Stundenplan events for a student between start and end
+	 *
+	 * @param string		$student_uid
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsStudent($student_uid, $start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$semester_range = $this->studienSemesterErmitteln($start, $end);
+		if (isError($semester_range))
+			return $semester_range;
+		$semester_range = getData($semester_range);
+
+		$this->sortStudienSemester($semester_range);
+
+		$function_error = $this->applyLoadUeberSemesterHaelfte($semester_range);
+		if ($function_error)
+			return $function_error;
+		
+		// getting the gruppen_kurzbz of the student in the different studiensemester
+		$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($student_uid, $semester_range);
+		if (isError($benutzer_gruppen))
+			return $benutzer_gruppen;
+		$benutzer_gruppen = getData($benutzer_gruppen);
+
+		// getting the student_lehrverbaende of the student in the different studiensemester
+		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range);
+		if (isError($student_lehrverband))
+			return $student_lehrverband;
+		$student_lehrverband = getData($student_lehrverband);
+		
+		$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery(
+			$start,
+			$end,
+			$semester_range,
+			$benutzer_gruppen,
+			$student_lehrverband
+		);
+		if (!$stundenplan_query)
+			return success([]);
+		
+		$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+		
+		return success($stundenplan_data);
+	}
+
+	/**
+	 * fetches Stundenplan events for an employee between start and end
+	 *
+	 * @param string		$uid
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsEmployee($uid, $start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start, $end, $uid);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+		
+		return success($stundenplan_data);
+	}
+
+	/**
+	 * fetches Stundenplan events for a LV between start and end
+	 *
+	 * @param integer		$lehrveranstaltung_id
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsLv($lehrveranstaltung_id, $start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start, $end, $lehrveranstaltung_id);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+
+		// query lv itself in case its Stundenplan is being queried and it has no entries
+		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$lv_result = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id);
+		if (isError($lv_result))
+			return $lv_result;
+		if (!hasData($lv_result))
+			return error('LV not found');
+		
+		return success($stundenplan_data);
+	}
+
+	/**
+	 * Get stundenplan for a room
+	 *
+	 * @param string	$ort_kurzbz
+	 * @param string	$start_date
+	 * @param string	$end_date
+	 * @return stdClass
+	 */
+	public function getRoomplan($ort_kurzbz, $start_date, $end_date)
+	{
+		$this->_ci =& get_instance();
+
+		// Load Config
+		$this->_ci->load->config('calendar');
+		// Load Models
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$query = $this->_ci->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date);
+		$roomplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($query);
+
+		if (isError($roomplan_data))
+			return $roomplan_data;
+
+		$this->expandObjectInformation($roomplan_data->retval);
+
+		return $roomplan_data;
+	}
+
+	/**
+	 * Get reservations (for a room or all)
+	 *
+	 * @param string	$start_date
+	 * @param string	$end_date
+	 * @param string	$ort_kurzbz
+	 * @return stdClass
+	 */
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
+	{
+		$this->_ci =& get_instance();
+
+		// Load Config
+		$this->_ci->load->config('calendar');
+		// Load Models
+		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
+		
+		if ($is_mitarbeiter) {
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
+		} else {
+			// querying the reservierungen
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+		}
+		
+		if (isError($reservierungen))
+			return $reservierungen;
+		
+		$function_error = $this->expandObjectInformation($reservierungen->retval);
+		
+		if (!is_null($function_error))
+			return $function_error;
+		
+		return $reservierungen;
+	}
+
+	public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		
+		$studiensemester = $this->_ci->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester_kurzbz]);
+		if(isError($studiensemester))
+		{
+			return error(getData($studiensemester));
+		}
+		$studiensemester = current(getData($studiensemester));
+		$lektoren = $this->_ci->StundenplanModel->execReadOnlyQuery("
+		SELECT DISTINCT uid 
+		FROM campus.vw_stundenplan
+		WHERE lehrveranstaltung_id = ? AND
+		studiengang_kz = ? AND
+		semester = ? AND
+		(datum BETWEEN ? AND ?)
+		",[$lehrveranstaltung_id, $studiengang_kz, $semester, $studiensemester->start, $studiensemester->ende]);
+		
+		if(isError($lektoren))
+		{
+			return error(getData($lektoren));
+		}
+		$lektoren = getData($lektoren);
+		if(isset($lektoren)){
+			$lektoren = array_map(function($lektor){
+				return $lektor->uid;
+			},$lektoren);
+
+		}
+		return success($lektoren);
+	}
+
+	public function expandObjectInformation($data)
+	{
+		$this->_ci =& get_instance();
+		
+		// Load Config
+		$this->_ci->load->config('calendar');
+		// Load Model
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		foreach ($data as $item)
+		{
+			$tz = new DateTimeZone($this->_ci->config->item('timezone'));
+			$isostart = new DateTime($item->datum . ' ' . $item->beginn, $tz);
+			$item->isostart = $isostart->format(DateTime::ATOM);
+
+			$isoend = new DateTime($item->datum . ' ' . $item->ende, $tz);
+			$item->isoend = $isoend->format(DateTime::ATOM);
+
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($item->lektor as $lv_lektor)
+			{
+				$this->_ci->StundenplanModel->addLimit(1);
+				$lektor_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
+				FROM public.tbl_mitarbeiter
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id
+				WHERE kurzbz = ?", [$lv_lektor]);
+				if (isError($lektor_object)) {
+					$this->_ci->show_error(getError($lektor_object));
+				}
+				if(isError($lektor_object))
+				{
+					return error(getData($lektor_object));
+				}
+				$lektor_object = getData($lektor_object);
+				if(count($lektor_object) == 0)
+				{
+					return error("No lektor object");
+				}
+				$lektor_object = current($lektor_object);
+				// only provide needed information of the mitarbeiter object
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($item->gruppe as $lv_gruppe)
+			{
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+			
+			if($item->ort_kurzbz) {
+
+				$ort_content_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				SELECT content_id
+				FROM public.tbl_ort
+				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
+				if (isError($ort_content_object)) {
+					return error(getData($ort_content_object));
+				}
+				$ort_content_object = getData($ort_content_object)[0];
+				if($ort_content_object) {
+					$item->ort_content_id = $ort_content_object->content_id;
+				}
+				
+				
+			}
+
+			$item->gruppe = $gruppe_obj_array;
+			$item->lektor = $lektor_obj_array;
+
+		}
+	}
+
+	public function fetchFerienTageEvents($start_date, $end_date, $studiengang_kz)
+	{
+		$this->_ci =& get_instance();
+
+		// Load Config
+		$this->_ci->load->config('calendar');
+
+		$this->_ci->load->model('organisation/Ferien_model', 'FerienModel');
+
+		$tz = new DateTimeZone($this->_ci->config->item('timezone'));
+
+		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
+		SELECT * 
+		FROM lehre.tbl_ferien
+		WHERE (bisdatum >= ? AND vondatum < ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
+		", [$start_date, $end_date, $studiengang_kz]);
+
+		if (isError($ferienEvents))
+			return $ferienEvents;
+		
+		$ferienEvents = getData($ferienEvents);
+
+		if (!$ferienEvents)
+			return success([]);
+		
+		$ferienEvents = array_map(function ($event) {
+			$event_start = new DateTime($event->vondatum);
+			$event_end = new DateTime($event->bisdatum);
+			$event_end->modify('+1 day');
+
+			$interval = new DateInterval('P1D');
+			$period = new DatePeriod($event_start, $interval, $event_end);
+			$event->dates = iterator_to_array($period);
+			return $event;
+		}, $ferienEvents);
+
+		$start_date = new DateTime($start_date);
+		$start_date->setTime(0, 0, 0);
+		$end_date = new DateTime($end_date);
+		$end_date->setTime(23, 59, 59);
+
+		$ferienEventsFlattened = [];
+		foreach ($ferienEvents as $ferien_event) {
+			foreach ($ferien_event->dates as $date) {
+				if ($date < $start_date || $date > $end_date)
+					continue;
+				$event = new stdClass();
+				$event->bezeichnung = $ferien_event->bezeichnung;
+				$event->datum = $date->format('Y-m-d');
+				$event->type = 'ferien';
+				$ferienEventsFlattened[] = $event;
+			}
+		};
+
+		$today = new DateTime();
+		$ferienEventsFlattened = array_map(function ($event) use ($today, $tz) {
+			$ferien_event = (object)array(
+				'type' => 'ferien',
+				'beginn' => $today->format('H:i:s'),
+				'ende' => $today->format('H:i:s'),
+				'isostart' => (new DateTime($event->datum . ' 00:00:00', $tz))->format('c'),
+				'isoend' => (new DateTime($event->datum . ' 23:59:59', $tz))->format('c'),
+				'allDayEvent' => true,
+				'datum' => $event->datum,
+				'topic' => $event->bezeichnung,
+				'titel' => $event->bezeichnung,
+				'farbe' => '00689E'
+			);
+			return $ferien_event;
+		}, $ferienEventsFlattened);
+		
+		return success($ferienEventsFlattened);
+	}
+
+	// start of the private functions ########################################################################################################
+
+	// function used to sort an array of studiensemester strings
+	private function sortStudienSemester(&$semester_range){
+		usort(
+			$semester_range,
+			function($first,$second)
+			{
+				$sem_first = null;
+				$year_first = null;
+				$match_first = null;
+
+				$sem_second = null;
+				$year_second = null;
+				$match_second = null;
+
+				preg_match('/([WS]+)([0-9]+)/',$first,$match_first);
+				preg_match('/([WS]+)([0-9]+)/',$second,$match_second);
+				
+				$sem_first = $match_first[1];
+				$year_first = intval($match_first[2]);
+
+				$sem_second = $match_second[1];
+				$year_second = intval($match_second[2]);
+
+				if($year_first < $year_second)
+				{
+					return -1;
+				}
+				else if($year_first > $year_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first > $sem_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first < $sem_second)
+				{
+					return -1;
+				}
+				return 0;
+			} 
+		);
+	}
+
+	
+
+	private function fetchBenutzerGruppenFromStudiensemester($student_uid, $semester_range)
+	{
+		$this->_ci->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
+		$benutzer_gruppen = [];
+		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
+		/*
+		[
+			['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
+			['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
+			['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$benutzer_gruppen[$semester_key] = [];
+			// each semester could have ajoint semesters that need to be checked
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the benutzer_gruppen associated to the semester
+				$benutzer_query = $this->_ci->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
+				if(isError($benutzer_query)){
+					return error(getData($benutzer_query));
+				}
+				$benutzer_query_result = getData($benutzer_query)??[];
+				
+				array_push(
+					$benutzer_gruppen[$semester_key],
+					 array_map(
+						function($item)
+						{
+							return "'".$item->gruppe_kurzbz. "'";
+						},
+						$benutzer_query_result
+					)
+				);
+			}
+		}
+		
+		// merge the gruppen of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
+			['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
+			['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
+		]
+		*/ 
+		$benutzer_gruppen = array_map(
+			function($gruppe)
+			{
+				$merged_gruppe = [];
+				foreach($gruppe as $gruppen_array)
+				{
+					$merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
+				}
+				return $merged_gruppe;
+			},
+			$benutzer_gruppen
+		);
+
+		return success($benutzer_gruppen);
+	}
+
+	private function fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range)
+	{
+		$this->_ci->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
+		$student_lehrverband = [];
+		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
+		/*
+		[
+			['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
+			['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
+			['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$student_lehrverband[$semester_key] = [];
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the student_lehrverband associated to the semester
+				$lehrverband_query = $this->_ci->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+				if(isError($lehrverband_query)){
+					return error(getData($lehrverband_query));
+				}	
+				$lehrverband_query_result = getData($lehrverband_query)??[];
+				
+				$converted_studentLehrverband= array_map(
+					function ($item)
+					{
+						$result = new stdClass();
+						$result->studiengang_kz = $item->studiengang_kz;
+						$result->semester = $item->semester;
+						$result->verband = $item->verband;
+						$result->gruppe = $item->gruppe;
+						return $result;
+					},
+					$lehrverband_query_result);
+				
+				array_push($student_lehrverband[$semester_key], $converted_studentLehrverband); 
+				
+			}
+			
+		}
+
+		// merge the studentlehrverband of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
+			['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
+			['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
+		]
+		*/
+		
+		$student_lehrverband = array_map(
+			function($studentlehrverband)
+			{	
+				$merged_studentlehrverband = [];
+				foreach($studentlehrverband as $studentlehrverband_array)
+				{
+					$merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
+				}
+				return $merged_studentlehrverband;
+			},
+			$student_lehrverband
+		);
+
+		return success($student_lehrverband);
+	}
+
+	private function applyLoadUeberSemesterHaelfte(&$semester_range)
+	{
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		/*
+		@var($semester_collection)
+		convert the array of studiensemester into an associative array with the studiensemester as the key 
+		and the values of each key are the studiensemester needed for the query associated to that studiensemester
+		example:
+
+		#INPUT:
+		['WS2023','SS2024','WS2024']
+		#OUTPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		*/
+		$semester_collection = [];
+		foreach($semester_range as $studiensemester)
+		{
+			$previous_studiensemester = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester);
+			if(isError($previous_studiensemester))
+			{
+				return error(getData($previous_studiensemester));
+			}
+			$previous_studiensemester = getData($previous_studiensemester);
+			if (count($previous_studiensemester) == 0) {
+				return error('no previous semester');
+			}
+			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
+			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
+		}
+
+		/*
+		@var($studienSemesterDateRanges)
+		fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
+		based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range 
+		or the semester with the full date range and the previous semester with the half date range:
+
+		#INPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		#OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-05-17"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		*/
+		$studienSemesterDateRanges=[]; 
+		foreach($semester_collection as $semester_original => $semester_adjoint)
+		{
+			$semester_start_ende = $this->_ci->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
+			if(isError($semester_start_ende))
+			{
+				return error(getData($semester_start_ende));
+			}
+			$semester_start_ende = current(getData($semester_start_ende)); 
+				
+			// initialize empty arrays to add key value pairs
+			$studienSemesterDateRanges[$semester_original] = [];
+
+			// check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
+			$match = null;
+			preg_match("/^(SS)([0-9]+)/",$semester_original,$match);
+			if(count($match) >0)
+			{
+				$one_month = new DateInterval('P1M');
+				$one_day = DateInterval::createFromDateString('1 days');
+				$summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$summer_studiensemester_end_date->add($one_month);
+				$summer_studiensemester_end_date->sub($one_day);
+				$semester_start_ende->ende = date_format($summer_studiensemester_end_date,'Y-m-d');
+			}
+			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+			{
+				foreach($semester_adjoint as $adjoint)
+				{
+					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
+				}
+			}
+			else
+			{
+				//TODO: half of a DateInterval might not be correctly calculated
+				// calculate the half of the studiensemester
+				$studiensemester_start_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->start);
+				$studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
+				$half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
+				$half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
+				$studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval),'Y-m-d');
+				
+				$first_half = new stdClass();
+				$first_half->start = $semester_start_ende->start;
+				$first_half->ende = $studiensemester_half;
+
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
+			}
+			$semester_range = $studienSemesterDateRanges;
+		}
+	}
+
+	private function studienSemesterErmitteln($start_date, $end_date)
+	{
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		// gets all studiensemester from the student from start_date to end_date
+		$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date, $end_date);
+		if (isError($semester_range))
+			return $semester_range;
+		
+		$semester_range = array_map(
+			function ($sem) {
+				return $sem->studiensemester_kurzbz;
+			},
+			getData($semester_range) ?: []
+		);
+
+		// if no studiensemester is found for the given timespan, get the nearest studiensemester
+		if (count($semester_range) == 0)
+		{
+			$aktuelle_studiensemester = $this->_ci->StudiensemesterModel->getNearest();
+			if (isError($aktuelle_studiensemester))
+				return $aktuelle_studiensemester;
+			
+			$aktuelle_studiensemester = getData($aktuelle_studiensemester);
+			if (count($aktuelle_studiensemester) == 0) {
+				return error("No aktuelles semester");
+			}
+			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
+			// push aktuelles semester in active semester array
+			array_push($semester_range, $aktuelle_studiensemester);
+		}
+
+		return success($semester_range);
+	}
+}

application/libraries/TableWidgetLib.php

@@ -1,5 +1,22 @@
 <?php
 
+/**
+ * Copyright (C) 2023 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
@@ -9,6 +26,8 @@ class TableWidgetLib
 {
 	const TABLE_UNIQUE_ID = 'tableUniqueId'; // TableWidget unique id
 
+	const TABLE_BOOTSTRAP_VERSION = 'bootstrapVersion'; // TableWidget bootstrap version
+
 	// TableWidget session name
 	const SESSION_NAME = 'FHC_TABLE_WIDGET';
 
@@ -16,6 +35,7 @@ class TableWidgetLib
 	const SESSION_FIELDS = 'fields';
 	const SESSION_COLUMNS_ALIASES = 'columnsAliases';
 	const SESSION_ADDITIONAL_COLUMNS = 'additionalColumns';
+	const SESSION_ENCRYPTED_COLUMNS = 'encryptedColumns';
 	const SESSION_CHECKBOXES = 'checkboxes';
 	const SESSION_METADATA = 'datasetMetadata';
 	const SESSION_ROW_NUMBER = 'rowNumber';
@@ -49,6 +69,7 @@ class TableWidgetLib
 	const ADDITIONAL_COLUMNS = 'additionalColumns';
 	const CHECKBOXES = 'checkboxes';
 	const COLUMNS_ALIASES = 'columnsAliases';
+	const ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// ...to format/mark records of a dataset
 	const FORMAT_ROW = 'formatRow';
@@ -74,7 +95,7 @@ class TableWidgetLib
 	/**
 	 * Gets the CI instance and loads message helper
 	 */
-	public function __construct($params = null)
+	public function __construct()
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 	}
@@ -177,7 +198,7 @@ class TableWidgetLib
 	/**
 	 * Retrieves the dataset from the DB
 	 */
-	public function getDataset($datasetQuery)
+	public function getDataset($datasetQuery, $encryptedColumns)
 	{
 		$dataset = null;
 
@@ -186,7 +207,7 @@ class TableWidgetLib
 			$this->_ci->load->model('system/Filters_model', 'FiltersModel');
 
 			// Execute the given SQL statement suppressing error messages
-			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery);
+			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery, null, $encryptedColumns);
 		}
 
 		return $dataset;

application/libraries/UDFLib.php

@@ -65,6 +65,8 @@ class UDFLib
 
 	private $_udfUniqueId; // Property that contains the UDF widget unique id
 
+	private $_definition_cache = [];
+
 	/**
 	 * Gets CI instance
 	 */
@@ -157,7 +159,7 @@ class UDFLib
 					$found = false; // used to check if the field is found or not in the json schema
 
 					$this->_sortJsonSchemas($jsonSchemasArray); // Sort the list of UDF by sort property
-					
+
 					// Loops through json schemas
 					foreach ($jsonSchemasArray as $jsonSchema)
 					{
@@ -292,7 +294,7 @@ class UDFLib
 				// Checks if the requiredPermissions is available and it is a valid array or a valid string
 				if (isset($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
 					&& (!isEmptyArray($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
-					|| !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
+						|| !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
 				{
 					// Then check if the user has the permissions to read such UDF
 					if (!$this->_readAllowed($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER}))
@@ -353,7 +355,7 @@ class UDFLib
 				// Checks if the requiredPermissions is available and it is a valid array or a valid string
 				if (isset($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
 					&& (!isEmptyArray($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})
-					|| !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
+						|| !isEmptyString($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER})))
 				{
 					// Then check if the user has the permissions to write such UDF
 					if (!$this->_writeAllowed($decodedUDFDefinition->{self::REQUIRED_PERMISSIONS_PARAMETER}))
@@ -613,6 +615,162 @@ class UDFLib
 		);
 	}
 
+	/**
+	 * Gets the UDF definitions for a model
+	 *
+	 * @param DB_Model			$targetModel
+	 *
+	 * @return stdClass
+	 */
+	public function getDefinitionForModel($targetModel)
+	{
+		$dbTable = $targetModel->getDbTable();
+		if (!isset($this->_definition_cache[$dbTable])) {
+			$this->_ci->load->model('system/UDF_model', 'UDFModel');
+			list($schema, $table) = explode('.', $dbTable);
+			$result = $this->_ci->UDFModel->loadWhere([
+				'schema' => $schema,
+				'table' => $table
+			]);
+			if (isError($result))
+				return $result;
+			if (!hasData($result))
+				$this->_definition_cache[$dbTable] = [];
+			else
+				$this->_definition_cache[$dbTable] = json_decode(current($result->retval)->jsons, true);
+		}
+		return success($this->_definition_cache[$dbTable]);
+	}
+
+	/**
+	 * Gets the UDFs for db entry with translated params and resolved listValues for dropdowns
+	 *
+	 * @param DB_Model			$targetModel
+	 * @param mixed				$id
+	 *
+	 * @return stdClass
+	 */
+	public function getFieldArray($targetModel, $id)
+	{
+		// Load Libraries
+		$this->_ci->load->library('PhrasesLib');
+		$this->_ci->load->library('PermissionLib');
+
+		$result = $this->getDefinitionForModel($targetModel);
+		if (isError($result))
+			return $result;
+		$definitions = $result->retval;
+
+		usort($definitions, function ($a, $b) {
+			return $a[self::SORT] - $b[self::SORT];
+		});
+
+		$values = $targetModel->getUDFs($id);
+
+		$fields = [];
+		foreach ($definitions as $field) {
+			// check read permissions
+			if (!$this->_ci->permissionlib->hasAtLeastOne(
+				$field[self::REQUIRED_PERMISSIONS_PARAMETER],
+				self::PERMISSION_TABLE_METHOD,
+				self::PERMISSION_TYPE_READ
+			))
+				continue;
+
+			// set value
+			if (isset($values[$field[self::NAME]])) {
+				$field['value'] = $values[$field[self::NAME]];
+			} elseif (isset($field['defaultValue'])) {
+				$field['value'] = $field['defaultValue'];
+			} elseif (isset($field[self::TYPE]) && $field[self::TYPE] == 'checkbox') {
+				$field['value'] = false;
+			} else {
+				$field['value'] = '';
+			}
+
+			// translate params
+			foreach ([self::LABEL, self::TITLE, self::PLACEHOLDER] as $key) {
+				if (isset($field[$key])) {
+					$res = $this->_ci->phraseslib->getPhrases(self::PHRASES_APP_NAME, getUserLanguage(), $field[$key], null, null, 'no');
+					if (hasData($res))
+						$field[$key] = current(getData($res))->text;
+				}
+			}
+
+			// check write permissions
+			$field['disabled'] = !$this->_ci->permissionlib->hasAtLeastOne(
+				$field[self::REQUIRED_PERMISSIONS_PARAMETER],
+				self::PERMISSION_TABLE_METHOD,
+				self::PERMISSION_TYPE_WRITE
+			);
+
+			// set listValues for dropdowns
+			if (isset($field[self::LIST_VALUES])) {
+				if (isset($field[self::LIST_VALUES]['enum'])) {
+					$field['options'] = $field[self::LIST_VALUES]['enum'];
+				} elseif (isset($field[self::LIST_VALUES]['sql'])) {
+					$res = $this->_ci->UDFModel->execReadOnlyQuery($field[self::LIST_VALUES]['sql']);
+					$field['options'] = hasData($res) ? getData($res) : [];
+				}
+			}
+
+			// add to array
+			$fields[] = $field;
+		}
+		return success($fields);
+	}
+
+	/**
+	 * Gets a validation config array for CI form_validation
+	 *
+	 * @param DB_Model			$targetModel
+	 * @param array				(optional) $filter
+	 *
+	 * @return stdClass
+	 */
+	public function getCiValidations($targetModel, $filter = null)
+	{
+		$result = $this->getDefinitionForModel($targetModel);
+		if (isError($result))
+			return $result;
+		$definitions = getData($result);
+
+		$result = [];
+		foreach ($definitions as $def) {
+			if ($filter && !isset($filter[$def['name']]))
+				continue;
+			$validations = [];
+			if (isset($def['requiredPermissions']))
+				$validations[] = 'has_write_permissions[' . implode(',', $def['requiredPermissions']) . ']';
+			if (isset($def['required']))
+				$validations[] = 'required';
+			if (isset($def['validation'])) {
+				if (isset($def['validation']['max-value']))
+					$validations[] = 'less_than_equal_to[' . $def['validation']['max-value'] . ']';
+				if (isset($def['validation']['min-value']))
+					$validations[] = 'greater_than_equal_to[' . $def['validation']['min-value'] . ']';
+				if (isset($def['validation']['max-length']))
+					$validations[] = 'max_length[' . $def['validation']['max-length'] . ']';
+				if (isset($def['validation']['min-length']))
+					$validations[] = 'min_length[' . $def['validation']['min-length'] . ']';
+				if (isset($def['validation']['regex']) && is_array($def['validation']['regex'])) {
+					foreach ($def['validation']['regex'] as $regex) {
+						if ($regex['language'] == 'php') {
+							$validations[] = 'regex_match[' . $regex['expression'] . ']';
+						}
+					}
+				}
+			}
+			if ($validations)
+				$result[] = [
+					'field' => $def['name'],
+					'label' => $def['title'],
+					'rules' => $validations
+				];
+		}
+		return success($result);
+	}
+
 	// -------------------------------------------------------------------------------------------------
 	// Private methods
 	//
@@ -841,7 +999,7 @@ class UDFLib
 		$htmlParameters[HTMLWidget::HTML_ID] = $jsonSchema->{self::NAME};
 		$htmlParameters[HTMLWidget::HTML_NAME] = $jsonSchema->{self::NAME};
 	}
-	
+
 	/**
 	 * Sort the list of UDF by sort property
 	 */
@@ -864,7 +1022,7 @@ class UDFLib
 			return ($a->{self::SORT} < $b->{self::SORT}) ? -1 : 1;
 		});
 	}
-	
+
 	/**
 	 * Loads the UDF description by the given schema and table
 	 */

application/libraries/dashboard/DashboardLib.php

@@ -0,0 +1,233 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+
+use \stdClass as stdClass;
+
+/**
+ * Description of DashboardLib
+ *
+ * @author bambi
+ */
+class DashboardLib
+{
+	const WIDGET_ID_RANDOM_BYTES = 16;
+	const DEFAULT_DASHBOARD_KURZBZ = 'fhcomplete';
+	const SECTION_IF_FUNKTION_KURZBZ_IS_NULL = 'general';
+	const USEROVERRIDE_SECTION = 'custom';
+	
+	private $_ci; // CI instance
+	
+	public function __construct()
+	{
+		// Loads CI instance
+		$this->_ci =& get_instance();
+		
+		$this->_ci->load->model('dashboard/Dashboard_model', 'DashboardModel');
+		$this->_ci->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
+		$this->_ci->load->model('dashboard/Dashboard_Override_model', 'DashboardOverrideModel');
+	}
+
+	public function generateWidgetId($dashboard_kurzbz = '')
+	{
+		$dashboard_kurzbz = (!empty($dashboard_kurzbz)) ? $dashboard_kurzbz : self::DEFAULT_DASHBOARD_KURZBZ;
+		$widgetid_input = time() . '_' . $dashboard_kurzbz . '_' . bin2hex(random_bytes(self::WIDGET_ID_RANDOM_BYTES));
+		$widgetid = md5($widgetid_input);
+		return $widgetid;
+	}
+	
+	public function getDashboardByKurzbz($dashboard_kurzbz)
+	{
+		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
+
+		if (hasData($result))
+		{
+			return current(getData($result));
+		}
+
+		return null;
+	}
+	
+	public function getMergedConfig($dashboard_id, $uid)
+	{
+		$defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
+		$userconfig = $this->getUserConfig($dashboard_id, $uid);
+		
+		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
+		
+		return $mergedconfig;
+	}
+	
+	public function getDefaultConfig($dashboard_id, $uid)
+	{
+		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
+		$defaultconfig = array();
+		
+		if (hasData($res_presets))
+		{
+			$presets = getData($res_presets);
+			foreach ($presets as $presetobj)
+			{
+				$preset = json_decode($presetobj->preset, true);
+				if (null !== $preset)
+				{
+					$defaultconfig = array_replace_recursive($defaultconfig, $preset);
+				}
+			}
+		}
+		
+		return $defaultconfig;
+	}
+	
+	public function getUserConfig($dashboard_id, $uid)
+	{
+		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
+		
+		if (hasData($res_userconfig))
+		{
+			$data = getData($res_userconfig);
+			$decodedconfig = json_decode(current($data)->override, true);
+			if (null !==  $decodedconfig)
+			{
+				return $decodedconfig;
+			}
+		}
+		
+		return [];
+	}
+	
+	public function getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid)
+	{
+		$override = $this->getOverride($dashboard_kurzbz, $uid);
+		if (null !== $override) {
+			return $override;
+		}
+		
+		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+		
+		$emptyoverride = new stdClass();
+		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
+		$emptyoverride->uid = $uid;
+		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
+		
+		return $emptyoverride;
+	}
+	
+	public function getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz)
+	{
+		if ($funktion_kurzbz === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL)
+			$funktion_kurzbz = null;
+		$preset = $this->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if (null !== $preset) {
+			return $preset;
+		}
+		
+		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+		
+		$emptypreset = new stdClass();
+		$emptypreset->dashboard_id = $dashboard->dashboard_id;
+		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
+		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
+		
+		return $emptypreset;
+	}
+	
+	public function getPreset($dashboard_kurzbz, $section)
+	{
+		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+		
+		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
+		$result = $this->_ci->DashboardPresetModel
+			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
+		
+		if (hasData($result))
+		{
+			return current(getData($result));
+		}
+		
+		return null;
+	}
+
+	public function getOverride($dashboard_kurzbz, $uid)
+	{
+		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
+		
+		$result = $this->_ci->DashboardOverrideModel
+			->getOverride($dashboard->dashboard_id, $uid);
+		
+		if (hasData($result))
+		{
+			return current(getData($result));
+		}
+		
+		return null;
+	}
+	
+	public function insertOrUpdatePreset($preset)
+	{
+		if (isset($preset->preset_id) && $preset->preset_id > 0)
+		{
+			$result = $this->_ci->DashboardPresetModel->update($preset->preset_id, $preset);
+		}
+		else
+		{
+			$result = $this->_ci->DashboardPresetModel->insert($preset);
+		}
+		
+		return $result;
+	}
+	
+	public function insertOrUpdateOverride($override)
+	{
+		if (isset($override->override_id) && $override->override_id > 0)
+		{
+			$result = $this->_ci->DashboardOverrideModel->update($override->override_id, $override);
+		}
+		else
+		{
+			$result = $this->_ci->DashboardOverrideModel->insert($override);
+		}
+		
+		return $result;
+	}
+
+	public function addWidgetsToWidgets(&$widgets, $dashboard_kurzbz, $section, $addwigets)
+	{
+		foreach ($addwigets as $widget)
+		{
+			if(!isset($widget->widgetid))
+			{
+				$widget->widgetid = $this->generateWidgetId($dashboard_kurzbz);
+			}
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget->widgetid);
+		}
+	}
+	
+	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if (!isset($widgets[$section]) || !isset($widgets[$section]["widgets"]) || !is_array($widgets[$section]))
+		{
+			$widgets[$section] = array();
+			$widgets[$section]["widgets"] = array();
+		}
+		
+		$widgets[$section]["widgets"][$widgetid] = $widget;
+	}
+	
+	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if (isset($widgets[$section]) && isset($widgets[$section]["widgets"][$widgetid]))
+		{
+			unset($widgets[$section]["widgets"][$widgetid]);
+			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
+				unset($widgets[$section]);
+			}
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+}

application/libraries/issues/PlausicheckDefinitionLib.php

@@ -0,0 +1,56 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Library containing definitions of all core plausichecks.
+ */
+class PlausicheckDefinitionLib
+{
+	// set fehler for core plausichecks
+	// structure: fehler_kurzbz => class (library) name for resolving
+	private $_fehlerLibMappings = array(
+		'AbbrecherAktiv' => 'AbbrecherAktiv',
+		'AbschlussstatusFehlt' => 'AbschlussstatusFehlt',
+		'AktSemesterNull' => 'AktSemesterNull',
+		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
+		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
+		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
+		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
+		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
+		'FalscheAnzahlAbschlusspruefungen' => 'FalscheAnzahlAbschlusspruefungen',
+		'FalscheAnzahlHeimatadressen' => 'FalscheAnzahlHeimatadressen',
+		'FalscheAnzahlZustelladressen' => 'FalscheAnzahlZustelladressen',
+		'GbDatumWeitZurueck' => 'GbDatumWeitZurueck',
+		'InaktiverStudentAktiverStatus' => 'InaktiverStudentAktiverStatus',
+		'IncomingHeimatNationOesterreich' => 'IncomingHeimatNationOesterreich',
+		'IncomingOhneIoDatensatz' => 'IncomingOhneIoDatensatz',
+		'IncomingOrGsFoerderrelevant' => 'IncomingOrGsFoerderrelevant',
+		'InskriptionVorLetzerBismeldung' => 'InskriptionVorLetzerBismeldung',
+		'NationNichtOesterreichAberGemeinde' => 'NationNichtOesterreichAberGemeinde',
+		'OrgformStgUngleichOrgformPrestudent' => 'OrgformStgUngleichOrgformPrestudent',
+		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
+		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
+		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
+		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
+		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
+		//'StudienplanUngueltig' => 'StudienplanUngueltig'
+		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
+	);
+
+	/**
+	 * Gets all fehler_kurzbz-library mappings for fehler which need to be checked.
+	 */
+	public function getFehlerLibMappings()
+	{
+		return $this->_fehlerLibMappings;
+	}
+
+	/**
+	 * Gets all fehler_kurzbz for fehler which need to be checked.
+	 */
+	public function getFehlerKurzbz()
+	{
+		return array_keys($this->_fehlerLibMappings);
+	}
+}

application/libraries/issues/PlausicheckProducerLib.php

@@ -4,77 +4,125 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class PlausicheckProducerLib
 {
-	const CI_LIBRARY_PATH = 'application/libraries';
+	const CI_PATH = 'application';
+	const CI_LIBRARY_FOLDER = 'libraries';
+	const EXTENSIONS_FOLDER = 'extensions';
 	const PLAUSI_ISSUES_FOLDER = 'issues/plausichecks';
 	const EXECUTE_PLAUSI_CHECK_METHOD_NAME = 'executePlausiCheck';
 
 	private $_ci; // ci instance
-	private $_currentStudiensemester; // current Studiensemester
+	private $_extensionName; // name of extension
+	private $_konfiguration = []; // configuration parameters
+	private $_fehlerLibMappings = []; // mappings of fehler and libraries for producing them
+	private $_isForResolutionCheck = false; // mappings of fehler and libraries for producing them
 
-	// set fehler which can be produced by the job
-	// structure: fehler_kurzbz => class (library) name for resolving
-	private $_fehlerLibMappings = array(
-		'AbbrecherAktiv' => 'AbbrecherAktiv',
-		'AbschlussstatusFehlt' => 'AbschlussstatusFehlt',
-		'AktSemesterNull' => 'AktSemesterNull',
-		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
-		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten',
-		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
-		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
-		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
-		'FalscheAnzahlAbschlusspruefungen' => 'FalscheAnzahlAbschlusspruefungen',
-		'FalscheAnzahlHeimatadressen' => 'FalscheAnzahlHeimatadressen',
-		'FalscheAnzahlZustelladressen' => 'FalscheAnzahlZustelladressen',
-		'GbDatumWeitZurueck' => 'GbDatumWeitZurueck',
-		'InaktiverStudentAktiverStatus' => 'InaktiverStudentAktiverStatus',
-		'IncomingHeimatNationOesterreich' => 'IncomingHeimatNationOesterreich',
-		'IncomingOhneIoDatensatz' => 'IncomingOhneIoDatensatz',
-		'IncomingOrGsFoerderrelevant' => 'IncomingOrGsFoerderrelevant',
-		'InskriptionVorLetzerBismeldung' => 'InskriptionVorLetzerBismeldung',
-		'NationNichtOesterreichAberGemeinde' => 'NationNichtOesterreichAberGemeinde',
-		'OrgformStgUngleichOrgformPrestudent' => 'OrgformStgUngleichOrgformPrestudent',
-		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
-		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
-		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
-		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher'
-		//'StudienplanUngueltig' => 'StudienplanUngueltig'
-	);
-
-	public function __construct()
+	public function __construct($params = null)
 	{
+		// set extension name if called from extension
+		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+		if (isset($params['fehlerLibMappings'])) $this->_fehlerLibMappings = $params['fehlerLibMappings'];
+		if (isset($params['isForResolutionCheck'])) $this->_isForResolutionCheck = $params['isForResolutionCheck'];
+
+		// set application
+		$app = isset($params['app']) ? $params['app'] : null;
+
 		$this->_ci =& get_instance(); // get ci instance
 
-		// load models
-		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
+		// load libraries
+		$this->_ci->load->library('IssuesLib');
 
-		// get current Studiensemester
-		$studiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
-		if (hasData($studiensemesterRes)) $this->_currentStudiensemester = getData($studiensemesterRes)[0]->studiensemester_kurzbz;
+		// load models
+		$this->_ci->load->model('system/Fehlerkonfiguration_model', 'FehlerkonfigurationModel');
+
+		// get all configuration parameters for the application
+		$fehlerkonfigurationRes = $this->_ci->FehlerkonfigurationModel->getKonfiguration($app);
+
+		if (hasData($fehlerkonfigurationRes))
+		{
+			$fehlerkonfiguration = getData($fehlerkonfigurationRes);
+
+			foreach ($fehlerkonfiguration as $fk)
+			{
+				$this->_konfiguration[$fk->fehler_kurzbz][$fk->konfigurationstyp_kurzbz] = $fk->konfiguration;
+			}
+		}
 	}
 
 	/**
-	 * Executes check for a fehler_kurzbz, returns the result.
-	 * @param $fehler_kurzbz string
-	 * @param $studiensemester_kurzbz string optionally needed for issue production
-	 * @param $studiengang_kz int optionally needed for issue production
+	 * Produces multiple plausicheck issues at once and saved them to db.
+	 * @param array $params passed to each plausicheck
+	 * @return result object with occured error and info
 	 */
-	public function producePlausicheckIssue($fehler_kurzbz, $studiensemester_kurzbz = null, $studiengang_kz = null)
+	public function producePlausicheckIssues($params)
 	{
-		$libName = $this->_fehlerLibMappings[$fehler_kurzbz];
+		$result = new StdClass();
+		$result->errors = [];
+		$result->infos = [];
 
-		// get Studiensemester
-		if (isEmptyString($studiensemester_kurzbz)) $studiensemester_kurzbz = $this->_currentStudiensemester;
+		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
+		{
+			$plausicheckRes = $this->producePlausicheckIssue(
+				$libName,
+				$fehler_kurzbz,
+				$params
+			);
 
-		// get path of library for issue to be produced
-		$issuesLibPath = DOC_ROOT . self::CI_LIBRARY_PATH . '/' . self::PLAUSI_ISSUES_FOLDER . '/';
-		$issuesLibFilePath = $issuesLibPath . $libName . '.php';
+			if (hasData($plausicheckRes))
+			{
+				$plausicheckData = getData($plausicheckRes);
+
+				foreach ($plausicheckData as $plausiData)
+				{
+					// get the data needed for issue production
+					$person_id = isset($plausiData['person_id']) ? $plausiData['person_id'] : null;
+					$oe_kurzbz = isset($plausiData['oe_kurzbz']) ? $plausiData['oe_kurzbz'] : null;
+					$fehlertext_params = isset($plausiData['fehlertext_params']) ? $plausiData['fehlertext_params'] : null;
+					$resolution_params = isset($plausiData['resolution_params']) ? $plausiData['resolution_params'] : null;
+
+					// write the issue
+					$addIssueRes = $this->_ci->issueslib->addFhcIssue($fehler_kurzbz, $person_id, $oe_kurzbz, $fehlertext_params, $resolution_params);
+
+					// log if error, or log info if inserted new issue
+					if (isError($addIssueRes))
+						$result->errors[] = getError($addIssueRes);
+					elseif (hasData($addIssueRes) && is_integer(getData($addIssueRes)))
+						$result->infos[] = "Plausicheck issue " . $fehler_kurzbz . " successfully produced, person_id: " . $person_id;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Executes plausicheck using a given library, returns the result.
+	 * @param $libName string name of library producing the issue
+	 * @param $fehler_kurzbz string unique short name of fehler, for which issue is produced
+	 * @param $params parameters passed to issue production method
+	 */
+	public function producePlausicheckIssue($libName, $fehler_kurzbz, $params)
+	{
+		// if called from extension (extension name set), path includes extension names
+		$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+
+		// path for loading issue library
+		$issuesLibPath = $libRootPath . self::PLAUSI_ISSUES_FOLDER . '/';
+
+		// file path of library for check if file exists
+		$issuesLibFilePath = DOC_ROOT . self::CI_PATH
+			. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::PLAUSI_ISSUES_FOLDER . '/' . $libName . '.php';
 
 		// check if library file exists
 		if (!file_exists($issuesLibFilePath)) return error("Issue library file " . $issuesLibFilePath . " does not exist");
 
+		// load konfiguration parameters of the fehler_kurzbz
+		$config = isset($this->_konfiguration[$fehler_kurzbz]) ? $this->_konfiguration[$fehler_kurzbz] : null;
+
 		// load library connected to fehlercode
-		$this->_ci->load->library(self::PLAUSI_ISSUES_FOLDER . '/'.$libName);
+		$this->_ci->load->library(
+			$issuesLibPath . $libName,
+			['configurationParams' => $config, 'isForResolutionCheck' => $this->_isForResolutionCheck]
+		);
 
 		$lowercaseLibName = mb_strtolower($libName);
 
@@ -82,21 +130,7 @@ class PlausicheckProducerLib
 		if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::EXECUTE_PLAUSI_CHECK_METHOD_NAME)))
 			return error("Method " . self::EXECUTE_PLAUSI_CHECK_METHOD_NAME . " is not defined in library $lowercaseLibName");
 
-		// pass the data needed for issue check
-		$paramsForCheck = array(
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'studiengang_kz' => $studiengang_kz
-		);
-
 		// call the function for checking for issue production
-		return $this->_ci->{$lowercaseLibName}->{self::EXECUTE_PLAUSI_CHECK_METHOD_NAME}($paramsForCheck);
-	}
-
-	/**
-	 * Gets all fehler_kurzbz for fehler which need to be checked.
-	 */
-	public function getFehlerKurzbz()
-	{
-		return array_keys($this->_fehlerLibMappings);
+		return $this->_ci->{$lowercaseLibName}->{self::EXECUTE_PLAUSI_CHECK_METHOD_NAME}($params);
 	}
 }

application/libraries/issues/PlausicheckResolverLib.php

@@ -0,0 +1,137 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class PlausicheckResolverLib
+{
+	const CI_PATH = 'application';
+	const CI_LIBRARY_FOLDER = 'libraries';
+	const EXTENSIONS_FOLDER = 'extensions';
+	const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
+	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
+
+	private $_ci; // ci instance
+	private $_extensionName; // name of extension
+	private $_codeLibMappings = []; // mappings for issues which explicitly defined resolver
+	private $_codeProducerLibMappings = []; // mappings for issues which are resolved with the same check as they are produced
+
+	public function __construct($params = null)
+	{
+		// set extension name if called from extension
+		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+		if (isset($params['codeLibMappings'])) $this->_codeLibMappings = $params['codeLibMappings'];
+		if (isset($params['codeProducerLibMappings'])) $this->_codeProducerLibMappings = $params['codeProducerLibMappings'];
+
+		$this->_ci =& get_instance(); // get ci instance
+
+		$this->_ci->load->library('IssuesLib');
+		$this->_ci->load->library('issues/PlausicheckProducerLib', ['extensionName' => $this->_extensionName, 'isForResolutionCheck' => true]);
+	}
+
+	/**
+	 * Reseolves multiple plausicheck issues at once.
+	 * @param array $codeLibMappings contains fehler type to check and library responsible for check (fehlercode => libName)
+	 * @param array $openIssues passed issues to resolve
+	 * @return result object with occured error and info
+	 */
+	public function resolvePlausicheckIssues($openIssues)
+	{
+		$result = new StdClass();
+		$result->errors = [];
+		$result->infos = [];
+
+		foreach ($openIssues as $issue)
+		{
+			// add person id and oe kurzbz automatically as params, merge it with additional params
+			// decode bewerbung_parameter into assoc array
+			$params = array_merge(
+				array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
+				isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
+			);
+
+			$issueResolved = false;
+
+			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
+			if (isset($this->_codeLibMappings[$issue->fehlercode]))
+			{
+				$libName = $this->_codeLibMappings[$issue->fehlercode];
+
+				// if called from extension (extension name set), path includes extension names
+				$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+
+				// path for loading issue library
+				$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
+
+				// file path of library for check if file exists
+				$issuesLibFilePath = DOC_ROOT . self::CI_PATH
+					. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
+
+				// check if library file exists
+				if (!file_exists($issuesLibFilePath))
+				{
+					// log error and continue with next issue if not
+					$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
+					continue;
+				}
+
+				// load library connected to fehlercode
+				$this->_ci->load->library($issuesLibPath . $libName);
+
+				$lowercaseLibName = mb_strtolower($libName);
+
+				// check if method is defined in library class
+				if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
+				{
+					// log error and continue with next issue if not
+					$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
+					continue;
+				}
+
+				// call the function for checking for issue resolution
+				$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+				if (isError($issueResolvedRes))
+				{
+					$result->errors[] = getError($issueResolvedRes);
+				}
+				else
+				{
+					$issueResolved = getData($issueResolvedRes) === true;
+				}
+			}
+			elseif (isset($this->_codeProducerLibMappings[$issue->fehlercode])) // check if it is an issue without explicit resolver, "self-resolving"
+			{
+				$libName = $this->_codeProducerLibMappings[$issue->fehlercode];
+
+				// execute same check as used for issue production 
+				$issueResolvedRes = $this->_ci->plausicheckproducerlib->producePlausicheckIssue(
+					$libName,
+					$issue->fehler_kurzbz,
+					$params
+				);
+
+				if (isError($issueResolvedRes))
+				{
+					$result->errors[] = getError($issueResolvedRes);
+				}
+				else
+				{
+					$issueResolved = !hasData($issueResolvedRes);
+				}
+			}
+
+			// set issue to resolved if needed
+			if ($issueResolved)
+			{
+				$behobenRes = $this->_ci->issueslib->setBehoben($issue->issue_id, null);
+
+				if (isError($behobenRes))
+					$result->errors[] = getError($behobenRes);
+				else
+					$result->infos[] = "Issue " . $issue->issue_id . " successfully resolved";
+			}
+		}
+
+		return $result;
+	}
+}

application/libraries/issues/plausichecks/AbbrecherAktiv.php

@@ -9,35 +9,21 @@ require_once('PlausiChecker.php');
  */
 class AbbrecherAktiv extends PlausiChecker
 {
-	public function executePlausiCheck($params)
-	{
-		$results = array();
+	protected $_base_sql = "
+		SELECT
+			pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+		FROM
+			public.tbl_prestudentstatus pre_status
+			JOIN public.tbl_prestudent pre USING(prestudent_id)
+			JOIN public.tbl_student student USING(prestudent_id)
+			JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
+			JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+		WHERE
+			pre_status.status_kurzbz ='Abbrecher'
+			AND benutzer.aktiv=true";
 
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAbbrecherAktiv($studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
+	protected $_config_params = ['exkludierteStudiengaenge' => " AND stg.studiengang_kz NOT IN ?"];
+	protected $_params_for_checking = ['studiengang_kz' => " AND stg.studiengang_kz = ?", 'prestudent_id' => " AND pre.prestudent_id = ?"];
+	protected $_fehlertext_params = ['prestudent_id'];
+	protected $_resolution_params = ['prestudent_id'];
 }

application/libraries/issues/plausichecks/AbschlussstatusFehlt.php

@@ -13,12 +13,20 @@ class AbschlussstatusFehlt extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAbschlussstatusFehlt($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getAbschlussstatusFehlt(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -41,4 +49,95 @@ class AbschlussstatusFehlt extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Prestudent should have a final status.
+	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getAbschlussstatusFehlt(
+		$studiensemester_kurzbz = null,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array();
+
+		$qry = "
+			SELECT
+				DISTINCT ON (pre.prestudent_id)
+				pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, status.studiensemester_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_person USING(person_id)
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			WHERE
+				NOT EXISTS( /*student does not study anymore*/
+					SELECT
+						1
+					FROM
+						public.tbl_prestudentstatus ps
+						JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+					WHERE
+						prestudent_id=pre.prestudent_id
+						/* 4 months: There might be Diplomanden, in summer months end status is often not entered yet */
+						AND tbl_studiensemester.ende>now() - interval '4 months'
+				)
+				/* check only valid begininng with 2018 */
+				AND '2018-01-01'<(SELECT max(datum) FROM public.tbl_prestudentstatus WHERE prestudent_id=pre.prestudent_id)
+				AND NOT EXISTS( /* no end status */
+					SELECT 1
+					FROM public.tbl_prestudentstatus ps
+					WHERE
+						prestudent_id=pre.prestudent_id
+						AND status_kurzbz IN('Abbrecher','Abgewiesener','Absolvent','Incoming')
+				)
+				AND stg.melderelevant
+				AND pre.bismelden";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
+
+			if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;
+
+			if (hasData($prevStudiensemesterRes))
+			{
+				// if Studiensemester given, check only if has status in current or previous semester
+				$prevStudiensemester = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
+				$qry .= " AND EXISTS (
+							SELECT 1
+							FROM public.tbl_prestudentstatus ps
+							WHERE studiensemester_kurzbz IN (?, ?)
+							AND ps.prestudent_id = pre.prestudent_id
+						)";
+				$params[] = $prevStudiensemester;
+				$params[] = $studiensemester_kurzbz;
+			}
+		}
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/AktSemesterNull.php

@@ -13,12 +13,15 @@ class AktSemesterNull extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -47,4 +50,51 @@ class AktSemesterNull extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Current Ausbildungssemester shouldn't be 0.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				DISTINCT pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, prestat.studiensemester_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_prestudentstatus prestat USING(prestudent_id)
+				JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			WHERE
+				prestat.status_kurzbz != 'Incoming'
+				AND prestat.studiensemester_kurzbz = ?
+				AND ausbildungssemester = 0
+				AND stg.melderelevant
+				AND pre.bismelden";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/AktiverStudentOhneStatus.php

@@ -13,11 +13,14 @@ class AktiverStudentOhneStatus extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAktiverStudentOhneStatus($studiengang_kz);
+		$prestudentRes = $this->getAktiverStudentOhneStatus($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -40,4 +43,57 @@ class AktiverStudentOhneStatus extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Students with active Benutzer should have a status in the current semester.
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getAktiverStudentOhneStatus($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
+		$params = array();
+
+		$qry = "
+			SELECT
+				DISTINCT (student_uid), prestudent.person_id, prestudent.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_student student
+				JOIN public.tbl_benutzer benutzer on (benutzer.uid = student.student_uid)
+				JOIN public.tbl_prestudent prestudent USING(prestudent_id)
+				JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
+			WHERE
+				benutzer.aktiv=TRUE
+				AND stg.melderelevant
+				AND prestudent.bismelden
+				AND NOT EXISTS (
+					SELECT 1
+					FROM public.tbl_prestudentstatus
+					JOIN public.tbl_studiensemester sem USING (studiensemester_kurzbz)
+					WHERE prestudent_id = prestudent.prestudent_id
+					/* buffer of four months, as status are often entered later */
+					AND sem.ende::date > NOW() - interval '4 months'
+				)";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/AktiverStudentstatusOhneKontobuchung.php

@@ -0,0 +1,120 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('PlausiChecker.php');
+
+/**
+ * Student with active status should have been charged, i.e. have a Kontobuchung with negative or zero value.
+ */
+class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
+{
+	public function executePlausiCheck($params)
+	{
+		$results = array();
+
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
+		// pass parameters needed for plausicheck
+		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
+		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+
+		// get all students failing the plausicheck
+		$prestudentRes = $this->getAktiverStudentstatusOhneKontobuchung(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
+
+		if (isError($prestudentRes)) return $prestudentRes;
+
+		if (hasData($prestudentRes))
+		{
+			$prestudents = getData($prestudentRes);
+
+			// populate results with data necessary for writing issues
+			foreach ($prestudents as $prestudent)
+			{
+				$results[] = array(
+					'person_id' => $prestudent->person_id,
+					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
+					'fehlertext_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
+					),
+					'resolution_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
+					)
+				);
+			}
+		}
+
+		// return the results
+		return success($results);
+	}
+
+	/**
+	 * Student with active status should have been charged, i.e. have a Kontobuchung with a negative or zero value.
+	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getAktiverStudentstatusOhneKontobuchung(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				DISTINCT ON (pre.prestudent_id)
+				pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, status.studiensemester_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_person pers USING(person_id)
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			WHERE
+				status.studiensemester_kurzbz = ?
+				AND status.status_kurzbz IN ('Student', 'Incoming')
+				AND NOT EXISTS (
+					SELECT 1
+					FROM
+						public.tbl_konto
+					WHERE
+						person_id = pers.person_id
+						AND studiensemester_kurzbz = status.studiensemester_kurzbz
+						AND buchungsnr_verweis IS NULL
+						AND betrag <= 0
+				)
+				AND stg.melderelevant
+				AND pre.bismelden";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
+}

application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php

@@ -13,14 +13,19 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAusbildungssemPrestudentUngleichAusbildungssemStatus(
+		$prestudentRes = $this->getAusbildungssemPrestudentUngleichAusbildungssemStatus(
 			$studiensemester_kurzbz,
-			$studiengang_kz
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
 		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
@@ -53,4 +58,59 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Ausbildungssemester of prestudent (lehrverband) must be the same as Ausbildungssemester of prestudentstatus.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getAusbildungssemPrestudentUngleichAusbildungssemStatus(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array($studiensemester_kurzbz, $studiensemester_kurzbz, $studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				DISTINCT(student.student_uid), student.student_uid, prestudent.person_id, prestudent.prestudent_id,
+				status.ausbildungssemester AS status_ausbildungssemester, lv.semester AS student_ausbildungssemester, status.studiensemester_kurzbz,
+				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_student student
+				JOIN public.tbl_studentlehrverband lv USING(student_uid)
+				JOIN public.tbl_prestudent prestudent USING(prestudent_id)
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
+			WHERE
+				status.studiensemester_kurzbz = ?
+				AND lv.studiensemester_kurzbz = ?
+				AND status.status_kurzbz NOT IN ('Interessent','Bewerber','Aufgenommener','Wartender','Abgewiesener','Unterbrecher')
+				AND get_rolle_prestudent (prestudent_id, ?)='Student'
+				AND status.ausbildungssemester != lv.semester";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/BewerberNichtZumRtAngetreten.php

@@ -13,12 +13,20 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getBewerberNichtZumRtAngetreten($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getBewerberNichtZumRtAngetreten(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -44,4 +52,72 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Bewerber should have participated in Reihungstest.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getBewerberNichtZumRtAngetreten(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$previousStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
+
+		if (isError($previousStudiensemesterRes)) return $previousStudiensemesterRes;
+
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				prestudent.person_id, prestudent.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, status.studiensemester_kurzbz
+			FROM
+				public.tbl_prestudent prestudent
+				JOIN public.tbl_prestudentstatus status ON(prestudent.prestudent_id=status.prestudent_id)
+				JOIN public.tbl_person USING(person_id)
+				LEFT JOIN bis.tbl_orgform USING(orgform_kurzbz)
+				JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			WHERE
+				status_kurzbz='Bewerber'
+				AND reihungstestangetreten=false
+				AND stg.melderelevant
+				AND prestudent.bismelden";
+
+		if (hasData($previousStudiensemesterRes))
+		{
+			$previousStudiensemester = getData($previousStudiensemesterRes)[0]->studiensemester_kurzbz;
+			$qry .= " AND (studiensemester_kurzbz=? OR studiensemester_kurzbz=?)";
+			$params[] = $previousStudiensemester;
+		}
+		else
+		{
+			$qry .= " AND studiensemester_kurzbz=?";
+		}
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/DatumAbschlusspruefungFehlt.php

@@ -13,12 +13,20 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getDatumAbschlusspruefungFehlt($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getDatumAbschlusspruefungFehlt(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -44,4 +52,72 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Date of final exam shouldn't be missing for Absolvent.
+	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param abschlusspruefung_id int if check is to be executed for a certain Abschlussprüfung
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getDatumAbschlusspruefungFehlt(
+		$studiensemester_kurzbz = null,
+		$studiengang_kz = null,
+		$abschlusspruefung_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array();
+
+		$qry = "
+			SELECT
+				pre.person_id, pre.prestudent_id,
+				pruefung.sponsion, pruefung.datum, pruefung.abschlusspruefung_id,
+				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_student stud USING(prestudent_id)
+				JOIN public.tbl_prestudentstatus prestatus USING(prestudent_id)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+				JOIN lehre.tbl_abschlusspruefung pruefung ON stud.student_uid = pruefung.student_uid
+			WHERE
+				status_kurzbz = 'Absolvent'
+				AND NOT EXISTS ( /* exclude gs */
+					SELECT 1
+					FROM bis.tbl_mobilitaet
+					WHERE prestudent_id = pre.prestudent_id
+					AND studiensemester_kurzbz = prestatus.studiensemester_kurzbz
+				)
+				AND abschlussbeurteilung_kurzbz!='nicht'
+				AND abschlussbeurteilung_kurzbz IS NOT NULL
+				AND pruefung.datum IS NULL
+				AND pre.bismelden
+				AND stg.melderelevant";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .= " AND prestatus.studiensemester_kurzbz = ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($abschlusspruefung_id))
+		{
+			$qry .= " AND pruefung.abschlusspruefung_id = ?";
+			$params[] = $abschlusspruefung_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/DatumSponsionFehlt.php

@@ -13,12 +13,20 @@ class DatumSponsionFehlt extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getDatumSponsionFehlt($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getDatumSponsionFehlt(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -44,4 +52,72 @@ class DatumSponsionFehlt extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Date of sponsion shouldn't be missing for Absolvent.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param abschlusspruefung_id int if check is to be executed only for a certain Abschlussprüfung
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getDatumSponsionFehlt(
+		$studiensemester_kurzbz = null,
+		$studiengang_kz = null,
+		$abschlusspruefung_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array();
+
+		$qry = "
+			SELECT
+				pre.person_id, pre.prestudent_id,
+				pruefung.sponsion, pruefung.datum, pruefung.abschlusspruefung_id,
+				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_student stud USING(prestudent_id)
+				JOIN public.tbl_prestudentstatus prestatus USING(prestudent_id)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+				JOIN lehre.tbl_abschlusspruefung pruefung ON stud.student_uid = pruefung.student_uid
+			WHERE
+				status_kurzbz = 'Absolvent'
+				AND NOT EXISTS ( /* exclude gs */
+					SELECT 1
+					FROM bis.tbl_mobilitaet
+					WHERE prestudent_id = pre.prestudent_id
+					AND studiensemester_kurzbz = prestatus.studiensemester_kurzbz
+				)
+				AND abschlussbeurteilung_kurzbz!='nicht'
+				AND abschlussbeurteilung_kurzbz IS NOT NULL
+				AND pruefung.sponsion IS NULL
+				AND pre.bismelden
+				AND stg.melderelevant";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .= " AND prestatus.studiensemester_kurzbz = ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($abschlusspruefung_id))
+		{
+			$qry .= " AND pruefung.abschlusspruefung_id = ?";
+			$params[] = $abschlusspruefung_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/DatumStudiensemesterFalscheReihenfolge.php

@@ -13,11 +13,14 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz);
+		$prestudentRes = $this->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -42,4 +45,64 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Status Dates and status studysemester dates should be in correct order.
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if check is to be executed only for certain Studiengaenge
+	 * @return success with prestudents or error
+	 */
+	public function getDatumStudiensemesterFalscheReihenfolge($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
+		$params = array();
+
+		// all active students with Status student in current semester
+		$qry = "
+			SELECT DISTINCT ON (prestudent_id) *
+			FROM (
+				SELECT
+					prestudent.person_id, prestudent.prestudent_id,
+					stg.studiengang_kz, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz,
+					ROW_NUMBER () OVER (
+						PARTITION BY prestudent.prestudent_id
+						ORDER BY sem.start DESC, status.datum DESC, status.insertamum DESC, status.ext_id DESC
+					) AS reihenfolge_semester,
+					ROW_NUMBER () OVER (
+						PARTITION BY prestudent.prestudent_id
+						ORDER BY status.datum DESC, status.insertamum DESC, status.ext_id DESC
+					) AS reihenfolge_datum
+				FROM
+					public.tbl_student student
+					JOIN public.tbl_benutzer benutzer on(student.student_uid = benutzer.uid)
+					JOIN public.tbl_prestudent prestudent USING(prestudent_id)
+					JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+					JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
+					JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
+				WHERE
+					benutzer.aktiv=true
+					AND status.status_kurzbz='Student'
+			) reihenfolge
+			WHERE reihenfolge_semester <> reihenfolge_datum";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php

@@ -0,0 +1,143 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('PlausiChecker.php');
+
+/**
+ *
+ */
+class DualesStudiumOhneMarkierung extends PlausiChecker
+{
+	public function executePlausiCheck($params)
+	{
+		$results = array();
+
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
+		// pass parameters needed for plausicheck
+		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
+		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+
+		// get all students failing the plausicheck
+		$prestudentRes = $this->getDualesStudiumOhneMarkierung(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
+
+		if (isError($prestudentRes)) return $prestudentRes;
+
+		if (hasData($prestudentRes))
+		{
+			$prestudents = getData($prestudentRes);
+
+			// populate results with data necessary for writing issues
+			foreach ($prestudents as $prestudent)
+			{
+				$results[] = array(
+					'person_id' => $prestudent->person_id,
+					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
+					'fehlertext_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studienplan' => $prestudent->studienplan
+					),
+					'resolution_params' => array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
+					)
+				);
+			}
+		}
+
+		// return the results
+		return success($results);
+	}
+
+	/**
+	 * All prestudents in dual Studiengang should have set the dual flag to true.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getDualesStudiumOhneMarkierung(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				DISTINCT pre.person_id, pre.prestudent_id,
+				stpl.bezeichnung AS studienplan,
+				status.studiensemester_kurzbz,
+				status.ausbildungssemester,
+				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_person USING(person_id)
+				JOIN lehre.tbl_studienplan stpl USING(studienplan_id)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+				JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
+			WHERE
+				(stpl.orgform_kurzbz = 'DUA' OR status.orgform_kurzbz = 'DUA')
+				AND pre.dual = FALSE
+				AND status.studiensemester_kurzbz=?
+				AND pre.bismelden
+				AND stg.melderelevant
+				AND NOT EXISTS (
+					SELECT 1
+					FROM
+						public.tbl_prestudentstatus
+						JOIN lehre.tbl_studienplan USING(studienplan_id)
+						JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+					WHERE
+						prestudent_id = pre.prestudent_id
+						AND
+						(
+							-- if there is a newer non-dual status, dual has not to be set
+							(
+								(
+									tbl_studienplan.orgform_kurzbz <> stpl.orgform_kurzbz
+									OR status.orgform_kurzbz <> tbl_prestudentstatus.orgform_kurzbz
+								)
+								AND
+								(
+									tbl_studiensemester.ende::date > sem.ende::date
+									OR (tbl_studiensemester.ende::date = sem.ende::date AND tbl_prestudentstatus.datum::date > status.datum::date)
+								)
+							)
+							OR
+								-- exclude Abgewiesene - they are not reported
+								tbl_prestudentstatus.status_kurzbz = 'Abgewiesener'
+						)
+				)";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
+}

application/libraries/issues/plausichecks/FalscheAnzahlAbschlusspruefungen.php

@@ -13,12 +13,20 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getFalscheAnzahlAbschlusspruefungen($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getFalscheAnzahlAbschlusspruefungen(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -41,4 +49,77 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Students with finished studies should have exactly one final exam.
+	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getFalscheAnzahlAbschlusspruefungen(
+		$studiensemester_kurzbz = null,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array();
+
+		$qry = "
+			SELECT * FROM (
+				SELECT
+					DISTINCT ON(pre.prestudent_id) pre.person_id, pre.prestudent_id, student_uid, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz,
+					(
+						SELECT COUNT(*)
+						FROM lehre.tbl_abschlusspruefung
+						WHERE student_uid = stud.student_uid
+						AND abschlussbeurteilung_kurzbz != 'nicht'
+						AND abschlussbeurteilung_kurzbz IS NOT NULL
+					) AS anzahl_abschlusspruefungen
+				FROM
+					public.tbl_prestudent pre
+					JOIN public.tbl_student stud USING(prestudent_id)
+					JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+					JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+				WHERE
+					status_kurzbz = 'Absolvent'
+					AND pre.bismelden
+					AND stg.melderelevant
+					AND NOT EXISTS ( /* exclude gs */
+						SELECT 1
+						FROM bis.tbl_mobilitaet
+						WHERE prestudent_id = pre.prestudent_id
+						AND studiensemester_kurzbz = status.studiensemester_kurzbz
+					)";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .= " AND status.studiensemester_kurzbz = ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		$qry .= ") studenten
+			WHERE anzahl_abschlusspruefungen != 1";
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/FalscheAnzahlHeimatadressen.php

@@ -13,12 +13,20 @@ class FalscheAnzahlHeimatadressen extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getFalscheAnzahlHeimatadressen($studiensemester_kurzbz, $studiengang_kz);
+		$personRes = $this->getFalscheAnzahlHeimatadressen(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($personRes)) return $personRes;
 
@@ -39,4 +47,67 @@ class FalscheAnzahlHeimatadressen extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Students should have exactly one home address.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param person_id int if check is to be executed only for one person
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getFalscheAnzahlHeimatadressen(
+		$studiensemester_kurzbz = null,
+		$studiengang_kz = null,
+		$person_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array();
+
+		$qry = "
+			SELECT
+				DISTINCT person_id
+			FROM
+				(
+					SELECT person_id, COUNT(adresse_id) AS anzahl_adressen
+					FROM public.tbl_adresse addr
+					WHERE heimatadresse IS TRUE
+					GROUP BY person_id
+				) adressen
+				JOIN public.tbl_person USING(person_id)
+				JOIN public.tbl_prestudent pre USING(person_id)
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_student USING(prestudent_id)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+			WHERE
+				anzahl_adressen != 1
+				AND stg.melderelevant
+				AND pre.bismelden";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .= " AND status.studiensemester_kurzbz = ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($person_id))
+		{
+			$qry .= " AND person_id = ?";
+			$params[] = $person_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/FalscheAnzahlZustelladressen.php

@@ -13,12 +13,20 @@ class FalscheAnzahlZustelladressen extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getFalscheAnzahlZustelladressen($studiensemester_kurzbz, $studiengang_kz);
+		$personRes = $this->getFalscheAnzahlZustelladressen(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($personRes)) return $personRes;
 
@@ -39,4 +47,67 @@ class FalscheAnzahlZustelladressen extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Students should have exactly one delivery address.
+	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param person_id int if check is to be executed only for one person
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getFalscheAnzahlZustelladressen(
+		$studiensemester_kurzbz = null,
+		$studiengang_kz = null,
+		$person_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array();
+
+		$qry = "
+			SELECT
+				DISTINCT person_id
+			FROM
+				(
+					SELECT person_id, COUNT(adresse_id) AS anzahl_adressen
+					FROM public.tbl_adresse addr
+					WHERE zustelladresse IS TRUE
+					GROUP BY person_id
+				) adressen
+				JOIN public.tbl_person USING(person_id)
+				JOIN public.tbl_prestudent pre USING(person_id)
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_student USING(prestudent_id)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+			WHERE
+				anzahl_adressen != 1
+				AND stg.melderelevant
+				AND pre.bismelden";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .= " AND status.studiensemester_kurzbz = ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($person_id))
+		{
+			$qry .= " AND person_id = ?";
+			$params[] = $person_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/GbDatumWeitZurueck.php

@@ -13,12 +13,15 @@ class GbDatumWeitZurueck extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getGbDatumWeitZurueck($studiensemester_kurzbz, $studiengang_kz);
+		$personRes = $this->getGbDatumWeitZurueck($studiensemester_kurzbz, $studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($personRes)) return $personRes;
 
@@ -39,4 +42,63 @@ class GbDatumWeitZurueck extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Birthdate is too long ago.
+	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param person_id int if check is to be executed only for one person
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getGbDatumWeitZurueck(
+		$studiensemester_kurzbz = null,
+		$studiengang_kz = null,
+		$person_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array();
+
+		$qry = "
+			SELECT
+				pers.person_id
+			FROM
+				public.tbl_person pers
+			WHERE
+				pers.gebdatum < '1920-01-01'
+				AND EXISTS (
+					SELECT 1
+					FROM public.tbl_prestudent
+					JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+					JOIN public.tbl_studiengang stg USING(studiengang_kz)
+					WHERE person_id = pers.person_id";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .= " AND status.studiensemester_kurzbz = ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		$qry .= ")";
+
+		if (isset($person_id))
+		{
+			$qry .= " AND pers.person_id = ?";
+			$params[] = $person_id;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php

@@ -13,12 +13,20 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getInaktiverStudentAktiverStatus($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getInaktiverStudentAktiverStatus(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -44,4 +52,63 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Students with active status should have an active Benutzer.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getInaktiverStudentAktiverStatus(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
+		$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
+
+		if (isError($aktStudiensemesterRes)) return $aktStudiensemesterRes;
+
+		$studiensemester_kurzbz = hasData($aktStudiensemesterRes) ? getData($aktStudiensemesterRes)[0]->studiensemester_kurzbz : '';
+
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				DISTINCT(student.student_uid), prestudent.person_id, prestudent.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_benutzer benutzer
+				JOIN public.tbl_student student on(benutzer.uid = student.student_uid)
+				JOIN public.tbl_prestudent prestudent USING(prestudent_id)
+				JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
+			WHERE
+				benutzer.aktiv=false
+				AND EXISTS (SELECT 1 FROM public.tbl_prestudentstatus WHERE prestudent_id = prestudent.prestudent_id AND studiensemester_kurzbz = ?)
+				AND get_rolle_prestudent(prestudent_id, NULL) IN ('Student', 'Diplomand', 'Unterbrecher', 'Praktikant')
+				AND stg.melderelevant
+				AND prestudent.bismelden";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php

@@ -13,12 +13,20 @@ class IncomingHeimatNationOesterreich extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getIncomingHeimatNationOesterreich($studiensemester_kurzbz, $studiengang_kz);
+		$personRes = $this->getIncomingHeimatNationOesterreich(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($personRes)) return $personRes;
 
@@ -39,4 +47,58 @@ class IncomingHeimatNationOesterreich extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Incoming shouldn't have austrian home address.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param person_id int if check is to be executed only for one person
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getIncomingHeimatNationOesterreich(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$person_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				DISTINCT pers.person_id, status.studiensemester_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_person pers USING(person_id)
+				JOIN public.tbl_adresse addr USING(person_id)
+				JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			WHERE
+				status.status_kurzbz = 'Incoming'
+				AND addr.nation = 'A'
+				AND addr.heimatadresse
+				AND status.studiensemester_kurzbz = ?
+				AND stg.melderelevant
+				AND pre.bismelden";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($person_id))
+		{
+			$qry .= " AND pers.person_id = ?";
+			$params[] = $person_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/IncomingOhneIoDatensatz.php

@@ -13,11 +13,14 @@ class IncomingOhneIoDatensatz extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getIncomingOhneIoDatensatz($studiengang_kz);
+		$prestudentRes = $this->getIncomingOhneIoDatensatz($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -40,4 +43,54 @@ class IncomingOhneIoDatensatz extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Incoming should have IN/OUT data.
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getIncomingOhneIoDatensatz($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
+		$params = array();
+
+		$qry = "
+			SELECT
+				DISTINCT ON(student_uid, nachname, vorname)
+				tbl_person.person_id,
+				tbl_prestudent.prestudent_id,
+				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_student
+				JOIN public.tbl_benutzer ON(student_uid=uid)
+				JOIN public.tbl_person USING(person_id)
+				JOIN public.tbl_prestudent USING(prestudent_id)
+				JOIN public.tbl_prestudentstatus ON(tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id)
+				JOIN public.tbl_studiengang stg ON(stg.studiengang_kz=tbl_student.studiengang_kz)
+			WHERE
+				bismelden=TRUE
+				AND status_kurzbz='Incoming' AND NOT EXISTS (SELECT 1 FROM bis.tbl_bisio WHERE student_uid=tbl_student.student_uid)
+				AND stg.melderelevant";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND tbl_prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php

@@ -13,12 +13,20 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getIncomingOrGsFoerderrelevant($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getIncomingOrGsFoerderrelevant(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -41,4 +49,77 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Incoming or gemeinsame Studien students should not receive funding (not be förderrelevant).
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return object success or error
+	 */
+	public function getIncomingOrGsFoerderrelevant(
+		$studiensemester_kurzbz = null,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array();
+
+		$qry = "
+			SELECT
+				DISTINCT ON(prestudent_id)
+				pers.person_id,
+				ps.prestudent_id,
+				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_student stud
+				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
+				(
+					status.status_kurzbz = 'Incoming'
+					OR EXISTS (
+						SELECT 1
+						FROM
+							bis.tbl_mobilitaet
+							JOIN public.tbl_prestudent USING(prestudent_id)
+						WHERE
+							prestudent_id = ps.prestudent_id
+							AND gsstudientyp_kurzbz = 'Extern'
+					)
+				)
+				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 = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND ps.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/InskriptionVorLetzerBismeldung.php

@@ -13,12 +13,20 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getInskriptionVorLetzerBismeldung($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getInskriptionVorLetzerBismeldung(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -48,4 +56,93 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Students of a semester shouldn't start studies before the date of Bismeldung.
+	 * e.g. If student studies in WS2022 datum of status shouldn't be before 15.4.2020
+	 * e.g. If student studies in SS2022 datum of status shouldn't be before 15.11.2022
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getInskriptionVorLetzerBismeldung(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		// get Bismeldedatum
+		$datumBis = $this->_getBisdateFromSemester($studiensemester_kurzbz);
+
+		$params = array($datumBis, $studiensemester_kurzbz, $datumBis);
+
+		// get active students
+		$qry = "
+			SELECT
+				DISTINCT ON (student.student_uid) ? AS datum_bismeldung,
+				prestudent.person_id, prestudent.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, status.studiensemester_kurzbz
+			FROM
+				public.tbl_benutzer benutzer
+				JOIN public.tbl_student student on(benutzer.uid = student.student_uid)
+				JOIN public.tbl_prestudent prestudent USING(prestudent_id)
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
+			WHERE
+				benutzer.aktiv=true
+				AND status.studiensemester_kurzbz = ?
+				/* inscription date before date of first student status */
+				AND (
+					SELECT datum
+					FROM public.tbl_prestudentstatus
+					WHERE prestudent_id = prestudent.prestudent_id
+					AND studiensemester_kurzbz = status.studiensemester_kurzbz
+					AND status_kurzbz = 'Student'
+					ORDER BY datum, insertamum, ext_id
+					LIMIT 1
+				) < ?
+				AND stg.melderelevant
+				AND prestudent.bismelden";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
+
+	/**
+	 * Gets Bismeldedate from Studiensemester.
+	 * @param studiensemester_kurzbz string
+	 */
+	private function _getBisdateFromSemester($studiensemester_kurzbz)
+	{
+		$semesterYear = substr($studiensemester_kurzbz, 2, 6);
+		$semesterType = substr($studiensemester_kurzbz, 0, 2);
+
+		if ($semesterType == 'SS')
+		{
+			return date_format(date_create(($semesterYear - 1)."-11-15"), 'Y-m-d');
+		}
+
+		if ($semesterType == 'WS')
+		{
+			return date_format(date_create($semesterYear."-04-15"), 'Y-m-d');
+		}
+	}
 }

application/libraries/issues/plausichecks/NationNichtOesterreichAberGemeinde.php

@@ -13,11 +13,18 @@ class NationNichtOesterreichAberGemeinde extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getNationNichtOesterreichAberGemeinde($studiengang_kz);
+		$personRes = $this->getNationNichtOesterreichAberGemeinde(
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($personRes)) return $personRes;
 
@@ -39,4 +46,49 @@ class NationNichtOesterreichAberGemeinde extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Nation is not Austria, but address has austrian Gemeinde.
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param person_id int if check is to be executed only for one person
+	 * @return success with prestudents or error
+	 */
+	public function getNationNichtOesterreichAberGemeinde($studiengang_kz = null, $person_id = null, $exkludierte_studiengang_kz = null)
+	{
+		$params = array();
+
+		$qry = "SELECT DISTINCT tbl_person.person_id, adr.gemeinde, adr.adresse_id
+				FROM
+					public.tbl_adresse adr
+					JOIN public.tbl_prestudent USING(person_id)
+					JOIN public.tbl_person USING(person_id)
+					JOIN public.tbl_student USING(prestudent_id)
+					JOIN public.tbl_benutzer ON(uid=student_uid)
+					JOIN public.tbl_studiengang stg ON tbl_prestudent.studiengang_kz = stg.studiengang_kz
+				WHERE
+					adr.nation!='A'
+					AND tbl_benutzer.aktiv
+					AND gemeinde NOT IN ('Münster')
+					AND EXISTS(SELECT 1 FROM bis.tbl_gemeinde WHERE name = adr.gemeinde)";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($person_id))
+		{
+			$qry .= " AND tbl_person.person_id = ?";
+			$params[] = $person_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php

@@ -13,12 +13,20 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getOrgformStgUngleichOrgformPrestudent($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getOrgformStgUngleichOrgformPrestudent(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -49,4 +57,74 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Orgform of a Studiengang in Studienplan should be the same as orgform of student.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getOrgformStgUngleichOrgformPrestudent(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				prestudent.person_id, prestudent.prestudent_id, status.studiensemester_kurzbz,
+				studiengang.orgform_kurzbz AS stg_orgform, status.orgform_kurzbz AS student_orgform,
+				prestudent.studiengang_kz AS student_studiengang, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_studiengang studiengang
+				JOIN public.tbl_student student USING(studiengang_kz)
+				JOIN public.tbl_prestudent prestudent USING(prestudent_id)
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_benutzer benutzer on(benutzer.uid = student.student_uid)
+				JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
+				LEFT JOIN lehre.tbl_studienplan stpl USING (studienplan_id)
+			WHERE
+				benutzer.aktiv = true
+				AND status.status_kurzbz IN ('Student', 'Unterbrecher', 'Abbrecher', 'Diplomand', 'Absolvent')
+				AND studiengang.studiengang_kz < 10000
+				AND status.studiensemester_kurzbz = ?
+				AND NOT (status.orgform_kurzbz IS NULL AND studiengang.mischform = FALSE)
+				AND NOT EXISTS(
+					SELECT 1
+					FROM
+						lehre.tbl_studienplan
+					JOIN
+						lehre.tbl_studienordnung USING(studienordnung_id)
+					WHERE
+						tbl_studienplan.studienplan_id = stpl.studienplan_id
+						AND tbl_studienordnung.studiengang_kz = prestudent.studiengang_kz
+						AND tbl_studienplan.orgform_kurzbz = status.orgform_kurzbz)";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND studiengang.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		$qry .= "
+			ORDER BY student_uid";
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/PlausiChecker.php

@@ -6,13 +6,28 @@
 abstract class PlausiChecker
 {
 	protected $_ci; // code igniter instance
+	protected $_config; // all applicable configuration parameters for this plausicheck
+	protected $_db; // database for queries
 
-	public function __construct()
+	protected $_isForResolutionCheck; // if true, additional parameters only needed for resolution are checked
+
+	protected $_config_params = []; // name of all config params which should be applied for this plausicheck, with sql [name] => [sql]
+	protected $_params_for_checking = []; // name of all passed params for checking, with sql [name] => [sql]
+
+	protected $_fehlertext_params = []; // parameter names for fehlertext params used for this plausicheck
+	protected $_resolution_params = []; // parameter names for resolution params used for this plausicheck
+
+	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		// load libraries
-		$this->_ci->load->library('issues/PlausicheckLib'); // load plausicheck library
+		// set configuration
+		$this->_config = $params['configurationParams'] ?? [];
+
+		$this->_isForResolutionCheck = $params['isForResolutionCheck'] ?? false;
+
+		// get database for queries
+		$this->_db = new DB_Model();
 	}
 
 	/**
@@ -20,5 +35,83 @@ abstract class PlausiChecker
 	 * @param $paramsForChecking array parameters needed for executing the check
 	 * @return array with objects which failed the plausi check
 	 */
-	abstract public function executePlausiCheck($paramsForChecking);
+	public function executePlausiCheck($paramsForChecking)
+	{
+		$results = [];
+		$params = [];
+		$qry = $this->_base_sql;
+
+		if ($this->_isForResolutionCheck == true)
+		{
+			foreach ($this->_resolution_params as $resParam)
+			{
+				if (!isset($paramsForChecking[$resParam]))
+					return error("$resParam missing".(isset($paramsForChecking['issue_id']) ? ", issue ID: ".$paramsForChecking['issue_id'] : ""));
+			}
+		}
+
+		// add config params to query
+		if (isset($this->_config_params) && !isEmptyArray($this->_config_params))
+		{
+			foreach ($this->_config_params as $param_name => $param_sql)
+			{
+				if (isset($this->_config[$param_name]))
+				{
+					$qry .= $param_sql;
+					$params[] = $this->_config[$param_name];
+				}
+			}
+		}
+
+		// add check params to query
+		if (isset($this->_params_for_checking) && !isEmptyArray($this->_params_for_checking))
+		{
+			foreach ($this->_params_for_checking as $param_name => $param_sql)
+			{
+				if (isset($paramsForChecking[$param_name]))
+				{
+					$qry .= $param_sql;
+					$params[] = $paramsForChecking[$param_name];
+				}
+			}
+		}
+
+		$result = $this->_db->execReadOnlyQuery($qry, $params);
+
+		if (isError($result)) return $result;
+
+		if (hasData($result))
+		{
+			$data = getData($result);
+
+			// populate results with data necessary for writing issues
+			foreach ($data as $d)
+			{
+				$fehlertext_params = [];
+				$resolution_params = [];
+
+				// add params for error texts
+				foreach ($this->_fehlertext_params as $param)
+				{
+					if (isset($d->{$param})) $fehlertext_params[$param] = $d->{$param};
+				}
+
+				// add params for resolution of issue
+				foreach ($this->_resolution_params as $param)
+				{
+					if (isset($d->{$param})) $resolution_params[$param] = $d->{$param};
+				}
+
+				$results[] = array(
+					'person_id' => $d->person_id,
+					'oe_kurzbz' => $d->prestudent_stg_oe_kurzbz,
+					'fehlertext_params' => $fehlertext_params,
+					'resolution_params' => $resolution_params
+				);
+			}
+		}
+
+		// return the results
+		return success($results);
+	}
 }

application/libraries/issues/plausichecks/PrestudentMischformOhneOrgform.php

@@ -13,12 +13,20 @@ class PrestudentMischformOhneOrgform extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getPrestudentMischformOhneOrgform($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getPrestudentMischformOhneOrgform(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -47,4 +55,55 @@ class PrestudentMischformOhneOrgform extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Students in "mixed" Studiengang should have Orgform.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getPrestudentMischformOhneOrgform(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, status.studiensemester_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_person USING(person_id)
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			WHERE
+				status.status_kurzbz IN ('Bewerber', 'Student')
+				AND stg.mischform
+				AND (status.orgform_kurzbz='' OR status.orgform_kurzbz IS NULL)
+				AND status.studiensemester_kurzbz=?";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudent.php

@@ -13,11 +13,14 @@ class StgPrestudentUngleichStgStudent extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getStgPrestudentUngleichStgStudent($studiengang_kz);
+		$prestudentRes = $this->getStgPrestudentUngleichStgStudent($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -40,4 +43,48 @@ class StgPrestudentUngleichStgStudent extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Studiengang should be the same for prestudent and student.
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getStgPrestudentUngleichStgStudent($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
+		$params = array();
+
+		$qry = "
+			SELECT
+				pre.person_id, pre.prestudent_id, stg.oe_kurzbz prestudent_stg_oe_kurzbz, student_stg.oe_kurzbz student_stg_oe_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_student stud USING(prestudent_id)
+				JOIN public.tbl_person pers USING(person_id)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+				JOIN public.tbl_studiengang student_stg ON stud.studiengang_kz = student_stg.studiengang_kz
+			WHERE
+				stud.studiengang_kz != pre.studiengang_kz";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudienplan.php

@@ -13,11 +13,14 @@ class StgPrestudentUngleichStgStudienplan extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getStgPrestudentUngleichStgStudienplan($studiengang_kz);
+		$prestudentRes = $this->getStgPrestudentUngleichStgStudienplan($studiengang_kz, null, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -40,4 +43,62 @@ class StgPrestudentUngleichStgStudienplan extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Studiengang should be the same for prestudent and studienplan.
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param studienordnung_id int if check is to be executed only for a certain studienordnung_id
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getStgPrestudentUngleichStgStudienplan(
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$studienordnung_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array();
+
+		$qry = "
+			SELECT
+				DISTINCT ON (ps.prestudent_id) ps.person_id, ps.prestudent_id, stordnung.studienordnung_id,
+				stplan.bezeichnung AS studienplan, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_prestudent ps
+				JOIN public.tbl_prestudentstatus USING(prestudent_id)
+				JOIN lehre.tbl_studienplan stplan USING(studienplan_id)
+				JOIN lehre.tbl_studienordnung stordnung USING(studienordnung_id)
+				JOIN public.tbl_person USING(person_id)
+				JOIN public.tbl_studiengang stg ON ps.studiengang_kz = stg.studiengang_kz
+			WHERE
+				ps.studiengang_kz<>stordnung.studiengang_kz
+				AND stg.melderelevant";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND ps.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($studienordnung_id))
+		{
+			$qry .= " AND stordnung.studienordnung_id = ?";
+			$params[] = $studienordnung_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/StudentstatusNachAbbrecher.php

@@ -13,11 +13,14 @@ class StudentstatusNachAbbrecher extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getStudentstatusNachAbbrecher($studiengang_kz);
+		$prestudentRes = $this->getStudentstatusNachAbbrecher($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -40,4 +43,48 @@ class StudentstatusNachAbbrecher extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * There shouldn't be any status after Abbrecher status.
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getStudentstatusNachAbbrecher($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
+		$params = array();
+
+		$qry = "
+			SELECT
+				prestudent.person_id, prestudent.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_student student
+				JOIN public.tbl_prestudent prestudent USING(prestudent_id)
+				JOIN public.tbl_prestudentstatus prestatus USING(prestudent_id)
+				JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
+			WHERE
+				prestatus.status_kurzbz = 'Abbrecher'
+				AND get_rolle_prestudent(prestudent.prestudent_id, prestatus.studiensemester_kurzbz) <> 'Abbrecher'";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/StudienplanUngueltig.php

@@ -13,12 +13,20 @@ class StudienplanUngueltig extends PlausiChecker
 	{
 		$results = array();
 
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getStudienplanUngueltig($studiensemester_kurzbz, $studiengang_kz);
+		$prestudentRes = $this->getStudienplanUngueltig(
+			$studiensemester_kurzbz,
+			$studiengang_kz,
+			null,
+			$exkludierte_studiengang_kz
+		);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -48,4 +56,71 @@ class StudienplanUngueltig extends PlausiChecker
 		// return the results
 		return success($results);
 	}
+
+	/**
+	 * Studienplan should be valid in current Ausbildungssemester of prestudent.
+	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getStudienplanUngueltig(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
+		$params = array($studiensemester_kurzbz);
+
+		$qry = "
+			SELECT
+				DISTINCT pre.person_id, pre.prestudent_id,
+				tbl_studienplan.bezeichnung AS studienplan,
+				status.status_kurzbz,
+				status.studiensemester_kurzbz,
+				status.ausbildungssemester,
+				stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_prestudent pre
+				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
+				JOIN public.tbl_person USING(person_id)
+				JOIN lehre.tbl_studienplan USING(studienplan_id)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+			WHERE
+				status_kurzbz in('Student', 'Interessent','Bewerber','Aufgenommener')
+				AND NOT EXISTS (
+					SELECT
+						1
+					FROM
+						lehre.tbl_studienplan_semester
+					WHERE
+						studienplan_id=status.studienplan_id
+						AND tbl_studienplan_semester.semester = status.ausbildungssemester
+						AND tbl_studienplan_semester.studiensemester_kurzbz = status.studiensemester_kurzbz
+				)
+				AND status.studiensemester_kurzbz=?
+				AND pre.bismelden
+				AND stg.melderelevant";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND tbl_prestudent.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/resolvers/CORE_INOUT_0007.php

@@ -17,10 +17,10 @@ class CORE_INOUT_0007 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/IncomingHeimatNationOesterreich');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getIncomingHeimatNationOesterreich($params['studiensemester_kurzbz'], null, $params['issue_person_id']);
+		$checkRes = $this->_ci->incomingheimatnationoesterreich->getIncomingHeimatNationOesterreich($params['studiensemester_kurzbz'], null, $params['issue_person_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_INOUT_0008.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Incoming should have IN/OUT data entry.
  */
 class CORE_INOUT_0008 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_INOUT_0008 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/IncomingOhneIoDatensatz');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getIncomingOhneIoDatensatz(null, $params['prestudent_id']);
+		$checkRes = $this->_ci->incomingohneiodatensatz->getIncomingOhneIoDatensatz(null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_INOUT_0009.php

@@ -14,10 +14,10 @@ class CORE_INOUT_0009 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/IncomingOrGsFoerderrelevant');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getIncomingOrGsFoerderrelevant(null, null, $params['prestudent_id']);
+		$checkRes = $this->_ci->incomingorgsfoerderrelevant->getIncomingOrGsFoerderrelevant(null, null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_PERSON_0001.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Birth date of person shouldn't be too long ago.
  */
 class CORE_PERSON_0001 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_PERSON_0001 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/GbDatumWeitZurueck');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getGbDatumWeitZurueck(null, null, $params['issue_person_id']);
+		$checkRes = $this->_ci->gbdatumweitzurueck->getGbDatumWeitZurueck(null, null, $params['issue_person_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_PERSON_0002.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Nation of person should be austria if Gemeinde (city) is austrian.
  */
 class CORE_PERSON_0002 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_PERSON_0002 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/NationNichtOesterreichAberGemeinde');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getNationNichtOesterreichAberGemeinde(null, $params['issue_person_id']);
+		$checkRes = $this->_ci->nationnichtoesterreichabergemeinde->getNationNichtOesterreichAberGemeinde(null, $params['issue_person_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_PERSON_0003.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Person should have only one home adress.
  */
 class CORE_PERSON_0003 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_PERSON_0003 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/FalscheAnzahlHeimatadressen');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getFalscheAnzahlHeimatadressen(null, null, $params['issue_person_id']);
+		$checkRes = $this->_ci->falscheanzahlheimatadressen->getFalscheAnzahlHeimatadressen(null, null, $params['issue_person_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_PERSON_0004.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Person should have only one delivery adress.
  */
 class CORE_PERSON_0004 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_PERSON_0004 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/FalscheAnzahlZustelladressen');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getFalscheAnzahlZustelladressen(null, null, $params['issue_person_id']);
+		$checkRes = $this->_ci->falscheanzahlzustelladressen->getFalscheAnzahlZustelladressen(null, null, $params['issue_person_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_PERSON_0005.php

@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Geburtsnation missing
+ */
+class CORE_PERSON_0005 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
+			return error('Person Id missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+
+		// load geburtsnation for the given person
+		$this->_ci->PersonModel->addSelect('geburtsnation');
+		$personRes = $this->_ci->PersonModel->load($params['issue_person_id']);
+
+		if (isError($personRes)) return $personRes;
+
+		if (hasData($personRes))
+		{
+			// get person data
+			$personData = getData($personRes)[0];
+
+			// if geburtsnation present, issue is resolved
+			return success(!isEmptyString($personData->geburtsnation));
+		}
+		else
+			return success(false); // if no person found, not resolved
+	}
+}

application/libraries/issues/resolvers/CORE_PERSON_0006.php

@@ -0,0 +1,37 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Geburtsnation missing
+ */
+class CORE_PERSON_0006 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
+			return error('Person Id missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->model('codex/Uhstat1daten_model', 'UhstatModel');
+
+		$personRes = $this->_ci->UhstatModel->getUHSTAT1PersonData([$params['issue_person_id']]);
+
+		if (isError($personRes)) return $personRes;
+
+		if (hasData($personRes))
+		{
+			// get person data
+			$personData = getData($personRes)[0];
+
+			// if person identification data present, issue is resolved
+			return success(
+				!isEmptyString($personData->ersatzkennzeichen)
+				|| (!isEmptyString($personData->vbpkAs) && !isEmptyString($personData->vbpkBf))
+			);
+		}
+		else
+			return success(false); // if no person found, not resolved
+	}
+}

application/libraries/issues/resolvers/CORE_STG_0001.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Studiengang should be the same for prestudent and student.
  */
 class CORE_STG_0001 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_STG_0001 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/StgPrestudentUngleichStgStudent');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getStgPrestudentUngleichStgStudent(null, $params['prestudent_id']);
+		$checkRes = $this->_ci->stgprestudentungleichstgstudent->getStgPrestudentUngleichStgStudent(null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STG_0002.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Orgform of a Studiengang in Studienplan should be the same as orgform of student.
  */
 class CORE_STG_0002 implements IIssueResolvedChecker
 {
@@ -17,10 +17,10 @@ class CORE_STG_0002 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/OrgformStgUngleichOrgformPrestudent');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getOrgformStgUngleichOrgformPrestudent($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
+		$checkRes = $this->_ci->orgformstgungleichorgformprestudent->getOrgformStgUngleichOrgformPrestudent($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STG_0003.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Students in "mixed" Studiengang should have Orgform.
  */
 class CORE_STG_0003 implements IIssueResolvedChecker
 {
@@ -17,10 +17,10 @@ class CORE_STG_0003 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/PrestudentMischformOhneOrgform');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getPrestudentMischformOhneOrgform($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
+		$checkRes = $this->_ci->prestudentmischformohneorgform->getPrestudentMischformOhneOrgform($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STG_0004.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Studiengang should be the same for prestudent and studienplan.
  */
 class CORE_STG_0004 implements IIssueResolvedChecker
 {
@@ -17,10 +17,10 @@ class CORE_STG_0004 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/StgPrestudentUngleichStgStudienplan');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getStgPrestudentUngleichStgStudienplan(null, $params['prestudent_id'], $params['studienordnung_id']);
+		$checkRes = $this->_ci->stgprestudentungleichstgstudienplan->getStgPrestudentUngleichStgStudienplan(null, $params['prestudent_id'], $params['studienordnung_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0001.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Abbrecher cannot be active.
  */
 class CORE_STUDENTSTATUS_0001 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_STUDENTSTATUS_0001 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/AbbrecherAktiv');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAbbrecherAktiv(null, $params['prestudent_id']);
+		$checkRes = $this->_ci->abbrecheraktiv->getAbbrecherAktiv(null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0002.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * There shouldn't be any status after Abbrecher status.
  */
 class CORE_STUDENTSTATUS_0002 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_STUDENTSTATUS_0002 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/StudentstatusNachAbbrecher');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getStudentstatusNachAbbrecher(null, $params['prestudent_id']);
+		$checkRes = $this->_ci->studentstatusnachabbrecher->getStudentstatusNachAbbrecher(null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0003.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Ausbildungssemester of prestudent (lehrverband) must be the same as Ausbildungssemester of prestudentstatus.
  */
 class CORE_STUDENTSTATUS_0003 implements IIssueResolvedChecker
 {
@@ -17,10 +17,14 @@ class CORE_STUDENTSTATUS_0003 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAusbildungssemPrestudentUngleichAusbildungssemStatus($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
+		$checkRes = $this->_ci->ausbildungssemprestudentungleichausbildungssemstatus->getAusbildungssemPrestudentUngleichAusbildungssemStatus(
+			$params['studiensemester_kurzbz'],
+			null,
+			$params['prestudent_id']
+		);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Students with active status should have an active Benutzer.
  */
 class CORE_STUDENTSTATUS_0004 implements IIssueResolvedChecker
 {
@@ -17,10 +17,14 @@ class CORE_STUDENTSTATUS_0004 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/InaktiverStudentAktiverStatus');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getInaktiverStudentAktiverStatus($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
+		$checkRes = $this->_ci->inaktiverstudentaktiverstatus->getInaktiverStudentAktiverStatus(
+			$params['studiensemester_kurzbz'],
+			null,
+			$params['prestudent_id']
+		);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0005.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Students of a semester shouldn't start studies before the date of Bismeldung.
  */
 class CORE_STUDENTSTATUS_0005 implements IIssueResolvedChecker
 {
@@ -17,10 +17,10 @@ class CORE_STUDENTSTATUS_0005 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/InskriptionVorLetzerBismeldung');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getInskriptionVorLetzerBismeldung($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
+		$checkRes = $this->_ci->inskriptionvorletzerbismeldung->getInskriptionVorLetzerBismeldung($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0006.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Status Dates and status studysemester dates should be in correct order.
  */
 class CORE_STUDENTSTATUS_0006 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_STUDENTSTATUS_0006 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/DatumStudiensemesterFalscheReihenfolge');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getDatumStudiensemesterFalscheReihenfolge(null, $params['prestudent_id']);
+		$checkRes = $this->_ci->datumstudiensemesterfalschereihenfolge->getDatumStudiensemesterFalscheReihenfolge(null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0007.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Students with active Benutzer should have a status in the current semester.
  */
 class CORE_STUDENTSTATUS_0007 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_STUDENTSTATUS_0007 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/AktiverStudentOhneStatus');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAktiverStudentOhneStatus(null, $params['prestudent_id']);
+		$checkRes = $this->_ci->aktiverstudentohnestatus->getAktiverStudentOhneStatus(null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0008.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Studienplan should be valid in current Ausbildungssemester of prestudent.
  */
 class CORE_STUDENTSTATUS_0008 implements IIssueResolvedChecker
 {
@@ -17,10 +17,10 @@ class CORE_STUDENTSTATUS_0008 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/StudienplanUngueltig');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getStudienplanUngueltig($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
+		$checkRes = $this->_ci->studienplanungueltig->getStudienplanUngueltig($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0009.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Students with finished studies should have exactly one final exam.
  */
 class CORE_STUDENTSTATUS_0009 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_STUDENTSTATUS_0009 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/FalscheAnzahlAbschlusspruefungen');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getFalscheAnzahlAbschlusspruefungen(null, null, $params['prestudent_id']);
+		$checkRes = $this->_ci->falscheanzahlabschlusspruefungen->getFalscheAnzahlAbschlusspruefungen(null, null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0010.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Date of final exam shouldn't be missing for Absolvent.
  */
 class CORE_STUDENTSTATUS_0010 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_STUDENTSTATUS_0010 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/DatumAbschlusspruefungFehlt');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getDatumAbschlusspruefungFehlt(null, null, $params['abschlusspruefung_id']);
+		$checkRes = $this->_ci->datumabschlusspruefungfehlt->getDatumAbschlusspruefungFehlt(null, null, $params['abschlusspruefung_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0011.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Date of sponsion shouldn't be missing for Absolvent.
  */
 class CORE_STUDENTSTATUS_0011 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_STUDENTSTATUS_0011 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/DatumSponsionFehlt');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getDatumSponsionFehlt(null, null, $params['abschlusspruefung_id']);
+		$checkRes = $this->_ci->datumsponsionfehlt->getDatumSponsionFehlt(null, null, $params['abschlusspruefung_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0012.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Bewerber should have participated in Reihungstest.
  */
 class CORE_STUDENTSTATUS_0012 implements IIssueResolvedChecker
 {
@@ -17,10 +17,14 @@ class CORE_STUDENTSTATUS_0012 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/BewerberNichtZumRtAngetreten');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getBewerberNichtZumRtAngetreten($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
+		$checkRes = $this->_ci->bewerbernichtzumrtangetreten->getBewerberNichtZumRtAngetreten(
+			$params['studiensemester_kurzbz'],
+			null,
+			$params['prestudent_id']
+		);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0013.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Current Ausbildungssemester shouldn't be 0.
  */
 class CORE_STUDENTSTATUS_0013 implements IIssueResolvedChecker
 {
@@ -17,10 +17,10 @@ class CORE_STUDENTSTATUS_0013 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/AktSemesterNull');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAktSemesterNull($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
+		$checkRes = $this->_ci->aktsemesternull->getAktSemesterNull($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Incoming shouldn't have austrian home address.
+ * Prestudent should have a final status.
  */
 class CORE_STUDENTSTATUS_0014 implements IIssueResolvedChecker
 {
@@ -14,10 +14,10 @@ class CORE_STUDENTSTATUS_0014 implements IIssueResolvedChecker
 
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		$this->_ci->load->library('issues/PlausicheckLib');
+		$this->_ci->load->library('issues/plausichecks/AbschlussstatusFehlt');
 
 		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAbschlussstatusFehlt(null, null, $params['prestudent_id']);
+		$checkRes = $this->_ci->abschlussstatusfehlt->getAbschlussstatusFehlt(null, null, $params['prestudent_id']);
 
 		if (isError($checkRes)) return $checkRes;
 

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0015.php

@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Student with active status should have been charged, i.e. have a Kontobuchung with negative or zero value.
+ */
+class CORE_STUDENTSTATUS_0015 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
+			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
+
+		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
+			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->library('issues/plausichecks/AktiverStudentstatusOhneKontobuchung');
+
+		// check if issue persists
+		$checkRes = $this->_ci->aktiverstudentstatusohnekontobuchung->getAktiverStudentstatusOhneKontobuchung(
+			$params['studiensemester_kurzbz'],
+			null,
+			$params['prestudent_id']
+		);
+
+		if (isError($checkRes)) return $checkRes;
+
+		if (hasData($checkRes))
+			return success(false); // not resolved if issue is still present
+		else
+			return success(true); // resolved otherwise
+	}
+}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0016.php

@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Student in dual Studiengang should have set the dual flag to true.
+ */
+class CORE_STUDENTSTATUS_0016 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
+			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
+
+		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
+			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->library('issues/plausichecks/DualesStudiumOhneMarkierung');
+
+		// check if issue persists
+		$checkRes = $this->_ci->dualesstudiumohnemarkierung->getDualesStudiumOhneMarkierung(
+			$params['studiensemester_kurzbz'],
+			null,
+			$params['prestudent_id']
+		);
+
+		if (isError($checkRes)) return $checkRes;
+
+		if (hasData($checkRes))
+			return success(false); // not resolved if issue is still present
+		else
+			return success(true); // resolved otherwise
+	}
+}

application/libraries/vertragsbestandteil/AbstractBestandteil.php

@@ -0,0 +1,69 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\IValidation;
+
+/**
+ * Description of AbstractBestandteil
+ *
+ * @author bambi
+ */
+abstract class AbstractBestandteil implements IValidation
+{
+	protected $isvalid;
+	protected $validationerrors;
+	
+	protected $modifiedcolumns;
+	protected $fromdb;
+	
+	public function __construct()
+	{
+		$this->isvalid = false;
+		$this->validationerrors = array();
+		
+		$this->modifiedcolumns = array();
+		$this->fromdb  = false;
+	}
+	
+	public function isDirty() {
+		return count($this->modifiedcolumns) > 0;
+	}
+	
+	protected function markDirty($columnname, $old_value, $new_value) {
+		if( $this->fromdb ) {
+			// data comes from db dont check for changes
+			if( isset($this->modifiedcolumns[$columnname]) ) {
+				unset($this->modifiedcolumns[$columnname]);
+			}
+			return;
+		}	
+		
+		if( is_bool($new_value) && ($old_value !== $new_value) ) {
+			$this->modifiedcolumns[$columnname] = $columnname;
+		} else if($old_value != $new_value) {		
+			$this->modifiedcolumns[$columnname] = $columnname;
+		}
+	}
+	
+	public function isValid()
+	{
+		return $this->isvalid;
+	}
+
+	public function getValidationErrors()
+	{
+		return $this->validationerrors;
+	}
+
+	
+	public function addValidationError($errormsg)
+	{
+		if( !in_array($errormsg, $this->validationerrors, true) )
+		{
+			$this->validationerrors[] = $errormsg;
+		}
+		$this->isvalid = false;
+	}
+	
+	abstract public function hydrateByStdClass($data, $fromdb=false);
+}

application/libraries/vertragsbestandteil/Dienstverhaeltnis.php

@@ -0,0 +1,296 @@
+<?php
+namespace vertragsbestandteil;
+
+require_once __DIR__ . '/IValidation.php';
+require_once __DIR__ . '/AbstractBestandteil.php';
+
+use vertragsbestandteil\AbstractBestandteil;
+use vertragsbestandteil\IValidation;
+
+const TYPE_ECHT = 'echterdv';
+const TYPE_STUDENTISCHE_HILFSKRAFT = 'studentischehilfskr';
+const TYPE_FREI = 'freierdv';
+const TYPE_EXTERN = 'externerlehrender';
+const TYPE_GAST = 'gastlektor';
+const TYPE_ECHT_FREI = 'echterfreier';
+const TYPE_WERKVERTRAG = 'werkvertrag';
+const TYPE_UEBERLASSUNG = 'ueberlassungsvertrag';
+
+class Dienstverhaeltnis extends AbstractBestandteil {
+    protected $dienstverhaeltnis_id;
+	protected $mitarbeiter_uid;
+    protected $vertragsart_kurzbz;
+    protected $oe_kurzbz;
+	protected $checkoverlap;
+    protected $von;
+    protected $bis;
+	protected $insertamum;
+	protected $insertvon;
+	protected $updateamum;
+	protected $updatevon;
+
+	protected $dvendegrund_kurzbz;
+	protected $dvendegrund_anmerkung;
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->checkoverlap = true;
+	}
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{		
+		$this->fromdb = $fromdb;
+		isset($data->dienstverhaeltnis_id) && $this->setDienstverhaeltnis_id($data->dienstverhaeltnis_id);
+		isset($data->mitarbeiter_uid) && $this->setMitarbeiter_uid($data->mitarbeiter_uid);
+		isset($data->vertragsart_kurzbz) && $this->setVertragsart_kurzbz($data->vertragsart_kurzbz);
+		isset($data->checkoverlap) && $this->setCheckoverlap($data->checkoverlap);
+		isset($data->oe_kurzbz) && $this->setOe_kurzbz($data->oe_kurzbz);		
+		isset($data->von) && $this->setVon($data->von);
+		isset($data->bis) && $this->setBis($data->bis);
+		isset($data->insertamum) && $this->setInsertamum($data->insertamum);
+		isset($data->insertvon) && $this->setInsertvon($data->insertvon);
+		isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
+		isset($data->updatevon) && $this->setUpdatevon($data->updatevon);
+		isset($data->dvendegrund_kurzbz) && $this->setDvendegrund_kurzbz($data->dvendegrund_kurzbz);
+		isset($data->dvendegrund_anmerkung) && $this->setDvendegrund_anmerkung($data->dvendegrund_anmerkung);
+		$this->fromdb = false;
+	}
+	
+    public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'dienstverhaeltnis_id' => $this->getDienstverhaeltnis_id(),
+			'mitarbeiter_uid' => $this->getMitarbeiter_uid(),
+			'vertragsart_kurzbz' => $this->getVertragsart_kurzbz(),
+            'oe_kurzbz' => $this->getOe_kurzbz(),
+			'von' => $this->getVon(),
+            'bis' => $this->getBis(),
+			'insertamum' => $this->getInsertamum(),
+			'insertvon' => $this->getInsertvon(),
+			'updateamum' => $this->getUpdateamum(),
+			'updatevon' => $this->getUpdatevon(), 
+			'dvendegrund_kurzbz' => $this->getDvendegrund_kurzbz(), 
+			'dvendegrund_anmerkung' => $this->getDvendegrund_anmerkung()
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+
+
+    public function __toString()
+	{
+		$txt = <<<EOTXT
+		dienstverhaeltnis_id: {$this->getDienstverhaeltnis_id()}
+		mitarbeiter_uid: {$this->getMitarbeiter_uid()}
+		vertragsart_kurzbz: {$this->getVertragsart_kurzbz()}
+		oe_kurzbz: {$this->getOe_kurzbz()}
+		von: {$this->getVon()}
+        bis: {$this->getBis()}
+
+EOTXT;
+		return $txt;
+	}
+
+	public function getDienstverhaeltnis_id()
+	{
+		return $this->dienstverhaeltnis_id;
+	}
+
+	public function getMitarbeiter_uid()
+	{
+		return $this->mitarbeiter_uid;
+	}
+
+	public function getVertragsart_kurzbz()
+	{
+		return $this->vertragsart_kurzbz;
+	}
+
+	public function getOe_kurzbz()
+	{
+		return $this->oe_kurzbz;
+	}
+
+	public function getVon()
+	{
+		return $this->von;
+	}
+
+	public function getBis()
+	{
+		return $this->bis;
+	}
+
+	public function getInsertamum()
+	{
+		return $this->insertamum;
+	}
+
+	public function getInsertvon()
+	{
+		return $this->insertvon;
+	}
+
+	public function getUpdateamum()
+	{
+		return $this->updateamum;
+	}
+
+	public function getUpdatevon()
+	{
+		return $this->updatevon;
+	}
+
+	public function getDvendegrund_kurzbz()
+	{
+	    return $this->dvendegrund_kurzbz;
+	}
+
+	public function getDvendegrund_anmerkung()
+	{
+	    return $this->dvendegrund_anmerkung;
+	}
+
+	public function setDienstverhaeltnis_id($dienstverhaeltnis_id)
+	{
+		$this->markDirty('dienstverhaeltnis_id', $this->dienstverhaeltnis_id, $dienstverhaeltnis_id);
+		$this->dienstverhaeltnis_id = $dienstverhaeltnis_id;
+		return $this;
+	}
+
+	public function setMitarbeiter_uid($mitarbeiter_uid)
+	{
+		$this->markDirty('mitarbeiter_uid', $this->mitarbeiter_uid, $mitarbeiter_uid);
+		$this->mitarbeiter_uid = $mitarbeiter_uid;
+		return $this;
+	}
+
+	public function setVertragsart_kurzbz($vertragsart_kurzbz)
+	{
+		$this->markDirty('vertragsart_kurzbz', $this->vertragsart_kurzbz, $vertragsart_kurzbz);
+		$this->vertragsart_kurzbz = $vertragsart_kurzbz;
+		return $this;
+	}
+
+	public function setCheckoverlap(bool $checkoverlap)
+	{
+		$this->checkoverlap = $checkoverlap;
+	}
+	
+	public function setOe_kurzbz($oe_kurzbz)
+	{
+		$this->markDirty('oe_kurzbz', $this->oe_kurzbz, $oe_kurzbz);
+		$this->oe_kurzbz = $oe_kurzbz;
+		return $this;
+	}
+
+	public function setVon($von)
+	{
+		$this->markDirty('von', $this->von, $von);
+		$this->von = $von;
+		return $this;
+	}
+
+	public function setBis($bis)
+	{
+		$this->markDirty('bis', $this->bis, $bis);
+		$this->bis = $bis;
+		return $this;
+	}
+
+	public function setInsertamum($insertamum)
+	{
+		$this->markDirty('insertamum', $this->insertamum, $insertamum);
+		$this->insertamum = $insertamum;
+		return $this;
+	}
+
+	public function setInsertvon($insertvon)
+	{
+		$this->markDirty('insertvon', $this->insertvon, $insertvon);
+		$this->insertvon = $insertvon;
+		return $this;
+	}
+
+	public function setUpdateamum($updateamum)
+	{
+		$this->markDirty('updateamum', $this->updateamum, $updateamum);
+		$this->updateamum = $updateamum;
+		return $this;
+	}
+
+	public function setUpdatevon($updatevon)
+	{
+		$this->markDirty('updatevon', $this->updatevon, $updatevon);
+		$this->updatevon = $updatevon;
+		return $this;
+	}
+	
+	public function setDvendegrund_kurzbz($dvendegrund_kurzbz)
+	{
+	    $this->markDirty('dvendegrund_kurzbz', $this->dvendegrund_kurzbz, $dvendegrund_kurzbz);
+	    $this->dvendegrund_kurzbz = $dvendegrund_kurzbz;
+	    return $this;
+	}
+
+	public function setDvendegrund_anmerkung($dvendegrund_anmerkung)
+	{
+	    $this->markDirty('dvendegrund_anmerkung', $this->dvendegrund_anmerkung, $dvendegrund_anmerkung);
+	    $this->dvendegrund_anmerkung = $dvendegrund_anmerkung;
+	    return $this;
+	}
+
+	public function validate() {		
+		//do Validation here
+		$ci = get_instance();
+		$ci->load->library('vertragsbestandteil/VertragsbestandteilLib', 
+            null, 'VertragsbestandteilLib');
+		
+		if( empty($this->mitarbeiter_uid) ) {
+			$this->validationerrors[] = 'Mitarbeiter_UID fehlt.';
+		}
+
+		if( empty($this->oe_kurzbz) ) {
+			$this->validationerrors[] = 'Unternehmen fehlt.';
+		}
+
+		if( empty($this->vertragsart_kurzbz) ) {
+			$this->validationerrors[] = 'Vertragsart fehlt.';
+		}
+		
+		$von = \DateTimeImmutable::createFromFormat('Y-m-d', $this->von);
+		$bis = \DateTimeImmutable::createFromFormat('Y-m-d', $this->bis);
+		
+		if( false === $von ) {
+			$this->validationerrors[] = 'Beginn muss ein gültiges Datum sein.';
+		}
+		
+		if( $this->bis !== null && $bis === false ) {
+			$this->validationerrors[] = 'Ende muss ein gültiges Datum oder leer sein.';
+		}
+		
+		if( $this-> bis !== null && $von && $bis && $von > $bis ) {
+			$this->validationerrors[] = 'Das Beginndatum muss vor dem Endedatum liegen.';
+		}
+		
+		if( $this->checkoverlap && !(in_array($this->vertragsart_kurzbz, array('werkvertrag', 'studentischehilfskr')) )
+			&& $ci->VertragsbestandteilLib->isOverlappingExistingDV($this) ) 
+		{
+			$this->validationerrors[] = 'Es existiert bereits ein überlappendes Dienstverhältnis';
+		}
+		
+		// return status after Validation
+		if( count($this->validationerrors) > 0 ) {
+			$this->isvalid = false;
+		} else {
+			$this->isvalid = true;
+		}
+		
+		return $this->isvalid;
+	}
+}

application/libraries/vertragsbestandteil/Gehaltsbestandteil.php

@@ -0,0 +1,368 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\AbstractBestandteil;
+use DateTimeImmutable;
+
+/**
+ * Salary always depends on employment (Dienstverhältnis) and optionally on part of contract (Vetragsbestandteil)
+ */
+class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializable
+{
+	protected $gehaltsbestandteil_id;
+	protected $dienstverhaeltnis_id;
+	protected $vertragsbestandteil_id;
+	protected $gehaltstyp_kurzbz;
+	protected $von;
+    protected $bis;
+	protected $anmerkung;
+	protected $grundbetrag;
+	protected $betrag_valorisiert;
+	protected $valorisierungssperre;
+	protected $valorisierung;
+	protected $auszahlungen;
+	
+	protected $insertamum;
+	protected $insertvon;
+	protected $updateamum;
+	protected $updatevon;
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+	
+    public function hydrateByStdClass($data, $fromdb=false)
+	{	
+		$this->fromdb = $fromdb;
+		isset($data->gehaltsbestandteil_id) && $this->setGehaltsbestandteil_id($data->gehaltsbestandteil_id);
+		isset($data->dienstverhaeltnis_id) && $this->setDienstverhaeltnis_id($data->dienstverhaeltnis_id);
+		isset($data->vertragsbestandteil_id) && $this->setVertragsbestandteil_id($data->vertragsbestandteil_id);
+		isset($data->gehaltstyp_kurzbz) && $this->setGehaltstyp_kurzbz($data->gehaltstyp_kurzbz);
+		isset($data->von) && $this->setVon($data->von);
+		isset($data->bis) && $this->setBis($data->bis);
+		isset($data->anmerkung) && $this->setAnmerkung($data->anmerkung);
+		isset($data->grundbetrag) && $this->setGrundbetrag($data->grundbetrag);
+		isset($data->betrag_valorisiert) && $this->setBetrag_valorisiert($data->betrag_valorisiert);
+		isset($data->valorisierungssperre) && $this->setValorisierungssperre($data->valorisierungssperre);
+		isset($data->valorisierung) && $this->setValorisierung($data->valorisierung);
+		isset($data->auszahlungen) && $this->setAuszahlungen($data->auszahlungen);
+		
+		isset($data->insertamum) && $this->setInsertamum($data->insertamum);
+		isset($data->insertvon) && $this->setInsertvon($data->insertvon);
+		isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
+		isset($data->updatevon) && $this->setUpdatevon($data->updatevon);
+		$this->fromdb = false;
+	}
+	
+	public function getGehaltsbestandteil_id()
+	{
+		return $this->gehaltsbestandteil_id;
+	}
+
+	public function getDienstverhaeltnis_id()
+	{
+		return $this->dienstverhaeltnis_id;
+	}
+
+	public function getVertragsbestandteil_id()
+	{
+		return $this->vertragsbestandteil_id;
+	}
+
+	public function getGehaltstyp_kurzbz()
+	{
+		return $this->gehaltstyp_kurzbz;
+	}
+
+	public function getVon()
+	{
+		return $this->von;
+	}
+
+	public function getBis()
+	{
+		return $this->bis;
+	}
+
+	public function getVonDateTime()
+	{
+		return $this->toDateTime($this->von);
+	}
+
+	public function getBisDateTime()
+	{
+		return $this->toDateTime($this->bis);
+	}
+
+	protected function toDateTime($d) {
+		if ($d == null) return null;
+		return new DateTimeImmutable($d);
+	}
+
+	public function getAnmerkung()
+	{
+		return $this->anmerkung;
+	}
+
+	public function getGrundbetrag()
+	{
+		return $this->grundbetrag;
+	}
+
+	public function getBetrag_valorisiert()
+	{
+		return $this->betrag_valorisiert;
+	}
+
+	public function getValorisierungssperre()
+	{
+		return $this->valorisierungssperre;
+	}
+
+	public function getValorisierung()
+	{
+		return $this->valorisierung;
+	}
+
+	public function getAuszahlungen()
+	{
+		return $this->auszahlungen;
+	}
+
+	public function getInsertamum()
+	{
+		return $this->insertamum;
+	}
+
+	public function getInsertvon()
+	{
+		return $this->insertvon;
+	}
+
+	public function getUpdateamum()
+	{
+		return $this->updateamum;
+	}
+
+	public function getUpdatevon()
+	{
+		return $this->updatevon;
+	}
+
+	public function setGehaltsbestandteil_id($gehaltsbestandteil_id)
+	{
+		$this->markDirty('gehaltsbestandteil_id', $this->gehaltsbestandteil_id, $gehaltsbestandteil_id);
+		$this->gehaltsbestandteil_id = $gehaltsbestandteil_id;
+		return $this;
+	}
+
+	public function setDienstverhaeltnis_id($dienstverhaeltnis_id)
+	{
+		$this->markDirty('dienstverhaeltnis_id', $this->dienstverhaeltnis_id, $dienstverhaeltnis_id);
+		$this->dienstverhaeltnis_id = $dienstverhaeltnis_id;
+		return $this;
+	}
+
+	public function setVertragsbestandteil_id($vertragsbestandteil_id)
+	{
+		$this->markDirty('vertragsbestandteil_id', $this->vertragsbestandteil_id, $vertragsbestandteil_id);
+		$this->vertragsbestandteil_id = $vertragsbestandteil_id;
+		return $this;
+	}
+
+	public function setGehaltstyp_kurzbz($gehaltstyp_kurzbz)
+	{
+		$this->markDirty('gehaltstyp_kurzbz', $this->gehaltstyp_kurzbz, $gehaltstyp_kurzbz);
+		$this->gehaltstyp_kurzbz = $gehaltstyp_kurzbz;
+		return $this;
+	}
+
+	public function setVon($von)
+	{
+		$this->markDirty('von', $this->von, $von);
+		$this->von = $von;
+		return $this;
+	}
+
+	public function setBis($bis)
+	{
+		$this->markDirty('bis', $this->bis, $bis);
+		$this->bis = $bis;
+		return $this;
+	}
+
+	public function setAnmerkung($anmerkung)
+	{
+		$this->markDirty('anmerkung', $this->anmerkung, $anmerkung);
+		$this->anmerkung = $anmerkung;
+		return $this;
+	}
+
+	public function setGrundbetrag($grundbetrag)
+	{
+		if(is_float($grundbetrag))
+		{
+		    $grundbetrag = number_format($grundbetrag, 2, '.', '');
+		}
+		$this->markDirty('grundbetrag', $this->grundbetrag, $grundbetrag);
+		$this->grundbetrag = $grundbetrag;
+		return $this;
+	}
+
+	public function setBetrag_valorisiert($betrag_valorisiert)
+	{
+		if(is_float($betrag_valorisiert))
+		{
+		    $betrag_valorisiert = number_format($betrag_valorisiert, 2, '.', '');
+		}
+		$this->markDirty('betrag_valorisiert', $this->betrag_valorisiert, $betrag_valorisiert);
+		$this->betrag_valorisiert = $betrag_valorisiert;
+		return $this;
+	}
+
+	public function setValorisierungssperre($valorisierungssperre)
+	{
+		$this->markDirty('valorisierungssperre', $this->valorisierungssperre, $valorisierungssperre);
+		$this->valorisierungssperre = $valorisierungssperre;
+		return $this;
+	}
+
+	public function setValorisierung($valorisierung)
+	{
+		$this->markDirty('valorisierung', $this->valorisierung, $valorisierung);
+		$this->valorisierung = $valorisierung;
+		return $this;
+	}
+
+	public function setAuszahlungen($auszahlungen)
+	{
+		$this->markDirty('auszahlungen', $this->auszahlungen, $auszahlungen);
+		$this->auszahlungen = $auszahlungen;
+		return $this;
+	}
+
+	public function setInsertamum($insertamum)
+	{
+		$this->markDirty('insertamum', $this->insertamum, $insertamum);
+		$this->insertamum = $insertamum;
+		return $this;
+	}
+
+	public function setInsertvon($insertvon)
+	{
+		$this->markDirty('insertvon', $this->insertvon, $insertvon);
+		$this->insertvon = $insertvon;
+		return $this;
+	}
+
+	public function setUpdateamum($updateamum)
+	{
+		$this->markDirty('updateamum', $this->updateamum, $updateamum);
+		$this->updateamum = $updateamum;
+		return $this;
+	}
+
+	public function setUpdatevon($updatevon)
+	{
+		$this->markDirty('updatevon', $this->updatevon, $updatevon);
+		$this->updatevon = $updatevon;
+		return $this;
+	}
+	
+	public function jsonSerialize()
+    {
+		$vars = get_object_vars($this);
+		unset($vars['CI']);
+        return $vars;
+    }
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'gehaltsbestandteil_id' => $this->getGehaltsbestandteil_id(),
+			'dienstverhaeltnis_id' => $this->getDienstverhaeltnis_id(),
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'gehaltstyp_kurzbz' => $this->getGehaltstyp_kurzbz(),
+			'von' => $this->getVon(),
+			'bis' => $this->getBis(),
+			'anmerkung' => $this->getAnmerkung(),
+			'grundbetrag' => $this->getGrundbetrag(),
+			'betrag_valorisiert' => $this->getBetrag_valorisiert(),
+			'valorisierungssperre' => $this->getValorisierungssperre(),
+			'valorisierung' => $this->getValorisierung(),
+			'auszahlungen' => $this->getAuszahlungen(),
+			'insertamum' => $this->getInsertamum(),
+			'insertvon' => $this->getInsertvon(),
+			'updateamum' => $this->getUpdateamum(),
+			'updatevon' => $this->getUpdatevon()
+		);
+
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+
+		return (object) $tmp;
+	}
+
+	public function __toString()
+	{
+		$txt = <<<EOTXT
+		gehaltsbestandteil_id: {$this->getGehaltsbestandteil_id()}
+		dienstverhaeltnis_id: {$this->getDienstverhaeltnis_id()}
+		vertragsbestandteil_id: {$this->getVertragsbestandteil_id()}
+		gehaltstyp_kurzbz: {$this->getGehaltstyp_kurzbz()}
+		von: {$this->getVon()}
+		bis: {$this->getBis()}
+		anmerkung: {$this->getAnmerkung()}
+		grundbetrag: {$this->getGrundbetrag()}
+		betrag_valorisiert: {$this->getBetrag_valorisiert()}
+		valorisierungssperre: {$this->getValorisierungssperre()}
+		valorisierung: {$this->getValorisierung()}
+		auszahlungen: {$this->getAuszahlungen()}
+		insertamum: {$this->getInsertamum()}
+		insertvon: {$this->getInsertvon()}
+		updateamum: {$this->getUpdateamum()}
+		updatevon: {$this->getUpdatevon()}
+
+EOTXT;
+		return $txt;
+	}
+	
+	public function validate() {
+		//do Validation here
+		if( empty($this->gehaltstyp_kurzbz) ) 
+		{
+			$this->validationerrors[] = "Ein Gehaltstyp muss ausgewählt sein.";
+		}
+		
+		if( empty($this->grundbetrag) )
+		{
+			$this->validationerrors[] = "Betrag fehlt.";
+		}
+		
+		$von = \DateTimeImmutable::createFromFormat('Y-m-d', $this->von);
+		$bis = \DateTimeImmutable::createFromFormat('Y-m-d', $this->bis);
+		
+		if( false === $von ) {
+			$this->validationerrors[] = 'Beginn muss ein gültiges Datum sein.';
+		}
+		
+		if( $this->bis !== null && $bis === false ) {
+			$this->validationerrors[] = 'Ende muss ein gültiges Datum oder leer sein.';
+		}
+		
+		if( $this-> bis !== null && $von && $bis && $von > $bis ) {
+			$this->validationerrors[] = 'Das Beginndatum muss vor dem Endedatum liegen.';
+		}
+		
+		// return status after Validation
+		if( count($this->validationerrors) > 0 ) {
+			$this->isvalid = false;
+		} else {
+			$this->isvalid = true;
+		}
+		
+		return $this->isvalid;
+	}
+}

application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php

@@ -0,0 +1,152 @@
+<?php
+require_once __DIR__ . '/IValidation.php';
+require_once __DIR__ . '/AbstractBestandteil.php';
+require_once __DIR__ . '/Gehaltsbestandteil.php';
+
+use vertragsbestandteil\Gehaltsbestandteil;
+
+/**
+ * Description of GehaltsbestandteilLib
+ *
+ * @author bambi
+ */
+class GehaltsbestandteilLib
+{		
+	protected $CI;
+	/** @var Gehaltsbestandteil_model */
+	protected $GehaltsbestandteilModel;
+
+	protected $loggedInUser;
+	
+	public function __construct()
+	{
+		$this->loggedInUser = getAuthUID();
+		$this->CI = get_instance();
+		$this->CI->load->model('vertragsbestandteil/Gehaltsbestandteil_model', 
+			'GehaltsbestandteilModel');
+		$this->GehaltsbestandteilModel = $this->CI->GehaltsbestandteilModel;
+	}
+
+	public function fetchGehaltsbestandteileValorisiertForChart($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
+	{
+		return $this->GehaltsbestandteilModel->getGehaltsbestandteileValorisiertForChart($dienstverhaeltnis_id, $stichtag, $includefuture);
+	}
+
+	public function fetchGehaltsbestandteile($dienstverhaeltnis_id, $stichtag=null, 
+		$includefuture=false, $withvalorisationhistory=true)
+	{
+		return $this->GehaltsbestandteilModel->getGehaltsbestandteile(
+			$dienstverhaeltnis_id, $stichtag, $includefuture, $withvalorisationhistory
+		);
+	}
+
+	public function fetchGehaltsbestandteil($gehaltsbestandteil_id)
+	{
+		return $this->GehaltsbestandteilModel->getGehaltsbestandteil($gehaltsbestandteil_id);
+	}
+	
+	public function storeGehaltsbestandteile($gehaltsbestandteile) 
+	{
+		foreach( $gehaltsbestandteile as $gehaltsbestandteil ) 
+		{
+			$this->storeGehaltsbestandteil($gehaltsbestandteil);
+		}
+	}
+	
+	public function storeGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil) 
+	{
+		try
+		{
+			$this->setUIDtoPGSQL();
+			if( intval($gehaltsbestandteil->getGehaltsbestandteil_id()) > 0 )
+			{
+				$this->updateGehaltsbestandteil($gehaltsbestandteil);
+			}
+			else
+			{
+				$this->insertGehaltsbestandteil($gehaltsbestandteil);
+			}
+		}
+		catch (Exception $ex)
+		{
+			log_message('debug', "Storing Gehaltsbestandteil failed. " . $ex->getMessage());
+			throw new Exception('Storing Gehaltsbestandteil failed.');
+		}	
+	}
+	
+	protected function insertGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil)
+	{
+		$gehaltsbestandteil->setInsertvon($this->loggedInUser)
+			->setInsertamum(strftime('%Y-%m-%d %H:%M:%S'));
+		$ret = $this->GehaltsbestandteilModel->insert($gehaltsbestandteil->toStdClass(),
+			$this->GehaltsbestandteilModel->getEncryptedColumns());
+		if( hasData($ret) ) 
+		{
+			$gehaltsbestandteil->setGehaltsbestandteil_id(getData($ret));
+		}
+		else
+		{
+			throw new Exception('error inserting gehaltsbestandteil');
+		}		
+	}
+	
+	protected function updateGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil)
+	{
+		if(!$gehaltsbestandteil->isDirty()) {
+			return;
+		}
+		
+		$gehaltsbestandteil->setUpdatevon($this->loggedInUser)
+			->setUpdateamum(strftime('%Y-%m-%d %H:%M:%S'));
+		$ret = $this->GehaltsbestandteilModel->update($gehaltsbestandteil->getGehaltsbestandteil_id(), 
+			$gehaltsbestandteil->toStdClass(),
+			$this->GehaltsbestandteilModel->getEncryptedColumns());
+		
+		if(isError($ret) )
+		{
+			throw new Exception('error updating gehaltsbestandteil');
+		}
+	}
+
+	public function deleteGehaltsbestandteile($gehaltsbestandteile)
+	{
+		foreach( $gehaltsbestandteile as $gehaltsbestandteil )
+		{
+			$this->deleteGehaltsbestandteil($gehaltsbestandteil);
+		}
+	}
+
+	public function deleteGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil)
+	{
+		$this->setUIDtoPGSQL();
+
+		$ret = $this->GehaltsbestandteilModel->delete($gehaltsbestandteil->getGehaltsbestandteil_id());
+		
+		if (isError($ret))
+		{
+			throw new Exception('error deleting gehaltsbestandteil');
+		}
+	}
+	
+	public function endGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil, $enddate)
+	{
+		$this->setUIDtoPGSQL();
+		if( $gehaltsbestandteil->getBis() !== null && $gehaltsbestandteil->getBis() < $enddate ) 
+		{
+			return;
+		}
+		
+		$gehaltsbestandteil->setBis($enddate);
+		$this->updateGehaltsbestandteil($gehaltsbestandteil);
+	}
+		
+	protected function setUIDtoPGSQL() {
+		$ret = $this->GehaltsbestandteilModel
+			->execReadOnlyQuery('SET LOCAL pv21.uid TO \'' 
+				. $this->loggedInUser . '\'');
+		if(isError($ret)) 
+		{
+			throw new Exception('error setting uid to pgsql');
+		}
+	}
+}

application/libraries/vertragsbestandteil/IValidation.php

@@ -0,0 +1,18 @@
+<?php
+namespace vertragsbestandteil;
+
+/**
+ * Description of IValidation
+ *
+ * @author bambi
+ */
+interface IValidation
+{
+	public function isValid();
+
+	public function getValidationErrors();
+	
+	public function validate();
+	
+	public function addValidationError($errormsg);
+}

application/libraries/vertragsbestandteil/OverlapChecker.php

@@ -0,0 +1,111 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFreitext;
+
+/**
+ * Description of OverlapChecker
+ *
+ * @author bambi
+ */
+class OverlapChecker
+{
+	protected $CI;
+	/**
+	 * @var Vertragsbestandteil_model
+	 */
+	protected $VertragsbestandteilModel;
+	/**
+	 * @var VertragsbestandteilFreitext_model
+	 */
+	protected $VertragsbestandteilFreitextModel;
+	/**
+	 * @var VertragsbestandteilTyp_model
+	 */
+	protected $VertragsbestandteilTypModel;
+	/**
+	 * @var VertragsbestandteilFreitexttyp_model
+	 */
+	protected $VertragsbestandteilFreitexttypModel;
+	
+	protected static $instance = null;
+	
+	public static function getInstance()
+	{
+		if( null === self::$instance )
+		{
+			self::$instance = new OverlapChecker();
+		}
+		return self::$instance;
+	}
+	
+	private function __construct()
+	{
+		$this->CI = get_instance();
+		$this->CI->load->model('vertragsbestandteil/Vertragsbestandteil_model', 
+			'VertragsbestandteilModel');
+		$this->VertragsbestandteilModel = $this->CI->VertragsbestandteilModel;
+		$this->CI->load->model('vertragsbestandteil/VertragsbestandteilFreitext_model', 
+			'VertragsbestandteilFreitextModel');
+		$this->VertragsbestandteilFreitextModel = $this->CI->VertragsbestandteilFreitextModel;
+		$this->CI->load->model('vertragsbestandteil/Vertragsbestandteiltyp_model', 
+			'VertragsbestandteilTypModel');
+		$this->VertragsbestandteilTypModel = $this->CI->VertragsbestandteilTypModel;
+		$this->CI->load->model('vertragsbestandteil/VertragsbestandteilFreitexttyp_model', 
+			'VertragsbestandteilFreitexttypModel');
+		$this->VertragsbestandteilFreitexttypModel = $this->CI->VertragsbestandteilFreitexttypModel;
+	}
+	
+	public function overlapsVB(Vertragsbestandteil $vb)
+	{
+		$result = $this->VertragsbestandteilTypModel->load($vb->getVertragsbestandteiltyp_kurzbz());
+		if( null === ($vertragsbestandteiltyp = getData($result)) )
+		{
+			throw new Exception('vertragsbestandteiltyp: ' 
+				. $vb->getVertragsbestandteiltyp_kurzbz() . ' not found.');
+		}
+		
+		if( true === $vertragsbestandteiltyp[0]->ueberlappend )
+		{
+			// vertragsbestandteiltyp can overlap
+			return false;
+		}
+		
+		if( $this->VertragsbestandteilModel->countOverlappingVBsOfSameType($vb) === 0 )
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	
+	public function overlapsFreitext(VertragsbestandteilFreitext $vbft)
+	{
+		$result = $this->VertragsbestandteilFreitexttypModel->load($vbft->getFreitexttypKurzbz());
+		if( null === ($vertragsbestandteilfreitexttyp = getData($result)) )
+		{
+			throw new Exception('vertragsbestandteilfreitexttyp: ' 
+				. $vbft->getFreitexttypKurzbz() . ' not found.');
+		}
+		
+		if( true === $vertragsbestandteilfreitexttyp[0]->ueberlappend )
+		{
+			// freitexttyp can overlap
+			return false;
+		}
+		
+		if( $this->VertragsbestandteilFreitextModel->countOverlappingVBFreitextsOfSameType($vbft) === 0 )
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	
+	private function __clone() {}
+}

application/libraries/vertragsbestandteil/Vertragsbestandteil.php

@@ -0,0 +1,265 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\AbstractBestandteil;
+
+/**
+ * Description of Vertragsbestandteil
+ *
+ * @author bambi
+ */
+abstract class Vertragsbestandteil extends AbstractBestandteil implements \JsonSerializable
+{
+	protected $vertragsbestandteil_id;
+	protected $dienstverhaeltnis_id;
+	protected $von;
+	protected $bis;
+	protected $vertragsbestandteiltyp_kurzbz;
+	protected $insertamum;
+	protected $insertvon;
+	protected $updateamum;
+	protected $updatevon;
+	
+	protected $gehaltsbestandteile;
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->gehaltsbestandteile = array();
+	}
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		$this->fromdb = $fromdb;
+		isset($data->vertragsbestandteil_id) && $this->setVertragsbestandteil_id($data->vertragsbestandteil_id);
+		isset($data->dienstverhaeltnis_id) && $this->setDienstverhaeltnis_id($data->dienstverhaeltnis_id);
+		isset($data->von) && $this->setVon($data->von);
+		isset($data->bis) && $this->setBis($data->bis);
+		isset($data->vertragsbestandteiltyp_kurzbz) && $this->setVertragsbestandteiltyp_kurzbz($data->vertragsbestandteiltyp_kurzbz);
+		isset($data->insertamum) && $this->setInsertamum($data->insertamum);
+		isset($data->insertvon) && $this->setInsertvon($data->insertvon);
+		isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
+		isset($data->updatevon) && $this->setUpdatevon($data->updatevon);
+		$this->fromdb = false;
+	}
+	
+	public function addGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil)
+	{
+		$gehaltsbestandteil->setDienstverhaeltnis_id($this->getDienstverhaeltnis_id());
+		$gehaltsbestandteil->setVertragsbestandteil_id($this->getVertragsbestandteil_id());
+		$this->gehaltsbestandteile[] = $gehaltsbestandteil;
+		return $this;
+	}
+	
+	public function getGehaltsbestandteile() 
+	{
+		return $this->gehaltsbestandteile;
+	}
+	
+	public function getVertragsbestandteil_id()
+	{
+		return $this->vertragsbestandteil_id;
+	}
+
+	public function getDienstverhaeltnis_id()
+	{
+		return $this->dienstverhaeltnis_id;
+	}
+
+	public function getVon()
+	{
+		return $this->von;
+	}
+
+	public function getBis()
+	{
+		return $this->bis;
+	}
+
+	public function getVertragsbestandteiltyp_kurzbz()
+	{
+		return $this->vertragsbestandteiltyp_kurzbz;
+	}
+
+	public function getInsertamum()
+	{
+		return $this->insertamum;
+	}
+
+	public function getInsertvon()
+	{
+		return $this->insertvon;
+	}
+
+	public function getUpdateamum()
+	{
+		return $this->updateamum;
+	}
+
+	public function getUpdatevon()
+	{
+		return $this->updatevon;
+	}
+
+	public function setGehaltsbestandteile($gehaltsbestandteile)
+	{
+		$this->gehaltsbestandteile = $gehaltsbestandteile;
+		return $this;
+	}
+	
+	public function setVertragsbestandteil_id($vertragsbestandteil_id)
+	{
+		$this->markDirty('vertragsbestandteil_id', $this->vertragsbestandteil_id, $vertragsbestandteil_id);
+		$this->vertragsbestandteil_id = $vertragsbestandteil_id;
+		foreach ($this->gehaltsbestandteile as $gehaltsbestandteil)
+		{
+			$gehaltsbestandteil->setVertragsbestandteil_id($vertragsbestandteil_id);
+		}
+		return $this;
+	}
+
+	public function setDienstverhaeltnis_id($dienstverhaeltnis_id)
+	{
+		$this->markDirty('dienstverhaeltnis_id', $this->dienstverhaeltnis_id, $dienstverhaeltnis_id);
+		$this->dienstverhaeltnis_id = $dienstverhaeltnis_id;
+		foreach ($this->gehaltsbestandteile as $gehaltsbestandteil)
+		{
+			$gehaltsbestandteil->setDienstverhaeltnis_id($dienstverhaeltnis_id);
+		}
+		return $this;
+	}
+
+	public function setVon($von)
+	{
+		$this->markDirty('von', $this->von, $von);
+		$this->von = $von;
+		return $this;
+	}
+
+	public function setBis($bis)
+	{
+		$this->markDirty('bis', $this->bis, $bis);
+		$this->bis = $bis;
+		return $this;
+	}
+
+	public function setVertragsbestandteiltyp_kurzbz($vertragsbestandteiltyp_kurzbz)
+	{
+		$this->markDirty('vertragsbestandteiltyp_kurzbz', $this->vertragsbestandteiltyp_kurzbz, $vertragsbestandteiltyp_kurzbz);
+		$this->vertragsbestandteiltyp_kurzbz = $vertragsbestandteiltyp_kurzbz;
+		return $this;
+	}
+
+	public function setInsertamum($insertamum)
+	{
+		$this->markDirty('insertamum', $this->insertamum, $insertamum);
+		$this->insertamum = $insertamum;
+		return $this;
+	}
+
+	public function setInsertvon($insertvon)
+	{
+		$this->markDirty('insertvon', $this->insertvon, $insertvon);
+		$this->insertvon = $insertvon;
+		return $this;
+	}
+
+	public function setUpdateamum($updateamum)
+	{
+		$this->markDirty('updateamum', $this->updateamum, $updateamum);
+		$this->updateamum = $updateamum;
+		return $this;
+	}
+
+	public function setUpdatevon($updatevon)
+	{
+		$this->markDirty('updatevon', $this->updatevon, $updatevon);
+		$this->updatevon = $updatevon;
+		return $this;
+	}
+	
+	public function baseToStdClass() {
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'dienstverhaeltnis_id' => $this->getDienstverhaeltnis_id(),
+			'von' => $this->getVon(),
+			'bis' => $this->getBis(),
+			'vertragsbestandteiltyp_kurzbz' => $this->getVertragsbestandteiltyp_kurzbz(),
+			'insertamum' => $this->getInsertamum(),
+			'insertvon' => $this->getInsertvon(),
+			'updateamum' => $this->getUpdateamum(),
+			'updatevon' => $this->getUpdatevon(),
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+
+	public function jsonSerialize()
+    {
+		$vars = get_object_vars($this);
+		unset($vars['CI']);
+		
+		// TODO cleanup workaroung for vb freitext where db column is anmerkung and formfield is freitext
+		if( isset($vars['anmerkung']) ) {
+			$vars['freitext'] = $vars['anmerkung'];
+		}
+		
+        return $vars;
+    }
+	
+	public function __toString() 
+	{
+		return <<<EOTXT
+		vertragsbestandteil_id: {$this->getVertragsbestandteil_id()}
+		dienstverhaeltnis_id: {$this->getDienstverhaeltnis_id()}
+		von: {$this->getVon()}
+		bis: {$this->getBis()}
+		vertragsbestandteiltyp_kurzbz: {$this->getVertragsbestandteiltyp_kurzbz()}
+		insertamum: {$this->getInsertamum()}
+		insertvon: {$this->getInsertvon()}
+		updateamum: {$this->getUpdateamum()}
+		updatevon: {$this->getUpdatevon()}
+
+EOTXT;
+		
+	}
+	
+	public function beforePersist() {
+		// can be overridden in childs
+	}
+	
+	public function afterDelete() {
+		// can be overridden in childs
+	}
+	
+	public function validate() {
+		$von = \DateTimeImmutable::createFromFormat('Y-m-d', $this->von);
+		$bis = \DateTimeImmutable::createFromFormat('Y-m-d', $this->bis);
+		
+		if( false === $von ) {
+			$this->validationerrors[] = 'Beginn muss ein gültiges Datum sein.';
+		}
+		
+		if( $this->bis !== null && $bis === false ) {
+			$this->validationerrors[] = 'Ende muss ein gültiges Datum oder leer sein.';
+		}
+		
+		if( $this-> bis !== null && $von && $bis && $von > $bis ) {
+			$this->validationerrors[] = 'Das Beginndatum muss vor dem Endedatum liegen.';
+		}
+		
+		if( count($this->validationerrors) > 0 ) {
+			$this->isvalid = false;
+		} else {
+			$this->isvalid = true;
+		}
+		
+		return $this->isvalid;
+	}
+	
+	public abstract function toStdClass();
+}

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

@@ -0,0 +1,137 @@
+<?php
+namespace vertragsbestandteil;
+
+use Exception;
+use vertragsbestandteil\VertragsbestandteilStunden;
+
+/**
+ * Description of VertragsbestandteilFactory
+ *
+ * @author bambi
+ */
+class VertragsbestandteilFactory
+{
+	const VERTRAGSBESTANDTEIL_STUNDEN	= 'stunden';
+	const VERTRAGSBESTANDTEIL_FUNKTION	= 'funktion';
+	const VERTRAGSBESTANDTEIL_GEHALT	= 'gehalt';
+	const VERTRAGSBESTANDTEIL_FREITEXT = 'freitext';
+	const VERTRAGSBESTANDTEIL_KARENZ = 'karenz';
+	const VERTRAGSBESTANDTEIL_BEFRISTUNG = 'befristung';
+	const VERTRAGSBESTANDTEIL_KUENDIGUNGSFRIST = 'kuendigungsfrist';
+	const VERTRAGSBESTANDTEIL_KV = 'kv';
+	const VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH = 'urlaubsanspruch';
+	const VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG = 'zeitaufzeichnung';
+	const VERTRAGSBESTANDTEIL_LEHRE = 'lehre';
+	
+	public static function getVertragsbestandteil($data, $fromdb=false)
+	{
+		$vertragsbestandteiltyp_kurzbz = isset($data->vertragsbestandteiltyp_kurzbz)
+			? $data->vertragsbestandteiltyp_kurzbz : false;
+		if( false === $vertragsbestandteiltyp_kurzbz )
+		{
+			throw new Exception('Missing Parameter vertragsbestandteiltyp_kurzbz');
+		}
+		
+		$vertragsbestandteil = null;
+		switch ($vertragsbestandteiltyp_kurzbz)
+		{
+			case self::VERTRAGSBESTANDTEIL_FREITEXT:
+				$vertragsbestandteil = new VertragsbestandteilFreitext();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
+			
+			case self::VERTRAGSBESTANDTEIL_FUNKTION:
+				$vertragsbestandteil = new VertragsbestandteilFunktion();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
+
+			case self::VERTRAGSBESTANDTEIL_KARENZ:
+				$vertragsbestandteil = new VertragsbestandteilKarenz();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
+
+			case self::VERTRAGSBESTANDTEIL_KUENDIGUNGSFRIST:
+				$vertragsbestandteil = new VertragsbestandteilKuendigungsfrist();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
+			
+			case self::VERTRAGSBESTANDTEIL_STUNDEN:
+				$vertragsbestandteil = new VertragsbestandteilStunden();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
+			
+			case self::VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH:
+				$vertragsbestandteil = new VertragsbestandteilUrlaubsanspruch();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
+			
+			case self::VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG:
+				$vertragsbestandteil = new VertragsbestandteilZeitaufzeichnung();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
+			
+			default:
+				throw new Exception('Unknown vertragsbestandteiltyp_kurzbz ' 
+					. $vertragsbestandteiltyp_kurzbz);			
+		}
+		
+		return $vertragsbestandteil;
+	}
+	
+	public static function getVertragsbestandteilDBModel($vertragsbestandteil_kurzbz): \DB_model
+	{
+		$CI = get_instance();
+		
+		$vertragsbestandteildbmodel = null;
+		switch ($vertragsbestandteil_kurzbz)
+		{
+			case self::VERTRAGSBESTANDTEIL_FREITEXT:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilFreitext_model',
+					'VertragsbestandteilFreitext_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilFreitext_model;
+				break;
+			
+			case self::VERTRAGSBESTANDTEIL_FUNKTION:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilFunktion_model',
+					'VertragsbestandteilFunktion_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilFunktion_model;
+				break;
+			
+			case self::VERTRAGSBESTANDTEIL_KARENZ:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilKarenz_model',
+					'VertragsbestandteilKarenz_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilKarenz_model;
+				break;
+
+			case self::VERTRAGSBESTANDTEIL_KUENDIGUNGSFRIST:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilKuendigungsfrist_model',
+					'VertragsbestandteilKuendigungsfrist_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilKuendigungsfrist_model;
+				break;
+			
+			case self::VERTRAGSBESTANDTEIL_STUNDEN:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilStunden_model', 
+					'VertragsbestandteilStunden_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilStunden_model;
+				break;
+			
+			case self::VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilUrlaubsanspruch_model',
+					'VertragsbestandteilUrlaubsanspruch_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilUrlaubsanspruch_model;
+				break;
+			
+			case self::VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilZeitaufzeichnung_model',
+					'VertragsbestandteilZeitaufzeichnung_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilZeitaufzeichnung_model;
+				break;
+
+			default:
+				throw new Exception('Unknown vertragsbestandteil_kurzbz '
+					. $vertragsbestandteil_kurzbz);
+		}
+		
+		return $vertragsbestandteildbmodel;
+	}
+}

application/libraries/vertragsbestandteil/VertragsbestandteilFreitext.php

@@ -0,0 +1,134 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilFreitext extends Vertragsbestandteil
+{
+	protected $freitexttyp_kurzbz;
+	protected $titel;
+	protected $anmerkung;
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_FREITEXT);
+	}
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->freitexttyp) && $this->setFreitexttypKurzbz($data->freitexttyp);
+		isset($data->freitexttyp_kurzbz) && $this->setFreitexttypKurzbz($data->freitexttyp_kurzbz);
+		isset($data->titel) && $this->setTitel($data->titel);
+		isset($data->freitext) && $this->setAnmerkung($data->freitext);
+		isset($data->anmerkung) && $this->setAnmerkung($data->anmerkung);
+		$this->fromdb = false;
+	}
+		
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'freitexttyp_kurzbz' => $this->getFreitexttypKurzbz(), 
+			'titel' => $this->getTitel(), 
+			'anmerkung' => $this->getAnmerkung()
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		anmerkung: {$this->getAnmerkung()}
+		titel: {$this->getTitel()}
+		freitexttyp_kurzbz: {$this->getFreitexttypKurzbz()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	/**
+	 * Get the value of anmerkung
+	 */
+	public function getAnmerkung()
+	{
+		return $this->anmerkung;
+	}
+
+	/**
+	 * Set the value of anmerkung
+	 */
+	public function setAnmerkung($anmerkung): self
+	{
+		$this->markDirty('anmerkung', $this->anmerkung, $anmerkung);
+		$this->anmerkung = $anmerkung;
+
+		return $this;
+	}
+
+	/**
+	 * Get the value of titel
+	 */
+	public function getTitel()
+	{
+		return $this->titel;
+	}
+
+	/**
+	 * Set the value of titel
+	 */
+	public function setTitel($titel): self
+	{
+		$this->markDirty('titel', $this->titel, $titel);
+		$this->titel = $titel;
+
+		return $this;
+	}
+
+	/**
+	 * Get the value of freitexttyp_kurzbz
+	 */
+	public function getFreitexttypKurzbz()
+	{		
+		return $this->freitexttyp_kurzbz;
+	}
+
+	/**
+	 * Set the value of freitexttyp_kurzbz
+	 */
+	public function setFreitexttypKurzbz($freitexttyp_kurzbz): self
+	{
+		$this->markDirty('freitexttyp_kurzbz', $this->freitexttyp_kurzbz, $freitexttyp_kurzbz);
+		$this->freitexttyp_kurzbz = $freitexttyp_kurzbz;
+
+		return $this;
+	}
+	
+	public function validate()
+	{
+		if( empty($this->freitexttyp_kurzbz) ) {
+			$this->validationerrors[] = 'Bitte einen gültigen Freitexttyp auswählen.';
+		}
+		
+		if( empty($this->titel) ) {
+			$this->validationerrors[] = 'Bitte einen Titel angeben.';
+		}
+		
+		if( empty($this->anmerkung) ) {
+			$this->validationerrors[] = 'Bitte eine Beschreibung eingeben.';
+		}
+		
+		return parent::validate();
+	}
+	
+	
+}

application/libraries/vertragsbestandteil/VertragsbestandteilFunktion.php

@@ -0,0 +1,369 @@
+<?php
+namespace vertragsbestandteil;
+
+use Exception;
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+/**
+ * Description of VertragsbestandteilFunktion
+ *
+ * @author bambi
+ */
+class VertragsbestandteilFunktion extends Vertragsbestandteil
+{
+	protected $benutzerfunktion_id;
+	protected $benutzerfunktiondata;
+
+	protected $CI;
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->benutzerfunktiondata = null;
+		
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_FUNKTION);
+		
+		$this->CI = get_instance();
+		$this->CI->load->model('person/Benutzerfunktion_model', 
+			'BenutzerfunktionModel');
+		$this->CI->load->model('vertragsbestandteil/VertragsbestandteilFunktion_model', 
+			'VertragsbestandteilFunktionModel');
+		$this->CI->load->library('vertragsbestandteil/VertragsbestandteilLib', 
+			null, 'VertragsbestandteilLib');
+	}
+	
+	public function isDirty()
+	{
+		$isdirty = parent::isDirty();
+		if( !$isdirty ) {
+			$bf = $this->loadBenutzerfunktion($this->getBenutzerfunktion_id());
+			if( !$this->areVbAndBfInSync($bf) )
+			{
+				$isdirty = true;
+			}
+		}
+		return $isdirty;
+	}
+
+	public function beforePersist()
+	{
+		if( isset($this->benutzerfunktion_id) && intval($this->benutzerfunktion_id) > 0 ) 
+		{
+			$this->beforePersitExisting();
+		} 
+		else 
+		{
+			$this->beforePersitNew();
+		}
+	}
+	
+	protected function loadBenutzerfunktion($bfid)
+	{
+		$bfres = $this->CI->BenutzerfunktionModel->load($bfid);
+		if(!hasData($bfres))
+		{
+			throw new Exception('failed to load existing Benutzerfunktion');
+		}
+		return (getData($bfres))[0];
+	}
+	
+	protected function loadPersitedVB($vbid)
+	{
+		$vb = $this->CI->VertragsbestandteilLib->fetchVertragsbestandteil($vbid);
+		if( $vb === null )
+		{
+			throw new Exception('failed to load persited Vertragsbestandteil');
+		}
+		return $vb;
+	}
+	
+	protected function areVbAndBfInSync($bf)
+	{		
+		$vbvon = $this->getVon();
+		$vbbis = $this->getBis();
+		if( intval($this->getVertragsbestandteil_id()) > 0 )
+		{
+			$vb = $this->loadPersitedVB($this->getVertragsbestandteil_id());
+			$vbvon = $vb->getVon();
+			$vbbis = $vb->getBis();
+		}
+		
+		if( ($bf->datum_von === $vbvon) && ($bf->datum_bis === $vbbis) )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	protected function isBefore($a, $b)
+	{
+		if($a === null) {
+			return false;
+		}
+		elseif($b === null) {
+			return true;
+		}
+		else {
+			return $a < $b;
+		}
+	}
+
+	protected function isAfter($a, $b)
+	{
+		if($b === null) {
+			return false;
+		}
+		elseif($a === null) {
+			return true;
+		}
+		else {
+			return $a > $b;
+		}
+	}
+	
+	protected function beforePersitExisting() 
+	{
+		$bf = $this->loadBenutzerfunktion($this->getBenutzerfunktion_id());
+		if( $this->areVbAndBfInSync($bf) )
+		{
+			// vb or stored vb von bis is in sync so update benutzerfunktion
+			$this->updateBenutzerfunktion($bf, $this->getVon(), $this->getBis());
+		}
+		else
+		{
+			$daybeforevon = \DateTime::createFromFormat('Y-m-d', $this->getVon(), 
+				new \DateTimeZone('Europe/Vienna'));
+			$daybeforevon->sub(new \DateInterval('P1D'));
+			
+			if( $this->isBefore($bf->datum_von, $this->getVon()) && 
+				$this->isBefore($bf->datum_von, $this->getBis()) )
+			{
+				$data = (object) array(
+					'mitarbeiter_uid' => $bf->uid,
+					'funktion' => $bf->funktion_kurzbz,
+					'orget' => $bf->oe_kurzbz
+				);
+				$this->createBenutzerfunktionData($data);
+				$bfid = $this->insertBenutzerfunktion($this->getBenutzerfunktionData4Insert());
+				$this->setBenutzerfunktion_id($bfid);
+			}
+			elseif( $this->isBefore($bf->datum_von, $this->getVon()) && 
+					$this->isAfter($this->getBis(), $bf->datum_von) )
+			{
+				$this->updateBenutzerfunktion($bf, $bf->datum_von, $daybeforevon->format('Y-m-d'));
+				$data = (object) array(
+					'mitarbeiter_uid' => $bf->uid,
+					'funktion' => $bf->funktion_kurzbz,
+					'orget' => $bf->oe_kurzbz
+				);
+				$this->createBenutzerfunktionData($data);
+				$bfid = $this->insertBenutzerfunktion($this->getBenutzerfunktionData4Insert());
+				$this->setBenutzerfunktion_id($bfid);
+			}
+			else
+			{
+				$this->updateBenutzerfunktion($bf, $this->getVon(), $this->getBis());
+			}
+		}
+	}
+	
+	protected function updateBenutzerfunktion($bf, $von, $bis)
+	{
+		$data = array();
+		
+		if($von !== $bf->datum_von) 
+		{
+			$data['datum_von'] = $von;
+		}
+		if($bis !== $bf->datum_bis) 
+		{
+			$data['datum_bis'] = $bis;
+		}			
+
+		if( count($data) === 0 ) 
+		{
+			return;
+		}
+		
+		$data['updateamum'] = strftime('%Y-%m-%d %H:%M:%S');
+		$data['updatevon'] = getAuthUID();		
+		
+		$ret = $this->CI->BenutzerfunktionModel->update($bf->benutzerfunktion_id, $data);
+		
+		if(isError($ret) )
+		{
+			throw new Exception('failed to update Benutzerfunktion');
+		}
+	}
+
+	protected function insertBenutzerfunktion($benutzerfunktiondata)
+	{
+		$ret = $this->CI->BenutzerfunktionModel->insert($benutzerfunktiondata);
+		
+		if(isError($ret) )
+		{
+			throw new Exception('failed to create Benutzerfunktion');
+		}
+		
+		return getData($ret);
+	}
+
+	protected function deleteBenutzerfunktion($benutzerfunktion_id)
+	{
+		$ret = $this->CI->BenutzerfunktionModel->delete($benutzerfunktion_id);
+		
+		if(isError($ret) )
+		{
+			throw new Exception('failed to delete Benutzerfunktion');
+		}
+	}
+	
+	protected function beforePersitNew() {
+		if( $this->benutzerfunktiondata === null) 
+		{
+			return;
+		}
+		
+		$bfid = $this->insertBenutzerfunktion($this->getBenutzerfunktionData4Insert());
+		
+		$this->setBenutzerfunktion_id($bfid);
+	}
+	
+	public function afterDelete()
+	{
+		if( !(intval($this->getBenutzerfunktion_id()) > 0) )
+		{
+			return;
+		}
+		
+		$this->deleteBenutzerfunktion($this->getBenutzerfunktion_id());
+	}
+	
+	public function toStdClass()
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'benutzerfunktion_id' => $this->getBenutzerfunktion_id()
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+
+	public function __toString()
+	{
+		$txt = <<<EOTXT
+		benutzerfunktion_id: {$this->getBenutzerfunktion_id()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->benutzerfunktionid) && $this->setBenutzerfunktion_id($data->benutzerfunktionid);
+		isset($data->benutzerfunktion_id) && $this->setBenutzerfunktion_id($data->benutzerfunktion_id);
+		isset($data->funktion) && isset($data->orget) 
+			&& isset($data->mitarbeiter_uid) && $this->createBenutzerfunktionData($data);
+		isset($data->funktion_bezeichnung) && isset($data->oe_bezeichnung) 
+			&& $this->createBenutzerfunktionData4Display($data);
+		$this->fromdb = false;
+		
+	}
+	
+	public function getBenutzerfunktion_id()
+	{
+		return $this->benutzerfunktion_id;
+	}
+	
+	public function setBenutzerfunktion_id($benutzerfunktion_id)
+	{
+		$this->markDirty('benutzerfunktion_id', $this->benutzerfunktion_id, $benutzerfunktion_id);
+		$this->benutzerfunktion_id = $benutzerfunktion_id;
+		return $this;
+	}
+	
+	protected function getBenutzerfunktionData4Insert()
+	{
+		if( null === $this->benutzerfunktiondata ) {
+			return null;
+		}
+		
+		$benutzerfunktiondata = (object) array(
+			'funktion_kurzbz' => $this->benutzerfunktiondata->funktion_kurzbz,
+			'oe_kurzbz' => $this->benutzerfunktiondata->oe_kurzbz,
+			'uid' => $this->benutzerfunktiondata->uid,			
+			'datum_von' => $this->getVon(), 
+			'datum_bis' => $this->getBis(),
+			'insertamum' => strftime('%Y-%m-%d %H:%M:%S'),
+			'insertvon' => getAuthUID()
+		);
+		
+		return $benutzerfunktiondata;
+	}
+	
+	protected function createBenutzerfunktionData($data)
+	{
+		if( empty($data->funktion) || empty($data->orget) ) 
+		{
+			return;
+		}
+		
+		$this->benutzerfunktiondata = (object) array(
+			'funktion_kurzbz' => $data->funktion,
+			'oe_kurzbz' => $data->orget,
+			'uid' => $data->mitarbeiter_uid
+		);
+	}
+
+	protected function createBenutzerfunktionData4Display($data)
+	{
+		if( empty($data->funktion_bezeichnung) || empty($data->oe_bezeichnung) ) 
+		{
+			return;
+		}
+		
+		$this->benutzerfunktiondata = (object) array(
+			'funktion_kurzbz' => $data->funktion_kurzbz,
+			'funktion_bezeichnung' => $data->funktion_bezeichnung,
+			'oe_kurzbz' => $data->oe_kurzbz,
+			'oe_bezeichnung' => $data->oe_bezeichnung,
+			'oe_kurzbz_sap' => $data->oe_kurzbz_sap,
+			'oe_typ_kurzbz' => $data->oe_typ_kurzbz,
+			'oe_typ_bezeichnung' => $data->oe_typ_bezeichnung, 
+			'uid' => $data->mitarbeiter_uid
+		);
+	}
+	
+	public function validate()
+	{
+		if( (intval($this->benutzerfunktion_id) < 1) 
+			&& ($this->benutzerfunktiondata === NULL) ) {
+			$this->validationerrors[] = 'Eine bestehende Funktion oder eine '
+				. 'Funktion und eine Organisationseinheit müssen ausgewählt sein.';
+		}
+		
+		// TODO check if Benutzerfunktion is assigned to another vb
+		if( intval($this->benutzerfunktion_id) > 0 ) 
+		{
+			if ( $this->CI->VertragsbestandteilFunktionModel
+					->isBenutzerfunktionAlreadyAttachedToAnotherVB(
+						$this->benutzerfunktion_id, 
+						$this->getVertragsbestandteil_id()) )
+			{
+				$this->validationerrors[] = 'Die Benutzerfunktion ist bereits '
+					. 'mit einem anderen Vertragsbestandteil verknüpft und kann '
+					. 'nicht mehrfach verknüft werden.';
+			}
+		}
+		
+		return parent::validate();
+	}
+}

application/libraries/vertragsbestandteil/VertragsbestandteilKarenz.php

@@ -0,0 +1,141 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilKarenz extends Vertragsbestandteil
+{
+	protected $karenztyp_kurzbz;
+	protected $tatsaechlicher_geburtstermin;
+	protected $geplanter_geburtstermin;
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_KARENZ);
+	}
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->karenztyp_kurzbz) && $this->setKarenztypKurzbz($data->karenztyp_kurzbz);
+		isset($data->geplanter_geburtstermin) && $this->setGeplanterGeburtstermin($data->geplanter_geburtstermin);
+		isset($data->tatsaechlicher_geburtstermin) && $this->setTatsaechlicherGeburtstermin($data->tatsaechlicher_geburtstermin);
+		$this->fromdb = false;
+	}	
+	
+	/**
+	 * Get the value of karenztyp_kurzbz
+	 */
+	public function getKarenztypKurzbz()
+	{
+		return $this->karenztyp_kurzbz;
+	}
+
+	/**
+	 * Set the value of karenztyp_kurzbz
+	 */
+	public function setKarenztypKurzbz($karenztyp_kurzbz): self
+	{
+		$this->markDirty('karenztyp_kurzbz', $this->karenztyp_kurzbz, $karenztyp_kurzbz);
+		$this->karenztyp_kurzbz = $karenztyp_kurzbz;
+
+		return $this;
+	}
+
+	/**
+	 * Get the value of tatsaechlicher_geburtstermin
+	 */
+	public function getTatsaechlicherGeburtstermin()
+	{		
+		return $this->tatsaechlicher_geburtstermin;
+	}
+
+	/**
+	 * Set the value of tatsaechlicher_geburtstermin
+	 */
+	public function setTatsaechlicherGeburtstermin($tatsaechlicher_geburtstermin): self
+	{
+		$this->markDirty('tatsaechlicher_geburtstermin', $this->tatsaechlicher_geburtstermin, $tatsaechlicher_geburtstermin);
+		$this->tatsaechlicher_geburtstermin = $tatsaechlicher_geburtstermin;
+
+		return $this;
+	}
+
+	/**
+	 * Get the value of geplanter_geburtstermin
+	 */
+	public function getGeplanterGeburtstermin()
+	{
+		return $this->geplanter_geburtstermin;
+	}
+
+	/**
+	 * Set the value of geplanter_geburtstermin
+	 */
+	public function setGeplanterGeburtstermin($geplanter_geburtstermin): self
+	{
+		$this->markDirty('geplanter_geburtstermin', $this->geplanter_geburtstermin, $geplanter_geburtstermin);
+		$this->geplanter_geburtstermin = $geplanter_geburtstermin;
+
+		return $this;
+	}
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'karenztyp_kurzbz' => $this->getKarenztypKurzbz(),
+			'tatsaechlicher_geburtstermin' => $this->getTatsaechlicherGeburtstermin(),
+			'geplanter_geburtstermin' => $this->getGeplanterGeburtstermin()
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		karenztyp_kurzbz: {$this->getKarenztypKurzbz()}
+		tatsaechlicher_geburtstermin: {$this->getTatsaechlicherGeburtstermin()}
+		geplanter_geburtstermin: {$this->getGeplanterGeburtstermin()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	public function validate()
+	{
+		if( empty($this->karenztyp_kurzbz) ) {
+			$this->validationerrors[] = 'Ein Karenztyp muss ausgewählt sein.';
+		}
+		
+		if( $this->karenztyp_kurzbz === 'elternkarenz' ) {			
+			$geplant = \DateTimeImmutable::createFromFormat('Y-m-d', $this->geplanter_geburtstermin);
+			$tatsaechlich = \DateTimeImmutable::createFromFormat('Y-m-d', $this->tatsaechlicher_geburtstermin);
+
+			if( false === $geplant ) {
+				$this->validationerrors[] = 'Bei Elternkarenz muss der geplanter Geburtstermin ein gültiges Datum sein.';
+			}
+			
+			if( !empty($this->tatsaechlicher_geburtstermin) && $tatsaechlich === false ) {
+				$this->validationerrors[] = 'Bei Elternkarenz muss der tatsaechliche Geburtstermin leer oder ein gültiges Datum sein.';
+			}
+		}		
+		
+		$bis = \DateTimeImmutable::createFromFormat('Y-m-d', $this->bis);
+		
+		if( false === $bis ) {
+			$this->validationerrors[] = 'Bei einer Karenz muss ein gültiges Ende-Datum angegeben werden.';
+		}
+		
+		return parent::validate();
+	}
+}

application/libraries/vertragsbestandteil/VertragsbestandteilKuendigungsfrist.php

@@ -0,0 +1,117 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilKuendigungsfrist extends Vertragsbestandteil
+{
+	protected $arbeitgeber_frist;
+	protected $arbeitnehmer_frist;
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_KUENDIGUNGSFRIST);
+	}
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->arbeitgeber_frist) && $this->setArbeitgeberFrist($data->arbeitgeber_frist);
+		isset($data->arbeitnehmer_frist) && $this->setArbeitnehmerFrist($data->arbeitnehmer_frist);
+		$this->fromdb = false;
+	}
+	
+	/**
+	 * Get the value of arbeitgeber_frist
+	 */
+	public function getArbeitgeberFrist()
+	{
+		return $this->arbeitgeber_frist;
+	}
+
+	/**
+	 * Set the value of arbeitgeber_frist
+	 */
+	public function setArbeitgeberFrist($arbeitgeber_frist): self
+	{
+		$this->markDirty('arbeitgeber_frist', $this->arbeitgeber_frist, $arbeitgeber_frist);
+		$this->arbeitgeber_frist = $arbeitgeber_frist;
+
+		return $this;
+	}
+
+	/**
+	 * Get the value of arbeitnehmer_frist
+	 */
+	public function getArbeitnehmerFrist()
+	{
+		return $this->arbeitnehmer_frist;
+	}
+
+	/**
+	 * Set the value of arbeitnehmer_frist
+	 */
+	public function setArbeitnehmerFrist($arbeitnehmer_frist): self
+	{
+		$this->markDirty('arbeitnehmer_frist', $this->arbeitnehmer_frist, $arbeitnehmer_frist);
+		$this->arbeitnehmer_frist = $arbeitnehmer_frist;
+
+		return $this;
+	}	
+
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'arbeitgeber_frist' => $this->getArbeitgeberFrist(),
+			'arbeitnehmer_frist' => $this->getArbeitnehmerFrist()
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		arbeitgeber_frist: {$this->getArbeitgeberFrist()}
+		arbeitnehmer_frist: {$this->getArbeitnehmerFrist()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	public function validate()
+	{
+		if( !(filter_var($this->arbeitgeber_frist, FILTER_VALIDATE_INT, 
+				array(
+					'options' => array(
+						'min_range' => 0,
+						'max_range' => 52
+					)
+				)
+			)) ) {
+			$this->validationerrors[] = 'Arbeitgeberfrist muss eine Wochenanzahl im Bereich 1 bis 52 sein.';
+		}
+		
+		if( !(filter_var($this->arbeitnehmer_frist, FILTER_VALIDATE_INT, 
+				array(
+					'options' => array(
+						'min_range' => 1,
+						'max_range' => 52
+					)
+				)
+			)) ) {
+			$this->validationerrors[] = 'Arbeitnehmerfrist muss eine Wochenanzahl im Bereich 1 bis 52 sein.';
+		}
+		
+		return parent::validate();
+	}
+}

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -0,0 +1,524 @@
+<?php
+require_once __DIR__ . '/IValidation.php';
+require_once __DIR__ . '/AbstractBestandteil.php';
+require_once __DIR__ . '/Dienstverhaeltnis.php';
+require_once __DIR__ . '/Vertragsbestandteil.php';
+require_once __DIR__ . '/VertragsbestandteilStunden.php';
+require_once __DIR__ . '/VertragsbestandteilFunktion.php';
+require_once __DIR__ . '/VertragsbestandteilZeitaufzeichnung.php';
+require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
+require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
+require_once __DIR__ . '/VertragsbestandteilFreitext.php';
+require_once __DIR__ . '/VertragsbestandteilKarenz.php';
+require_once __DIR__ . '/VertragsbestandteilFactory.php';
+require_once __DIR__ . '/OverlapChecker.php';
+
+use vertragsbestandteil\Dienstverhaeltnis;
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+/**
+ * Description of VertragsbestandteilLib
+ *
+ * @author bambi
+ */
+class VertragsbestandteilLib
+{
+	const INCLUDE_FUTURE = true;
+	const DO_NOT_INCLUDE_FUTURE = false;
+	const WITH_VALORISATION_HISTORY = true;
+	const NOT_WITH_VALORISATION_HISTORY = false;
+
+	protected $CI;
+	/** @var Dienstverhaeltnis_model */
+	protected $DienstverhaeltnisModel;
+	/** @var Vertragsbestandteil_model */
+	protected $VertragsbestandteilModel;
+	/** @var Benutzer_model */
+	protected $BenutzerModel;
+	/**
+	 * @var GehaltsbestandteilLib
+	 */
+	protected $GehaltsbestandteilLib;
+
+	protected $loggedInUser;
+
+	public function __construct()
+	{
+		$this->loggedInUser = getAuthUID();
+		$this->CI = get_instance();
+		$this->CI->load->model('vertragsbestandteil/Dienstverhaeltnis_model',
+			'DienstverhaeltnisModel');
+		$this->DienstverhaeltnisModel = $this->CI->DienstverhaeltnisModel;
+		$this->CI->load->model('vertragsbestandteil/Vertragsbestandteil_model',
+			'VertragsbestandteilModel');
+		$this->VertragsbestandteilModel = $this->CI->VertragsbestandteilModel;
+		$this->CI->load->model('person/benutzer_model',
+			'BenutzerModel');
+		$this->BenutzerModel = $this->CI->BenutzerModel;
+		$this->CI->load->library('vertragsbestandteil/GehaltsbestandteilLib',
+			null, 'GehaltsbestandteilLib');
+		$this->GehaltsbestandteilLib = $this->CI->GehaltsbestandteilLib;
+	}
+
+	public function handleGUIData($guidata, $employeeUID, $userUID)
+	{
+		$guiHandler  = new GUIHandler($employeeUID, $userUID);
+		$ret = false;
+		try {
+			$ret = $guiHandler->handle($guidata,  $employeeUID, $userUID);
+		} catch (Exception $ex)
+		{
+			log_message('debug', "Error handling json data from GUI. " . $ex->getMessage());
+		}
+
+		return $ret;
+	}
+
+	public function fetchDienstverhaeltnisse($unternehmen, $stichtag=null, $mitarbeiteruid=null) {
+		$dvs = $this->DienstverhaeltnisModel->fetchDienstverhaeltnisse($unternehmen, $stichtag, $mitarbeiteruid);
+		return $dvs;
+	}
+
+	public function fetchDienstverhaeltnis($dienstverhaeltnis_id)
+	{
+		$result = $this->DienstverhaeltnisModel->load($dienstverhaeltnis_id);
+		$dv = null;
+		if(null !== ($row = getData($result)))
+		{
+			$dv = new Dienstverhaeltnis();
+			$dv->hydrateByStdClass($row[0], true);
+		}
+		return $dv;
+	}
+
+	public function fetchVertragsbestandteile($dienstverhaeltnis_id, $stichtag=null, 
+		$includefuture=false, $withvalorisationhistory=true)
+	{
+		$vbs = $this->VertragsbestandteilModel->getVertragsbestandteile(
+			$dienstverhaeltnis_id, $stichtag, $includefuture
+		);
+		$gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile(
+			$dienstverhaeltnis_id, $stichtag, $includefuture, $withvalorisationhistory
+		);
+
+		$gbsByVBid = array();
+		foreach( $gbs as $gb )
+		{
+			if( intval($gb->getVertragsbestandteil_id()) > 0 )
+			{
+				if( !isset($gbsByVBid[$gb->getVertragsbestandteil_id()])
+					|| !is_array($gbsByVBid[$gb->getVertragsbestandteil_id()]) ) {
+					$gbsByVBid[$gb->getVertragsbestandteil_id()] = array();
+				}
+				$gbsByVBid[$gb->getVertragsbestandteil_id()][] = $gb;
+			}
+		}
+
+		foreach ($vbs as $vb)
+		{
+			if( isset($gbsByVBid[$vb->getVertragsbestandteil_id()]) )
+			{
+				$vb->setGehaltsbestandteile($gbsByVBid[$vb->getVertragsbestandteil_id()]);
+			}
+		}
+
+		return $vbs;
+	}
+
+	public function fetchVertragsbestandteil($vertragsbestandteil_id)
+	{
+		return $this->VertragsbestandteilModel->getVertragsbestandteil($vertragsbestandteil_id);
+	}
+
+	public function fetchLastVertragsbestandteilStundenBeforeAltersteilzeit($dienstverhaeltnis_id)
+	{
+		return $this->VertragsbestandteilModel->getLastVertragsbestanteilStundenBeforeAltersteilzeit($dienstverhaeltnis_id);
+	}
+
+	public function storeDienstverhaeltnis(Dienstverhaeltnis $dv)
+	{
+		if( intval($dv->getDienstverhaeltnis_id()) > 0 )
+		{
+			$this->updateDienstverhaeltnis($dv);
+		}
+		else
+		{
+			$this->insertDienstverhaeltnis($dv);
+		}
+	}
+
+	public function storeVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil)
+	{
+		$this->CI->db->trans_begin();
+		try
+		{
+			$this->setUIDtoPGSQL();
+			if( intval($vertragsbestandteil->getVertragsbestandteil_id()) > 0 )
+			{
+				$this->updateVertragsbestandteil($vertragsbestandteil);
+			}
+			else
+			{
+				$this->insertVertragsbestandteil($vertragsbestandteil);
+			}
+			if( $this->CI->db->trans_status() === false )
+			{
+				log_message('debug', "Transaction failed");
+				throw new Exception("Transaction failed");
+			}
+			$this->CI->db->trans_commit();
+		}
+		catch (Exception $ex)
+		{
+			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
+			$this->CI->db->trans_rollback();
+			throw new Exception('Storing Vertragsbestandteil failed.');
+		}
+	}
+
+	public function deleteDienstverhaeltnis(Dienstverhaeltnis $dv)
+	{
+		$this->CI->db->trans_begin();
+		try
+		{
+			$this->setUIDtoPGSQL();
+			if( intval($dv->getDienstverhaeltnis_id()) > 0 )
+			{
+				$vbs = $this->fetchVertragsbestandteile($dv->getDienstverhaeltnis_id());
+				foreach ($vbs as $vb)
+				{
+					$this->deleteVertragsbestandteil($vb);
+				}
+
+				$ret = $this->DienstverhaeltnisModel->delete($dv->getDienstverhaeltnis_id());
+				if(isError($ret) )
+				{
+					log_message('debug', "Delete DV failed");
+					throw new Exception('error deleting dienstverhaeltnis '
+						. $dv->getDienstverhaeltnis_id());
+				}
+
+				if( $this->CI->db->trans_status() === false )
+				{
+					log_message('debug', "Transaction failed");
+					throw new Exception("Transaction failed");
+				}
+				$this->CI->db->trans_commit();
+			}
+		}
+		catch (Exception $ex)
+		{
+			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
+			$this->CI->db->trans_rollback();
+			return $ex->getMessage();
+		}
+
+		return true;
+
+	}
+
+	public function deleteVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil)
+	{
+		$this->CI->db->trans_begin();
+		try
+		{
+			$this->setUIDtoPGSQL();
+			if( intval($vertragsbestandteil->getVertragsbestandteil_id()) > 0 )
+			{
+				$this->deleteVertragsbestandteilHelper($vertragsbestandteil);
+			}
+			if( $this->CI->db->trans_status() === false )
+			{
+				log_message('debug', "Transaction failed");
+				throw new Exception("Transaction failed");
+			}
+			$this->CI->db->trans_commit();
+		}
+		catch (Exception $ex)
+		{
+			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
+			$this->CI->db->trans_rollback();
+			throw new Exception('Delete Vertragsbestandteil failed.');
+		}
+	}
+
+	protected function insertDienstverhaeltnis(Dienstverhaeltnis $dv)
+	{
+		$dv->setInsertvon($this->loggedInUser)
+			->setInsertamum(strftime('%Y-%m-%d %H:%M:%S'));
+		$ret = $this->DienstverhaeltnisModel->insert($dv->toStdClass());
+		if( hasData($ret) )
+		{
+			$dv->setDienstverhaeltnis_id(getData($ret));
+		}
+		else
+		{
+			throw new Exception('error inserting dienstverhaeltnis');
+		}
+	}
+
+	protected function insertVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil)
+	{
+		$vertragsbestandteil->setInsertvon($this->loggedInUser)
+			->setInsertamum(strftime('%Y-%m-%d %H:%M:%S'));
+		$vertragsbestandteil->beforePersist();
+		$ret = $this->VertragsbestandteilModel->insert($vertragsbestandteil->baseToStdClass());
+		if( hasData($ret) )
+		{
+			$vertragsbestandteil->setVertragsbestandteil_id(getData($ret));
+		}
+		else
+		{
+			throw new Exception('error inserting vertragsbestandteil');
+		}
+
+		$specialisedModel = VertragsbestandteilFactory::getVertragsbestandteilDBModel(
+			$vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
+		$retspecial = $specialisedModel->insert($vertragsbestandteil->toStdClass());
+
+		if(isError($retspecial) )
+		{
+			throw new Exception('error updating vertragsbestandteil '
+				. $vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
+		}
+
+		try
+		{
+			$gehaltsbestandteile = $vertragsbestandteil->getGehaltsbestandteile();
+			$this->GehaltsbestandteilLib->storeGehaltsbestandteile($gehaltsbestandteile);
+		}
+		catch(Exception $ex)
+		{
+			throw new Exception('VertragsbestandteilLib insertVertragsbestandteil '
+				. 'failed to store Gehaltsbestandteile. ' . $ex->getMessage());
+		}
+	}
+
+	protected function updateDienstverhaeltnis(Dienstverhaeltnis $dv)
+	{
+		if(!$dv->isDirty()) {
+			return;
+		}
+
+		$dv->setUpdatevon($this->loggedInUser)
+			->setUpdateamum(strftime('%Y-%m-%d %H:%M:%S'));
+		$ret = $this->DienstverhaeltnisModel->update($dv->getDienstverhaeltnis_id(),
+			$dv->toStdClass());
+		if(isError($ret) )
+		{
+			throw new Exception('error updating dienstverhaeltnis');
+		}
+	}
+
+	private function deleteVertragsbestandteilHelper(Vertragsbestandteil $vertragsbestandteil)
+	{
+
+		$specialisedModel = VertragsbestandteilFactory::getVertragsbestandteilDBModel(
+			$vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
+		$retspecial = $specialisedModel->delete($vertragsbestandteil->getVertragsbestandteil_id());
+
+		if(isError($retspecial) )
+		{
+			throw new Exception('error deleting vertragsbestandteil '
+				. $vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
+		}
+
+		try
+		{
+			$gehaltsbestandteile = $vertragsbestandteil->getGehaltsbestandteile();
+			$this->GehaltsbestandteilLib->deleteGehaltsbestandteile($gehaltsbestandteile);
+		}
+		catch(Exception $ex)
+		{
+			throw new Exception('VertragsbestandteilLib deleteVertragsbestandteil '
+				. 'failed to delete Gehaltsbestandteile. ' . $ex->getMessage());
+		}
+
+
+		$ret = $this->VertragsbestandteilModel->delete($vertragsbestandteil->getVertragsbestandteil_id());
+
+		if(isError($ret) )
+		{
+			throw new Exception('error deleting vertragsbestandteil');
+		}
+
+		$vertragsbestandteil->afterDelete();
+	}
+
+	protected function updateVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil)
+	{
+		if($vertragsbestandteil->isDirty()) {
+			$vertragsbestandteil->setUpdatevon($this->loggedInUser)
+				->setUpdateamum(strftime('%Y-%m-%d %H:%M:%S'));
+			$vertragsbestandteil->beforePersist();
+			$basedata = $vertragsbestandteil->baseToStdClass();
+			if( count((array) $basedata) > 0 )
+			{
+				$ret = $this->VertragsbestandteilModel->update(
+					$vertragsbestandteil->getVertragsbestandteil_id(),
+					$basedata);
+
+				if(isError($ret) )
+				{
+					throw new Exception('error updating vertragsbestandteil');
+				}
+			}
+
+			$specialisedData = $vertragsbestandteil->toStdClass();
+			if( count((array) $specialisedData) > 0 )
+			{
+				$specialisedModel = VertragsbestandteilFactory::getVertragsbestandteilDBModel(
+					$vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
+				$retspecial = $specialisedModel->update(
+					$vertragsbestandteil->getVertragsbestandteil_id(),
+					$specialisedData);
+
+				if(isError($retspecial) )
+				{
+					throw new Exception('error updating vertragsbestandteil '
+						. $vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());
+				}
+			}
+		}
+
+		try
+		{
+			$gehaltsbestandteile = $vertragsbestandteil->getGehaltsbestandteile();
+			$this->GehaltsbestandteilLib->storeGehaltsbestandteile($gehaltsbestandteile);
+		}
+		catch(Exception $ex)
+		{
+			throw new Exception('VertragsbestandteilLib updateVertragsbestandteil '
+				. 'failed to store Gehaltsbestandteile. ' . $ex->getMessage());
+		}
+	}
+
+	public function isOverlappingExistingDV(Dienstverhaeltnis $dv)
+	{
+		return $this->DienstverhaeltnisModel->isOverlappingExistingDV(
+			$dv->getMitarbeiter_uid(),
+			$dv->getOe_kurzbz(),
+			$dv->getVon(),
+			$dv->getBis(),
+			$dv->getDienstverhaeltnis_id()
+		);
+	}
+
+	protected function hasOtherActiveDV(Dienstverhaeltnis $dv, $duedate)
+	{
+	    $hasotheractivedv = false;
+	    $result = $this->DienstverhaeltnisModel->getDVByPersonUID($dv->getMitarbeiter_uid(), null, $duedate);
+	    $dvs = getData($result);
+	    foreach ($dvs as $tmpdv)
+	    {
+		if(intval($tmpdv->dienstverhaeltnis_id) !== intval($dv->getDienstverhaeltnis_id()))
+		{
+		    $hasotheractivedv = true;
+		    break;
+		}
+	    }
+	    return $hasotheractivedv;
+	}
+
+	/**
+	 * like endDienstverhaeltnis, but also sets aktiv flag to false
+	 */
+	public function deactivateDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate, $deactivate)
+	{
+	    $result = $this->endDienstverhaeltnis($dv, $enddate);
+	    if ( $result === true)
+	    {
+		if (!$deactivate) return $result;
+
+		if(!$this->hasOtherActiveDV($dv, $enddate))
+		{
+		    $result = $this->BenutzerModel->update(
+			array('uid' => $dv->getMitarbeiter_uid()),
+			array(
+			    'aktiv' => false,
+			    'updateaktivam' => date('Y-m-d'),
+			    'updateaktivvon' => $this->loggedInUser
+			)
+		    );
+		}
+	    }
+
+	    return $result;
+	}
+
+	public function endDienstverhaeltnis(Dienstverhaeltnis $dv, $enddate, $dvendegrund_kurzbz=null, $dvendegrund_anmerkung=null)
+	{
+		if( $dv->getBis() !== null && $dv->getBis() < $enddate )
+		{
+			return 'Dienstverhältnis ist bereits beendet.';
+		}
+
+		$this->CI->db->trans_begin();
+		try
+		{
+			$this->setUIDtoPGSQL();
+			if( intval($dv->getDienstverhaeltnis_id()) > 0 )
+			{
+				$gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile($dv->getDienstverhaeltnis_id());
+				foreach ($gbs as $gb)
+				{
+					$this->GehaltsbestandteilLib->endGehaltsbestandteil($gb, $enddate);
+				}
+
+				$vbs = $this->fetchVertragsbestandteile($dv->getDienstverhaeltnis_id());
+				foreach ($vbs as $vb)
+				{
+					$this->endVertragsbestandteil($vb, $enddate);
+				}
+
+				if( $dvendegrund_kurzbz !== null )
+				{
+				    $dv->setDvendegrund_kurzbz($dvendegrund_kurzbz);
+				}
+				if( $dvendegrund_anmerkung !== null )
+				{
+				    $dv->setDvendegrund_anmerkung($dvendegrund_anmerkung);
+				}
+				$dv->setBis($enddate);
+				$this->updateDienstverhaeltnis($dv);
+
+				if( $this->CI->db->trans_status() === false )
+				{
+					log_message('debug', "Transaction failed");
+					throw new Exception("Transaction failed");
+				}
+				$this->CI->db->trans_commit();
+			}
+		}
+		catch (Exception $ex)
+		{
+			log_message('debug', "end DV failed " . $dv->getDienstverhaeltnis_id());
+			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
+			$this->CI->db->trans_rollback();
+			return $ex->getMessage();
+		}
+		return true;
+	}
+
+	public function endVertragsbestandteil(Vertragsbestandteil $vertragsbestandteil, $enddate)
+	{
+		if( $vertragsbestandteil->getBis() !== null && $vertragsbestandteil->getBis() < $enddate )
+		{
+			return;
+		}
+
+		$vertragsbestandteil->setBis($enddate);
+		$this->updateVertragsbestandteil($vertragsbestandteil);
+	}
+
+	protected function setUIDtoPGSQL() {
+		$ret = $this->VertragsbestandteilModel
+			->execReadOnlyQuery('SET LOCAL pv21.uid TO \''
+				. $this->loggedInUser . '\'');
+		if(isError($ret))
+		{
+			throw new Exception('error setting uid to pgsql');
+		}
+	}
+}

application/libraries/vertragsbestandteil/VertragsbestandteilStunden.php

@@ -0,0 +1,110 @@
+<?php
+
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+
+
+/**
+ * Description of VertragsbestandteilStunden
+ *
+ * @author bambi
+ */
+class VertragsbestandteilStunden extends Vertragsbestandteil
+{
+	protected $wochenstunden;
+	protected $teilzeittyp_kurzbz;
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_STUNDEN);
+	}
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->wochenstunden) && $this->setWochenstunden($data->wochenstunden);
+		isset($data->teilzeittyp_kurzbz) && $this->setTeilzeittyp_kurzbz($data->teilzeittyp_kurzbz);
+		$this->fromdb = false;
+	}
+	
+	public function getWochenstunden()
+	{
+		return $this->wochenstunden;
+	}
+
+	public function getTeilzeittyp_kurzbz()
+	{
+		return $this->teilzeittyp_kurzbz;
+	}
+
+	public function setWochenstunden($wochenstunden)
+	{
+		$this->markDirty('wochenstunden', $this->wochenstunden, $wochenstunden);
+		$this->wochenstunden = $wochenstunden;
+		return $this;
+	}
+
+	public function setTeilzeittyp_kurzbz($teilzeittyp_kurzbz)
+	{
+		$teilzeittyp_kurzbz = ($teilzeittyp_kurzbz !== '') 
+			? $teilzeittyp_kurzbz : null;
+		$this->markDirty('teilzeittyp_kurzbz', $this->teilzeittyp_kurzbz, $teilzeittyp_kurzbz);
+		$this->teilzeittyp_kurzbz = $teilzeittyp_kurzbz;
+		return $this;
+	}
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'wochenstunden' => $this->getWochenstunden(),
+			'teilzeittyp_kurzbz' => $this->getTeilzeittyp_kurzbz()
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		wochenstunden: {$this->getWochenstunden()}
+		teilzeittyp_kurzbz: {$this->getTeilzeittyp_kurzbz()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+	
+	public function validate()
+	{
+		if( false === filter_var($this->wochenstunden, FILTER_VALIDATE_FLOAT, 
+				array(
+					'options' => array(
+						'min_range' => 0,
+						'max_range' => 100
+					)
+				)
+			) ) {
+			$this->validationerrors[] = 'Stunden muss eine Kommazahl im Bereich 0 bis 100 sein.';
+		}
+		else
+		{
+			if( floatval($this->wochenstunden) < floatval('0.01') && 
+				$this->teilzeittyp_kurzbz !== 'altersteilzeit' ) 
+			{
+				$this->validationerrors[] = '0 Wochenstunden ist nur in Kombination mit Altersteilzeit zulässig.';
+			}
+		}
+		
+		return parent::validate();
+	}
+}

application/libraries/vertragsbestandteil/VertragsbestandteilUrlaubsanspruch.php

@@ -0,0 +1,83 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilUrlaubsanspruch extends Vertragsbestandteil
+{
+	protected $tage;
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH);
+	}
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->tage) && $this->setTage($data->tage);
+		$this->fromdb = false;
+	}
+	
+	/**
+	 * Get the value of tage
+	 */
+	public function getTage()
+	{
+		return $this->tage;
+	}
+
+	/**
+	 * Set the value of tage
+	 */
+	public function setTage($tage): self
+	{
+		$this->markDirty('tage', $this->tage, $tage);
+		$this->tage = $tage;
+
+		return $this;
+	}
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'tage' => $this->getTage(),
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		tage: {$this->getTage()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	public function validate()
+	{
+		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
+				array(
+					'options' => array(
+						'min_range' => 1,
+						'max_range' => 50
+					)
+				)
+			)) ) {
+			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		}
+		
+		return parent::validate();
+	}
+}

application/libraries/vertragsbestandteil/VertragsbestandteilZeitaufzeichnung.php

@@ -0,0 +1,118 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilZeitaufzeichnung extends Vertragsbestandteil
+{
+	protected $zeitaufzeichnung;
+	protected $azgrelevant;
+	protected $homeoffice;
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG);
+	}
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->zeitaufzeichnung) && $this->setZeitaufzeichnung($data->zeitaufzeichnung);
+		isset($data->azgrelevant) && $this->setAzgrelevant($data->azgrelevant);
+		isset($data->homeoffice) && $this->setHomeoffice($data->homeoffice);
+		$this->fromdb = false;
+	}
+	
+	/**
+	 * Get the value of zeitaufzeichnung
+	 */
+	public function getZeitaufzeichnung()
+	{
+		return $this->zeitaufzeichnung;
+	}
+
+	/**
+	 * Set the value of zeitaufzeichnung
+	 */
+	public function setZeitaufzeichnung($zeitaufzeichnung): self
+	{
+		$this->markDirty('zeitaufzeichnung', $this->zeitaufzeichnung, $zeitaufzeichnung);
+		$this->zeitaufzeichnung = $zeitaufzeichnung;
+
+		return $this;
+	}
+
+	/**
+	 * Get the value of azgrelevant
+	 */
+	public function getAzgrelevant()
+	{
+		return $this->azgrelevant;
+	}
+
+	/**
+	 * Set the value of azgrelevant
+	 */
+	public function setAzgrelevant($azgrelevant): self
+	{
+		$this->markDirty('azgrelevant', $this->azgrelevant, $azgrelevant);
+		$this->azgrelevant = $azgrelevant;
+
+		return $this;
+	}
+
+	/**
+	 * Get the value of homeoffice
+	 */
+	public function getHomeoffice()
+	{
+		return $this->homeoffice;
+	}
+
+	/**
+	 * Set the value of homeoffice
+	 */
+	public function setHomeoffice($homeoffice): self
+	{
+		$this->markDirty('homeoffice', $this->homeoffice, $homeoffice);
+		$this->homeoffice = $homeoffice;
+
+		return $this;
+	}
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'zeitaufzeichnung' => $this->getZeitaufzeichnung(),
+			'azgrelevant' => $this->getAzgrelevant(),
+			'homeoffice' => $this->getHomeoffice()
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		zeitaufzeichnung: {$this->getZeitaufzeichnung()}
+		azgrelevant: {$this->getAzgrelevant()}
+		homeoffice: {$this->getHomeoffice()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+	
+	public function validate()
+	{
+		return parent::validate();
+	}
+}