new function loadAllTemplates()

Umbenennung Lehreinheit in LV-Teil

application/config/navigation.php

@@ -55,6 +55,12 @@ $config['navigation_header'] = array(
 					'description' => 'CIS',
 					'sort' => 10
 				),
+				'lehrveranstaltungen' => array(
+					'link' => site_url('lehre/lvplanung/LvTemplateUebersicht'),
+					'icon' => '',
+					'description' => 'Lehrveranstaltungen',
+					'sort' => 15
+				),
 				'reihungstest' => array(
 					'link' => site_url('organisation/Reihungstest'),
 					'description' => 'Reihungstests',
@@ -287,6 +293,15 @@ $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
 	)
 );
 
+$config['navigation_menu']['lehre/lvplanung/LvTemplateUebersicht/index'] = array(
+	'lvTemplateUebersicht' => array(
+		'link' => site_url('lehre/lvplanung/LvTemplateUebersicht'),
+		'description' => 'LV Template Übersicht',
+		'icon' => '',
+		'sort' => 1
+	)
+);
+
 $config['navigation_menu']['system/issues/Issues/*'] = array(
 	'fehlerzustaendigkeiten' => array(
 		'link' => site_url('system/issues/IssuesZustaendigkeiten'),

application/controllers/Studentenverwaltung.php

@@ -0,0 +1,40 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studentenverwaltung extends Auth_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function _remap()
+	{
+		$this->load->view('Studentenverwaltung', [
+			'permissions' => [
+				'student/bpk' => $this->permissionlib->isBerechtigt('student/bpk'),
+				'student/alias' => $this->permissionlib->isBerechtigt('student/alias'),
+				'basis/prestudent' => $this->permissionlib->isBerechtigt('basis/prestudent'),
+				'basis/prestudentstatus' => $this->permissionlib->isBerechtigt('basis/prestudentstatus'),
+				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
+				'admin' => $this->permissionlib->isBerechtigt('admin'),
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
+				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
+				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht')
+			],
+			'variables' => [
+				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
+			]
+		]);
+	}
+}

application/controllers/api/frontend/v1/Udf.php

@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright (C) 2024 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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the UDFLib (back-end)
+ * Provides data to the ajax get calls about the Udf component
+ * Listens to ajax post calls to change the Udf data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Udf extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares the UDFLib
+	 */
+	public function __construct()
+	{
+		// NOTE: UdfLib has its own permissions checks
+		parent::__construct([
+			'load' => self::PERM_LOGGED,
+			'save' => self::PERM_LOGGED
+		]);
+
+		// Libraries
+		$this->load->library('form_validation');
+		$this->load->library('UDFLib');
+		
+		// Models
+		$this->load->model($this->getTargetModelPath(), 'TargetModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Load all UDFs for a dataset
+	 *
+	 * @return void
+	 */
+	public function load()
+	{
+		$pks = $this->TargetModel->getPks();
+		foreach ($pks as $id)
+			$this->form_validation->set_rules($id, $id, 'required');
+		
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$id = [];
+		foreach ($pks as $pk)
+			$id[$pk] = $this->input->post($pk);
+		if (!is_array($this->TargetModel->getPk()))
+			$id = current($id);
+
+		$result = $this->udflib->getFieldArray($this->TargetModel, $id);
+
+		$fields = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($fields);
+	}
+
+	/**
+	 * Saves UDFs to a dataset
+	 *
+	 * @return void
+	 */
+	public function save()
+	{
+		$pks = $this->TargetModel->getPks();
+		foreach ($pks as $id)
+			$this->form_validation->set_rules($id, $id, 'required');
+
+		$result = $this->udflib->getCiValidations($this->TargetModel, $this->input->post());
+		
+		$fieldValidations = $this->getDataOrTerminateWithError($result);
+
+		$this->form_validation->set_rules($fieldvalidations);
+
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$id = [];
+		$fields = $this->input->post();
+		foreach ($pks as $pk) {
+			$id[$pk] = $fields[$pk];
+			unset($fields[$pk]);
+		}
+		if (!is_array($this->TargetModel->getPk()))
+			$id = current($id);
+
+		$result = $this->TargetModel->update($id, $fields);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(array_fill_keys(array_keys($fields), ''));
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Get the path to the target model from the url
+	 *
+	 * @return string
+	 */
+	private function getTargetModelPath()
+	{
+		$ci_model_path = array_slice($this->uri->rsegments, 2);
+		if ($ci_model_path)
+			$ci_model_path[] = ucfirst(array_pop($ci_model_path)) . '_model';
+		return implode(DIRECTORY_SEPARATOR, $ci_model_path);
+	}
+}

application/controllers/api/frontend/v1/checkperson/CheckPerson.php

@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright (C) 2024 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');
+
+class CheckPerson extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
+			'filterPerson' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
+			'checkUnruly' => array('basis/mitarbeiter:r', 'student/antragfreigabe:r', 'student/studierendenantrag:r', 'infocenter:r'),
+			'checkDuplicate' => array('infocenter:r'),
+		]);
+
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+	}
+
+	public function updatePersonUnrulyStatus()
+	{
+		$data = json_decode($this->input->raw_input_stream, true);
+
+		$person_id = $data['person_id'];
+		$unruly = $data['unruly'];
+
+		$result = $this->_ci->PersonModel->updateUnruly($person_id, $unruly);
+
+		if(isError($result)) {
+			$this->terminateWithError($result);
+		} else if (isSuccess($result)) {
+			$this->terminateWithSuccess($result);
+		}
+
+	}
+
+	public function checkDuplicate() {
+
+		$person_id = $this->input->post('person_id');
+
+		$result = $this->_ci->PersonModel->checkDuplicate($person_id);
+
+		if (isSuccess($result))
+			$this->terminateWithSuccess($result);
+		else
+			$this->terminateWithError('Error when searching for person');
+
+	}
+
+	// performs strict check over vorname, nachname, gebdatum
+	public function checkUnruly() {
+
+		$vorname = $this->input->post('vorname');
+		$nachname = $this->input->post('nachname');
+		$gebdatum = $this->input->post('gebdatum');
+
+		$result = $this->_ci->PersonModel->checkUnruly($vorname, $nachname, $gebdatum);
+
+		if (isSuccess($result))
+			$this->terminateWithSuccess($result);
+		else
+			$this->terminateWithError('Error when searching for person');
+	}
+
+	// filters nachname on similarity and vorname/gebdatum are optional
+	public function filterPerson() {
+		$payload = json_decode($this->input->raw_input_stream, TRUE);
+
+		$nachnameString = '';
+		$vornameString = '';
+		$filterUnruly = true;
+		$birthdateString = '';
+
+		if(array_key_exists( 'nachname', $payload) ) {
+			$nachnameString = $payload['nachname'];
+		}
+
+		if(array_key_exists('vorname', $payload)) {
+			$vornameString = $payload['vorname'];
+		}
+
+		if(array_key_exists('unruly', $payload)){
+			$filterUnruly = $payload['unruly'];
+		}
+
+		if(array_key_exists('gebdatum', $payload)) {
+			// TODO: enable if gebdatum filter for unrulys is desired
+//				$birthdateString = $payload['gebdatum'];
+		}
+
+		$parametersArray = array($nachnameString);
+		$where ="p.nachname~* ? ";
+		if (mb_strlen($nachnameString) == 2)
+		{
+			$where = "p.nachname=? ";
+		}
+
+		if(isset($vornameString) && $vornameString != '')
+		{
+			$where.= " AND p.vorname~*?";
+			$parametersArray[] = $vornameString;
+		}
+
+		if(isset($birthdateString) && $birthdateString != '')
+		{
+			$where.=" AND p.gebdatum=?";
+			$parametersArray[] = $birthdateString;
+		}
+
+		if(isset($filterUnruly))
+		{
+			$where.=" AND p.unruly=?";
+			$parametersArray[] = $filterUnruly;
+		}
+
+		$result = $this->_ci->PersonModel->checkUnrulyWhere($where, $parametersArray);
+
+		if (isSuccess($result))
+			$this->terminateWithSuccess($result);
+		else
+			$this->terminateWithError('Error when searching for person');
+
+
+	}
+}

application/controllers/api/frontend/v1/education/Lehrveranstaltung.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Lehrveranstaltung extends FHCAPI_Controller
+{
+	/**
+	 * Lehrveranstaltung API constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct(array(
+			'getTemplateLvTree' => array(
+			    'lehre/lehrveranstaltung:rw'
+			)
+		));
+
+		// Load model LehrveranstaltungModel
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+	}
+
+	/**
+	 * Get all Templates and union with all Lehrveranstaltungen of given Studiensemester and Oes of given Berechtigung,
+	 * that are assigned to a template. This data structure can be used for nested tabulators' data tree.
+	 *
+	 * @param null|string $studiensemester_kurzbz
+	 * @param null|string $berechtigung
+	 * @return array|stdClass|null
+	 */
+	public function getTemplateLvTree()
+	{
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+		$berechtigung = $this->input->get('berechtigung');
+
+		if ($berechtigung)
+		{
+			$oe_permissions = $this->permissionlib->getOE_isEntitledFor($berechtigung);
+			if(!$oe_permissions) $oe_permissions = [];
+
+			$result = $this->LehrveranstaltungModel->getTemplateLvTree($studiensemester_kurzbz, $oe_permissions);
+		}
+		else
+		{
+			$result = $this->LehrveranstaltungModel->getTemplateLvTree($studiensemester_kurzbz);
+		}
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+}

application/controllers/api/frontend/v1/notiz/NotizPerson.php

@@ -0,0 +1,51 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class NotizPerson extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getUid' => ['admin:r', 'assistenz:r'],
+			'getNotizen' => ['admin:r', 'assistenz:r'],
+			'loadNotiz' => ['admin:r', 'assistenz:r'],
+			'addNewNotiz' => ['admin:rw', 'assistenz:rw'],
+			'updateNotiz' => ['admin:rw', 'assistenz:rw'],
+			'deleteNotiz' => ['admin:rw', 'assistenz:rw'],
+			'loadDokumente' => ['admin:r', 'assistenz:r'],
+			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+	}
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if($typeId != "person_id")
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//TODO define permission
+		if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre', 'error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function loadDokumente()
+	{
+		$notiz_id = $this->input->post('notiz_id');
+
+		// TODO(chris): make CI variant of endpoint
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || campus.tbl_dms_version.dms_id AS preview');
+		
+		return parent::loadDokumente();
+	}
+}

application/controllers/api/frontend/v1/organisation/Studiensemester.php

@@ -0,0 +1,118 @@
+<?php
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studiensemester extends FHCAPI_Controller
+{
+	/**
+	 * Studiensemester API constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'getAll' => self::PERM_LOGGED,
+				'getAktNext' => self::PERM_LOGGED
+			)
+		);
+		// Load model StudiensemesterModel
+		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
+	}
+
+	/**
+	 * Get all Studiensemester.
+	 *
+	 * @param null|string $order Sorting order for the Studiensemester, 'asc' or 'desc'. Defaults to 'asc'.
+	 * @param null|string $start Start date of the displayed Studiensemester in the format 'YYYY-MM-DD'.
+	 * 	If provided, only Studiensemester starting from this date onwards will be returned.
+	 *  eg. '2020-09-01' will start with WS2020.
+	 */
+	public function getAll()
+	{
+		$order = $this->input->get('order');
+		$start = $this->input->get('start');
+
+		if (strcasecmp($order, 'DESC') == 0)
+		{
+			$this->StudiensemesterModel->addOrder('ende', 'DESC');
+		}
+		else
+		{
+			$this->StudiensemesterModel->addOrder('ende', 'ASC');
+		}
+
+		if ($start)
+		{
+			$result = $this->StudiensemesterModel->loadWhere([
+				'start >= ' => $start
+			]);
+		}
+		else
+		{
+			$result = $this->StudiensemesterModel->load();
+		}
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function getAktNext()
+	{
+		$semester = $this->input->get('semester');
+
+		$result = null;
+
+		if (!is_numeric($semester))
+		{
+			$result = $this->StudiensemesterModel->loadWhere(array('start <=' => 'NOW()', 'ende >=' => 'NOW()'));
+		}
+
+		if (!hasData($result))
+		{
+			$this->StudiensemesterModel->addOrder('ende');
+			$this->StudiensemesterModel->addLimit(1);
+
+			$whereArray = array('ende >=' => 'NOW()');
+
+			if (is_numeric($semester))
+			{
+				if ($semester % 2 == 0)
+				{
+					$ss = 'SS';
+				}
+				else
+				{
+					$ss = 'WS';
+				}
+
+				$whereArray['SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) ='] = $ss;
+			}
+
+			$result = $this->StudiensemesterModel->loadWhere($whereArray);
+		}
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: ''));
+	}
+}

application/controllers/api/frontend/v1/studstatus/Abmeldung.php

@@ -184,4 +184,4 @@ class Abmeldung extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess($data);
 	}
-}
+}

application/controllers/api/frontend/v1/studstatus/Leitung.php

@@ -53,7 +53,8 @@ class Leitung extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'studierendenantrag'
+			'studierendenantrag',
+			'lehre'
 		]);
 	}
 

application/controllers/api/frontend/v1/stv/Address.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright (C) 2024 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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about addresses
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Address extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getNations' => self::PERM_LOGGED,
+			'getPlaces' => self::PERM_LOGGED
+		]);
+	}
+
+	public function getNations()
+	{
+		$this->load->model('codex/Nation_model', 'NationModel');
+
+		$this->NationModel->addOrder('kurztext');
+
+		$result = $this->NationModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getPlaces($plz)
+	{
+		$this->load->model('codex/Gemeinde_model', 'GemeindeModel');
+
+		$this->load->library('form_validation');
+		
+		$this->form_validation->set_data(['address.plz' => $plz]);
+
+		$this->form_validation->set_rules('address.plz', 'PLZ', 'numeric|less_than[10000]');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->GemeindeModel->getGemeindeByPlz($plz);
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+}

application/controllers/api/frontend/v1/stv/Config.php

@@ -0,0 +1,233 @@
+<?php
+/**
+ * Copyright (C) 2024 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 CI3_Events as Events;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about the StV Config
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Config extends FHCAPI_Controller
+{
+
+
+	public function __construct()
+	{
+		// TODO(chris): permissions
+		parent::__construct([
+			'student' => ['admin:r', 'assistenz:r'],
+			'students' => ['admin:r', 'assistenz:r']
+		]);
+
+
+		// Load Phrases
+		$this->loadPhrases([
+			'global',
+			'person',
+			'lehre',
+			'stv',
+			'konto'
+		]);
+	}
+
+	public function student()
+	{
+		$result = [];
+		$result['details'] = [
+			'title' => $this->p->t('stv', 'tab_details'),
+			'component' => './Stv/Studentenverwaltung/Details/Details.js'
+		];
+		$result['notes'] = [
+			'title' => $this->p->t('stv', 'tab_notes'),
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
+		];
+		$result['contact'] = [
+			'title' => $this->p->t('stv', 'tab_contact'),
+			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js',
+			'config' => [
+				'showBankaccount' => $this->permissionlib->isBerechtigt('mitarbeiter/bankdaten')
+					|| $this->permissionlib->isBerechtigt('student/bankdaten')
+			]
+		];
+		$result['prestudent'] = [
+			'title' => $this->p->t('stv', 'tab_prestudent'),
+			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js'
+		];
+		$result['status'] = [
+			'title' => 'Status',
+			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
+		];
+		$result['banking'] = [
+			'title' => $this->p->t('stv', 'tab_banking'),
+			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
+			'config' => [
+				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
+				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
+				'showMahnspanne' => (!defined('FAS_KONTO_SHOW_MAHNSPANNE') || FAS_KONTO_SHOW_MAHNSPANNE===true),
+				'showCreditpoints' => (defined('FAS_KONTO_SHOW_CREDIT_POINTS') && FAS_KONTO_SHOW_CREDIT_POINTS == 'true'),
+				'columns' => $this->kontoColumns(),
+				'additionalCols' => []
+			]
+		];
+		$result['resources'] = [
+			'title' => $this->p->t('stv', 'tab_resources'),
+			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
+		];
+		/* TODO(chris): Ausgeblendet für Testing
+		$result['grades'] = [
+			'title' => $this->p->t('stv', 'tab_grades'),
+			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
+		];
+		*/
+
+		Events::trigger('stv_conf_student', function & () use (&$result) {
+			return $result;
+		});
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function students()
+	{
+		$result = [];
+		$result['banking'] = [
+			'title' => $this->p->t('stv', 'tab_banking'),
+			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
+			'config' => [
+				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
+				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
+				'showMahnspanne' => (!defined('FAS_KONTO_SHOW_MAHNSPANNE') || FAS_KONTO_SHOW_MAHNSPANNE===true),
+				'showCreditpoints' => (defined('FAS_KONTO_SHOW_CREDIT_POINTS') && FAS_KONTO_SHOW_CREDIT_POINTS == 'true'),
+				'columns' => $this->kontoColumnsMultiPerson(),
+				'additionalCols' => []
+			]
+		];
+		$result['status'] = [
+			'title' => 'Status',
+			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
+			'config' => [
+				'changeStatusToAbbrecherStgl' => $this->permissionlib->isBerechtigt('admin'),
+				'changeStatusToAbbrecherStud' => $this->permissionlib->isBerechtigt('admin'),
+				'changeStatusToUnterbrecher' => $this->permissionlib->isBerechtigt('admin'),
+				'changeStatusToDiplomand' => $this->permissionlib->isBerechtigt('admin'),
+				'changeStatusToAbsolvent' => $this->permissionlib->isBerechtigt('admin')
+			]
+		];
+
+		Events::trigger('stv_conf_students', function & () use (&$result) {
+			return $result;
+		});
+
+		$this->terminateWithSuccess($result);
+	}
+
+	protected function kontoColumns()
+	{
+		return [
+			'buchungsdatum' => [
+				'field' => "buchungsdatum",
+				'title' => $this->p->t('konto', 'buchungsdatum')
+			],
+			'buchungstext' => [
+				'field' => "buchungstext",
+				'title' => $this->p->t('konto', 'buchungstext')
+			],
+			'betrag' => [
+				'field' => "betrag",
+				'title' => $this->p->t('konto', 'betrag')
+			],
+			'studiensemester_kurzbz' => [
+				'field' => "studiensemester_kurzbz",
+				'title' => $this->p->t('lehre', 'studiensemester')
+			],
+			'buchungstyp_kurzbz' => [
+				'field' => "buchungstyp_kurzbz",
+				'title' => $this->p->t('konto', 'buchungstyp'),
+				'visible' => false
+			],
+			'buchungsnr' => [
+				'field' => "buchungsnr",
+				'title' => $this->p->t('konto', 'buchungsnr'),
+				'visible' => false
+			],
+			'insertvon' => [
+				'field' => "insertvon",
+				'title' => $this->p->t('global', 'insertvon'),
+				'visible' => false
+			],
+			'insertamum' => [
+				'field' => "insertamum",
+				'title' => $this->p->t('global', 'insertamum'),
+				'visible' => false
+			],
+			'kuerzel' => [
+				'field' => "kuerzel",
+				'title' => $this->p->t('lehre', 'studiengang'),
+				'visible' => false
+			],
+			'anmerkung' => [
+				'field' => "anmerkung",
+				'title' => $this->p->t('global', 'anmerkung')
+			],
+			'actions' => [
+				'title' => $this->p->t('global', 'actions'),
+				'frozen' => true
+			]
+		];
+	}
+	protected function kontoColumnsMultiPerson()
+	{
+		return [
+			'person_id' => [
+				'field' => "person_id",
+				'title' => $this->p->t('person', 'person_id')
+			],
+			'anrede' => [
+				'field' => "anrede",
+				'title' => $this->p->t('person', 'anrede'),
+				'visible' => false
+			],
+			'titelpost' => [
+				'field' => "titelpost",
+				'title' => $this->p->t('person', 'titelpost'),
+				'visible' => false
+			],
+			'titelpre' => [
+				'field' => "titelpre",
+				'title' => $this->p->t('person', 'titelpre'),
+				'visible' => false
+			],
+			'vorname' => [
+				'field' => "vorname",
+				'title' => $this->p->t('person', 'vorname')
+			],
+			'vornamen' => [
+				'field' => "vornamen",
+				'title' => $this->p->t('person', 'vornamen'),
+				'visible' => false
+			],
+			'nachname' => [
+				'field' => "nachname",
+				'title' => $this->p->t('person', 'nachname')
+			]
+		] + $this->kontoColumns();
+	}
+}

application/controllers/api/frontend/v1/stv/Favorites.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright (C) 2024 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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about favorite verbände
+ * Listens to ajax post calls to change the favorite verbände data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Favorites extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+
+		// TODO(chris): variable table might be to small to store favorites!
+	}
+
+	public function index()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_favorites']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if (!$data)
+			$this->terminateWithSuccess(null);
+		else
+			$this->terminateWithSuccess($data['stv_favorites']);
+	}
+
+	public function set()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$favorites = $this->input->post('favorites');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess(true);
+	}
+}

application/controllers/api/frontend/v1/stv/Filter.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright (C) 2024 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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about the Studiengang filter
+ * Listens to ajax post calls to change the Studiengang filter data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Filter extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStg' => self::PERM_LOGGED,
+			'setStg' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Get current setting
+	 *
+	 * @return void
+	 */
+	public function getStg()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['kontofilterstg']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data['kontofilterstg'] == 'true');
+	}
+
+	/**
+	 * Set current setting
+	 *
+	 * @return void
+	 */
+	public function setStg()
+	{
+		$this->load->library('form_validation');
+
+		$studiengang_kz = $this->input->post('studiengang_kz');
+
+		if ($studiengang_kz === null) {
+			$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
+
+			if (!$this->form_validation->run())
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'kontofilterstg', $studiengang_kz ? 'true' : 'false');
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(true);
+	}
+}

application/controllers/api/frontend/v1/stv/Kontakt.php

@@ -0,0 +1,754 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Kontakt extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAdressen' => ['admin:r', 'assistenz:r'],
+			'addNewAddress' => ['admin:rw', 'assistenz:rw'],
+			'addNewContact' => ['admin:rw', 'assistenz:rw'],
+			'addNewBankverbindung' => ['mitarbeiter/bankdaten:rw', 'student/bankdaten:rw'],
+			'updateAddress' => ['admin:rw', 'assistenz:rw'],
+			'updateContact' => ['admin:rw', 'assistenz:rw'],
+			'updateBankverbindung' => ['mitarbeiter/bankdaten:rw', 'student/bankdaten:rw'],
+			'loadAddress' => ['admin:r', 'assistenz:r'],
+			'loadContact' => ['admin:r', 'assistenz:r'],
+			'loadBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r'],
+			'deleteAddress' => ['admin:rw', 'assistenz:rw'],
+			'deleteContact' => ['admin:rw','assistenz:rw'],
+			'deleteBankverbindung' => ['mitarbeiter/bankdaten:rw','astudent/bankdaten:rw'],
+			'getAdressentypen' => ['admin:r', 'assistenz:r'],
+			'getKontakttypen' => ['admin:r', 'assistenz:r'],
+			'getFirmen' => ['admin:r', 'assistenz:r'],
+			'getStandorte' => ['admin:r', 'assistenz:r'],
+			'getStandorteByFirma' => ['admin:r', 'assistenz:r'],
+			'getKontakte' => ['admin:r', 'assistenz:r'],
+			'getBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r']
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'person'
+		]);
+
+		// Load models
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('organisation/standort_model', 'StandortModel');
+		$this->load->model('ressource/firma_model', 'FirmaModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		// Extra Permissionchecks
+		$permsMa = [];
+		$permsStud = [];
+		switch ($this->router->method) {
+			case 'getBankverbindung':
+			case 'loadBankverbindung':
+				$permsMa = ['mitarbeiter/bankdaten:r'];
+				$permsStud = ['student/bankdaten:r'];
+				break;
+			case 'addNewBankverbindung':
+			case 'updateBankverbindung':
+			case 'deleteBankverbindung':
+				$permsMa = ['mitarbeiter/bankdaten:rw'];
+				$permsStud = ['student/bankdaten:rw'];
+				break;
+			case 'getAdressen':
+			case 'getKontakte':
+			case 'loadAddress':
+			case 'loadContact':
+				$permsMa = $permsStud = ['admin:r', 'assistenz:r'];
+				break;
+			case 'addNewAddress':
+			case 'addNewContact':
+			case 'updateAddress':
+			case 'updateContact':
+			case 'deleteAddress':
+			case 'deleteContact':
+				$permsMa = $permsStud = ['admin:rw', 'assistenz:rw'];
+				break;
+		}
+		if ($this->router->method == 'getAdressen'
+			|| $this->router->method == 'getKontakte'
+			|| $this->router->method == 'getBankverbindung'
+			|| $this->router->method == 'addNewAddress'
+			|| $this->router->method == 'addNewContact'
+			|| $this->router->method == 'addNewBankverbindung'
+		) {
+			$person_id = current(array_slice($this->uri->rsegments, 2));
+			
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+		} elseif ($this->router->method == 'loadAddress'
+			|| $this->router->method == 'loadContact'
+			|| $this->router->method == 'loadBankverbindung'
+			|| $this->router->method == 'updateAddress'
+			|| $this->router->method == 'updateContact'
+			|| $this->router->method == 'updateBankverbindung'
+			|| $this->router->method == 'deleteAddress'
+			|| $this->router->method == 'deleteContact'
+			|| $this->router->method == 'deleteBankverbindung'
+		) {
+			$id = current(array_slice($this->uri->rsegments, 2));
+
+			$model = 'person/Adresse_model';
+			if ($this->router->method == 'loadContact'
+				|| $this->router->method == 'updateContact'
+				|| $this->router->method == 'deleteContact'
+			) {
+				$model = 'person/Kontakt_model';
+			} elseif ($this->router->method == 'loadBankverbindung'
+				|| $this->router->method == 'updateBankverbindung'
+				|| $this->router->method == 'deleteBankverbindung'
+			) {
+				$model = 'person/Bankverbindung_model';
+			}
+
+			$this->load->model($model, 'TempModel');
+			$result = $this->TempModel->load($id);
+			$data = $this->getDataOrTerminateWithError($result);
+			if (!$result)
+				show_404();
+
+			$person_id = current($data)->person_id;
+			
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+		}
+	}
+	public function getAdressen($person_id)
+	{
+		$this->AdresseModel->addSelect('public.tbl_adresse.*');
+		$this->AdresseModel->addSelect('t.*');
+		$this->AdresseModel->addSelect('f.firma_id');
+		$this->AdresseModel->addSelect('f.name as firmenname');
+		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
+		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
+
+		$result = $this->AdresseModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function addNewAddress($person_id)
+	{
+		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
+		]);
+
+		if(isset($_POST['gemeinde']) && isset($_POST['ort']))
+		$this->form_validation->set_rules('plz', 'Postleitzahl', 'callback_validateLocationCombination', [
+			'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$uid = getAuthUID();
+		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
+		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
+		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
+		$gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
+		$nation = isset($_POST['nation']) ? $_POST['nation'] : null;
+		$name = isset($_POST['name']) ? $_POST['name'] : null;
+		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
+		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
+
+		if(isset($_POST['firma']))
+		{
+			$firma_id = $_POST['firma']['firma_id'];
+		}
+		else
+			$firma_id = null;
+
+		$result = $this->AdresseModel->insert(
+			[
+				'person_id' => $person_id,
+				'strasse' =>  $strasse,
+				'insertvon' => $uid,
+				'insertamum' => date('c'),
+				'plz' => $_POST['plz'],
+				'ort' => $ort,
+				'gemeinde' => $gemeinde,
+				'nation' => $nation,
+				'heimatadresse' => $_POST['heimatadresse'],
+				'zustelladresse' => $_POST['zustelladresse'],
+				'co_name' => $co_name,
+				'typ' => $typ,
+				'firma_id' => $firma_id,
+				'name' => $name,
+				'rechnungsadresse' => $_POST['rechnungsadresse'],
+				'anmerkung' => $anmerkung
+
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function updateAddress($address_id)
+	{
+		$uid = getAuthUID();
+		$this->form_validation->set_rules('plz', 'PLZ', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
+		]);
+
+		if(isset($_POST['gemeinde']) && isset($_POST['ort']))
+			$this->form_validation->set_rules('plz', 'Postleitzahl', 'callback_validateLocationCombination', [
+				'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
+			]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		if(!$address_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		if(isset($_POST['firma']))
+		{
+			$firma_id = $_POST['firma']['firma_id'];
+		}
+		elseif(isset($_POST['firma_id']))
+		{
+			$firma_id = $_POST['firma_id'];
+		}
+		else
+			$firma_id = null;
+
+		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
+		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
+		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
+		$ort = isset($_POST['ort']) ? $_POST['ort'] : null;
+		$gemeinde = isset($_POST['gemeinde']) ? $_POST['gemeinde'] : null;
+		$nation = isset($_POST['nation']) ? $_POST['nation'] : null;
+		$name = isset($_POST['name']) ? $_POST['name'] : null;
+		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
+		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
+
+		$result = $this->AdresseModel->update(
+			[
+				'adresse_id' => $address_id
+			],
+			[	'person_id' => $person_id,
+				'strasse' =>  $strasse,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'plz' => $_POST['plz'],
+				'ort' => $ort,
+				'gemeinde' => $gemeinde,
+				'nation' => $nation,
+				'heimatadresse' => $_POST['heimatadresse'],
+				'zustelladresse' => $_POST['zustelladresse'],
+				'co_name' => $co_name,
+				'typ' => $typ,
+				'firma_id' => $firma_id,
+				'name' => $name,
+				'rechnungsadresse' => $_POST['rechnungsadresse'],
+				'anmerkung' => $anmerkung
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function loadAddress($adresse_id)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+
+		$this->AdresseModel->addSelect('public.tbl_adresse.*');
+		$this->AdresseModel->addSelect('t.*');
+		$this->AdresseModel->addSelect('f.firma_id');
+		$this->AdresseModel->addSelect('f.name as firmenname');
+		$this->AdresseModel->addJoin('public.tbl_adressentyp t', 'ON (t.adressentyp_kurzbz = public.tbl_adresse.typ)');
+		$this->AdresseModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = public.tbl_adresse.firma_id)', 'LEFT');
+
+		$this->AdresseModel->addLimit(1);
+
+		$result = $this->AdresseModel->loadWhere(
+			array('adresse_id' => $adresse_id)
+		);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+	public function deleteAddress($adresse_id)
+	{
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$result = $this->AdresseModel->load([
+			'adresse_id'=> $adresse_id,
+		]);
+		if(isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$result = current(getData($result));
+
+		if($result->heimatadresse)
+
+			$this->terminateWithError($this->p->t('person', 'error_deleteHomeAdress'), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->AdresseModel->delete(
+			array('adresse_id' => $adresse_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+	public function getAdressentypen()
+	{
+		$this->load->model('person/Adressentyp_model', 'AdressentypModel');
+
+		$result = $this->AdressentypModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getFirmen($searchString)
+	{
+		$this->load->model('ressource/firma_model', 'FirmaModel');
+
+		$result = $this->FirmaModel->searchFirmen($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+
+	public function getStandorte($searchString)
+	{
+		$this->load->model('organisation/standort_model', 'StandortModel');
+
+		$result = $this->StandortModel->searchStandorte($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+
+	public function getStandorteByFirma($firma_id)
+	{
+		$this->load->model('organisation/standort_model', 'StandortModel');
+
+		$result = $this->StandortModel->getStandorteByFirma($firma_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getKontakte($person_id)
+	{
+		$this->KontaktModel->addSelect("public.tbl_kontakt.*,
+			TO_CHAR (CASE 
+					WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum 
+					THEN public.tbl_kontakt.updateamum 
+					ELSE public.tbl_kontakt.insertamum 
+				END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate, st.bezeichnung, f.name");
+		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
+		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
+		$result = $this->KontaktModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getKontakttypen()
+	{
+		$this->load->model('person/Kontakttyp_model', 'KontakttypModel');
+
+		$result = $this->KontakttypModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		else
+		{
+			$this->terminateWithSuccess(getData($result) ?: []);
+		}
+	}
+
+	public function loadContact($kontakt_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$this->KontaktModel->addSelect('*, public.tbl_kontakt.*');
+		$this->KontaktModel->addSelect('st.kurzbz');
+		$this->KontaktModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
+		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
+
+		$this->KontaktModel->addLimit(1);
+
+		$result = $this->KontaktModel->loadWhere(
+			array('kontakt_id' => $kontakt_id)
+		);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+		}
+		//	$this->outputJsonSuccess(current(getData($result)));
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function addNewContact($person_id)
+	{
+		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
+		{
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required|valid_email', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt']),
+				'valid_email' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
+			]);
+		}
+		else
+		{
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt'])
+			]);
+		}
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$uid = getAuthUID();
+
+		$kontakttyp = $this->input->post('kontakttyp');
+		$anmerkung = $this->input->post('anmerkung');
+		$kontakt = $this->input->post('kontakt');
+		$ext_id = $this->input->post('ext_id');
+		$standort_id = $this->input->post('standort_id');
+
+		$result = $this->KontaktModel->insert(
+			[
+				'person_id' => $person_id,
+				'kontakttyp' =>  $kontakttyp,
+				'anmerkung' => $anmerkung,
+				'kontakt' => $kontakt,
+				'zustellung' => $_POST['zustellung'],
+				'insertvon' => $uid,
+				'insertamum' => date('c'),
+				'standort_id' => $standort_id,
+				'ext_id' => $ext_id
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function updateContact($kontakt_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		if(!$kontakt_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		if(($_POST['kontakttyp'] == 'email' && isset($_POST['kontakt'])))
+		{
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required|valid_email', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt']),
+				'valid_email' => $this->p->t('ui', 'error_fieldNoValidEmail', ['field' => 'Kontakt'])
+			]);
+		}
+		else
+		{
+			$this->form_validation->set_rules('kontakt', 'Kontakt', 'required', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Kontakt'])
+			]);
+		}
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+/*		if(isset($_POST['standort']))
+		{
+			$standort_id = $_POST['standort']['standort_id'];
+		}
+		else
+			$standort_id = null;*/
+
+		$uid = getAuthUID();
+		$kontakttyp = $this->input->post('kontakttyp');
+		$anmerkung = $this->input->post('anmerkung');
+		$kontakt = $this->input->post('kontakt');
+		$ext_id = $this->input->post('ext_id');
+		$person_id = $this->input->post('person_id');
+		$standort_id = $this->input->post('standort_id');
+
+		//return $this->terminateWithError("in update " . $standort_id, self::ERROR_TYPE_GENERAL);
+
+		$result = $this->KontaktModel->update(
+			[
+				'kontakt_id' => $kontakt_id
+			],
+			[
+				'person_id' => $person_id,
+				'kontakttyp' =>  $kontakttyp,
+				'anmerkung' => $anmerkung,
+				'kontakt' => $kontakt,
+				'zustellung' => $_POST['zustellung'],
+				'insertvon' => 	$uid,
+				'insertamum' => date('c'),
+				'standort_id' => $standort_id,
+				'ext_id' => $ext_id
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function deleteContact($kontakt_id)
+	{
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$result = $this->KontaktModel->delete(
+			array('kontakt_id' => $kontakt_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Kontakt_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+	public function getBankverbindung($person_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$this->BankverbindungModel->addSelect('*');
+
+		$result = $this->BankverbindungModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function addNewBankverbindung($person_id)
+	{
+		$this->form_validation->set_rules('iban', 'IBAN', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'IBAN'])
+		]);
+
+		$this->form_validation->set_rules('typ', 'TYP', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'TYP'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$ext_id = $this->input->post('ext_id');
+		$oe_kurzbz = $this->input->post('oe_kurzbz');
+		$orgform_kurzbz = $this->input->post('orgform_kurzbz');
+		$name = $this->input->post('name');
+		$anschrift = $this->input->post('anschrift');
+		$bic = $this->input->post('bic');
+		$blz  = $this->input->post('blz');
+		$kontonr = $this->input->post('kontonr');
+
+		$result = $this->BankverbindungModel->insert(
+			[
+				'person_id' => $person_id,
+				'name' => $name,
+				'anschrift' => $anschrift,
+				'bic' => $bic,
+				'iban' => $_POST['iban'],
+				'blz' => $blz,
+				'kontonr' => $kontonr,
+				'insertvon' => 'uid',
+				'insertamum' => date('c'),
+				'typ' => $_POST['typ'],
+				'verrechnung' => $_POST['verrechnung'],
+				'ext_id' => $ext_id,
+				'oe_kurzbz' => $oe_kurzbz,
+				'orgform_kurzbz' => $orgform_kurzbz
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function loadBankverbindung($bankverbindung_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$this->BankverbindungModel->addSelect('*');
+
+		$this->BankverbindungModel->addLimit(1);
+
+		$result = $this->BankverbindungModel->loadWhere(
+			array('bankverbindung_id' => $bankverbindung_id)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function updateBankverbindung($bankverbindung_id)
+	{
+		$this->form_validation->set_rules('iban', 'IBAN', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'IBAN'])
+		]);
+
+		$this->form_validation->set_rules('typ', 'TYP', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'TYP'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		if(!$bankverbindung_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Bankverbindung_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$uid = getAuthUID();
+
+		$result = $this->BankverbindungModel->update(
+			[
+				'bankverbindung_id' => $bankverbindung_id
+			],
+			[
+				'person_id' => $_POST['person_id'],
+				'name' => $_POST['name'],
+				'anschrift' => $_POST['anschrift'],
+				'bic' => $_POST['bic'],
+				'iban' => $_POST['iban'],
+				'blz' => $_POST['blz'],
+				'kontonr' => $_POST['kontonr'],
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'typ' => $_POST['typ'],
+				'verrechnung' => $_POST['verrechnung'],
+				'ext_id' => $_POST['ext_id'],
+				'oe_kurzbz' => $_POST['oe_kurzbz'],
+				'orgform_kurzbz' => $_POST['orgform_kurzbz']
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(true);
+	}
+
+	public function deleteBankverbindung($bankverbindung_id)
+	{
+		$this->load->model('person/Bankverbindung_model', 'BankverbindungModel');
+
+		$result = $this->BankverbindungModel->delete(
+			array('bankverbindung_id' => $bankverbindung_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			$this->outputJson($result);
+		}
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+	public function validateLocationCombination()
+	{
+		$this->load->model('codex/Gemeinde_model', 'GemeindeModel');
+
+		return $this->GemeindeModel->checkLocation($_POST['plz'], $_POST['gemeinde'], $_POST['ort']);
+	}
+}

application/controllers/api/frontend/v1/stv/Konto.php

@@ -0,0 +1,495 @@
+<?php
+/**
+ * Copyright (C) 2024 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 CI3_Events as Events;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about a Konto
+ * Listens to ajax post calls to change the Konto data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Konto extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => 'student/stammdaten:r',
+			'getBuchungstypen' => self::PERM_LOGGED,
+			'checkDoubles' => ['admin:r', 'assistenz:r'],
+			'insert' => ['admin:w', 'assistenz:w'],
+			'counter' => ['admin:w', 'assistenz:w'],
+			'update' => ['admin:w', 'assistenz:w'],
+			'delete' => ['admin:w', 'assistenz:w']
+		]);
+
+		// Load models
+		$this->load->model('crm/Konto_model', 'KontoModel');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'konto'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Get details for a prestudent
+	 *
+	 * @return void
+	 */
+	public function get()
+	{
+		$this->load->library('form_validation');
+
+		$person_id = $this->input->post('person_id');
+		if (!$person_id || !is_array($person_id)) {
+			$this->form_validation->set_rules('person_id', 'Person ID', 'required');
+
+			if (!$this->form_validation->run())
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+
+		$studiengang_kz = $this->input->post('studiengang_kz');
+
+		if ($this->input->post('only_open')) {
+			$result = $this->KontoModel->getOffeneBuchungen($person_id, $studiengang_kz);
+		} else {
+			$result = $this->KontoModel->getAlleBuchungen($person_id, $studiengang_kz);
+		}
+
+		$result = $this->getDataOrTerminateWithError($result);
+
+		// sort into tree
+		$childs = [];
+		$data = [];
+		foreach ($result as $entry) {
+			if ($entry->buchungsnr_verweis) {
+				if (isset($data[$entry->buchungsnr_verweis])) {
+					if (!isset($data[$entry->buchungsnr_verweis]->_children))
+						$data[$entry->buchungsnr_verweis]->_children = [];
+					$data[$entry->buchungsnr_verweis]->_children[] = $entry;
+				} else {
+					if (!isset($childs[$entry->buchungsnr_verweis]))
+						$childs[$entry->buchungsnr_verweis] = [];
+					$childs[$entry->buchungsnr_verweis][] = $entry;
+				}
+			} else {
+				$data[$entry->buchungsnr] = $entry;
+				if (isset($childs[$entry->buchungsnr]))
+					$entry->_children = $childs[$entry->buchungsnr];
+			}
+		}
+
+		$this->terminateWithSuccess(array_values($data));
+	}
+
+	/**
+	 * Get list of Buchungstypen
+	 *
+	 * @return void
+	 */
+	public function getBuchungstypen()
+	{
+		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
+
+		$result = $this->BuchungstypModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Check double Buchungen
+	 *
+	 * @return void
+	 */
+	public function checkDoubles()
+	{
+		if (!defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK') || !FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK)
+			$this->terminateWithSuccess(false);
+
+		$this->load->library('form_validation');
+
+		$person_ids = $this->input->post('person_id');
+
+		if (!$person_ids || !is_array($person_ids)) {
+			$person_ids = [$person_ids];
+			$this->form_validation->set_rules('person_id', 'Person ID', 'required');
+		}
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('buchungstyp_kurzbz', 'Buchungstyp', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$buchungstypen = unserialize(FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK);
+		$buchung = $this->input->post('buchungstyp_kurzbz');
+		
+		if (!isset($buchungstypen[$buchung]))
+			$this->terminateWithSuccess(false);
+
+		$result = $this->KontoModel->checkDoubleBuchung($person_ids, $this->input->post('studiensemester_kurzbz'), $buchungstypen[$buchung]);
+
+		$result = $this->getDataOrTerminateWithError($result);
+
+		if (!$result)
+			$this->terminateWithSuccess(false);
+
+		$persons = array_map(function ($row) {
+			return $row->nachname . ' ' . $row->vorname;
+		}, $result);
+		
+		$result = $this->p->t('konto', 'confirm_overwrite') . "\n";
+		if (count($persons) > 10) {
+			$result .= "-" . implode("\n-", array_slice($persons, 0, 10)) . "\n";
+			
+			if (count($persons) == 11) {
+				$result .= "\n" . $this->p->t('konto', 'confirm_overwrite_1_add_pers');
+			} else {
+				$result .= "\n" . $this->p->t('konto', 'confirm_overwrite_x_add_pers', [
+					'x' => count($persons) - 10
+				]);
+			}
+		} else {
+			$result .= "-" . implode("\n-", $persons) . "\n";
+		}
+		$result .= $this->p->t('konto', 'confirm_overwrite_proceed');
+
+		$this->addError($result, 'confirm');
+
+		$this->terminateWithSuccess(true);
+	}
+
+
+	/**
+	 * Save Buchung
+	 *
+	 * @return void
+	 */
+	public function insert()
+	{
+		$this->load->library('form_validation');
+
+		$person_ids = $this->input->post('person_id');
+
+		if (!$person_ids || !is_array($person_ids)) {
+			$person_ids = [$person_ids];
+			$this->form_validation->set_rules('person_id', 'Person ID', 'required');
+		}
+		$this->form_validation->set_rules('betrag', 'Betrag', 'numeric');
+		$this->form_validation->set_rules('buchungsdatum', 'Buchungsdatum', 'is_valid_date');
+		$this->form_validation->set_rules('buchungstext', 'Buchungstext', 'max_length[256]');
+		$this->form_validation->set_rules('mahnspanne', 'Mahnspanne', 'integer');
+		$this->form_validation->set_rules('buchungstyp_kurzbz', 'Buchungstyp', 'required|max_length[32]');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required|max_length[16]');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required|has_permissions_for_stg[admin:rw,assistenz:rw]');
+		$this->form_validation->set_rules('credit_points', 'Credit Points', 'numeric');
+
+		Events::trigger('konto_insert_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$allowed = [
+			'betrag',
+			'buchungsdatum',
+			'buchungstext',
+			'mahnspanne',
+			'buchungstyp_kurzbz',
+			'studiensemester_kurzbz',
+			'studiengang_kz',
+			'credit_points',
+			'anmerkung'
+		];
+		$data = [
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+		foreach ($allowed as $field)
+			if ($this->input->post($field) !== null)
+				$data[$field] = $this->input->post($field);
+
+		if (defined('FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE') && isset(unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']])) {
+			$data['kostenstelle'] = unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']];
+		}
+
+		$result = [];
+		foreach ($person_ids as $person_id) {
+			$id = $this->KontoModel->insert(array_merge($data, ['person_id' => $person_id]));
+			if (isError($id)) {
+				$this->addError(getError($id), self::ERROR_TYPE_DB);
+			} else {
+				$kontodata = $this->KontoModel->withAdditionalInfo()->load(getData($id));
+				if (isError($kontodata))
+					$this->addError(getError($kontodata), self::ERROR_TYPE_DB);
+				else
+					$result[] = current(getData($kontodata));
+			}
+		}
+
+		if ($result)
+			$this->terminateWithSuccess($result);
+
+		$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+	}
+
+	/**
+	 * Save Counter Buchung
+	 *
+	 * @return void
+	 */
+	public function counter()
+	{
+		$this->load->library('form_validation');
+
+		$buchungsnrs = $this->input->post('buchungsnr');
+
+		if (!$buchungsnrs || !is_array($buchungsnrs)) {
+			$buchungsnrs = $buchungsnrs ? [$buchungsnrs] : [];
+			$this->form_validation->set_rules('buchungsnr', 'Buchungsnr', 'required');
+		}
+		$this->form_validation->set_rules('buchungsdatum', 'Buchungsdatum', 'is_valid_date');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$data = [];
+		$rules = [];
+		foreach ($buchungsnrs as $k => $buchungsnr) {
+			$result = $this->KontoModel->load($buchungsnr);
+			if (isError($result)) {
+				$rules[] = [
+					'field' => 'buchung[' . $k . ']',
+					'label' => 'Buchung #' . $buchungsnr,
+					'rules' => 'required',
+					'errors' => [
+						'required' => getError($result)
+					]
+				];
+			} elseif (!hasData($result)) {
+				$rules[] = [
+					'field' => 'buchung[' . $k . ']',
+					'label' => 'Buchung #' . $buchungsnr,
+					'rules' => 'required'
+				];
+			} else {
+				$data[$k] = get_object_vars(current(getData($result)));
+				$rules[] = [
+					'field' => 'buchung[' . $k . '][buchungsnr]',
+					'label' => 'Buchung # ' . $buchungsnr,
+					'rules' => 'required|numeric'
+				];
+				$rules[] = [
+					'field' => 'buchung[' . $k . '][studiengang_kz]',
+					'label' => 'Buchung # ' . $buchungsnr,
+					'rules' => 'required|has_permissions_for_stg[admin:rw,assistenz:rw]'
+				];
+				$rules[] = [
+					'field' => 'buchung[' . $k . '][buchungsnr_verweis]',
+					'label' => 'Buchung # ' . $buchungsnr,
+					'rules' => 'regex_match[/^$/]',
+					'errors' => [
+						'regex_match' => $this->p->t('konto', 'error_counter_level')
+					]
+				];
+			}
+		}
+		
+		$this->form_validation->reset_validation();
+		$this->form_validation->set_data(['buchung' => $data]);
+		$this->form_validation->set_rules($rules);
+		
+		Events::trigger('konto_counter_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$buchungsdatum = $this->input->post('buchungsdatum');
+
+		$newItems = [];
+		foreach ($data as $buchung) {
+			$result = $this->KontoModel->getDifferenz($buchung['buchungsnr']);
+			if (isError($result)) {
+				$this->addError(getError($result), self::ERROR_TYPE_GENERAL);
+				continue;
+			}
+			$betrag = $result->retval;
+			if ($betrag === null) {
+				$this->addError($this->p->t(
+					'konto',
+					'error_missing',
+					$buchung
+				), self::ERROR_TYPE_GENERAL);
+				continue;
+			}
+
+
+			$result = $this->KontoModel->insert([
+				'person_id' => $buchung['person_id'],
+				'studiengang_kz' => $buchung['studiengang_kz'],
+				'studiensemester_kurzbz' => $buchung['studiensemester_kurzbz'],
+				'buchungstext' => $buchung['buchungstext'],
+				'buchungstyp_kurzbz' => $buchung['buchungstyp_kurzbz'],
+				'credit_points' => $buchung['credit_points'],
+				'zahlungsreferenz' => $buchung['zahlungsreferenz'],
+				'betrag' => $betrag,
+				'buchungsdatum' => $buchungsdatum,
+				'mahnspanne' => '0',
+				'buchungsnr_verweis' => $buchung['buchungsnr'],
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID(),
+				'anmerkung' => ''
+			]);
+			if (isError($result)) {
+				$this->addError(getError($result), self::ERROR_TYPE_GENERAL);
+				continue;
+			}
+
+			$newItems = null;
+			// TODO(chris): get as tree?
+			/*$result = $this->KontoModel->withAdditionalInfo()->load($result->retval);
+			if (!hasData($result))
+				$newItems = null;
+			elseif ($newItems !== null)
+				$newItems[] = current(getData($result));*/
+		}
+
+		$this->terminateWithSuccess($newItems);
+	}
+
+	/**
+	 * Save Buchung
+	 *
+	 * @return void
+	 */
+	public function update()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('buchungsnr', 'Buchungsnr', 'required');
+		$this->form_validation->set_rules('betrag', 'Betrag', 'numeric');
+		$this->form_validation->set_rules('buchungsdatum', 'Buchungsdatum', 'is_valid_date');
+		$this->form_validation->set_rules('buchungstext', 'Buchungstext', 'max_length[256]');
+		$this->form_validation->set_rules('mahnspanne', 'Mahnspanne', 'integer');
+		$this->form_validation->set_rules('buchungstyp_kurzbz', 'Buchungstyp', 'required|max_length[32]');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required|max_length[16]');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required|has_permissions_for_stg[admin:rw,assistenz:rw]');
+		$this->form_validation->set_rules('credit_points', 'Credit Points', 'numeric');
+
+		Events::trigger('konto_update_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$id = $this->input->post('buchungsnr');
+		$allowed = [
+			'betrag',
+			'buchungsdatum',
+			'buchungstext',
+			'mahnspanne',
+			'buchungstyp_kurzbz',
+			'studiensemester_kurzbz',
+			'studiengang_kz',
+			'credit_points',
+			'anmerkung'
+		];
+		$data = [
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
+		];
+		foreach ($allowed as $field)
+			if ($this->input->post($field) !== null)
+				$data[$field] = $this->input->post($field);
+
+		$result = $this->KontoModel->update($id, $data);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$result = null;
+		// TODO(chris): get as tree?
+		/*$result = $this->KontoModel->withAdditionalInfo()->load($id);
+		
+		#$result = $this->getDataOrTerminateWithError($result);
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$result = $result->retval;*/
+
+		$this->terminateWithSuccess($result);
+	}
+
+	/**
+	 * Delete Buchung
+	 *
+	 * @return void
+	 */
+	public function delete()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('buchungsnr', 'Buchungsnr', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$buchungsnr = $this->input->post('buchungsnr');
+
+		$result = $this->KontoModel->load($buchungsnr);
+
+		$result = $this->getDataOrTerminateWithError($result);
+
+		if (!$result)
+			$this->terminateWithError($this->p->t('konto', 'error_missing', [
+				'buchungsnr' => $buchungsnr
+			]));
+
+		$_POST['studiengang_kz'] = current($result)->studiengang_kz;
+
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'has_permissions_for_stg[admin:rw,assistenz:rw]');
+
+		Events::trigger('konto_delete_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		Events::trigger('konto_delete', $buchungsnr);
+		
+		$result = $this->KontoModel->delete($buchungsnr);
+		if (isError($result)) {
+			if (getCode($result) != 42)
+				$this->terminateWithError(getError($result));
+			$this->terminateWithError($this->p->t('konto', 'error_delete_level'));
+		}
+
+		$this->terminateWithSuccess();
+	}
+}

application/controllers/api/frontend/v1/stv/Lists.php

@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright (C) 2024 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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about generally used lists
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Lists extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudiensemester' => self::PERM_LOGGED,
+			'getStgs' => self::PERM_LOGGED,
+			'getSprachen' => self::PERM_LOGGED,
+			'getGeschlechter' => self::PERM_LOGGED,
+			'getAusbildungen' => self::PERM_LOGGED,
+			'getOrgforms' => self::PERM_LOGGED,
+			'getStati' => self::PERM_LOGGED
+		]);
+	}
+
+	public function getStudiensemester()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('ende');
+
+		$result = $this->StudiensemesterModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStgs()
+	{
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$this->StudiengangModel->addSelect('*');
+		$this->StudiengangModel->addSelect('UPPER(typ || kurzbz) AS kuerzel');
+
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$result = $this->StudiengangModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getSprachen()
+	{
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+
+		$this->SpracheModel->addOrder('sprache');
+
+		$result = $this->SpracheModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getGeschlechter()
+	{
+		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
+
+		$this->GeschlechtModel->addOrder('sort');
+		$this->GeschlechtModel->addOrder('geschlecht');
+
+		$this->GeschlechtModel->addSelect('*');
+		#$this->GeschlechtModel->addTranslatedSelect("bezeichnung_mehrsprachig", "bezeichnung");
+		$this->GeschlechtModel->addSelect("bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->GeschlechtModel->escape(DEFAULT_LANGUAGE) . " LIMIT 1)] AS bezeichnung");
+
+		$result = $this->GeschlechtModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getAusbildungen()
+	{
+		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
+
+		$this->AusbildungModel->addOrder('ausbildungcode');
+
+		$result = $this->AusbildungModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getOrgforms()
+	{
+		$this->load->model('codex/Orgform_model', 'OrgformModel');
+
+		$this->OrgformModel->addOrder('bezeichnung');
+
+		$result = $this->OrgformModel->loadWhere(['rolle' => true]);
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStati()
+	{
+		$lang = getUserLanguage();
+		$this->load->model('crm/Status_model', 'StatusModel');
+
+		$this->StatusModel->addSelect('*');
+		#$this->StatusModel->addTranslatedSelect('bezeichnung_mehrsprachig', 'bezeichnung');
+		$this->StatusModel->addSelect(
+			'bezeichnung_mehrsprachig[(
+				SELECT index
+				FROM public.tbl_sprache
+				WHERE sprache=' . $this->StatusModel->escape($lang) . '
+				LIMIT 1
+			)] AS bezeichnung',
+			false
+		);
+		#$this->StatusModel->addOrder('ext_id');
+
+		$result = $this->StatusModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+}

application/controllers/api/frontend/v1/stv/Notiz.php

@@ -0,0 +1,384 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Notiz extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getUid' => ['admin:r', 'assistenz:r'],
+			'getNotizen' => ['admin:r', 'assistenz:r'],
+			'loadNotiz' => ['admin:r', 'assistenz:r'], // TODO(manu): self::PERM_LOGGED
+			'addNewNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED
+			'updateNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED
+			'deleteNotiz' => ['admin:r', 'assistenz:r'],
+			'loadDokumente' => ['admin:r', 'assistenz:r'],
+			'getMitarbeiter' => ['admin:r', 'assistenz:r']
+		]);
+
+		//Load Models
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+/*	public function getUid()
+	{
+		$this->terminateWithSuccess(getAuthUID());
+	}*/
+
+
+	public function getNotizen($id, $type)
+	{
+
+		//check if valid type
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if(isError($result))
+			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
+
+		//$this->terminateWithError(" after check type not valid", self::ERROR_TYPE_GENERAL);
+		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+
+		//	return $this->terminateWithError("type not valid", self::ERROR_TYPE_GENERAL);
+
+	}
+
+/*	public function loadNotiz()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$notiz_id = $this->input->post('notiz_id');
+
+		//$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
+		$this->NotizModel->addSelect('*');
+		$this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum 
+			THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
+		$this->NotizModel->addLimit(1);
+
+		$result = $this->NotizModel->loadWhere(
+			array('notiz_id' => $notiz_id)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+		else
+		{
+			$this->terminateWithSuccess(current(getData($result)));
+		}
+	}
+
+
+	public function updateNotiz()
+	{
+		$this->load->library('form_validation');
+		$this->load->library('DmsLib');
+
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
+		$notiz_id = $this->input->post('notiz_id');
+
+		if(!$notiz_id)
+		{
+			$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		//Form Validation
+		$this->form_validation->set_rules('titel', 'Titel', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+		]);
+
+		$this->form_validation->set_rules('text', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		//update Notiz
+		$uid = getAuthUID();
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$verfasser_uid = $this->input->post('verfasser');
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
+		$erledigt = $this->input->post('erledigt');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
+
+		$result = $this->NotizModel->update(
+			[
+				'notiz_id' => $notiz_id
+			],
+			[
+				'titel' =>  $titel,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'text' => $text,
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
+				'start' => $start,
+				'ende' => $ende,
+				'erledigt' => $erledigt
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		//update(1) laden aller bereits mit dieser notiz_id verknüpften DMS-Einträge
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
+		$dms_uploaded = null;
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			$dms_id_arr = null;
+		}
+		else
+		{
+			$result = getData($result);
+			foreach($result as $doc) {
+				$dms_id_arr[] = array(
+					'name' => $doc->name,
+					'dms_id' => $doc->dms_id
+				);
+			}
+		}
+
+		foreach ($_FILES as $k => $file)
+		{
+			//update(2) alle neuen files (alle außer type application/x.fhc-dms+json) anhängen
+			if($file["type"] == 'application/x.fhc-dms+json')
+			{
+				$dms_uploaded[] = array(
+					'name' => $file["name"]
+				);
+			}
+			else
+			{
+				$dms = array(
+					'kategorie_kurzbz'  => 'notiz',
+					'version'           => 0,
+					'name'              => $file["name"],
+					'mimetype'          => $file["type"],
+					'insertamum'        => date('c'),
+					'insertvon'         => $uid
+				);
+
+				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+				//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+				$result = $this->dmslib->upload($dms, $k, array('*'));
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				$dms_id = $result->retval['dms_id'];
+
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+
+		//update(3) check if Dateien gelöscht wurden
+		if(count($dms_uploaded) != count($dms_id_arr))
+		{
+			if (count($dms_uploaded) == 0)
+			{
+				$filesDeleted = $dms_id_arr;
+			}
+			else
+			{
+				$upload_new_names = array_column($dms_uploaded, "name");
+
+				$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
+					return !in_array($file["name"], $upload_new_names);
+				});
+			}
+
+			foreach ($filesDeleted as $file)
+			{
+				$result = $this->dmslib->removeAll($file['dms_id']);
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+				else
+					$this->outputJson($result);
+			}
+		}
+		return $this->terminateWithSuccess($result);
+	}*/
+
+
+/*	public function deleteNotiz()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$notiz_id = $this->input->post('notiz_id');
+		$type = $this->input->post('type_id');
+		$id = $this->input->post('id');
+
+		//dms_id auslesen aus notizdokument wenn vorhanden
+		$dms_id_arr = [];
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		if(hasData($result))
+		{
+			$result = getData($result);
+			foreach ($result as $doc) {
+				$dms_id_arr[] = $doc->dms_id;
+			}
+		}
+
+		if($dms_id_arr)
+		{
+			$this->load->library('DmsLib');
+			foreach($dms_id_arr as $dms_id)
+			{
+				$result = $this->dmslib->removeAll($dms_id);
+
+				if (isError($result))
+				{
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+
+				$this->outputJson($result);
+			}
+		}
+
+		//delete Notizzuordnung
+		if($type == "software_id")
+		{
+			// Loads extension Model
+			$this->load->model('extensions/FHC-Core-Softwarebereitstellung/Softwarenotizzuordnung_model', 'ExtensionnotizzuordnungModel');
+			$result = $this->ExtensionnotizzuordnungModel->delete([
+				'notiz_id' => $notiz_id,
+				'id' => strval($id)
+				],
+				[
+				'type_id' => $type
+			]);
+
+		}
+		else
+		{
+			//notizzuordnungsid!
+			$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
+		}
+
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		//$this->NotizModel->addJoin('public.tbl_notizzuordnung', 'notiz_id');
+
+		//TODO (erweitern um Type_id) für Extensions, damit auch Notizzuordnung gelöscht werden kann
+
+		//Löschen von Notiz
+		$result = $this->NotizModel->delete(
+			array('notiz_id' => $notiz_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		return $this->terminateWithSuccess(current(getData($result)));
+	}*/
+
+/*	public function loadDokumente()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		$notiz_id = $this->input->post('notiz_id');
+
+		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
+		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
+
+		$result = $this->NotizModel->loadWhere(
+			array('public.tbl_notiz.notiz_id' => $notiz_id)
+		);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result));
+	}*/
+
+/*	public function getMitarbeiter($searchString)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess($result);
+	}*/
+
+	public function isBerechtigt($id, $typeId)
+	{
+		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
+		{
+			$result =  $this->p->t('lehre','error_keineSchreibrechte');
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return success("berechtigt in überschreibender Funktion");
+/*		return $this->terminateWithError('keine Berechtigung bro', self::ERROR_TYPE_GENERAL);*/
+	}
+
+}

application/controllers/api/frontend/v1/stv/Prestudent.php

@@ -0,0 +1,299 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Prestudent extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'updatePrestudent' =>  ['admin:rw', 'assistenz:rw'],
+			'getHistoryPrestudents' => ['admin:r', 'assistenz:r'],
+			'getBezeichnungZGV' => ['admin:r', 'assistenz:r'],
+			'getBezeichnungDZgv' => ['admin:r', 'assistenz:r'],
+			'getBezeichnungMZgv' => ['admin:r', 'assistenz:r'],
+			'getAusbildung' => ['admin:r', 'assistenz:r'],
+			'getAufmerksamdurch' => ['admin:r', 'assistenz:r'],
+			'getBerufstaetigkeit' => ['admin:r', 'assistenz:r'],
+			'getTypenStg' => ['admin:r', 'assistenz:r'],
+			'getStudienplaene' => ['admin:r', 'assistenz:r'],
+			'getStudiengang' => ['admin:r', 'assistenz:r']
+		]);
+
+		if ($this->router->method == 'updatePrestudent') {
+			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
+			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+		} elseif ($this->router->method == 'get'
+			|| $this->router->method == 'getStudienplaene'
+			|| $this->router->method == 'getStudiengang'
+		) {
+			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
+			$this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']);
+		} elseif ($this->router->method == 'getHistoryPrestudents') {
+			$person_id = current(array_slice($this->uri->rsegments, 2));
+			$this->checkPermissionsForPerson($person_id, ['admin:r', 'assistenz:r'], ['admin:r', 'assistenz:r']);
+		}
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui', 'studierendenantrag', 'lehre'
+		]);
+	}
+
+	public function get($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addSelect('*');
+		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		if(!hasData($result))
+		{
+			return show_404();
+		}
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function updatePrestudent($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		// UDF
+		$this->load->library('UDFLib');
+		
+		$result = $this->udflib->getCiValidations($this->PrestudentModel, $this->input->post());
+		$udf_field_validations = $this->getDataOrTerminateWithError($result);
+
+		//Form validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules($udf_field_validations);
+
+		$this->form_validation->set_rules('priorisierung', 'Priorisierung', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Priorisierung'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$uid = getAuthUID();
+
+		$array_allowed_props_prestudent = [
+			'aufmerksamdurch_kurzbz',
+			'studiengang_kz',
+			'gsstudientyp_kurzbz',
+			'person_id',
+			'berufstaetigkeit_code',
+			'ausbildungcode',
+			'zgv_code',
+			'zgvort',
+			'zgvdatum',
+			'zgvnation',
+			'zgvmas_code',
+			'zgvmaort',
+			'zgvmadatum',
+			'zgvmanation',
+			'facheinschlberuf',
+			'bismelden',
+			'anmerkung',
+			'dual',
+			'zgvdoktor_code',
+			'zgvdoktorort',
+			'zgvdoktordatum',
+			'zgvdoktornation',
+			'aufnahmegruppe_kurzbz',
+			'priorisierung',
+			'foerderrelevant',
+			'zgv_erfuellt',
+			'zgvmas_erfuellt',
+			'zgvdoktor_erfuellt',
+			'mentor',
+			'aufnahmeschluessel',
+			'standort_code'
+		];
+
+		// add UDFs
+		$result = $this->udflib->getDefinitionForModel($this->PrestudentModel);
+
+		$definitions = $this->getDataOrTerminateWithError($result);
+
+		foreach ($definitions as $def)
+			$array_allowed_props_prestudent[] = $def['name'];
+
+		$update_prestudent = array();
+		foreach ($array_allowed_props_prestudent as $prop)
+		{
+			$val = $this->input->post($prop);
+			if ($val !== null || $prop == 'foerderrelevant') {
+				$update_prestudent[$prop] = $val;
+			}
+		}
+
+		$update_prestudent['updateamum'] = date('c');
+		$update_prestudent['updatevon'] = $uid;
+
+		if (count($update_prestudent))
+		{
+			$result = $this->PrestudentModel->update(
+				$prestudent_id,
+				$update_prestudent
+			);
+			$this->getDataOrTerminateWithError($result);
+
+			return $this->terminateWithSuccess(true);
+		}
+		return $this->terminateWithSuccess(false);
+	}
+
+	public function getHistoryPrestudents($person_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->getHistoryPrestudents($person_id);
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getBezeichnungZGV()
+	{
+		$this->load->model('codex/Zgv_model', 'ZgvModel');
+
+		$this->ZgvModel->addOrder('zgv_code');
+
+		$result = $this->ZgvModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getBezeichnungDZgv()
+	{
+		$this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel');
+
+		$this->ZgvdoktorModel->addOrder('zgvdoktor_code');
+
+		$result = $this->ZgvdoktorModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getBezeichnungMZgv()
+	{
+		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
+
+		$this->ZgvmasterModel->addOrder('zgvmas_code');
+
+		$result = $this->ZgvmasterModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getAusbildung()
+	{
+		$this->load->model('codex/Ausbildung_model', 'AusbildungModel');
+
+		$this->AusbildungModel->addOrder('ausbildungcode');
+
+		$result = $this->AusbildungModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getAufmerksamdurch()
+	{
+		$this->load->model('codex/Aufmerksamdurch_model', 'AufmerksamdurchModel');
+
+		$this->AufmerksamdurchModel->addOrder('aufmerksamdurch_kurzbz');
+
+		$result = $this->AufmerksamdurchModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getBerufstaetigkeit()
+	{
+		$this->load->model('codex/Berufstaetigkeit_model', 'BerufstaetigkeitModel');
+
+		$this->BerufstaetigkeitModel->addOrder('berufstaetigkeit_code');
+
+		$result = $this->BerufstaetigkeitModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getTypenStg()
+	{
+		$this->load->model('education/Gsstudientyp_model', 'GsstudientypModel');
+
+		$this->GsstudientypModel->addOrder('gsstudientyp_kurzbz');
+
+		$result = $this->GsstudientypModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getStudienplaene($prestudent_id)
+	{
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$result = $this->StudienplanModel->getStudienplaeneByPrestudents($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Gets details for the Studiengang of the Prestudent
+	 *
+	 * @param integer					$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function getStudiengang($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addSelect('stg.*');
+
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+
+		$result = $this->PrestudentModel->load($prestudent_id);
+
+		$stg = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($stg));
+	}
+}

application/controllers/api/frontend/v1/stv/Student.php

@@ -0,0 +1,562 @@
+<?php
+/**
+ * Copyright (C) 2024 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 \DateTime as DateTime;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about a Student
+ * Listens to ajax post calls to change the Student data
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Student extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'save' => ['admin:rw', 'assistenz:rw'],
+			'check' => ['admin:rw', 'assistenz:rw'],
+			'add' => ['admin:rw', 'assistenz:rw'] // TODO(chris): extra permissions
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		if ($this->router->method == 'get'
+			|| $this->router->method == 'save'
+		) {
+			$prestudent_id = current(array_slice($this->uri->rsegments, 2));
+			if ($this->router->method == 'get')
+				$this->checkPermissionsForPrestudent($prestudent_id, ['admin:r', 'assistenz:r']);
+			else
+				$this->checkPermissionsForPrestudent($prestudent_id, ['admin:rw', 'assistenz:rw']);
+		}
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Get details for a prestudent
+	 *
+	 * @param string			$prestudent_id
+	 * @return void
+	 */
+	public function get($prestudent_id)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addSelect('p.*');
+		$this->PrestudentModel->addSelect('s.student_uid');
+		$this->PrestudentModel->addSelect('matrikelnr');
+		$this->PrestudentModel->addSelect('b.aktiv');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect('b.alias');
+
+		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
+			$this->PrestudentModel->addSelect(
+				"(
+					SELECT kontakt 
+					FROM public.tbl_kontakt 
+					WHERE kontakttyp='email' 
+					AND person_id=p.person_id 
+					AND zustellung 
+					ORDER BY kontakt_id 
+					LIMIT 1
+				) AS email_privat",
+				false
+			);
+		}
+
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+			'LEFT'
+		);
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'p.person_id = tbl_prestudent.person_id');
+
+		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		
+		$student = $this->getDataOrTerminateWithError($result);
+		
+		if (!$student)
+			return show_404();
+
+		$this->terminateWithSuccess(current($student));
+	}
+
+	/**
+	 * Saves data to a prestudent
+	 *
+	 * @param string			$prestudent_id
+	 * @return void
+	 */
+	public function save($prestudent_id)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
+
+		$this->form_validation->set_rules('semester', 'Semester', 'integer');
+
+		$this->load->library('UDFLib');
+		
+		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
+
+		//TODO(Manu) check with Chris: input number not allowed
+		$udf_field_validations = $this->getDataOrTerminateWithError($result);
+
+		$this->form_validation->set_rules($udf_field_validations);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		
+		$student = $this->getDataOrTerminateWithError($result);
+
+		$uid = $student ? current($student)->student_uid : null;
+
+		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		$person = $this->getDataOrTerminateWithError($result);
+
+		$person_id = $person ? current($person)->person_id : null;
+
+		
+		$array_allowed_props_lehrverband = ['verband', 'semester', 'gruppe'];
+		$update_lehrverband = array();
+		foreach ($array_allowed_props_lehrverband as $prop) {
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_lehrverband[$prop] = $val;
+			}
+		}
+
+		$array_allowed_props_person = [
+			'anrede',
+			'bpk',
+			'titelpre',
+			'titelpost',
+			'nachname',
+			'vorname',
+			'vornamen',
+			'wahlname',
+			'gebdatum',
+			'gebort',
+			'geburtsnation',
+			'svnr',
+			'ersatzkennzeichen',
+			'staatsbuergerschaft',
+			'matr_nr',
+			'sprache',
+			'geschlecht',
+			'familienstand',
+			'foto',
+			'anmerkung',
+			'homepage'
+		];
+		
+		// add UDFs
+		$result = $this->udflib->getDefinitionForModel($this->PersonModel);
+
+		$definitions = $this->getDataOrTerminateWithError($result);
+
+		foreach ($definitions as $def)
+			$array_allowed_props_person[] = $def['name'];
+
+		$update_person = array();
+		foreach ($array_allowed_props_person as $prop) {
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_person[$prop] = $val;
+			}
+		}
+
+		$array_allowed_props_student = ['matrikelnr'];
+		$update_student = array();
+		foreach ($array_allowed_props_student as $prop) {
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_student[$prop] = $val;
+			}
+		}
+
+		// Check PKs
+		if (count($update_lehrverband) + count($update_student) && $uid === null) {
+			// TODO(chris): phrase
+			$this->terminateWithValidationErrors(['' => "Kein/e StudentIn vorhanden!"]);
+		}
+		if (count($update_person) && $person_id === null) {
+			// TODO(chris): phrase
+			$this->terminateWithValidationErrors(['' => "Keine Person vorhanden!"]);
+		}
+
+		// Do Updates
+		if (count($update_lehrverband)) {
+			$result = $this->StudentlehrverbandModel->update([
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'student_uid' => $uid
+			], $update_lehrverband);
+			$this->getDataOrTerminateWithError($result);
+		}
+
+		if (count($update_person)) {
+			$result = $this->PersonModel->update(
+				$person_id,
+				$update_person
+			);
+			$this->getDataOrTerminateWithError($result);
+		}
+
+
+		if (count($update_student)) {
+			$result = $this->StudentModel->update(
+				[$uid],
+				$update_student
+			);
+			$this->getDataOrTerminateWithError($result);
+		}
+
+		$this->terminateWithSuccess(array_fill_keys(array_merge(
+			array_keys($update_lehrverband),
+			array_keys($update_person),
+			array_keys($update_student)
+		), ''));
+	}
+
+	public function check()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$vorname = $this->input->post('vorname');
+		$nachname = $this->input->post('nachname');
+		$gebdatum = $this->input->post('gebdatum');
+
+		if (!$vorname && !$nachname && !$gebdatum)
+			$this->terminateWithValidationErrors(['At least one of vorname, nachname or gebdatum must be set']);
+
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		if ($gebdatum)
+			$this->PersonModel->db->where('gebdatum', (new DateTime($gebdatum))->format('Y-m-d'));
+		if ($vorname && $nachname) {
+			$this->PersonModel->db->or_group_start();
+			$this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape($nachname) . ')', false);
+			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape($vorname) . ')', false);
+			$this->PersonModel->db->group_end();
+		} elseif ($nachname) {
+			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($nachname) . ')', false);
+		}
+
+		$result = $this->PersonModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function add()
+	{
+		if (!$this->input->post('person_id')) {
+			if (!isset($_POST['address']) || !is_array($_POST['address']))
+				$_POST['address'] = [];
+			$_POST['address']['func'] = 1;
+		}
+		if ($this->input->post('incoming')) {
+			$_POST['ausbildungssemester'] = 0;
+		}
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
+		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]');
+		// TODO(chris): validate studienplan with studiengang, semester and orgform?
+		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// TODO(chris): This should be in a library
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$this->db->trans_start();
+
+		$result = $this->addInteressent();
+
+		$this->db->trans_complete();
+
+		if ($this->db->trans_status() === FALSE)
+			$this->terminateWithError('TODO(chris): TEXT', self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	protected function addInteressent()
+	{
+		// Person anlegen wenn nötig
+		$person_id = $this->input->post('person_id');
+		if (!$person_id) {
+			$this->load->model('person/Person_model', 'PersonModel');
+			
+			$data = [
+				'nachname' => $this->input->post('nachname'),
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID(),
+				'zugangscode' => uniqid(),
+				'aktiv' => true
+			];
+			if ($this->input->post('anrede'))
+				$data['anrede'] = $this->input->post('anrede');
+			if ($this->input->post('titelpre'))
+				$data['titelpre'] = $this->input->post('titelpre');
+			if ($this->input->post('titelpost'))
+				$data['titelpost'] = $this->input->post('titelpost');
+			if ($this->input->post('vorname'))
+				$data['vorname'] = $this->input->post('vorname');
+			if ($this->input->post('vornamen'))
+				$data['vornamen'] = $this->input->post('vornamen');
+			if ($this->input->post('wahlname'))
+				$data['wahlname'] = $this->input->post('wahlname');
+			if ($this->input->post('geschlecht'))
+				$data['geschlecht'] = $this->input->post('geschlecht');
+			if ($this->input->post('gebdatum'))
+				$data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d');
+			if ($this->input->post('geburtsnation'))
+				$data['geburtsnation'] = $this->input->post('geburtsnation');
+			if ($this->input->post('staatsbuergerschaft'))
+				$data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft');
+
+			$result = $this->PersonModel->insert($data);
+			$person_id = $this->getDataOrTerminateWithError($result);
+		}
+
+		// Addresse anlegen
+		$anlegen = $this->input->post('address[func]');
+		if ($anlegen) {
+			$this->load->model('person/Adresse_model', 'AdresseModel');
+
+			$data = [
+				'nation' => $this->input->post('address[nation]'),
+				'strasse' => $this->input->post('address[address]'),
+				'plz' => $this->input->post('address[plz]'),
+				'ort' => $this->input->post('address[ort]'),
+				'gemeinde' => $this->input->post('address[gemeinde]'),
+				'typ' => 'h',
+				'zustelladresse' => true,
+			];
+			if ($anlegen < 0) { // Überschreiben
+				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
+				$this->AdresseModel->addOrder('sort');
+				$result = $this->AdresseModel->loadWhere([
+					'person_id' => $person_id
+				]);
+				$address = $this->getDataOrTerminateWithError($result);
+				if ($address) {
+					$address = current($address);
+
+					$data['updateamum'] = date('c');
+					$data['updatevon'] = getAuthUID();
+
+					$result = $this->AdresseModel->update($address->adresse_id, $data);
+					$this->getDataOrTerminateWithError($result);
+				} else {
+					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
+					$anlegen = 1;
+					$data['heimatadresse'] = true;
+				}
+			}
+			if ($anlegen > 0) {
+				$data['person_id'] = $person_id;
+				$data['insertamum'] = date('c');
+				$data['insertvon'] = getAuthUID();
+				if (!isset($data['heimatadresse']))
+					$data['heimatadresse'] = !$this->input->post('person_id');
+				
+				$result = $this->AdresseModel->insert($data);
+				$this->getDataOrTerminateWithError($result);
+			}
+		}
+		
+		// Kontaktdaten
+		$kontaktdaten = [];
+		foreach (['email', 'telefon', 'mobil'] as $k) {
+			$v = $this->input->post($k);
+			if ($v)
+				$kontaktdaten[$k] = $v;
+		}
+		if (count($kontaktdaten)) {
+			$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+			foreach ($kontaktdaten as $typ => $kontakt) {
+				$data = [
+					'person_id' => $person_id,
+					'kontakttyp' => $typ,
+					'kontakt' => $kontakt,
+					'zustellung' => true,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID()
+				];
+				$result = $this->KontaktModel->insert($data);
+				$this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		// Prestudent anlegen
+		$data = [
+			'aufmerksamdurch_kurzbz' => 'k.A.',
+			'person_id' => $person_id,
+			'studiengang_kz' => $this->input->post('studiengang_kz'),
+			'ausbildungcode' => $this->input->post('letzteausbildung'),
+			'anmerkung' => $this->input->post('anmerkungen'),
+			'reihungstestangetreten' => false,
+			'bismelden' => true
+		];
+		$ausbildungsart = $this->input->post('ausbildungsart');
+		if ($ausbildungsart)
+			$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
+		// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
+		$incoming = $this->input->post('incoming');
+		if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
+			$data['foerderrelevant'] = false;
+		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
+		$this->PrestudentModel->addOrder('zgvmas_code');
+		$this->PrestudentModel->addOrder('zgv_code', 'DESC');
+		$this->PrestudentModel->addLimit(1);
+		$result = $this->PrestudentModel->loadWhere([
+			'person_id' => $person_id
+		]);
+		$prestudent = $this->getDataOrTerminateWithError($result);
+		if ($prestudent) {
+			$prestudent = current($prestudent);
+			if ($prestudent->zgv_code) {
+				$data['zgv_code'] = $prestudent->zgv_code;
+				$data['zgvort'] = $prestudent->zgvort;
+				$data['zgvdatum'] = $prestudent->zgvdatum;
+
+				$data['zgvmas_code'] = $prestudent->zgvmas_code;
+				$data['zgvmaort'] = $prestudent->zgvmaort;
+				$data['zgvmadatum'] = $prestudent->zgvmadatum;
+			}
+		}
+		// Prestudent speichern
+		$result = $this->PrestudentModel->insert($data);
+		$prestudent_id = $this->getDataOrTerminateWithError($result);
+
+		// Prestudent Rolle Anlegen
+		$data = [
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent',
+			'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'),
+			'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0,
+			'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null,
+			'studienplan_id' => $this->input->post('studienplan_id') ?: null,
+			'datum' => date('Y-m-d'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+		$result = $this->PrestudentstatusModel->insert($data);
+		$this->getDataOrTerminateWithError($result);
+
+		if ($incoming) {
+			// TODO(chris): IMPLEMENT!
+			//Matrikelnummer und UID generieren
+			//Benutzerdatensatz anlegen
+			//Studentendatensatz anlegen
+			//StudentLehrverband anlegen
+		}
+
+		// TODO(chris): DEBUG
+		/*$result = $this->PrestudentModel->loadWhere([
+			'pestudent_id' => 1
+		]);
+		if (isError($result)) {
+			return $result;
+		}*/
+
+		$this->terminateWithSuccess(true);
+	}
+
+	public function requiredIfNotPersonId($value)
+	{
+		if (isset($_POST['person_id']))
+			return true;
+		return !!$value;
+	}
+	
+	public function requiredIfAddressFunc($value)
+	{
+		if (!$_POST['address']['func'])
+			return true;
+		return !!$value;
+	}
+}

application/controllers/api/frontend/v1/stv/Students.php

@@ -0,0 +1,743 @@
+<?php
+/**
+ * Copyright (C) 2024 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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about listing students
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Students extends FHCAPI_Controller
+{
+	private $allowedStgs = [];
+
+
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		$this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$this->allowedStgs = array_merge($this->allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+		
+		if (!$this->allowedStgs) {
+			$this->_outputAuthError([$router->method => ['admin:r', 'assistenz:r']]);
+			exit;
+		}
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	/**
+	 * Remap calls:
+	 * /													=> return []
+	 * /inout												=> return []
+	 * /inout/incoming										=> getIncoming
+	 * /inout/outgoing										=> getOutgoing
+	 * /inout/gemeinsamestudien								=> getGemeinsamestudien
+	 * /(studiengang_kz)									=> getStudents
+	 * /(studiengang_kz)/prestudent							=> getPrestudents
+	 * /(studiengang_kz)/prestudent/*						=> getPrestudents
+	 * /(studiengang_kz)/(semester)							=> getStudents
+	 * /(studiengang_kz)/(semester)/grp/(gruppe_kurzbz)		=> getStudents
+	 * /(studiengang_kz)/(semester)/(verband)				=> getStudents
+	 * /(studiengang_kz)/(semester)/(verband)/(gruppe)		=> getStudents
+	 * /(studiengang_kz)/(org_form)							=> getStudents
+	 * /(studiengang_kz)/(org_form)/prestudent				=> getPrestudents
+	 * /(studiengang_kz)/(org_form)/prestudent/*			=> getPrestudents
+	 * /(studiengang_kz)/(org_form)/(semester)				=> getStudents
+	 * /(studiengang_kz)/(org_form)/(semester)/grp/(gruppe_kurzbz)
+	 * 														=> getStudents
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getStudents
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
+	 * 														=> getStudents
+	 * /uid/(student_uid)									=> getStudent
+	 * /prestudent/(prestudent_id)							=> getPrestudent
+	 * /person/(person_id)									=> getPerson
+	 *
+	 * @param string		$method
+	 * @param array			$params				(optional)
+	 *
+	 * @return void
+	 */
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->terminateWithSuccess([]);
+
+		if ($method == 'inout') {
+			if (!count($params))
+				return $this->terminateWithSuccess([]);
+			switch ($params[0]) {
+				case 'incoming':
+					return $this->getIncoming();
+				case 'outgoing':
+					return $this->getOutgoing();
+				case 'gemeinsamestudien':
+					return $this->getGemeinsamestudien();
+				default:
+					return show_404();
+			}
+		}
+
+		$count = count($params);
+		if (!$count)
+			return $this->getStudents($method);
+
+		if ($method == 'uid' && $count == 1)
+			return $this->getStudent($params[0]);
+
+		if ($method == 'prestudent' && $count == 1)
+			return $this->getPrestudent($params[0]);
+
+		if ($method == 'person' && $count == 1)
+			return $this->getPerson($params[0]);
+
+		if (is_numeric($params[0])) {
+			$sem = $params[0];
+			if ($count == 3 && $params[1] == 'grp') {
+				$g = $params[2];
+				$ver = null;
+				$grp = null;
+			} else {
+				$g = null;
+				$ver = $count > 1 ? $params[1] : null;
+				$grp = $count > 2 ? $params[2] : null;
+			}
+			return $this->getStudents($method, $sem, $ver, $grp, $g);
+		} elseif ($params[0] == 'prestudent') {
+			if ($count == 1)
+				return $this->getPrestudents($method);
+			if ($count == 2)
+				return $this->getPrestudents($method, $params[1]);
+			return $this->getPrestudents($method, $params[1], $params[$count-1]);
+		} else {
+			$org = $params[0];
+			if ($count > 1 && $params[1] == 'prestudent') {
+				if ($count == 2)
+					return $this->getPrestudents($method, null, null, $org);
+				if ($count == 3)
+					return $this->getPrestudents($method, $params[2], null, $org);
+				return $this->getPrestudents($method, $params[2], $params[$count-1], $org);
+			}
+			$sem = $count > 1 ? $params[1] : null;
+			if ($count == 4 && $params[2] == 'grp') {
+				$g = $params[3];
+				$ver = null;
+				$grp = null;
+			} else {
+				$g = null;
+				$ver = $count > 2 ? $params[2] : null;
+				$grp = $count > 3 ? $params[3] : null;
+			}
+
+			return $this->getStudents($method, $sem, $ver, $grp, $g, $org);
+		}
+		
+		show_404();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getIncoming()
+	{
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getOutgoing()
+	{
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getGemeinsamestudien()
+	{
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param string		$studiensemester_kurzbz			(optional)
+	 * @param string		$filter							(optional)
+	 * @param string		$orgform_kurzbz					(optional)
+	 *
+	 * @return void
+	 */
+	protected function getPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+		$selectRT = "
+			SELECT 1 
+			FROM public.tbl_rt_person 
+			JOIN public.tbl_reihungstest r ON (rt_id = reihungstest_id) 
+			WHERE person_id=p.person_id 
+			AND studienplan_id IN (
+				SELECT studienplan_id 
+				FROM lehre.tbl_studienplan 
+				JOIN lehre.tbl_studienordnung o USING(studienordnung_id) 
+				WHERE o.studiengang_kz=tbl_prestudent.studiengang_kz
+			) 
+			AND r.studiensemester_kurzbz=" . $stdsemEsc;
+
+		
+		$where = ['tbl_prestudent.studiengang_kz' => $studiengang_kz];
+
+		if ($orgform_kurzbz) {
+			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
+		}
+
+		switch ($filter) {
+			case "interessenten":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				break;
+			case "bewerbungnichtabgeschickt":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bewerbung_abgeschicktamum'] = null;
+				break;
+			case "bewerbungabgeschickt":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bewerbung_abgeschicktamum IS NOT NULL'] = null;
+				$where['bestaetigtam'] = null;
+				break;
+			case "statusbestaetigt":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bestaetigtam IS NOT NULL'] = null;
+				break;
+			case "statusbestaetigtrtnichtangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				break;
+			case "statusbestaetigtrtangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				break;
+			case "zgv":
+				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+				$result = $this->StudiengangModel->load($studiengang_kz);
+
+				$stg = $this->getDataOrTerminateWithError($result);
+				if (!$stg)
+					$this->terminateWithValidationErrors(['' => 'Studiengang does not exist']); // TODO(chris): phrase
+				$stg = current($stg);
+
+				$where['ps.status_kurzbz'] = 'Interessent';
+				
+				if ($stg->typ == 'm') {
+					$where['zgvmas_code IS NOT NULL'] = null;
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$where['zgvmas_erfuellt'] = true;
+				} elseif ($stg->typ == 'p') {
+					$where['zgvdoktor_code IS NOT NULL'] = null;
+					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
+						$where['zgvdoktor_erfuellt'] = true;
+				} else {
+					$where['zgv_code IS NOT NULL'] = null;
+					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
+						$where['zgv_erfuellt'] = true;
+				}
+				break;
+			case "reihungstestangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				break;
+			case "reihungstestnichtangemeldet":
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				break;
+			case "bewerber":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				break;
+			case "bewerberrtnichtangemeldet":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
+				break;
+			case "bewerberrtangemeldet":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				break;
+			case "bewerberrtangemeldetteilgenommen":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = true;
+				break;
+			case "bewerberrtangemeldetnichtteilgenommen":
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = false;
+				break;
+			case "aufgenommen":
+				$where['ps.status_kurzbz'] = 'Aufgenommener';
+				break;
+			case "warteliste":
+				$where['ps.status_kurzbz'] = 'Wartender';
+				break;
+			case "absage":
+				$where['ps.status_kurzbz'] = 'Abgewiesener';
+				break;
+			case "incoming":
+				// NOTE(chris): in FAS it was not filtered for studiengang_kz
+				$where['ps.status_kurzbz'] = 'Incoming';
+				break;
+			case "absolvent":
+				$where['ps.status_kurzbz'] = 'Absolvent';
+				break;
+			case "diplomand":
+				$where['ps.status_kurzbz'] = 'Diplomand';
+				break;
+			default:
+				if (!$studiensemester_kurzbz) {
+					// TODO(chris): this does not work with $orgform_kurzbz != null
+					$where['ps.status_kurzbz'] = null;
+				} else {
+					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
+						'Interessent',
+						'Bewerber',
+						'Aufgenommener',
+						'Wartender',
+						'Abgewiesener'
+					]);
+				}
+				break;
+		}
+
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+				ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+				AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+				AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+				AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');*/
+		$this->prepareQuery($studiensemester_kurzbz);
+		
+		$this->PrestudentModel->addSelect("
+			CASE WHEN ps.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+			THEN ps.ausbildungssemester::text 
+			ELSE ''::text END AS semester", false);
+		$this->PrestudentModel->addSelect("'' AS verband");
+		$this->PrestudentModel->addSelect("'' AS gruppe");
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere($where);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester						(optional)
+	 * @param string		$verband						(optional)
+	 * @param integer		$gruppe							(optional)
+	 * @param string		$gruppe_kurzbz					(optional)
+	 * @param string		$orgform_kurzbz					(optional)
+	 *
+	 * @return void
+	 */
+	protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
+			);*/
+		$this->prepareQuery($studiensemester_kurzbz, '');
+
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
+
+
+		$where = [];
+
+		if ($gruppe_kurzbz !== null) {
+			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
+			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
+			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
+		} else {
+			$where['v.studiengang_kz'] = $studiengang_kz;
+
+			if ($semester !== null)
+				$where['v.semester'] = $semester;
+
+			if ($verband !== null)
+				$where['v.verband'] = $verband;
+
+			if ($gruppe !== null)
+				$where['v.gruppe'] = $gruppe;
+	
+			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
+				$this->PrestudentModel->db->where(
+					"(
+						SELECT orgform_kurzbz 
+						FROM public.tbl_prestudentstatus 
+						WHERE prestudent_id=tbl_prestudent.prestudent_id 
+						AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . " 
+						ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
+					) =",
+					$this->PrestudentModel->escape($orgform_kurzbz),
+					false
+				);
+			}
+
+		}
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere($where);
+		
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * @param string		$prestudent_id
+	 *
+	 * @return void
+	 */
+	protected function getPrestudent($prestudent_id)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+				'LEFT'
+			);*/
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere([
+			'tbl_prestudent.prestudent_id' => $prestudent_id
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * @param string		$student_uid
+	 *
+	 * @return void
+	 */
+	protected function getStudent($student_uid)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+				'LEFT'
+			);*/
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere([
+			's.student_uid' => $student_uid
+		]);
+		
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * @param integer		$person_id
+	 *
+	 * @return void
+	 */
+	protected function getPerson($person_id)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+				'LEFT'
+			);*/
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->loadWhere([
+			'p.person_id' => $person_id
+		]);
+		
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * @param string|null	$studiensemester_kurzbz
+	 * @param string		$type
+	 *
+	 * @return void
+	 */
+	protected function prepareQuery($studiensemester_kurzbz, $type = 'LEFT')
+	{
+		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', $type);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+		$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
+			$type
+		);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+			ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+
+
+		$this->PrestudentModel->addSelect("b.uid");
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('svnr');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('geschlecht');
+
+		// semester
+		// verband
+		// gruppe
+
+		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect("s.matrikelnr");
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
+		$this->PrestudentModel->addSelect('pls.datum AS status_datum');
+		$this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect("
+			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
+			THEN b.uid || " . $this->PrestudentModel->escape(DOMAIN) . " 
+			ELSE '' END AS mail_intern", false);
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('pls.orgform_kurzbz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+
+		// priorisierung_relativ
+
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+
+		/*$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');*/
+
+		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function addSelectPrioRel()
+	{
+		$this->PrestudentModel->addSelect("(
+			SELECT count(*)
+			FROM (
+				SELECT *, public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) AS laststatus
+				FROM PUBLIC.tbl_prestudent pss
+				JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
+				WHERE person_id = p.person_id
+				AND studiensemester_kurzbz = (
+					SELECT studiensemester_kurzbz
+					FROM PUBLIC.tbl_prestudentstatus
+					WHERE prestudent_id = tbl_prestudent.prestudent_id
+					AND status_kurzbz = 'Interessent'
+					LIMIT 1
+				)
+				AND status_kurzbz = 'Interessent'
+			) prest
+			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
+			AND priorisierung <= tbl_prestudent.priorisierung
+		) || ' (' || tbl_prestudent.priorisierung || ')' AS priorisierung_relativ", false);
+	}
+
+	/**
+	 * Adds additional filters to the query
+	 *
+	 * @param string		$studiensemester_kurzbz
+	 *
+	 * @return void
+	 */
+	protected function addFilter($studiensemester_kurzbz)
+	{
+		$filter = $this->input->get('filter');
+		if (isset($filter['konto_count_0'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_count_0']);
+			$stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
+
+			$this->PrestudentModel->db->where('(
+				SELECT count(*) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id 
+				AND buchungstyp_kurzbz=' . $bt . ' 
+				AND studiensemester_kurzbz=' . $stdsem . '
+			) =', 0);
+			$this->PrestudentModel->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
+		}
+		if (isset($filter['konto_missing_counter'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_missing_counter']);
+			$stg = '';
+			if ($this->variablelib->getVar('kontofilterstg') == 'true')
+				$stg = ' AND studiengang_kz=tbl_prestudent.studiengang_kz';
+
+			$bt = $bt == 'alle' ? '' : ' AND buchungstyp_kurzbz=' . $bt;
+
+			$this->PrestudentModel->db->where('(
+				SELECT sum(betrag) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id' .
+				$bt .
+				$stg . '
+			) !=', 0);
+		}
+	}
+}

application/controllers/api/frontend/v1/stv/Verband.php

@@ -0,0 +1,493 @@
+<?php
+/**
+ * Copyright (C) 2024 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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about verbände
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Verband extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		// Load Models
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+	
+	/**
+	 * Remap calls:
+	 * /
+	 * /(studiengang_kz)									=> getStudiengang
+	 * /(studiengang_kz)/(semester)							=> getSemester
+	 * /(studiengang_kz)/(semester)/(verband)				=> getVerband
+	 * /(studiengang_kz)/(org_form)							=> getStudiengang
+	 * /(studiengang_kz)/(org_form)/(semester)				=> getSemester
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getVerband
+	 *
+	 * @param string		$method
+	 * @param array			$params				(optional)
+	 *
+	 * @return void
+	 */
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->getBase();
+
+		// NOTE(chris): Test if access is allowed ($method is the Studiengang)
+		if (!$this->permissionlib->isBerechtigt('assistenz', 's', $method)
+			&& !$this->permissionlib->isBerechtigt('admin', 's', $method)
+		) {
+			return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
+		}
+
+		$count = count($params);
+		if (!$count)
+			return $this->getStudiengang($method);
+
+		if ($count == 1) {
+			if (is_numeric($params[0]))
+				return $this->getSemester($method, $params[0]);
+			elseif ($params[0] == 'prestudent')
+				return $this->terminateWithSuccess($this->getStdSem($method . '/prestudent/', $method));
+			else
+				return $this->getStudiengang($method, $params[0]);
+		}
+		if ($count == 2) {
+			if (is_numeric($params[0]))
+				return $this->getVerband($method, $params[0], $params[1]);
+			elseif ($params[1] == 'prestudent')
+				return $this->terminateWithSuccess($this->getStdSem($method . '/' . $params[0] . '/prestudent/', $method));
+			else
+				return $this->getSemester($method, $params[1], $params[0]);
+		}
+		if ($count == 3 && !is_numeric($params[0]) && is_numeric($params[1]) && !is_numeric($params[2]))
+			return $this->getVerband($method, $params[1], $params[2], $params[0]);
+
+		show_404();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getBase()
+	{
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("v.studiengang_kz AS link");
+		$this->StudiengangModel->addSelect(
+			"CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
+			false
+		);
+		$this->StudiengangModel->addSelect('erhalter_kz');
+		$this->StudiengangModel->addSelect('typ');
+		$this->StudiengangModel->addSelect('kurzbz');
+		$this->StudiengangModel->addSelect('studiengang_kz');
+		$this->StudiengangModel->addSelect('studiengang_kz AS stg_kz');
+		
+		$this->StudiengangModel->addOrder('erhalter_kz');
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$stgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$stgs = array_merge($stgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+
+		if (!$stgs)
+			$this->terminateWithSuccess([]);
+
+		$this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
+
+		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		if ($this->permissionlib->isBerechtigt('inout/uebersicht'))
+			$list[] = [
+				'name' => 'International',
+				'link' => 'inout',
+				'children' => [
+					[
+						'name' => 'Incoming',
+						'link' => 'inout/incoming',
+						'leaf' => true
+					],
+					[
+						'name' => 'Outgoing',
+						'link' => 'inout/outgoing',
+						'leaf' => true
+					],
+					[
+						'name' => 'Gemeinsame Studien',
+						'link' => 'inout/gemeinsamestudien',
+						'leaf' => true
+					]
+				]
+			];
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param string		$orgform			(optional)
+	 *
+	 * @return void
+	 */
+	protected function getStudiengang($studiengang_kz, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester ORDER BY verband, gruppe LIMIT 1)) AS name", false);
+
+		$this->StudiengangModel->addSelect('semester');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+		
+		$this->StudiengangModel->addOrder('semester');
+
+		if ($org_form !== null) {
+			$this->StudiengangModel->db->group_start();
+			$this->StudiengangModel->db->where('v.semester', 0);
+			$this->StudiengangModel->db->or_where('v.orgform_kurzbz', $org_form);
+			$this->StudiengangModel->db->group_end();
+		}
+
+		$result = $this->StudiengangModel->loadWhere([
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.aktiv' => true
+		]);
+		$list = $this->getDataOrTerminateWithError($result);
+
+		array_unshift($list, [
+			'name' => 'PreStudent',
+			'link' => $link . 'prestudent',
+			'children' => $this->getStdSem($link . 'prestudent/', $studiengang_kz)
+		]);
+
+		if ($org_form === null) {
+			// NOTE(chris): if mischform show orgforms
+			$result = $this->StudiengangModel->load($studiengang_kz);
+			$result = $this->getDataOrTerminateWithError($result);
+			if ($result) {
+				if (current($result)->mischform) {
+					$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
+
+					$this->StudienordnungModel->addDistinct();
+					$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
+					$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+
+					$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
+
+					$result = $this->StudienordnungModel->loadWhere([
+						'aktiv' => true,
+						'studiengang_kz' => $studiengang_kz,
+						'p.orgform_kurzbz !=' => 'DDP'
+					]);
+					$result = $this->getDataOrTerminateWithError($result);
+
+					$list = array_merge($list, $result);
+				}
+			}
+
+		}
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester
+	 * @param string		$orgform
+	 *
+	 * @return void
+	 */
+	protected function getSemester($studiengang_kz, $semester, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/';
+
+
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+
+		$this->GruppeModel->addDistinct();
+		$this->GruppeModel->addSelect("CONCAT(" . $this->GruppeModel->escape($link . 'grp/') . ", gruppe_kurzbz) AS link", false);
+		$this->GruppeModel->addSelect("CONCAT(gruppe_kurzbz, ' (', bezeichnung, ')') AS name", false);
+		$this->GruppeModel->addSelect("TRUE AS leaf", false);
+
+		$this->GruppeModel->addSelect('sort');
+		$this->GruppeModel->addSelect('gruppe_kurzbz');
+		$this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->GruppeModel->addOrder('sort');
+		$this->GruppeModel->addOrder('gruppe_kurzbz');
+
+		$where = [
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false
+		];
+
+		if ($org_form !== null)
+			$where['orgform_kurzbz'] = $org_form;
+
+		$result = $this->GruppeModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", verband) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
+
+		$this->StudiengangModel->addSelect('verband');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+		
+		$this->StudiengangModel->addOrder('verband');
+
+		$this->StudiengangModel->addGroupBy('link, name, verband');
+		
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		$list = array_merge($list, $result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester
+	 * @param integer		$verband
+	 * @param string		$orgform
+	 *
+	 * @return void
+	 */
+	protected function getVerband($studiengang_kz, $semester, $verband, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/'. $verband . '/';
+
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", gruppe) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, gruppe, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband AND gruppe=v.gruppe ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
+
+		$this->StudiengangModel->addSelect('gruppe');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+		
+		$this->StudiengangModel->addOrder('gruppe');
+
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband' => $verband,
+			'v.gruppe !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param string		$link
+	 * @param integer		$studiengang_kz
+	 *
+	 * @return array
+	 */
+	protected function getStdSem($link, $studiengang_kz)
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
+		$data = $this->getDataOrTerminateWithError($result);
+		$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'] ?? null;
+
+		$this->StudiensemesterModel->addPlusMinus(null, $number_displayed_past_studiensemester);
+		$this->StudiensemesterModel->addOrder('ende');
+		$result = $this->StudiensemesterModel->load();
+
+		$studiensemester = $this->getDataOrTerminateWithError($result);
+		$result = [];
+
+		$studiengang_kz = (int)$studiengang_kz;
+
+		foreach ($studiensemester as $sem) {
+			$semlink = $link . $sem->studiensemester_kurzbz;
+			$intlink = $semlink . '/interessenten';
+			$result[] = [
+				'name' => $sem->studiensemester_kurzbz,
+				'link' => $semlink,
+				'stg_kz' => $studiengang_kz,
+				'children' => [
+					[
+						'name' => 'Interessenten',
+						'link' => $intlink,
+						'stg_kz' => $studiengang_kz,
+						'children' => [
+							[
+								'name' => 'Bewerbung nicht abgeschickt',
+								'link' => $intlink . '/bewerbungnichtabgeschickt',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Bewerbung abgeschickt, Status unbestätigt',
+								'link' => $intlink . '/bewerbungabgeschickt',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'ZGV erfüllt',
+								'link' => $intlink . '/zgv',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Status bestätigt',
+								'link' => $intlink . '/statusbestaetigt',
+								'stg_kz' => $studiengang_kz,
+								'children' => [
+									[
+										'name' => 'Nicht zum Reihungstest angemeldet',
+										'link' => $intlink . '/statusbestaetigtrtnichtangemeldet',
+										'leaf' => true
+									],
+									[
+										'name' => 'Reihungstest angemeldet',
+										'link' => $intlink . '/statusbestaetigtrtangemeldet',
+										'leaf' => true
+									]
+								]
+							],
+							[
+								'name' => 'Nicht zum Reihungstest angemeldet',
+								'link' => $intlink . '/reihungstestnichtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Reihungstest angemeldet',
+								'link' => $intlink . '/reihungstestangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							]
+						]
+					],
+					[
+						'name' => 'Bewerber',
+						'link' => $semlink . '/bewerber',
+						'stg_kz' => $studiengang_kz,
+						'children' => [
+							[
+								'name' => 'Nicht zum Reihungstest angemeldet',
+								'link' => $intlink . '/bewerberrtnichtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Reihungstest angemeldet',
+								'link' => $intlink . '/bewerberrtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'children' => [
+									[
+										'name' => 'Teilgenommen',
+										'link' => $intlink . '/bewerberrtangemeldetteilgenommen',
+										'stg_kz' => $studiengang_kz,
+										'leaf' => true
+									],
+									[
+										'name' => 'Nicht teilgenommen',
+										'link' => $intlink . '/bewerberrtangemeldetnichtteilgenommen',
+										'stg_kz' => $studiengang_kz,
+										'leaf' => true
+									]
+								]
+							]
+						]
+					],
+					[
+						'name' => 'Aufgenommen',
+						'link' => $semlink . '/aufgenommen',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					],
+					[
+						'name' => 'Warteliste',
+						'link' => $semlink . '/warteliste',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					],
+					[
+						'name' => 'Absage',
+						'link' => $semlink . '/absage',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					],
+					[
+						'name' => 'Incoming',
+						'link' => $semlink . '/incoming',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					]
+				]
+			];
+		}
+
+		return $result;
+	}
+}

application/controllers/api/v1/person/Person.php

@@ -264,4 +264,4 @@ class Person extends API_Controller
 
 		return success('Input data are valid');
 	}
-}
+}

application/controllers/codex/UHSTAT1.php

@@ -5,8 +5,12 @@ if (! defined("BASEPATH")) exit("No direct script access allowed");
 class UHSTAT1 extends FHC_Controller
 {
 	const BERECHTIGUNG_UHSTAT_VERWALTEN = 'student/uhstat1daten_verwalten';
+	const LOGIN_SESSION_INDEX = 'bewerbung/user';
 	const PERSON_ID_SESSION_INDEX = 'bewerbung/personId';
 	const CODEX_OESTERREICH = 'A';
+	const CODEX_UNKNOWN_YEAR = 9999;
+	const CODEX_UNKNOWN_NATION = 'XXX';
+	const CODEX_UNKNOWN_BILDUNGMAX = 999;
 	const LOWER_BOUNDARY_YEARS = 160;
 	const UPPER_BOUNDARY_YEARS = 20;
 
@@ -210,7 +214,9 @@ class UHSTAT1 extends FHC_Controller
 		else
 			return true;
 
-		if (!isset($bildungsstaat)) return true;
+		// if no Bildungsstaat or Bildungmax unknown - valid
+		if (!isset($bildungsstaat) || $bildungmax == self::CODEX_UNKNOWN_BILDUNGMAX) return true;
+
 
 		// find out if abschluss is in Austria
 		$this->AbschlussModel->addSelect("in_oesterreich");
@@ -219,8 +225,11 @@ class UHSTAT1 extends FHC_Controller
 		if (hasData($abschlussRes))
 		{
 			$in_oesterreich = getData($abschlussRes)[0]->in_oesterreich;
-			// invalid if abschluss in Austria, but not Bildungsstaat, or abschluss not in Austria, but Bildungsstaat in Austria
-			return ($in_oesterreich && $bildungsstaat == self::CODEX_OESTERREICH) || (!$in_oesterreich && $bildungsstaat != self::CODEX_OESTERREICH);
+
+			// valid if Bildungsstaat and Abschluss in Austria, or Bildungsstaat and Abschluss not in Austria
+			// (or Abschluss not in Austria and Bildungsstaat unknown)
+			return ($in_oesterreich && $bildungsstaat == self::CODEX_OESTERREICH)
+				|| (!$in_oesterreich && ($bildungsstaat != self::CODEX_OESTERREICH || $bildungsstaat == self::CODEX_UNKNOWN_NATION));
 		}
 
 		return false;
@@ -363,7 +372,11 @@ class UHSTAT1 extends FHC_Controller
 
 		// get realistic birth years, dated back from current year
 		$currYear = date("Y");
-		$formMetaData['jahre'] = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
+		$yearRange = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
+		$formMetaData['jahre'] = array_combine($yearRange, $yearRange);
+
+		// add "unknown" option
+		$formMetaData['jahre'][self::CODEX_UNKNOWN_YEAR] = 'unbekannt';
 
 		return success($formMetaData);
 	}
@@ -411,7 +424,10 @@ class UHSTAT1 extends FHC_Controller
 	private function _getValidPersonId($berechtigungsArt)
 	{
 		// if coming from bewerbungstool - person id is in session (person must be logged in bewerbungstool)
-		if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX]) && is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX]))
+		if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX])
+			&& is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX])
+			&& isset($_SESSION[self::LOGIN_SESSION_INDEX])
+		)
 			return $_SESSION[self::PERSON_ID_SESSION_INDEX];
 
 		// if person id passed directly...

application/controllers/components/stv/Noten.php

@@ -0,0 +1,168 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Noten extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => 'student/noten:r',
+			'getZeugnis' => 'student/noten:r',
+			'update' => ['admin:w', 'assistenz:w']
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	public function get()
+	{
+		$this->load->model('codex/Note_model', 'NoteModel');
+
+		$result = $this->NoteModel->addOrder('note');
+		
+		$result = $this->NoteModel->load();
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		
+		return $this->outputJson($result);
+	}
+
+	public function getZeugnis($prestudent_id, $all = null)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$result = $this->StudentModel->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+		if (!hasData($result))
+			return $this->outputJsonSuccess(null);
+		
+		$student_uid = current(getData($result))->student_uid;
+
+		$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
+
+		$result = $this->ZeugnisnoteModel->getZeugnisnoten($student_uid, $studiensemester_kurzbz);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		
+		return $this->outputJson($result);
+	}
+
+	public function update()
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$this->load->library('form_validation');
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+		
+		if (empty($_POST) || !is_array(current($_POST))) {
+			$result = $this->hasPermissionUpdate($this->input->post('lehrveranstaltung_id'), $this->input->post('student_uid'));
+			if (isError($result)) {
+				$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
+				return $this->outputJson($result);
+			}
+
+			$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrverantaltung ID', 'required|numeric');
+			$this->form_validation->set_rules('student_uid', 'Student UID', 'required');
+			$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester Kurzbezeichnung', 'required');
+			$this->form_validation->set_rules('note', 'Note', 'required|numeric');
+			$post = [$_POST];
+		} else {
+			foreach ($_POST as $i => $data) {
+				$lvid = isset($data['lehrveranstaltung_id']) ? $data['lehrveranstaltung_id'] : null;
+				$uid = isset($data['student_uid']) ? $data['student_uid'] : null;
+				$result = $this->hasPermissionUpdate($lvid, $uid);
+				if (isError($result)) {
+					$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
+					return $this->outputJson($result);
+				}
+
+				$this->form_validation->set_rules($i . '[lehrveranstaltung_id]', '#' . $i . ' Lehrverantaltung ID', 'required|numeric');
+				$this->form_validation->set_rules($i . '[student_uid]', '#' . $i . ' Student UID', 'required');
+				$this->form_validation->set_rules($i . '[studiensemester_kurzbz]', '#' . $i . ' Studiensemester Kurzbezeichnung', 'required');
+				$this->form_validation->set_rules($i . '[note]', '#' . $i . ' Note', 'required|numeric');
+			}
+			$post = $_POST;
+		}
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$final_result = success();
+		$this->ZeugnisnoteModel->db->trans_start();
+
+		foreach ($post as $i => $data) {
+			$note = $data['note'];
+			unset($data['note']);
+			$result = $this->ZeugnisnoteModel->update($data, [
+				'note' => $note,
+				'benotungsdatum' => date('c'),
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
+			]);
+			if (isError($result)) {
+				$final_result = $result;
+				break;
+			}
+		}
+
+		$this->ZeugnisnoteModel->db->trans_complete();
+
+		if (isError($final_result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+
+		$this->outputJson($final_result);
+	}
+
+	protected function hasPermissionUpdate($lehrveranstaltung_id, $student_uid)
+	{
+		// TODO(chris): error phrases!
+		if ($lehrveranstaltung_id === null || $student_uid === null)
+			return success();
+		$result = $this->StudentModel->load([$student_uid]);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error('Fehler beim Ermitteln des Studenten');
+		$student = current(getData($result));
+
+		if ($this->permissionlib->isBerechtigt('admin', 'suid', $student->studiengang_kz))
+			return success();
+		if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $student->studiengang_kz))
+			return success();
+
+		$result = $this->StudienplanModel->getAllOesForLv($lehrveranstaltung_id);
+		if (isError($result))
+			return $result;
+		$oes = getData($result) ?: [];
+		$result = $this->LehrveranstaltungModel->getStg($lehrveranstaltung_id);
+		if (isError($result))
+			return $result;
+		if (hasData($result))
+			$oes[] = current(getData($result));
+
+		foreach ($oes as $oe) {
+			if ($this->permissionlib->isBerechtigt('admin', 'suid', $oe->oe_kurzbz))
+				return success();
+			if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $oe->oe_kurzbz))
+				return success();
+		}
+
+		return error('Forbidden');
+	}
+}

application/controllers/components/stv/Studienplan.php

@@ -0,0 +1,43 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studienplan extends Auth_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct([
+			'get' => self::PERM_LOGGED
+		]);
+	}
+
+	public function get()
+	{
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+		
+		$this->load->library('form_validation');
+		
+		$this->form_validation->set_rules('studiengang_kz', 'StudiengangKz', 'required|numeric');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'StudiensemesterKurbz', 'required');
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'numeric');
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studiengang_kz = $this->input->post('studiengang_kz');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$ausbildungssemester = $this->input->post('ausbildungssemester') ?: null;
+		$orgform_kurzbz = $this->input->post('orgform_kurzbz') ?: null;
+
+		$result = $this->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester, $orgform_kurzbz);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+}

application/controllers/components/stv/Studiensemester.php

@@ -0,0 +1,78 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studiensemester extends Auth_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'now' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
+	}
+
+	public function index()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('start');
+
+		$result = $this->StudiensemesterModel->load();
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+		}
+		$this->outputJson($result);
+	}
+
+	public function now()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$result = $this->StudiensemesterModel->getNearest();
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJson(getError($result));
+		}
+		$result = getData($result) ?: [];
+
+		if (count($result) != 1) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			$this->outputJsonError(count($result) ? 'Mehrere Studiensemester aktiv' : 'Kein Studiensemester aktiv');
+		} else {
+			$this->outputJsonSuccess(current($result)->studiensemester_kurzbz);
+		}
+	}
+
+	public function set()
+	{
+		$this->load->library('AuthLib');
+		$this->load->library('form_validation');
+
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
+
+		if ($this->form_validation->run() == false) {
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$stdsem = $this->input->post('studiensemester');
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'semester_aktuell', $stdsem);
+
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJson($result);
+		}
+
+		$this->outputJsonSuccess(true);
+	}
+}

application/controllers/jobs/AntragJob.php

@@ -29,6 +29,10 @@ class AntragJob extends JOB_Controller
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->loadPhrases([
+			'lehre'
+		]);
 	}
 
 	/**
@@ -417,7 +421,7 @@ class AntragJob extends JOB_Controller
 
 		$this->StudierendenantragModel->db->where_in(
 			'public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)',
-			$this->config->item('antrag_prestudentstatus_whitelist')
+			$this->config->item('antrag_prestudentstatus_whitelist_abmeldung')
 		);
 
 		$result = $this->StudierendenantragModel->getWithLastStatusWhere([
@@ -451,11 +455,23 @@ class AntragJob extends JOB_Controller
 					if (isError($result))
 						$this->logError(getError($result));
 
+					$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+					$result = $this->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStgl']);
+					if (isError($result)) {
+						$this->logError(getError($result));
+						continue;
+					} elseif (!hasData($result)) {
+						$this->logError($this->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl']));
+						continue;
+					}
+					
+					$statusgrund = current(getData($result));
+
 					$result = $this->prestudentlib->setAbbrecher(
 	                    $antrag->prestudent_id,
 	                    $antrag->studiensemester_kurzbz,
 	                    'AntragJob',
-	                    'abbrecherStgl',
+	                    $statusgrund->statusgrund_id,
 	                    $antrag->insertamum,
 	                    null,
 	                    $antrag->insertvon ?: $insertvon

application/controllers/jobs/IssueResolver.php

@@ -9,8 +9,8 @@ class IssueResolver extends IssueResolver_Controller
 	{
 		parent::__construct();
 
-		// set fehler codes which can be resolved by the job
-		// structure: fehlercode => class (library) name for resolving
+		// set fehler codes which can be resolved by the job, with own resolver defined
+		// structure: fehlercode => class (library) name for resolving in "resolvers" folder
 		$this->_codeLibMappings = array(
 			'CORE_ZGV_0001' => 'CORE_ZGV_0001',
 			'CORE_ZGV_0002' => 'CORE_ZGV_0002',
@@ -30,7 +30,6 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_STG_0002' => 'CORE_STG_0002',
 			'CORE_STG_0003' => 'CORE_STG_0003',
 			'CORE_STG_0004' => 'CORE_STG_0004',
-			'CORE_STUDENTSTATUS_0001' => 'CORE_STUDENTSTATUS_0001',
 			'CORE_STUDENTSTATUS_0002' => 'CORE_STUDENTSTATUS_0002',
 			'CORE_STUDENTSTATUS_0003' => 'CORE_STUDENTSTATUS_0003',
 			'CORE_STUDENTSTATUS_0004' => 'CORE_STUDENTSTATUS_0004',
@@ -51,5 +50,11 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_PERSON_0003' => 'CORE_PERSON_0003',
 			'CORE_PERSON_0004' => 'CORE_PERSON_0004'
 		);
+
+		// fehler which are resolved by the job the same way as they are produced
+		// structure: fehlercode => class (library) name for resolving in "plausichecks" folder
+		$this->_codeProducerLibMappings = array(
+			'CORE_STUDENTSTATUS_0001' => 'AbbrecherAktiv',
+		);
 	}
 }

application/controllers/jobs/OneTimeMessages.php

@@ -51,7 +51,7 @@ class OneTimeMessages extends JOB_Controller
 			   FROM public.tbl_prestudent p
 			   JOIN public.tbl_prestudentstatus ps USING (prestudent_id)
  			   JOIN public.tbl_studiengang s USING (studiengang_kz)
-			  WHERE ps.status_kurzbz = \'Wartender\'
+			  WHERE get_rolle_prestudent(ps.prestudent_id, NULL) = \'Wartender\'
 			    AND ps.studiensemester_kurzbz = ?
 			    AND ps.datum <= NOW() - \''.$days.' days\'::interval
 			    AND s.typ = ?

application/controllers/lehre/Studierendenantrag.php

@@ -21,6 +21,7 @@ class Studierendenantrag extends FHC_Controller
 
 		// Load Models
 		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->load->model('person/Person_model', 'PersonModel');
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -102,6 +103,7 @@ class Studierendenantrag extends FHC_Controller
 
 	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
 	{
+
 		$this->load->view('lehre/Antrag/Create', [
 			'prestudent_id' => $prestudent_id,
 			'studierendenantrag_id' => $studierendenantrag_id,
@@ -185,4 +187,4 @@ class Studierendenantrag extends FHC_Controller
 
 		return $strRequiredPermissions;
 	}
-}
+}

application/controllers/lehre/lvplanung/LvTemplateUebersicht.php

@@ -0,0 +1,45 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class LvTemplateUebersicht extends Auth_Controller
+{
+	public function __construct()
+	{
+		// Set required permissions
+		parent::__construct(
+			array(
+				'index' => 'lehre/lehrveranstaltung:rw',
+			)
+		);
+
+		// Load libraries
+		$this->load->library('AuthLib');
+
+
+		// Load language phrases
+		$this->loadPhrases(
+			array(
+				'global',
+				'lehre'
+			)
+		);
+
+		$this->_setAuthUID();
+	}
+
+	public function index()
+	{
+		$this->load->view('lehre/lvplanung/lvTemplateUebersicht.php');
+	}
+
+
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid) show_error('User authentification failed');
+	}
+}

application/controllers/system/infocenter/InfoCenter.php

@@ -337,10 +337,13 @@ class InfoCenter extends Auth_Controller
 		$persondata = $this->_loadPersonData($person_id);
 
 		$checkPerson = $this->PersonModel->checkDuplicate($person_id);
-
 		if (isError($checkPerson)) show_error(getError($checkPerson));
 
-		$duplicate = array('duplicated' => getData($checkPerson));
+		$checkUnruly = $this->PersonModel->checkUnruly($persondata['stammdaten']->vorname, $persondata['stammdaten']->nachname, $persondata['stammdaten']->gebdatum);
+		if (isError($checkUnruly)) show_error(getError($checkUnruly));
+
+		$duplicate = array('duplicate' => getData($checkPerson));
+		$unruly = array('unruly' => getData($checkUnruly));
 
 		$prestudentdata = $this->_loadPrestudentData($person_id);
 
@@ -351,7 +354,8 @@ class InfoCenter extends Auth_Controller
 			$persondata,
 			$prestudentdata,
 			$dokumentdata,
-			$duplicate
+			$duplicate,
+			$unruly
 		);
 
 		$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
@@ -1285,67 +1289,28 @@ class InfoCenter extends Auth_Controller
 			$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
 
 		$kontakte = $this->input->post('kontakt');
-		foreach ($kontakte as $kontakt)
-		{
-			$kontaktExists = $this->KontaktModel->loadWhere(array(
-				'kontakt_id' => $kontakt['id'],
-				'person_id' => $person_id,
-			));
+		if($kontakte) {
 
-			if (hasData($kontaktExists))
-			{
-				$kontaktExists = getData($kontaktExists)[0];
+			foreach ($kontakte as $kontakt) {
+				$kontaktExists = $this->KontaktModel->loadWhere(array(
+					'kontakt_id' => $kontakt['id'],
+					'person_id' => $person_id,
+				));
 
-				if ($kontaktExists->kontakt === $kontakt['value'])
-					continue;
+				if (hasData($kontaktExists)) {
+					$kontaktExists = getData($kontaktExists)[0];
 
-				$update = $this->KontaktModel->update(
-					array
-					(
-						'kontakt_id' => $kontakt['id']
-					),
-					array
-					(
-						'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
-						'updateamum' => date('Y-m-d H:i:s'),
-						'updatevon' => $this->_uid
-					)
-				);
+					if ($kontaktExists->kontakt === $kontakt['value'])
+						continue;
 
-				if (isError($update))
-					$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
-			}
-		}
-
-		$adressen = $this->input->post('adresse');
-
-		foreach ($adressen as $adresse)
-		{
-			$adresseExists = $this->AdresseModel->loadWhere(array(
-				'adresse_id' => $adresse['id'],
-				'person_id' => $person_id,
-			));
-
-			if (hasData($adresseExists))
-			{
-				$adresse = $adresse['value'];
-				$adresseExists = getData($adresseExists)[0];
-				if ($adresseExists->strasse !== $adresse['strasse'] ||
-					$adresseExists->plz !== $adresse['plz'] ||
-					$adresseExists->ort !== $adresse['ort'] ||
-					$adresseExists->nation !== $adresse['nation'])
-				{
-					$update = $this->AdresseModel->update(
+					$update = $this->KontaktModel->update(
 						array
 						(
-							'adresse_id' => $adresseExists->adresse_id
+							'kontakt_id' => $kontakt['id']
 						),
 						array
 						(
-							'strasse' => isEmptyString($adresse['strasse']) ? null : $adresse['strasse'],
-							'plz' => isEmptyString($adresse['plz']) ? null : $adresse['plz'],
-							'ort' => isEmptyString($adresse['ort']) ? null : $adresse['ort'],
-							'nation' => isEmptyString($adresse['nation']) ? null : $adresse['nation'],
+							'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
 							'updateamum' => date('Y-m-d H:i:s'),
 							'updatevon' => $this->_uid
 						)
@@ -1354,7 +1319,48 @@ class InfoCenter extends Auth_Controller
 					if (isError($update))
 						$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
 				}
+			}
 
+		}
+
+		$adressen = $this->input->post('adresse');
+
+		if($adressen) {
+
+			foreach ($adressen as $adresse) {
+				$adresseExists = $this->AdresseModel->loadWhere(array(
+					'adresse_id' => $adresse['id'],
+					'person_id' => $person_id,
+				));
+
+				if (hasData($adresseExists)) {
+					$adresse = $adresse['value'];
+					$adresseExists = getData($adresseExists)[0];
+					if ($adresseExists->strasse !== $adresse['strasse'] ||
+						$adresseExists->plz !== $adresse['plz'] ||
+						$adresseExists->ort !== $adresse['ort'] ||
+						$adresseExists->nation !== $adresse['nation']) {
+						$update = $this->AdresseModel->update(
+							array
+							(
+								'adresse_id' => $adresseExists->adresse_id
+							),
+							array
+							(
+								'strasse' => isEmptyString($adresse['strasse']) ? null : $adresse['strasse'],
+								'plz' => isEmptyString($adresse['plz']) ? null : $adresse['plz'],
+								'ort' => isEmptyString($adresse['ort']) ? null : $adresse['ort'],
+								'nation' => isEmptyString($adresse['nation']) ? null : $adresse['nation'],
+								'updateamum' => date('Y-m-d H:i:s'),
+								'updatevon' => $this->_uid
+							)
+						);
+
+						if (isError($update))
+							$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
+					}
+
+				}
 			}
 		}
 
@@ -2383,4 +2389,4 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Success");
 	}
-}
+}

application/core/Auth_Controller.php

@@ -88,6 +88,22 @@ abstract class Auth_Controller extends FHC_Controller
 		}
 	}
 
+	/**
+	 * Checks for Permissions depending on the Studiengang of a Prestudent
+	 * and exits/outputs an error if they are not met.
+	 *
+	 * @param integer 				$prestudent_id
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return void
+	 */
+	protected function checkPermissionsForPrestudent($prestudent_id, $permStud)
+	{
+		if (!$this->hasPermissionsForPrestudent($prestudent_id, $permStud)) {
+			$this->_outputAuthError([$this->router->method => $permStud]);
+		}
+	}
+
 	/**
 	 * Checks for Permissions depending if the given person is a
 	 * Mitarbeiter and/or Student
@@ -97,11 +113,11 @@ abstract class Auth_Controller extends FHC_Controller
 	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
 	 * @param array 				$permStud	Perms if the person is a Student
 	 *
-	 * @return boolean
+	 * @return integer				0 if permission is granted
 	 */
 	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
 	{
-		$res = 0;
+		$res = 3;
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
 		$this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
@@ -129,6 +145,30 @@ abstract class Auth_Controller extends FHC_Controller
 		return $res;
 	}
 
+	/**
+	 * Checks for Permissions depending on the Studiengang of a Prestudent
+	 * and returns the result.
+	 *
+	 * @param integer 				$prestudent_id
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return boolean
+	 */
+	protected function hasPermissionsForPrestudent($prestudent_id, $permStud)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load($prestudent_id);
+		if (!hasData($result))
+			show_404();
+		$stg = current(getData($result))->studiengang_kz;
+		foreach ($permStud as $k => $v) {
+			$perm = $this->permissionlib->convertAccessType($v);
+			if ($this->permissionlib->isBerechtigt($perm[0], $perm[1], $stg))
+				return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Outputs an error message and sets the HTTP Header.
 	 * This function is protected so that it can be overwritten.

application/core/DB_Model.php

@@ -827,6 +827,23 @@ class DB_Model extends CI_Model
 		return $result;
 	}
 
+	public function getDbTable()
+	{
+		return $this->dbTable;
+	}
+
+	public function getPk()
+	{
+		return $this->pk;
+	}
+
+	public function getPks()
+	{
+		if (is_array($this->pk))
+			return $this->pk;
+		return [$this->pk];
+	}
+
 	// ------------------------------------------------------------------------------------------
 	// Protected methods
 

application/core/FHCAPI_Controller.php

@@ -94,7 +94,7 @@ class FHCAPI_Controller extends Auth_Controller
 	// ---------------------------------------------------------------
 
 	/**
-	 * @param array					$data
+	 * @param string|array|object	$data
 	 * @param string				$type (optional)
 	 * @return void
 	 */
@@ -110,6 +110,8 @@ class FHCAPI_Controller extends Auth_Controller
 				$error['messages'] = $data;
 			else
 				$error = $data;
+		} elseif (is_object($data)) {
+			$error = (array)$data;
 		} else {
 			$error['message'] = $data;
 		}
@@ -117,6 +119,9 @@ class FHCAPI_Controller extends Auth_Controller
 		if ($type)
 			$error['type'] = $type;
 
+		if (!isset($error['type']))
+			$error['type'] = self::ERROR_TYPE_GENERAL;
+
 		$this->returnObj['errors'][] = $error;
 	}
 

application/core/IssueResolver_Controller.php

@@ -5,21 +5,18 @@
  */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	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';
+	// mappings in form fehlercode -> resolverlibrary name, fehler which have explicit resolver class defined
+	protected $_codeLibMappings = [];
 
-	protected $_codeLibMappings;
+	// mappings in form fehlercode -> producer library name, fehler which are resolved the same way they are produced
+	protected $_codeProducerLibMappings = [];
 
 	public function __construct()
 	{
 		parent::__construct();
 
+		// pass extension name if calling from extension
 		$this->load->model('system/Issue_model', 'IssueModel');
-
-		$this->load->library('IssuesLib');
 	}
 
 	/**
@@ -27,97 +24,29 @@ abstract class IssueResolver_Controller extends JOB_Controller
 	 */
 	public function run()
 	{
+		$this->load->library(
+			'issues/PlausicheckResolverLib',
+			[
+				'extensionName' => $this->_extensionName ?? null,
+				'codeLibMappings' => $this->_codeLibMappings,
+				'codeProducerLibMappings' => $this->_codeProducerLibMappings
+			]
+		);
+
 		$this->logInfo("Issue resolve job started");
 
 		// load open issues with given errorcodes
-		$openIssuesRes = $this->IssueModel->getOpenIssues(array_keys($this->_codeLibMappings));
+		$openIssuesRes = $this->IssueModel->getOpenIssues(
+			array_merge(array_keys($this->_codeLibMappings), array_keys($this->_codeProducerLibMappings))
+		);
 
-		// log error if occured
-		if (isError($openIssuesRes))
-		{
-			$this->logError(getError($openIssuesRes));
-		}
-		else
-		{
-			// log info if no data found
-			if (!hasData($openIssuesRes))
-			{
-				$this->logInfo("No open issues found");
-			}
-			else
-			{
-				$openIssues = getData($openIssuesRes);
+		$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
 
-				foreach ($openIssues as $issue)
-				{
-					// ignore if Fehlercode is not in libmappings (shouldn't be checked)
-					if (!isset($this->_codeLibMappings[$issue->fehlercode])) continue;
+		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues($openIssues);
 
-					$libName = $this->_codeLibMappings[$issue->fehlercode];
-
-					// 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()
-					);
-
-					// 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
-						$this->logError("Issue library file " . $issuesLibFilePath . " does not exist");
-						continue;
-					}
-
-					// load library connected to fehlercode
-					$this->load->library($issuesLibPath . $libName);
-
-					$lowercaseLibName = mb_strtolower($libName);
-
-					// check if method is defined in library class
-					if (!is_callable(array($this->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
-					{
-						// log error and continue with next issue if not
-						$this->logError("Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName");
-						continue;
-					}
-
-					// call the function for checking for issue resolution
-					$issueResolvedRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
-
-					if (isError($issueResolvedRes))
-					{
-						$this->logError(getError($issueResolvedRes));
-					}
-					else
-					{
-						$issueResolvedData = getData($issueResolvedRes);
-
-						if ($issueResolvedData === true)
-						{
-							// set issue to resolved if needed
-							$behobenRes = $this->issueslib->setBehoben($issue->issue_id, null);
-
-							if (isError($behobenRes))
-								$this->logError(getError($behobenRes));
-							else
-								$this->logInfo("Issue " . $issue->issue_id . " successfully resolved");
-						}
-					}
-				}
-			}
-		}
+		// log if error, or log info if inserted new issue
+		foreach ($result->errors as $error) $this->logError($error);
+		foreach ($result->infos as $info) $this->logInfo($info);
 
 		$this->logInfo("Issue resolve job ended");
 	}

application/core/Notiz_Controller.php

@@ -0,0 +1,461 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+abstract class Notiz_Controller extends FHCAPI_Controller
+{
+	const DEFAULT_PERMISSION_R  = 'admin:r';
+	const DEFAULT_PERMISSION_RW = 'admin:rw';
+	//public function __construct($zuordnung = 'person/Notizzuordnung_model')
+	public function __construct($permissions)
+	{
+		$default_permissions = [
+			'getUid' => self::DEFAULT_PERMISSION_R,
+			'getNotizen' => self::DEFAULT_PERMISSION_R,
+			'loadNotiz' => self::DEFAULT_PERMISSION_R,
+			'addNewNotiz' => self::DEFAULT_PERMISSION_RW,
+			'updateNotiz' => self::DEFAULT_PERMISSION_RW,
+			'deleteNotiz' => self::DEFAULT_PERMISSION_RW,
+			'loadDokumente' => self::DEFAULT_PERMISSION_R,
+			'getMitarbeiter' => self::DEFAULT_PERMISSION_R,
+			'isBerechtigt' => self::DEFAULT_PERMISSION_R,
+		];
+		
+		if(!is_array($permissions))
+		{
+		    $this->terminateWithError("Notiz_controller construct: permissions must be an array");
+		}
+		
+		$merged_permissions = array_merge($default_permissions, $permissions);
+		
+		parent::__construct($merged_permissions);
+
+		//Load Models
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getUid()
+	{
+		$this->terminateWithSuccess(getAuthUID());
+	}
+
+
+	//Override function for extensions
+	protected function assignNotiz($notiz_id, $id, $type)
+	{
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$result = $this->NotizzuordnungModel->insert(array('notiz_id' => $notiz_id, $type => $id));
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return success(getData($result));
+	}
+
+	//Override function for extensions
+	protected function deleteNotizzuordnung($notiz_id, $id, $type)
+	{
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if (isError($result)) {
+			$this->terminateWithError('type not in table notizzuordnung enthalten..', self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->NotizzuordnungModel->delete(['notiz_id' => $notiz_id, $type => $id]);
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return success(getData($result));
+	}
+
+
+	//Override function for extensions
+	public function getNotizen($id, $type)
+	{
+		$result = $this->NotizzuordnungModel->isValidType($type);
+		if(isError($result))
+			$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
+
+		$result = $this->NotizModel->getNotizWithDocEntries($id, $type);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+
+	//Override function
+	protected function isBerechtigt($id, $typeId){
+		return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
+	}
+
+	public function loadNotiz()
+	{
+		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
+
+		$notiz_id = $this->input->post('notiz_id');
+
+		//$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
+		$this->NotizModel->addSelect('*');
+		$this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum 
+			THEN public.tbl_notiz.updateamum ELSE public.tbl_notiz.insertamum END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate");
+		$this->NotizModel->addLimit(1);
+
+		$result = $this->NotizModel->loadWhere(
+			array('notiz_id' => $notiz_id)
+		);
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		elseif (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+		else
+		{
+			$this->terminateWithSuccess(current(getData($result)));
+		}
+	}
+
+	public function addNewNotiz($id, $paramTyp = null)
+	{
+		$this->load->library('DmsLib');
+		$this->load->library('form_validation');
+
+		$uid = getAuthUID();
+
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
+		//Form Validation
+		$this->form_validation->set_rules('titel', 'Titel', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+		]);
+
+		$this->form_validation->set_rules('text', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$erledigt = $this->input->post('erledigt');
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
+		$type = $this->input->post('typeId');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
+
+		// Start DB transaction
+		$this->db->trans_start();
+
+		//Save note
+		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
+			"insertvon" => $verfasser_uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
+
+		if (isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$notiz_id = $result->retval;
+
+		//save Notizzuordnung
+		$result = $this->assignNotiz($notiz_id, $id, $type);
+
+		if (isError($result))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		//save Documents
+		$dms_id_arr = [];
+		foreach ($_FILES as $k => $file)
+		{
+			$dms = array(
+				'kategorie_kurzbz'  => 'notiz',
+				'version'           => 0,
+				'name'              => $file["name"],
+				'mimetype'          => $file["type"],
+				'insertamum'        => date('c'),
+				'insertvon'         => $uid
+			);
+
+			//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+			//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+			//Todo define in dms component: readFile, downloadFile
+			$result = $this->dmslib->upload($dms, $k, ['*']);
+			/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
+			if (isError($result))
+			{
+				$this->db->trans_rollback();
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			$dms_id_arr[] = $result->retval['dms_id'];
+		}
+
+		//save entry in Notizdokument
+		if($dms_id_arr)
+		{
+			$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+			foreach($dms_id_arr as $dms_id)
+			{
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+				if (isError($result))
+				{
+					$this->db->trans_rollback();
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+		$this->db->trans_commit();
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function updateNotiz()
+	{
+		$this->load->library('form_validation');
+		$this->load->library('DmsLib');
+
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
+		$notiz_id = $this->input->post('notiz_id');
+
+		if(!$notiz_id)
+		{
+			$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		//Form Validation
+		$this->form_validation->set_rules('titel', 'Titel', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
+		]);
+
+		$this->form_validation->set_rules('text', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		//update Notiz
+		$uid = getAuthUID();
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
+		$erledigt = $this->input->post('erledigt');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
+
+		$result = $this->NotizModel->update(
+			[
+				'notiz_id' => $notiz_id
+			],
+			[
+				'titel' =>  $titel,
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
+				'text' => $text,
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
+				'start' => $start,
+				'ende' => $ende,
+				'erledigt' => $erledigt
+			]
+		);
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		//update(1) loading all dms-entries with this notiz_id
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+		$result = $this->getDataOrTerminateWithError($result);
+		foreach ($result as $doc) {
+			$dms_id_arr[$doc->dms_id] = array(
+				'name' => $doc->name,
+				'dms_id' => $doc->dms_id
+			);
+		}
+
+		foreach ($_FILES as $k => $file)
+		{
+			//update(2) attach all new files (except type application/x.fhc-dms+json)
+			if($file["type"] == 'application/x.fhc-dms+json')
+			{
+				$jsonFile = json_decode(file_get_contents($file['tmp_name']));
+				unset($dms_id_arr[$jsonFile->dms_id]);
+				#$dms_uploaded[] = $jsonFile->dms_id;
+			}
+			else
+			{
+				$dms = array(
+					'kategorie_kurzbz'  => 'notiz',
+					'version'           => 0,
+					'name'              => $file["name"],
+					'mimetype'          => $file["type"],
+					'insertamum'        => date('c'),
+					'insertvon'         => $uid
+				);
+
+				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
+				//Todo(manu)check name files: nicht gleiches file 2mal hochladen
+				//Todo define in dms component: readFile, downloadFile
+				$result = $this->dmslib->upload($dms, $k, array('*'));
+
+				$result = $this->getDataOrTerminateWithError($result);
+				$dms_id = $result['dms_id'];
+
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
+
+				$this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		//update(3) check if all files have been deleted
+		foreach ($dms_id_arr as $file)
+		{
+			$result = $this->dmslib->removeAll($file['dms_id']);
+
+			$this->getDataOrTerminateWithError($result);
+		}
+
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function deleteNotiz()
+	{
+		$this->load->library('DmsLib');
+
+		$notiz_id = $this->input->post('notiz_id');
+		$typeId = $this->input->post('type_id');
+		$id = $this->input->post('id');
+
+		//TODO(manu): define Permissions for deletion document if filecomponent finished
+
+		//get dms_id from notizdokument
+		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
+
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
+
+		$result = $this->getDataOrTerminateWithError($result);
+
+		// Start DB transaction
+		$this->db->trans_start();
+
+		if ($result)
+			$this->load->library('DmsLib');
+
+		foreach ($result as $doc) {
+			$res = $this->dmslib->removeAll($doc->dms_id);
+			if (isError($result))
+			{
+				$this->db->trans_rollback();
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		//delete Notizzuordnung
+		$result = $this-> deleteNotizzuordnung($notiz_id, $id, $typeId);
+		if (isError($result))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+
+		//Delete Note
+		$result = $this->NotizModel->delete($notiz_id);
+
+		if (isError($result))
+		{
+			$this->db->trans_rollback();
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_complete();
+		return $this->terminateWithSuccess(getData($result));
+	}
+
+	public function loadDokumente()
+	{
+		$notiz_id = $this->input->post('notiz_id');
+
+		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+
+		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
+		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
+
+		$result = $this->NotizModel->loadWhere(
+			array('public.tbl_notiz.notiz_id' => $notiz_id)
+		);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if(!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result));
+	}
+
+	public function getMitarbeiter($searchString)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess($result);
+	}
+
+}

application/core/PlausiIssueProducer_Controller.php

@@ -5,61 +5,23 @@
  */
 abstract class PlausiIssueProducer_Controller extends JOB_Controller
 {
-	protected $_fehlerLibMappings;
+	protected $_fehlerLibMappings = [];
 	protected $_app;
 
-	public function __construct($app = null)
-	{
-		parent::__construct();
-
-		// pass extension name if calling from extension
-		$extensionName = isset($this->_extensionName) ? $this->_extensionName : null;
-
-		// load libraries
-		$this->load->library('issues/PlausicheckProducerLib', array('extensionName' => $extensionName, 'app' => $this->_app));
-		$this->load->library('IssuesLib');
-	}
-
 	protected function producePlausicheckIssues($params)
 	{
+		$this->load->library(
+			'issues/PlausicheckProducerLib',
+			['extensionName' => $this->_extensionName ?? null, 'app' => $this->_app, 'fehlerLibMappings' => $this->_fehlerLibMappings]
+		);
+
 		$this->logInfo("Plausicheck issue producer job started");
 
-		// get the data returned by Plausicheck
-		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
-		{
-			// execute the check
-			$this->logInfo("Checking " . $fehler_kurzbz . "...");
-			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue(
-				$libName,
-				$fehler_kurzbz,
-				$params
-			);
+		$result = $this->plausicheckproducerlib->producePlausicheckIssues($params);
 
-			if (isError($plausicheckRes)) $this->logError(getError($plausicheckRes));
-
-			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->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))
-						$this->logError(getError($addIssueRes));
-					elseif (hasData($addIssueRes) && is_integer(getData($addIssueRes)))
-						$this->logInfo("Plausicheck issue " . $fehler_kurzbz . " successfully produced, person_id: " . $person_id);
-				}
-			}
-		}
+		// log if error, or log info if inserted new issue
+		foreach ($result->errors as $error) $this->logError($error);
+		foreach ($result->infos as $info) $this->logInfo($info);
 
 		$this->logInfo("Plausicheck issue producer job stopped");
 	}

application/libraries/AntragLib.php

@@ -121,7 +121,7 @@ class AntragLib
 	public function unpauseAntrag($antrag_id, $insertvon)
 	{
 		if ($insertvon == Studierendenantragstatus_model::INSERTVON_DEREGISTERED)
-			return error($this->p->t('studierendenantrag', 'error_no_right'));
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_right'));
 		if ($insertvon == Studierendenantragstatus_model::INSERTVON_ABMELDUNGSTGL) {
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
@@ -257,18 +257,28 @@ class AntragLib
 						if (isError($result))
 							$errors[] = getError($result);
 
+						$this->_ci->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+						$result = $this->_ci->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStud']);
+						if (isError($result)) {
+							$errors[] = getError($result);
+							continue;
+						} elseif (!hasData($result)) {
+							$errors[] = $this->_ci->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStud']);
+							continue;
+						}
+						$statusgrund = current(getData($result));
+
 						$result = $this->_ci->prestudentlib->setAbbrecher(
                             $antrag->prestudent_id,
                             $antrag->studiensemester_kurzbz,
                             $insertvon,
-                            'abbrecherStud',
+                            $statusgrund->statusgrund_id,
                             $antrag->datum,
                             $insertam
                         );
-						if (isError($result))
-						{
+						if (isError($result)) {
 							$errors[] = getError($result);
-							return $errors;
+							continue;
 						}
 
 						$result = $this->_ci->PersonModel->loadPrestudent($antrag->prestudent_id);
@@ -421,11 +431,20 @@ class AntragLib
 			// NOTE(chris): here we should have error handling but at the
 			// moment there is no way to notify the user for "soft" errors
 
+			$this->_ci->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+			$result = $this->_ci->StatusgrundModel->loadWhere(['statusgrund_kurzbz' => 'abbrecherStgl']);
+			if (isError($result))
+				return $result;
+			if (!hasData($result))
+				return error($this->_ci->p->t('lehre', 'error_noStatusgrund', ['statusgrund_kurzbz' => 'abbrecherStgl']));
+			
+			$statusgrund = current(getData($result));
+
 			$result = $this->_ci->prestudentlib->setAbbrecher(
                 $antrag->prestudent_id,
                 $antrag->studiensemester_kurzbz,
                 $insertvon,
-                'abbrecherStgl',
+                $statusgrund->statusgrund_id,
                 $status->insertamum
             );
 
@@ -911,7 +930,7 @@ class AntragLib
 	public function createWiederholung($prestudent_id, $studiensemester_kurzbz, $insertvon, $repeat)
 	{
 		$result = $this->_ci->StudierendenantragModel->loadIdAndStatusWhere([
-			'prestudent_id' => $prestudent_id,
+			'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 			'studiensemester_kurzbz'=> $studiensemester_kurzbz,
 			'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
 		]);
@@ -1341,7 +1360,7 @@ class AntragLib
 
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist_abmeldung'))) {
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
 			], [
 				Studierendenantrag_model::TYP_ABMELDUNG,
@@ -1353,7 +1372,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
 			], [
 				Studierendenantrag_model::TYP_ABMELDUNG,
@@ -1367,7 +1386,7 @@ class AntragLib
 			return success(0);
 		}
 
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1428,7 +1447,7 @@ class AntragLib
 			&& $result->status_kurzbz != 'Unterbrecher') {
 			return success(0);
 		}
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1444,12 +1463,6 @@ class AntragLib
 				elseif($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
 					return success(-2);
 			}
-			if ($antrag->typ == Studierendenantrag_model::TYP_UNTERBRECHUNG)
-			{
-				// NOTE(chris): Ignore canceled ones
-				if ($antrag->status == Studierendenantragstatus_model::STATUS_CANCELLED)
-					continue;
-			}
 			if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG)
 			{
 				if($antrag->status == Studierendenantragstatus_model::STATUS_PASS)
@@ -1510,7 +1523,7 @@ class AntragLib
 		$datumStatus = $result->datum;
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
 			]);
@@ -1520,7 +1533,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED
 			]);
@@ -1530,7 +1543,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
 			]);
@@ -1541,7 +1554,7 @@ class AntragLib
 
 			return success(0);
 		}
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1594,7 +1607,7 @@ class AntragLib
 	public function getDetailsForLastAntrag($prestudent_id, $typ = null)
 	{
 		$where = [
-			'prestudent_id' => $prestudent_id
+			'tbl_studierendenantrag.prestudent_id' => $prestudent_id
 		];
 		$types = null;
 		if ($typ) {
@@ -2180,4 +2193,4 @@ class AntragLib
 		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
 		return $result;
 	}
-}
+}

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/PrestudentLib.php

@@ -35,8 +35,15 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
-	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null)
-	{
+	public function setAbbrecher(
+		$prestudent_id,
+		$studiensemester_kurzbz,
+		$insertvon = null,
+		$statusgrund_id = null,
+		$datum = null,
+		$bestaetigtam = null,
+		$bestaetigtvon = null
+	) {
 		if (!$insertvon)
 			$insertvon = getAuthUID();
 		if (!$bestaetigtvon)
@@ -70,8 +77,8 @@ class PrestudentLib
 		if(!$bestaetigtam)
 			$bestaetigtam = date('c');
 
-		//Status und Statusgrund updaten
-		$result = $this->_ci->PrestudentstatusModel->withGrund($statusgrund_kurzbz)->insert([
+		// 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,
@@ -82,13 +89,13 @@ class PrestudentLib
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
 			'bestaetigtvon' => $bestaetigtvon,
-			'bestaetigtam' => $bestaetigtam
+			'bestaetigtam' => $bestaetigtam,
+			'statusgrund_id' => $statusgrund_id
 		]);
 
 		if (isError($result))
 			return $result;
 
-
 		//Verband anlegen
 		$result = $this->_ci->LehrverbandModel->load([
 			'studiengang_kz' => $student->studiengang_kz,
@@ -134,7 +141,7 @@ class PrestudentLib
 			]);
 		}
 
-		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		// noch nicht eingetragene Zeugnisnoten auf 9 setzen
 		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz);
 		if (isError($result))
 			return $result;
@@ -166,9 +173,9 @@ class PrestudentLib
 		}
 
 
-		//Update Aktionen
+		// Update Aktionen
 
-		//StudentModel updaten
+		// StudentModel updaten
 		$this->_ci->StudentModel->update([
 			'student_uid' => $student->student_uid
 		], [
@@ -192,7 +199,7 @@ class PrestudentLib
 			'updatevon' => $insertvon
 		]);
 
-		//Benutzer inaktiv setzen
+		// Benutzer inaktiv setzen
 		$this->_ci->BenutzerModel->update([
 			'uid' =>  $student->student_uid
 		], [
@@ -206,17 +213,28 @@ class PrestudentLib
 		return success();
 	}
 
-	public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id, $insertvon = null)
-	{
+	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) {
+		
+		if (!$result) { // NOTE(chris): no status in target stdsem
 			//NOTE(manu): only valid if nextSemester focus max
 
 			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
@@ -224,7 +242,7 @@ class PrestudentLib
 				return $result;
 			$result = getData($result);
 
-			//check if ausbildungssemester is last
+			// 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))
@@ -236,7 +254,7 @@ class PrestudentLib
 
 			$studiengang = current(getData($res));
 			$prestudent_status = current($result);
-			if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+			if ($prestudent_status->status_kurzbz != Prestudentstatus_model::STATUS_UNTERBRECHER && $prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
 				$ausbildungssemester_plus = 1;
 
 			if(!$result)
@@ -246,34 +264,79 @@ class PrestudentLib
 					'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);
 
-		$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);
+		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]));
 
-		//Status updaten
+			$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' => $prestudent_status->ausbildungssemester + $ausbildungssemester_plus,
+			'ausbildungssemester' => $semester,
 			'datum' => date('c'),
 			'insertvon' => $insertvon,
 			'insertamum' => date('c'),
@@ -281,7 +344,8 @@ class PrestudentLib
 			'studienplan_id'=> $prestudent_status->studienplan_id,
 			'bestaetigtvon' => $insertvon,
 			'bestaetigtam' => date('c'),
-			'anmerkung'=> 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg
+			'anmerkung'=> $anmerkung,
+			'statusgrund_id' => $statusgrund_id
 		]);
 
 		if (isError($result))
@@ -332,7 +396,7 @@ class PrestudentLib
 			]);
 		}
 
-		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		// noch nicht eingetragene Zeugnisnoten auf 9 setzen
 		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
 		if (isError($result))
 			return $result;
@@ -363,10 +427,9 @@ class PrestudentLib
 			}
 		}
 
+		// Update Aktionen
 
-		//Update Aktionen
-
-		//StudentModel updaten
+		// StudentModel updaten
 		$this->_ci->StudentModel->update([
 			'student_uid' => $student->student_uid
 		], [
@@ -409,4 +472,463 @@ class PrestudentLib
 
 		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));
+
+
+		$this->_ci->load->library('VariableLib', ['uid' => $authUID]);
+		$semester_aktuell = $this->_ci->variablelib->getVar('semester_aktuell');
+
+
+		// 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' => $semester_aktuell
+		], [
+			'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/SearchBarLib.php

@@ -358,6 +358,35 @@ EOSC;
 	 */
 	private function _student($searchstr, $type)
 	{
+		$dbModel = new DB_Model();
+
+		$students = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$type.'\' AS type,
+			s.student_uid AS uid,
+			s.matrikelnr,
+			p.person_id AS person_id,
+			p.vorname || \' \' || p.nachname AS name,
+			k.kontakt as email ,
+			p.foto
+			FROM public.tbl_student s
+			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, email, p.foto
+	');
+
+		// If something has been found then return it
+		if (hasData($students)) return getData($students);
+
+		// Otherwise return an empty array
 		return array();
 	}
 
@@ -366,6 +395,41 @@ EOSC;
 	 */
 	private function _prestudent($searchstr, $type)
 	{
+		$dbModel = new DB_Model();
+
+		$prestudent = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$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();
 	}
 

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/issues/PlausicheckDefinitionLib.php

@@ -15,7 +15,6 @@ class PlausicheckDefinitionLib
 		'AktSemesterNull' => 'AktSemesterNull',
 		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
 		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten',
 		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
 		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
 		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
@@ -36,6 +35,7 @@ class PlausicheckDefinitionLib
 		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
 		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
 		//'StudienplanUngueltig' => 'StudienplanUngueltig'
+		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
 	);
 
 	/**

application/libraries/issues/PlausicheckProducerLib.php

@@ -12,18 +12,25 @@ class PlausicheckProducerLib
 
 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
-	private $_konfiguration = array(); // configuration parameters
+	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
 
 	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 libraries
+		$this->_ci->load->library('IssuesLib');
+
 		// load models
 		$this->_ci->load->model('system/Fehlerkonfiguration_model', 'FehlerkonfigurationModel');
 
@@ -41,6 +48,52 @@ class PlausicheckProducerLib
 		}
 	}
 
+	/**
+	 * 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 producePlausicheckIssues($params)
+	{
+		$result = new StdClass();
+		$result->errors = [];
+		$result->infos = [];
+
+		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
+		{
+			$plausicheckRes = $this->producePlausicheckIssue(
+				$libName,
+				$fehler_kurzbz,
+				$params
+			);
+
+			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
@@ -66,7 +119,10 @@ class PlausicheckProducerLib
 		$config = isset($this->_konfiguration[$fehler_kurzbz]) ? $this->_konfiguration[$fehler_kurzbz] : null;
 
 		// load library connected to fehlercode
-		$this->_ci->load->library($issuesLibPath . $libName, $config);
+		$this->_ci->load->library(
+			$issuesLibPath . $libName,
+			['configurationParams' => $config, 'isForResolutionCheck' => $this->_isForResolutionCheck]
+		);
 
 		$lowercaseLibName = mb_strtolower($libName);
 

application/libraries/issues/PlausicheckResolverLib.php

@@ -0,0 +1,136 @@
+<?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 as 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]))
+			{
+				$libName = $this->_codeProducerLibMappings[$issue->fehlercode];
+
+				$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,83 +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";
 
-		// 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->getAbbrecherAktiv($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),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Abbrecher cannot be active.
-	 * @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 getAbbrecherAktiv($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
-	{
-		$params = array();
-
-		$qry = "
-			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";
-
-		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);
-	}
+	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/PlausiChecker.php

@@ -6,15 +6,25 @@
 abstract class PlausiChecker
 {
 	protected $_ci; // code igniter instance
-	protected $_config; // configuration parameters for this plausicheck
+	protected $_config; // all applicable configuration parameters for this plausicheck
 	protected $_db; // database for queries
 
-	public function __construct($configurationParams = null)
+	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
 
 		// set configuration
-		$this->_config = $configurationParams;
+		$this->_config = $params['configurationParams'] ?? [];
+
+		$this->_isForResolutionCheck = $params['isForResolutionCheck'] ?? false;
 
 		// get database for queries
 		$this->_db = new DB_Model();
@@ -25,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/models/codex/Bismeldestichtag_model.php

@@ -1,7 +1,6 @@
 <?php
 class Bismeldestichtag_model extends DB_Model
 {
-
 	/**
 	 * Constructor
 	 */
@@ -12,6 +11,105 @@ class Bismeldestichtag_model extends DB_Model
 		$this->pk = 'meldestichtag_id';
 	}
 
+	public function getLastReachedMeldestichtag($studiensemester_kurzbz = null)
+	{
+		$this->addSelect('meldestichtag_id');
+		$this->addSelect('meldestichtag');
+		$this->addSelect('studiensemester_kurzbz');
+		$this->addSelect('insertamum');
+		$this->addSelect('insertvon');
+		$this->addSelect('updateamum');
+		$this->addSelect('updatevon');
+
+		if ($studiensemester_kurzbz) {
+			$this->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
+		}
+
+		$this->addOrder('meldestichtag', 'DESC');
+		$this->addLimit(1);
+
+		return $this->loadWhere([
+			'meldestichtag < NOW()' => null
+		]);
+	}
+
+	/**
+	 * Liefert nächstliegenden Bismeldestichtag.
+	 * @return object success or error
+	 */
+	public function getNextMeldestichtag()
+	{
+		$this->addSelect('meldestichtag');
+		$this->addSelect('studiensemester_kurzbz');
+
+		$this->addOrder('meldestichtag', 'ASC');
+		$this->addLimit(1);
+
+		return $this->loadWhere([
+			'meldestichtag >= NOW()' => null
+		]);
+	}
+
+	/**
+	 * Prüft, ob Meldestichtag für ein bestimmtes Statusdatum und Studiensemester erreicht ist.
+	 *
+	 * @param $status_datum
+	 * @return boolean true wenn erreicht, oder false
+	 */
+	public function checkIfMeldestichtagErreicht($status_datum, $studiensemester_kurzbz = null)
+	{
+		$erreicht = false;
+
+		if (isset($studiensemester_kurzbz))
+		{
+			// Studiensemesterende holen
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			$result = $this->StudiensemesterModel->loadWhere(
+				array(
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				)
+			);
+			if(isError($result))
+			{
+				return $result;
+			}
+			$result = current(getData($result));
+
+			$studiensemester_ende = new DateTime($result->ende);
+		}
+
+		// letztes erreichtes Bismeldedatum holen
+		$result = $this->getLastReachedMeldestichtag();
+		if (isError($result))
+		{
+			return $result;
+		}
+		if (!hasData($result)) {
+			return success("0",'No Statusdata vorhanden');
+		}
+		$stichtag = current(getData($result));
+		$stichtag = new DateTime($stichtag->meldestichtag);
+
+		$statusDatum = new DateTime($status_datum);
+
+		// Prüfen, ob Studentstatusdatum oder Studiensemester vor dem Stichtagsdatum liegen
+		if (isset($statusDatum))
+		{
+			if (isset($stichtag))
+				$erreicht = $statusDatum < $stichtag;
+		}
+
+		if (isset($studiensemester_ende))
+		{
+			$erreicht = $erreicht || $studiensemester_ende < $stichtag;
+		}
+
+		if ($erreicht)
+			return success("1", "Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht hinzugefügt werden");
+
+		return success("0", "Meldestatus nicht erreicht");
+	}
+
 	/**
 	 * Gets last Bismeldestichtag for a Studiensemester.
 	 * @param $studiensemester_kurzbz

application/models/codex/Gemeinde_model.php

@@ -19,4 +19,13 @@ class Gemeinde_model extends DB_Model
 		
 		return $this->loadWhere(array("plz" => $plz));
 	}
+
+	public function checkLocation($plz, $gemeinde, $ort)
+	{
+		$this->db->where('ortschaftsname', $ort);
+		$this->db->where('name', $gemeinde);
+		$this->db->where('plz', $plz);
+
+		return (boolean)$this->db->count_all_results($this->dbTable);
+	}
 }

application/models/crm/Konto_model.php

@@ -1,4 +1,7 @@
 <?php
+
+use CI3_Events as Events;
+
 class Konto_model extends DB_Model
 {
 
@@ -12,6 +15,218 @@ class Konto_model extends DB_Model
 		$this->pk = 'buchungsnr';
 	}
 
+	/**
+	 * Insert Data into DB-Table
+	 *
+	 * @param array				$data  DataArray for Insert
+	 * @return stdClass
+	 */
+	public function insert($data, $encryptedColumns = null)
+	{
+		if (isset($data['buchungsnr_verweis']) && $data['buchungsnr_verweis'])
+			return parent::insert($data, $encryptedColumns);
+
+		$this->db->trans_begin();
+
+		$result = parent::insert($data, $encryptedColumns);
+		if (isError($result)) {
+			$this->db->trans_rollback();
+			return $result;
+		}
+
+		$buchungsnr = $result->retval;
+		// If studiengang_kz is not present in $data it will fail above since it is a not null field
+		$studiengang_kz = $data['studiengang_kz'];
+
+
+		$zahlungsreferenz = false;
+		Events::trigger('generate_zahlungsreferenz', $buchungsnr, $data, function ($value) use ($zahlungsreferenz) {
+			$zahlungsreferenz = $value;
+		});
+
+		if ($zahlungsreferenz === false) {
+			$result = $this->execQuery('SELECT UPPER(oe_kurzbz) || ? as zahlungsreferenz 
+				FROM public.tbl_studiengang 
+				WHERE studiengang_kz=?', [$buchungsnr, $studiengang_kz]);
+			if (isError($result)) {
+				$this->db->trans_rollback();
+				return $result;
+			}
+			$zahlungsreferenz = current(getData($result))->zahlungsreferenz;
+		} elseif (isError($zahlungsreferenz)) {
+			$this->db->trans_rollback();
+			return $zahlungsreferenz;
+		}
+
+
+		$result = $this->update($buchungsnr, [
+			'zahlungsreferenz' => $zahlungsreferenz
+		]);
+
+		if (isError($result)) {
+			$this->db->trans_rollback();
+			return $result;
+		}
+
+		$this->db->trans_commit();
+
+		return success($buchungsnr);
+	}
+
+	/**
+	 * Delete data from DB-Table
+	 *
+	 * @param string			$id  Primary Key for DELETE
+	 *
+	 * @return stdClass
+	 */
+	public function delete($id)
+	{
+		$this->db->where('buchungsnr_verweis', $id);
+		if ($this->db->count_all_results($this->dbTable))
+			return error('Bitte zuerst die zugeordneten Buchungen loeschen', 42);
+		return parent::delete($id);
+	}
+
+	/**
+	 * Adds additional fields to the Query
+	 *
+	 * @return Konto_model
+	 */
+	public function withAdditionalInfo()
+	{
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('UPPER(typ::varchar(1) || kurzbz) AS kuerzel');
+		$this->addSelect('person.anrede');
+		$this->addSelect('person.titelpost');
+		$this->addSelect('person.titelpre');
+		$this->addSelect('person.vorname');
+		$this->addSelect('person.vornamen');
+		$this->addSelect('person.nachname');
+
+		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->addJoin('public.tbl_person person', 'person_id', 'LEFT');
+
+		Events::trigger('konto_query');
+
+		return $this;
+	}
+
+	/**
+	 * Get all accounting entries for a person optionally filtered by Studiengang
+	 *
+	 * @param integer|array		$person_id
+	 * @param string			(optional) $studiengang_kz
+	 *
+	 * @return stdClass
+	 */
+	public function getAlleBuchungen($person_id, $studiengang_kz = '')
+	{
+		$this->withAdditionalInfo();
+
+		$this->addOrder('buchungsdatum');
+
+		if (is_array($person_id))
+			$this->db->where_in('person_id', $person_id);
+		else
+			$this->db->where('person_id', $person_id);
+
+		if ($studiengang_kz)
+			return $this->loadWhere([
+				'studiengang_kz' => $studiengang_kz
+			]);
+		return $this->load();
+	}
+
+	/**
+	 * Get all open accounting entries for a person optionally filtered by Studiengang
+	 *
+	 * @param integer|array		$person_id
+	 * @param string			(optional) $studiengang_kz
+	 *
+	 * @return stdClass
+	 */
+	public function getOffeneBuchungen($person_id, $studiengang_kz = '')
+	{
+		$this->addSelect('buchungsnr');
+		$this->db->where('(betrag + (
+			SELECT CASE WHEN sum(betrag) is null THEN 0 ELSE sum(betrag) END
+			FROM ' . $this->dbTable . '
+			WHERE buchungsnr_verweis=konto_a.buchungsnr
+		)) !=', 0, false);
+		if (is_array($person_id))
+			$this->db->where_in('person_id', $person_id);
+		else
+			$this->db->where('person_id', $person_id);
+		$sql = $this->db->get_compiled_select($this->dbTable . ' konto_a');
+
+		$this->db->group_start();
+		$this->db->where_in('buchungsnr', $sql, false);
+		$this->db->or_where_in('buchungsnr_verweis', $sql, false);
+		$this->db->group_end();
+
+		return $this->getAlleBuchungen($person_id, $studiengang_kz);
+	}
+
+	/**
+	 * Check double Buchungen
+	 *
+	 * @param array				$person_ids
+	 * @param string			$studiensemester_kurzbz
+	 * @param array				$buchungstyp_kurzbzs
+	 *
+	 * @return stdClass
+	 */
+	public function checkDoubleBuchung($person_ids, $studiensemester_kurzbz, $buchungstyp_kurzbzs)
+	{
+		$this->addSelect('vorname');
+		$this->addSelect('nachname');
+
+		$this->addJoin('public.tbl_person', 'person_id');
+
+		$this->db->where_in('person_id', $person_ids);
+		$this->db->where_in('buchungstyp_kurzbz', $buchungstyp_kurzbzs);
+
+		$this->addGroupBy('vorname, nachname');
+		$this->addOrder('nachname');
+		$this->addOrder('vorname');
+
+		return $this->loadWhere([
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		]);
+	}
+
+	/**
+	 * Berechnet den offenen Betrag einer Buchung
+	 *
+	 * @param integer		$buchungsnr
+	 *
+	 * @return stdClass
+	 */
+	public function getDifferenz($buchungsnr)
+	{
+		$this->addSelect('buchungsnr_verweis');
+		$this->db->where('buchungsnr', $buchungsnr);
+		$sql = $this->db->get_compiled_select($this->dbTable);
+
+		$this->addSelect('buchungsnr_verweis');
+		$this->db->where('buchungsnr', $buchungsnr);
+		$this->db->or_where('buchungsnr_verweis', '(' . $sql . ')', false);
+		$sql = $this->db->get_compiled_select($this->dbTable);
+
+		$this->addSelect('sum(betrag) differenz');
+		$this->db->where('buchungsnr', $buchungsnr);
+		$this->db->or_where('buchungsnr_verweis', $buchungsnr);
+		$this->db->or_where('buchungsnr', '(' . $sql . ')', false);
+
+		$result = $this->load();
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(null);
+		return success(current(getData($result))->differenz * -1);
+	}
+
 	/**
 	 * Sets a Payment as paid
 	 */

application/models/crm/Prestudent_model.php

@@ -14,6 +14,39 @@ class Prestudent_model extends DB_Model
 		$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 	}
 
+	/**
+	 * Update Data in DB-Table
+	 *
+	 * @param   string $id  PK for DB-Table
+	 * @param   array $data  DataArray for Insert
+	 * @return  array
+	 */
+	public function update($id, $data, $encryptedColumns = null)
+	{
+		if (isset($data['zgvmas_code'])
+			|| isset($data['zgvmanation'])
+			|| isset($data['zgv_code'])
+			|| isset($data['zgvnation'])
+		) {
+			/**
+			 * Falls ZGV vorhanden, setze Ausstellungsstaat (für BIS-Meldung)
+			 * auf Nation der höchsten angegebenen ZGV
+			 */
+			$case = '(CASE 
+				WHEN zgvmas_code IS NOT NULL AND zgvmanation IS NOT NULL THEN zgvmanation 
+				WHEN zgv_code IS NOT NULL AND zgvnation IS NOT NULL THEN zgvnation 
+				ELSE NULL END)';
+			
+			foreach (['zgvmas_code', 'zgvmanation', 'zgv_code', 'zgvnation'] as $key)
+				if (isset($data[$key]))
+					$case = str_replace($key, $this->escape($data[$key]), $case);
+			
+			$this->db->set('ausstellungsstaat', $case, false);
+		}
+
+		return parent::update($id, $data, $encryptedColumns);
+	}
+
 	/**
 	 * getLastStatuses
 	 */
@@ -700,4 +733,33 @@ class Prestudent_model extends DB_Model
 		return $this->execQuery($query, array($prestudent_id));
 	}
 
+	/**
+	 * Gets history of all prestudents, person_id given
+	 * @param int $person_id
+	 * @return object
+	 */
+	public function getHistoryPrestudents($person_id)
+	{
+
+		$query = "
+			SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, ps.orgform_kurzbz, 
+					ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester,
+			       CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status, p.prestudent_id
+			FROM public.tbl_prestudent p
+			JOIN (
+					SELECT DISTINCT ON(prestudent_id) *
+						FROM public.tbl_prestudentstatus
+						WHERE prestudent_id IN (SELECT prestudent_id FROM public.tbl_prestudent WHERE person_id = ?)
+					ORDER BY prestudent_id, datum desc, insertamum desc
+				) ps USING(prestudent_id)
+			JOIN public.tbl_status USING(status_kurzbz)
+			LEFT JOIN public.tbl_status_grund g USING (statusgrund_id)
+			JOIN public.tbl_studiengang sg USING(studiengang_kz)
+			LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
+			LEFT JOIN public.tbl_student s USING (prestudent_id)
+			ORDER BY p.priorisierung
+		";
+
+		return $this->execQuery($query, array($person_id));
+	}
 }

application/models/crm/Prestudentstatus_model.php

@@ -5,6 +5,15 @@ class Prestudentstatus_model extends DB_Model
 
 	const STATUS_ABBRECHER = 'Abbrecher';
 	const STATUS_UNTERBRECHER = 'Unterbrecher';
+	const STATUS_STUDENT = 'Student';
+	const STATUS_DIPLOMAND = 'Diplomand';
+	const STATUS_ABSOLVENT = 'Absolvent';
+	const STATUS_BEWERBER = 'Bewerber';
+	const STATUS_AUFGENOMMENER = 'Aufgenommener';
+	const STATUS_WARTENDER = 'Wartender';
+	const STATUS_ABGEWIESENER = 'Abgewiesener';
+	const STATUS_INTERESSENT = 'Interessent';
+	const STATUS_INCOMING = 'Incoming';
 
 	/**
 	 * Constructor
@@ -280,6 +289,7 @@ class Prestudentstatus_model extends DB_Model
 		$this->addSelect('ss.studienjahr_kurzbz');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
+		$this->addSelect('pers.unruly');
 		$this->addSelect('TRIM(CONCAT(pers.vorname, \' \', pers.nachname)) AS name');
 		$this->addSelect('pers.person_id');
 		$this->addSelect('g.studiengang_kz');
@@ -330,13 +340,252 @@ class Prestudentstatus_model extends DB_Model
 	 */
 	public function withGrund($statusgrund_kurzbz)
 	{
-		if($statusgrund_kurzbz)
+		if ($statusgrund_kurzbz)
 			$this->db->set(
 				'statusgrund_id',
-				'(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz =' . $this->db->escape($statusgrund_kurzbz) .')',
+				'(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz=' . $this->db->escape($statusgrund_kurzbz) . ')',
 				false
 			);
 
 		return $this;
 	}
-}
+
+	/**
+	 * Check if there is only one prestudentstatus left
+	 *
+	 * @param integer					$prestudent_id
+	 * @param string					$studiensemester_kurzbz
+	 *
+	 * @return stdClass
+	 */
+	public function checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz = null)
+	{
+		$this->addSelect('COUNT(*) AS anzahl', false);
+
+		if ($studiensemester_kurzbz)
+			$this->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
+
+		$result = $this->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
+
+		if (isError($result))
+			return $result;
+
+		$resultObject = current($result->retval);
+
+		$anzahl = (int)$resultObject->anzahl;
+
+		if ($anzahl <= 1)
+			return success(true, $this->p->t('lehre', 'error_lastRole'));
+
+		return success(false, $this->p->t('lehre', 'anzahl_existingRoles', ['anzahl' => $anzahl]));
+	}
+
+	public function getAllPrestudentstatiWithStudiensemester($prestudent_id)
+	{
+		$qry = "
+				SELECT
+					tbl_prestudentstatus.status_kurzbz,
+					tbl_prestudentstatus.studiensemester_kurzbz,
+					tbl_prestudentstatus.ausbildungssemester,
+					tbl_prestudentstatus.datum,
+					s.start AS studiensemester_start,
+					pl.orgform_kurzbz AS studienplan_orgform_kurzbz,
+					stud.matrikelnr,
+					pers.vorname,
+					pers.nachname
+				FROM
+					public.tbl_prestudentstatus
+					JOIN public.tbl_studiensemester s USING (studiensemester_kurzbz)
+					JOIN public.tbl_prestudent USING (prestudent_id)
+					JOIN public.tbl_person pers USING (person_id)
+					LEFT JOIN public.tbl_student stud USING (prestudent_id)
+					LEFT JOIN lehre.tbl_studienplan pl USING (studienplan_id)
+				WHERE
+					prestudent_id = ?
+				ORDER BY
+					public.tbl_prestudentstatus.datum DESC,
+					public.tbl_prestudentstatus.insertamum DESC,
+					public.tbl_prestudentstatus.ext_id DESC
+		";
+
+		return $this->execQuery($qry, array($prestudent_id));
+	}
+
+	/**
+	 * Gets status history of a prestudent
+	 * This function uses the language of the logged in user to
+	 * translate the given statusgrund
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function getHistoryPrestudent($prestudent_id)
+	{
+		$lang= getUserLanguage();
+		$this->addSelect('tbl_prestudentstatus.prestudent_id');
+		$this->addSelect('tbl_prestudentstatus.status_kurzbz');
+		$this->addSelect('tbl_prestudentstatus.studiensemester_kurzbz');
+		$this->addSelect('tbl_prestudentstatus.ausbildungssemester');
+		$this->addSelect('tbl_prestudentstatus.datum');
+		$this->addSelect("TO_CHAR(tbl_prestudentstatus.datum::timestamp, 'DD.MM.YYYY') AS format_datum");
+		$this->addSelect('tbl_prestudentstatus.insertamum');
+		$this->addSelect('tbl_prestudentstatus.insertvon');
+		$this->addSelect('tbl_prestudentstatus.updateamum');
+		$this->addSelect('tbl_prestudentstatus.updatevon');
+		$this->addSelect('tbl_prestudentstatus.orgform_kurzbz');
+		$this->addSelect('tbl_prestudentstatus.bestaetigtam');
+		$this->addSelect("TO_CHAR(tbl_prestudentstatus.bestaetigtam::timestamp, 'DD.MM.YYYY') AS format_bestaetigtam");
+		$this->addSelect('tbl_prestudentstatus.bestaetigtvon');
+		$this->addSelect('tbl_prestudentstatus.bewerbung_abgeschicktamum');
+		$this->addSelect("TO_CHAR(tbl_prestudentstatus.bewerbung_abgeschicktamum::timestamp, 'DD.MM.YYYY') AS format_bewerbung_abgeschicktamum");
+		$this->addSelect('tbl_prestudentstatus.anmerkung');
+		$this->addSelect('plan.studienplan_id');
+		$this->addSelect('plan.bezeichnung');
+
+		$this->addSelect('grund.beschreibung[(
+			SELECT index 
+			FROM public.tbl_sprache 
+			WHERE sprache=' . $this->escape($lang) . '
+		)] AS statusgrund_bezeichnung', false);
+		$this->addSelect("CASE 
+			WHEN s.student_uid IS NOT NULL 
+			AND tbl_prestudentstatus.status_kurzbz IN (" . implode(",", $this->escape([
+				'Student',
+				'Diplomand',
+				'Abbrecher',
+				'Absolvent',
+				'Ausserodentlicher',
+				'Incoming',
+				'Outgoing',
+				'Unterbrecher'
+			])) . ") 
+			THEN lv.semester || lv.verband || lv.gruppe 
+			ELSE '-'
+			END AS lehrverband", false);
+
+
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('public.tbl_status_grund grund', 'statusgrund_id', 'LEFT');
+		$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+		$this->addJoin(
+			'public.tbl_studentlehrverband lv',
+			's.student_uid IS NOT NULL AND s.student_uid=lv.student_uid AND tbl_prestudentstatus.studiensemester_kurzbz=lv.studiensemester_kurzbz',
+			'LEFT'
+		);
+
+		$this->addOrder('tbl_prestudentstatus.datum', 'DESC');
+		$this->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
+		$this->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
+
+		return $this->loadWhere([
+			'tbl_prestudentstatus.prestudent_id' => $prestudent_id
+		]);
+	}
+
+	/**
+	 * Gets status history of a prestudent for checking purposes.
+	 * This function adds the new state or replaces the edited.
+	 *
+	 * @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 getHistoryWithNewOrEditedState(
+		$prestudent_id,
+		$status_kurzbz,
+		$new_date,
+		$new_studiensemester_kurzbz,
+		$new_ausbildungssemester,
+		$old_studiensemester_kurzbz,
+		$old_ausbildungssemester
+	) {
+		$new_date = $new_date->format('Y-m-d');
+
+		$this->addSelect('status_kurzbz');
+		$this->addSelect('studiensemester_kurzbz');
+		$this->addSelect('ausbildungssemester');
+		$this->addSelect('datum');
+		$this->addSelect('insertamum');
+		$this->addSelect('ext_id');
+
+		if ($old_studiensemester_kurzbz || $old_ausbildungssemester) {
+			$this->db->not_group_start();
+			$this->db->where('status_kurzbz', $status_kurzbz);
+			$this->db->where('studiensemester_kurzbz', $old_studiensemester_kurzbz);
+			$this->db->where('ausbildungssemester', $old_ausbildungssemester);
+			$this->db->group_end();
+		}
+
+		$this->db->where('prestudent_id', $prestudent_id);
+
+		$tmpTable = $this->db->get_compiled_select($this->dbTable);
+
+		$tmpTable .= "UNION
+			SELECT " .
+				$this->escape($status_kurzbz) . " AS status_kurzbz, " .
+				$this->escape($new_studiensemester_kurzbz) . " AS studiensemester_kurzbz, " .
+				$this->escape($new_ausbildungssemester) . " AS ausbildungssemester, " .
+				$this->escape($new_date) . "::date AS datum," .
+				$this->escape(date('c')) . "::date AS insertamum," .
+				"NULL AS ext_id";
+
+		$this->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz');
+
+		$this->addOrder('s.datum', 'DESC');
+		$this->addOrder('s.insertamum', 'DESC');
+		$this->addOrder('s.ext_id', 'DESC');
+
+		$dbTable = $this->dbTable;
+		$this->dbTable = "(" . $tmpTable . ") s";
+
+		$result = $this->load();
+
+		$this->dbTable = $dbTable;
+
+		return $result;
+	}
+
+	/**
+	 * For checks if Orgform of Student status and Bewerber status match.
+	 * Returns any Bewerber status that does not match the first Student
+	 * status' Orgform.
+	 *
+	 * @param integer				$prestudent_id
+	 *
+	 * @return stdClass
+	 */
+	public function getBewerberWhereOrgformNotStudent($prestudent_id)
+	{
+		$this->addSelect('plan.orgform_kurzbz');
+
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+
+		$this->addOrder('tbl_prestudentstatus.datum', 'DESC');
+		$this->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
+		$this->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
+
+		$this->addLimit(1);
+
+		$this->db->where('prestudent_id', $prestudent_id);
+		$this->db->where('status_kurzbz', self::STATUS_STUDENT);
+
+		$sql = $this->db->get_compiled_select($this->dbTable);
+
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+
+		$this->db->where('plan.orgform_kurzbz !=', '(' . $sql . ')', false);
+		return $this->loadWhere([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => self::STATUS_BEWERBER
+		]);
+	}
+}

application/models/crm/Status_model.php

@@ -11,4 +11,21 @@ class Status_model extends DB_Model
 		$this->dbTable = 'public.tbl_status';
 		$this->pk = 'status_kurzbz';
 	}
+
+	public function getAllStatiWithStatusgruende()
+	{
+		$lang = '[(SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage()) . ' LIMIT 1)]';
+
+		$this->addSelect('sg.status_kurzbz');
+
+		$this->addSelect('statusgrund_id');
+		$this->addSelect('sg.bezeichnung_mehrsprachig' . $lang . ' AS bezeichnung');
+		$this->addSelect('sg.beschreibung' . $lang . ' AS beschreibung');
+
+		$this->addJoin('public.tbl_status_grund sg', 'ON (sg.status_kurzbz = public.tbl_status.status_kurzbz)', 'LEFT');
+
+		return $this->loadWhere([
+			'aktiv'=> true,
+		]);
+	}
 }

application/models/crm/Statusgrund_model.php

@@ -27,4 +27,19 @@ class Statusgrund_model extends DB_Model
 
 		return success($status->retval);
 	}
+
+	public function getAktiveGruende()
+	{
+		$lang = '[(SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage()) . ' LIMIT 1)]';
+
+		$this->addSelect('tbl_status_grund.*');
+		$this->addSelect('bezeichnung_mehrsprachig' . $lang . ' AS bezeichnung');
+		$this->addSelect('beschreibung' . $lang . ' AS beschreibung');
+
+		$this->addOrder('bezeichnung_mehrsprachig' . $lang);
+
+		return $this->loadWhere([
+			'aktiv' => true
+		]);
+	}
 }

application/models/crm/Student_model.php

@@ -1,4 +1,8 @@
 <?php
+
+use \InvalidArgumentException as InvalidArgumentException;
+use \CI3_Events as Events;
+
 class Student_model extends DB_Model
 {
 
@@ -43,9 +47,169 @@ class Student_model extends DB_Model
 			$max = 0;
 
 		$max += 1;
+
 		return $matrikelnummer.sprintf("%03d", $max);
 	}
 
+	/**
+	 * Generiert die Matrikelnummer
+	 * FORMAT: 0710254001
+	 * 07 = Jahr
+	 * 1/2/0  = WS/SS/incoming
+	 * 0254 = Studiengangskennzahl vierstellig
+	 * 001 = Laufende Nummer
+	 * copy of generateMatrikelnummer plus
+	 * logic FH Burgenland
+	 *
+	 * TODO(chris): replace function above with this?
+	 * TODO(chris): rename to generatePersonenkennzeichen?
+	 *
+	 * @param integer					$studiengang_kz
+	 * @param string					$studiensemester_kurzbz
+	 * @param string					$typ
+	 *
+	 * @return stdClass
+	 */
+	public function generateMatrikelnummer2($studiengang_kz, $studiensemester_kurzbz, $typ = null)
+	{
+		$personenkennzeichen = false;
+
+		Events::trigger(
+			'generate_personenkennzeichen',
+			function ($value) use ($personenkennzeichen) {
+				$personenkennzeichen = $value;
+			},
+			$studiengang_kz,
+			$studiensemester_kurzbz,
+			$typ
+		);
+
+		if ($personenkennzeichen !== false)
+			return success($personenkennzeichen);
+
+		// Validierung der Eingabewerte
+		if (strlen($studiensemester_kurzbz) < 6) {
+			throw new InvalidArgumentException("Ungültiges studiensemester_kurzbz Format.");
+		}
+
+		$jahr = mb_substr($studiensemester_kurzbz, 4);
+		$art = substr($studiensemester_kurzbz, 0, 2);
+
+		if (($studiengang_kz < 0) || (isset($typ) && ($typ == 'l')))
+		{
+			$studiengang_kz=abs($studiengang_kz);
+			//Lehrgang
+			switch($art)
+			{
+				case 'WS':
+					$art = '3';
+					break;
+				case 'SS':
+					$art = '4';
+					break;
+				default:
+					$art = '0';
+					break;
+			}
+		}
+		else
+		{
+			//Studiengang
+			switch($art)
+			{
+				case 'WS':
+					$art = '1';
+					break;
+				case 'SS':
+					$art = '2';
+					break;
+				default:
+					$art = '0';
+					break;
+			}
+		}
+		if($art=='2' || $art=='4')
+			$jahr = $jahr-1;
+
+		//FH-Burgenland - weil leider die AO Studiengänge aufgeteilt sind
+		//(AO sind normal 9+erhalter Nummer, matrikelnr/personenkz wird auch im DVUH Extension berücksichtigt)
+		if ($studiengang_kz >= 90010 && $studiengang_kz <= 90019)
+		{
+			$matrikelnummer = sprintf("%02d", $jahr).$art.substr($studiengang_kz, 0, 4);
+		}
+		else
+		{
+			$matrikelnummer = sprintf("%02d", $jahr).$art.sprintf("%04d", $studiengang_kz);
+		}
+
+		$qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE ? ORDER BY matrikelnr DESC LIMIT 1";
+		$matrikelnrres = $this->execQuery($qry, array($matrikelnummer.'%'));
+
+		$max = 0;
+		if ($matrikelnrres && hasData($matrikelnrres)) {
+			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
+			if (!is_numeric($max)) {
+				$max = (int)$max;
+			}
+		}
+
+		$max += 1;
+		return success($matrikelnummer.sprintf("%03d", $max));
+	}
+
+	/**
+	 * Generiert die UID
+	 * FORMAT: el07b001
+	 * $stgkzl: el = studiengangskuerzel
+	 * $jahr: 07 = Jahr
+	 * $stgtyp: b/m/d/x = Bachelor/Master/Diplom/Incoming
+	 * $matrikelnummer
+	 * 001 = Laufende Nummer  Wenn StSem==SS dann wird zur Nummer 500 dazugezaehlt
+	 * Bei Incoming im Masterstudiengang wird auch 500 dazugezaehlt
+	 *
+	 * @param string					$stgkzl
+	 * @param string					$jahr
+	 * @param string					$stgtyp
+	 * @param string					$matrikelnummer
+	 * @param string					$vorname
+	 * @param string					$nachname
+	 *
+	 * @return stdClass
+	 */
+	public function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer, $vorname, $nachname)
+	{
+		$uid = false;
+
+		Events::trigger(
+			'generate_student_uid',
+			function ($value) use ($uid) {
+				$uid = $value;
+			},
+			$stgkzl,
+			$jahr,
+			$stgtyp,
+			$matrikelnummer,
+			$vorname,
+			$nachname
+		);
+
+		if ($uid !== false)
+			return success($uid);
+
+		$art = mb_substr($matrikelnummer, 2, 1);
+		$nr = mb_substr($matrikelnummer, mb_strlen(trim($matrikelnummer))-3);
+		if($art=='2') //Sommersemester
+			$nr = $nr+500;
+		elseif($art=='0' && $stgtyp=='m') //Incoming im Masterstudiengang
+			$nr = $nr+500;
+		elseif($art=='4' && $stgtyp=='l') // Lehrgangsteilnehmer im Sommersemester
+			$nr = $nr+500;
+
+
+		return success(mb_strtolower($stgkzl.$jahr.($art!='0'?$stgtyp:'x').$nr));
+	}
+
+
 	/**
 	 * Get students UID by PrestudentID.
 	 * @param $prestudent_id
@@ -78,7 +242,8 @@ class Student_model extends DB_Model
 			OR lower(person.nachname) like ".$this->db->escape('%'.$filter.'%')."
 			OR lower(person.vorname) like ".$this->db->escape('%'.$filter.'%')."
 			OR lower(person.nachname || ' ' || person.vorname) like ".$this->db->escape('%'.$filter.'%')."
-			OR lower(person.vorname || ' ' || person.nachname) like ".$this->db->escape('%'.$filter.'%'));
+			OR lower(person.vorname || ' ' || person.nachname) like ".$this->db->escape('%'.$filter.'%')
+		);
 
 		return $result;
 	}

application/models/education/Gsstudientyp_model.php

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

application/models/education/Lehrveranstaltung_model.php

@@ -15,6 +15,297 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 	}
 
+	/**
+	 * Get Lehrveranstaltungen by eventQuery string. Use with autocomplete event queries.
+	 * @param $eventQuery String
+	 * @param string $studiensemester_kurzbz Filter by Studiensemester
+	 * @param array $oes Filter by Organisationseinheiten
+	 * @return array
+	 */
+	public function getAutocompleteSuggestions($eventQuery, $studiensemester_kurzbz = null, $oes = null)
+	{
+		$subQry = $this->_getQryLvsByStudienplan($studiensemester_kurzbz, $oes);
+		$params = [];
+
+		/* filter by input string */
+		if (is_string($eventQuery)) {
+			$subQry.= ' AND lv.bezeichnung ILIKE ?';
+			$params[] = '%' . $eventQuery . '%';
+		}
+
+		$qry = 'SELECT DISTINCT ON (lehrveranstaltung_id) * FROM ('. $subQry. ') AS tmp';
+
+		return $this->execQuery($qry, $params);
+	}
+
+	/**
+	 * Get Lehrveranstaltungen with its Stg, OE and OE-type.
+	 * Filter by Studiensemester and Organisationseinheiten if necessary.
+	 * @param $eventQuery String
+	 * @param string $studiensemester_kurzbz Filter by Studiensemester
+	 * @param array $oes Filter by Organisationseinheiten
+	 * @param array $lv_ids Filter by Lehrveranstaltung-Ids
+	 * @return array
+	 */
+	public function getLvsByStudienplan($studiensemester_kurzbz = null, $oes = null, $lv_ids = null)
+	{
+		$subQry = $this->_getQryLvsByStudienplan($studiensemester_kurzbz, $oes);
+		$qry = 'SELECT * FROM ('. $subQry. ') AS tmp';
+
+		if (isset($lv_ids) && is_array($lv_ids))
+		{
+			/* filter by lv_ids */
+			$implodedLvIds = "'". implode("', '", $lv_ids). "'";
+			$qry.= ' WHERE lehrveranstaltung_id IN ('. $implodedLvIds. ')';
+		}
+
+		$qry.= ' ORDER BY stg_typ_kurzbz, orgform_kurzbz DESC';
+
+		return $this->execQuery($qry);
+	}
+
+	/**
+	 * Get basic query to retrieve Lehrveranstaltungen according to the Orgforms and Ausbildungssemesters actual Studienplan.
+	 *
+	 * @return string
+	 */
+	private function _getQryLvsByStudienplan($studiensemester_kurzbz = null, $oes = null,  $lehrtyp_kurzbz = 'lv')
+	{
+		$qry = '
+			SELECT
+				lv.oe_kurzbz AS lv_oe_kurzbz,
+				CASE
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
+                    ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
+                END AS lv_oe_bezeichnung,
+				stplsem.studiensemester_kurzbz,
+				studienordnung_id,
+				sto.studiengang_kz,
+				stpl.studienplan_id,
+				stplsem.semester,
+				stpl.orgform_kurzbz,
+				upper(stg.typ || stg.kurzbz) AS stg_typ_kurzbz,    
+				stg.bezeichnung AS stg_bezeichnung,
+				stgtyp.bezeichnung AS stg_typ_bezeichnung,
+			    lv.lehrveranstaltung_id,
+				lv.semester,   		
+				lv.bezeichnung AS lv_bezeichnung,
+				(
+				    -- comma seperated string of all lehreinheitgruppen
+					SELECT string_agg(bezeichnung, \', \') AS lehreinheitgruppe_bezeichnung
+					FROM(
+					    -- distinct bezeichnung, as may come multiple times from different lehreinheiten
+						SELECT DISTINCT ON (studiengang_kz, bezeichnung) studiengang_kz, bezeichnung FROM
+						(
+							-- distinct lehreinheitgruppe, as may come multiple times from different lehrform
+							SELECT DISTINCT ON (legr.lehreinheitgruppe_id) legr.studiengang_kz,
+								-- get Spezialgruppe or Lehrverbandgruppe 
+								COALESCE(
+									legr.gruppe_kurzbz,
+									CONCAT( UPPER(stg1.typ), UPPER(stg1.kurzbz), \'-\', legr.semester, legr.verband, legr.gruppe )
+								) as bezeichnung
+							FROM lehre.tbl_lehreinheitgruppe 	legr
+							JOIN lehre.tbl_lehreinheit 			le USING (lehreinheit_id)
+							JOIN lehre.tbl_lehrveranstaltung 	lv1 USING (lehrveranstaltung_id)
+							JOIN public.tbl_studiengang 		stg1 ON stg1.studiengang_kz = legr.studiengang_kz
+							WHERE lv1.lehrveranstaltung_id 		= lv.lehrveranstaltung_id
+							AND le.studiensemester_kurzbz 		= stplsem.studiensemester_kurzbz
+						) AS lehreinheitgruppen
+					    GROUP BY studiengang_kz, bezeichnung
+						ORDER BY studiengang_kz DESC
+					) AS uniqueLehreinheitgruppen_bezeichnung
+				) AS lehreinheitgruppen_bezeichnung
+            FROM
+				lehre.tbl_studienplan 							stpl
+				JOIN lehre.tbl_studienordnung 					sto USING (studienordnung_id)
+				JOIN lehre.tbl_studienplan_semester 			stplsem USING (studienplan_id)
+				JOIN lehre.tbl_studienplan_lehrveranstaltung 	stpllv ON (stpllv.studienplan_id = stpl.studienplan_id AND stpllv.semester = stplsem.semester)
+				JOIN lehre.tbl_lehrveranstaltung 				lv USING (lehrveranstaltung_id)
+				JOIN public.tbl_organisationseinheit 			oe USING (oe_kurzbz)
+				JOIN public.tbl_studiengang          			stg ON stg.studiengang_kz = sto.studiengang_kz
+				JOIN public.tbl_studiengangstyp 				stgtyp ON stgtyp.typ = stg.typ
+			/* filter by lehrtyp_kurzbz, default is lvs only */
+			WHERE 
+			      lehrtyp_kurzbz = '. $this->db->escape($lehrtyp_kurzbz);
+
+		if (isset($studiensemester_kurzbz) && is_string($studiensemester_kurzbz))
+		{
+			/* filter by studiensemester */
+			$qry.= ' AND stplsem.studiensemester_kurzbz = '. $this->db->escape($studiensemester_kurzbz);
+
+		}
+
+		if (isset($oes) && is_array($oes))
+		{
+			/* filter by organisationseinheit */
+			$implodedOes = "'". implode("', '", $oes). "'";
+			$qry.= ' AND lv.oe_kurzbz IN ('. $implodedOes. ')';
+		}
+
+		return $qry;
+	}
+
+	/**
+	 * Get all Templates and union with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
+	 * a template. This data structure can be used for nested tabulator data tree.
+	 *
+	 * @param null|string $studiensemester_kurzbz
+	 * @param null|array $oes
+	 * @return array|stdClass|null
+	 */
+	public function getTemplateLvTree($studiensemester_kurzbz = null, $oes = null){
+		$params = [];
+		$qry = '
+		WITH 	
+			-- All Lvs that are assigned to a template in given Studiensemester for given Oes
+			-- joining via actual Studienplan
+			standardisierteLvs AS (
+				SELECT
+					lv.*,
+					stpl.studienplan_id::text as studienplan_id,
+					stpl.bezeichnung AS studienplan_bezeichnung,
+					stplsem.studiensemester_kurzbz
+				FROM
+					lehre.tbl_studienplan 							stpl
+					JOIN lehre.tbl_studienordnung 					sto USING (studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester 			stplsem USING (studienplan_id)
+					JOIN lehre.tbl_studienplan_lehrveranstaltung 	stpllv ON (stpllv.studienplan_id = stpl.studienplan_id AND stpllv.semester = stplsem.semester)
+					JOIN lehre.tbl_lehrveranstaltung 				lv USING (lehrveranstaltung_id)
+					JOIN public.tbl_organisationseinheit 			oe USING (oe_kurzbz)
+					JOIN public.tbl_studiengang          			stg ON stg.studiengang_kz = sto.studiengang_kz
+					JOIN public.tbl_studiengangstyp 				stgtyp ON stgtyp.typ = stg.typ
+				WHERE 
+					-- filter type lv
+				  	lehrtyp_kurzbz = \'lv\'
+				  	-- filter lvs assigned to template (= standardisierte lv)
+					AND lehrveranstaltung_template_id IS NOT NULL';
+
+					if (is_string($studiensemester_kurzbz))
+					{
+						/* filter by studiensemester */
+						$params[]= $studiensemester_kurzbz;
+						$qry.= ' AND stplsem.studiensemester_kurzbz = ? ';
+
+					}
+
+					if (is_array($oes))
+					{
+						/* filter by organisationseinheit */
+						$params[]= $oes;
+						$qry.= ' AND lv.oe_kurzbz IN ? ';
+					}
+		$qry.= '
+			),
+			-- All templates
+			templateLvs AS (
+				SELECT 
+					lv.*,
+					NULL AS studienplan_id,
+					(
+						SELECT string_agg(stpl_bezeichnung, \', \')
+						FROM
+						(
+							SELECT stlv.studienplan_bezeichnung AS stpl_bezeichnung
+							FROM standardisierteLvs stlv
+							WHERE stlv.lehrveranstaltung_template_id = lv.lehrveranstaltung_id
+						) AS studienplaene
+					) AS studienplan_bezeichnung,
+					NULL AS studiensemester_kurzbz
+				FROM 
+					lehre.tbl_lehrveranstaltung lv
+				WHERE 
+					-- filter type template
+					lehrtyp_kurzbz = \'tpl\'
+					-- filter semester that were retrieved by standardisierte lvs semester for selected studiensemester
+					AND EXISTS (
+						SELECT 1
+						FROM standardisierteLvs std
+						WHERE std.lehrveranstaltung_template_id = lv.lehrveranstaltung_id
+					)';
+
+		if (is_array($oes))
+		{
+			/* filter by organisationseinheit */
+			$params[]= $oes;
+			$qry.= ' AND lv.oe_kurzbz IN ? ';
+		}
+		$qry.= '
+			)	
+		';
+
+		$qry.= '
+			SELECT 
+				lv.lehrveranstaltung_id,
+				lv.kurzbz,
+			    lv.lehrtyp_kurzbz,
+				lv.bezeichnung AS lv_bezeichnung, 
+				lv.bezeichnung_english,
+				lv.studiengang_kz,
+				lv.semester,
+				lv.oe_kurzbz,
+				lv.ects,
+				lv.lehrform_kurzbz,
+				lv.orgform_kurzbz,
+				lv.sprache, 
+				lv.aktiv,
+				lv.lehrveranstaltung_template_id,
+				lv.studienplan_id,
+			    lv.studienplan_bezeichnung,
+			    lv.studiensemester_kurzbz,
+			    upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",    
+				stg.bezeichnung AS "stg_bezeichnung",
+				stgtyp.bezeichnung AS "stg_typ_bezeichnung",
+				CASE
+   			 		WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
+                    ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
+                END AS "lv_oe_bezeichnung",
+			   (
+				    -- comma seperated string of all lehreinheitgruppen
+					SELECT string_agg(bezeichnung, \', \') AS lehreinheitgruppe_bezeichnung
+					FROM(
+					    -- distinct bezeichnung, as may come multiple times from different lehreinheiten
+						SELECT DISTINCT ON (studiengang_kz, bezeichnung) studiengang_kz, bezeichnung FROM
+						(
+							-- distinct lehreinheitgruppe, as may come multiple times from different lehrform
+							SELECT DISTINCT ON (legr.lehreinheitgruppe_id) legr.studiengang_kz,
+								-- get Spezialgruppe or Lehrverbandgruppe 
+								COALESCE(
+									legr.gruppe_kurzbz,
+									CONCAT( UPPER(stg1.typ), UPPER(stg1.kurzbz), \'-\', legr.semester, legr.verband, legr.gruppe )
+								) as bezeichnung
+							FROM lehre.tbl_lehreinheitgruppe 	legr
+							JOIN lehre.tbl_lehreinheit 			le USING (lehreinheit_id)
+							JOIN lehre.tbl_lehrveranstaltung 	lv1 USING (lehrveranstaltung_id)
+							JOIN public.tbl_studiengang 		stg1 ON stg1.studiengang_kz = legr.studiengang_kz
+							WHERE lv1.lehrveranstaltung_id 		= lv.lehrveranstaltung_id
+							AND le.studiensemester_kurzbz 		= lv.studiensemester_kurzbz
+						) AS lehreinheitgruppen
+					    GROUP BY studiengang_kz, bezeichnung
+						ORDER BY studiengang_kz DESC
+					) AS uniqueLehreinheitgruppen_bezeichnung
+				) AS lehreinheitgruppen_bezeichnung
+			FROM (
+				SELECT 
+					* 
+				FROM 
+				     standardisierteLvs 
+				UNION
+				SELECT 
+				   * 
+				FROM templateLvs 
+			) AS lv
+				JOIN public.tbl_studiengang          	stg ON stg.studiengang_kz = lv.studiengang_kz
+				JOIN public.tbl_studiengangstyp 		stgtyp ON stgtyp.typ = stg.typ
+				JOIN public.tbl_organisationseinheit 	oe ON oe.oe_kurzbz = lv.oe_kurzbz
+		ORDER BY
+			oe.bezeichnung, lv.semester, lv.bezeichnung
+		';
+
+		return $this->execQuery($qry, $params);
+	}
+
 	/**
 	 * Gets unique Groupstrings for Lehrveranstaltungen, e.g. WS2018_BIF_1_PRJM_VZ_LV12345
 	 * @param string $studiensemester_kurzbz
@@ -493,4 +784,11 @@ class Lehrveranstaltung_model extends DB_Model
 
         return $this->execQuery($qry, array($student_uid));
     }
+
+    public function getStg($lehrveranstaltung_id)
+    {
+    	$this->addSelect('stg.*');
+    	$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+    	return $this->load($lehrveranstaltung_id);
+    }
 }

application/models/education/Lvgesamtnote_model.php

@@ -10,5 +10,6 @@ class Lvgesamtnote_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'campus.tbl_lvgesamtnote';
 		$this->pk = array('student_uid', 'studiensemester_kurzbz', 'lehrveranstaltung_id');
+		$this->hasSequence = false;
 	}
 }

application/models/education/Paabgabe_model.php

@@ -25,7 +25,7 @@ class Paabgabe_model extends DB_Model
 				WHERE projektarbeit_id = ?
 				AND paabgabetyp_kurzbz = 'end'
 				AND paabg.abgabedatum IS NOT NULL
-				ORDER BY paabg.abgabedatum, paabg.datum DESC
+				ORDER BY paabg.abgabedatum DESC, paabg.datum DESC
 				LIMIT 1";
 
 		return $this->execQuery($qry, array($projektarbeit_id));

application/models/education/Pruefung_model.php

@@ -175,6 +175,8 @@ class Pruefung_model extends DB_Model
 		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
 		$this->addSelect('pss.ausbildungssemester');
 
+		$this->addJoin('(SELECT MAX(datum) AS datum, lehreinheit_id AS le_id, student_uid AS stud_uid FROM lehre.tbl_pruefung p WHERE pruefungstyp_kurzbz IN (\'kommPruef\', \'zusKommPruef\') GROUP BY lehreinheit_id, student_uid) lpd',
+			'p.datum = lpd.datum AND p.lehreinheit_id = lpd.le_id AND p.student_uid = lpd.stud_uid');
 		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
 		$this->addJoin('public.tbl_student s', 'student_uid');

application/models/education/Studentlehrverband_model.php

@@ -11,5 +11,7 @@ class Studentlehrverband_model extends DB_Model
 		$this->dbTable = 'public.tbl_studentlehrverband';
 		$this->pk = array('studiensemester_kurzbz', 'student_uid');
 		$this->hasSequence = false;
+
+		$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 	}
 }

application/models/education/Studierendenantrag_model.php

@@ -38,6 +38,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('studienjahr_kurzbz');
 		$this->addSelect('vorname');
 		$this->addSelect('nachname');
+		$this->addSelect('unruly');
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('p.studiengang_kz');
 		$this->addSelect('semester');
@@ -96,7 +97,8 @@ class Studierendenantrag_model extends DB_Model
 			Studierendenantragstatus_model::STATUS_REJECTED,
 			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
 			Studierendenantragstatus_model::STATUS_DEREGISTERED,
-			Studierendenantragstatus_model::STATUS_PAUSE
+			Studierendenantragstatus_model::STATUS_PAUSE,
+			Studierendenantragstatus_model::STATUS_REMINDERSENT
 		]);
 		$this->db->or_group_start();
 		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
@@ -148,6 +150,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('s.studierendenantrag_statustyp_kurzbz status');
 		$this->addSelect('s.insertvon status_insertvon');
 		$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
+		$this->addSelect('p.unruly AS unruly');
 
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_status s',
@@ -157,6 +160,18 @@ class Studierendenantrag_model extends DB_Model
 			'campus.tbl_studierendenantrag_statustyp t',
 			's.studierendenantrag_statustyp_kurzbz=t.studierendenantrag_statustyp_kurzbz'
 		);
+		$this->addJoin(
+			'public.tbl_student st',
+			'st.prestudent_id=tbl_studierendenantrag.prestudent_id'
+		);
+		$this->addJoin(
+			'public.tbl_benutzer b',
+			'st.student_uid=b.uid'
+		);
+		$this->addJoin(
+			'public.tbl_person p',
+			'b.person_id=p.person_id'
+		);
 
 		if ($types && is_array($types)) {
 			$this->db->where_in('typ', $types);
@@ -354,7 +369,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->db->where([
 			'prestudent_id' => $prestudent_id,
 			'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
-			'campus.get_status_studierendenantrag(studierendenantrag_id) !=' => Studierendenantragstatus_model::STATUS_CANCELLED,
+			'campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN (\'' . Studierendenantragstatus_model::STATUS_CANCELLED . '\', \'' . Studierendenantragstatus_model::STATUS_REJECTED . '\')' => null,
 			'start < ' . $end => null,
 			'datum_wiedereinstieg > ' . $start => null,
 		]);
@@ -410,7 +425,7 @@ class Studierendenantrag_model extends DB_Model
 			FROM campus.tbl_studierendenantrag 
 			LEFT JOIN public.tbl_studiensemester USING(studiensemester_kurzbz) 
 			WHERE typ=? 
-			AND campus.get_status_studierendenantrag(studierendenantrag_id) != ?
+			AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
 			AND prestudent_id=?
 		) a ON (s.start < a.ende AND s.ende > a.start)
 		WHERE s.start >= (" . $subquery . ")
@@ -420,7 +435,10 @@ class Studierendenantrag_model extends DB_Model
 		return $this->execQuery($sql, [
 			$max_length,
 			self::TYP_UNTERBRECHUNG,
-			Studierendenantragstatus_model::STATUS_CANCELLED,
+			array(
+			    Studierendenantragstatus_model::STATUS_CANCELLED,
+			    Studierendenantragstatus_model::STATUS_REJECTED
+			),
 			$prestudent_id,
 			$studiensemester ?: $prestudent_id,
 			$max_length * $max_starters
@@ -471,4 +489,4 @@ class Studierendenantrag_model extends DB_Model
 		
 		return hasData($this->load());
 	}
-}
+}

application/models/organisation/Geschaeftsjahr_model.php

@@ -32,11 +32,20 @@ class Geschaeftsjahr_model extends DB_Model
 	 * Gets next Geschaeftsjahr, as determined by its start date
 	 * @return array|null
 	 */
-	public function getNextGeschaeftsjahr()
+	public function getNextGeschaeftsjahr($offsetDays=null)
 	{
 		$query = 'SELECT *
-					FROM public.tbl_geschaeftsjahr
-					WHERE start > now()
+					FROM public.tbl_geschaeftsjahr WHERE ';
+
+		if(!is_null($offsetDays))
+		{
+			$query .= "start > now() - '".$offsetDays." days'::interval";
+		}
+		else
+		{
+			$query .= 'start > now()';
+		}
+		$query .= '
 					ORDER BY start
 					LIMIT 1';
 

application/models/organisation/Lehrverband_model.php

@@ -11,4 +11,34 @@ class Lehrverband_model extends DB_Model
 		$this->dbTable = 'public.tbl_lehrverband';
 		$this->pk = array('gruppe', 'verband', 'semester', 'studiengang_kz');
 	}
+
+	/**
+	 * Gets the maximum possible semester for one or more Studiengaenge.
+	 * If there are more than one Studiengang each maximum is calculated and
+	 * the smallest result is returned.
+	 *
+	 * @param array					$studiengang_kzs
+	 *
+	 * @return stdClass
+	 */
+	public function getMaxSemester($studiengang_kzs)
+	{
+		$sqls = [];
+		foreach ($studiengang_kzs as $studiengang_kz) {
+			$this->addSelect('MAX(semester) AS maxsem');
+			$this->db->where('studiengang_kz', $studiengang_kz);
+			$sqls[] = $this->db->get_compiled_select($this->dbTable);
+		}
+		
+		$this->addSelect('MIN(a.maxsem) AS maxsem');
+		
+		$dbTable = $this->dbTable;
+		$this->dbTable = '(' . implode(' UNION ', $sqls) . ') AS a';
+		
+		$result = $this->load();
+		
+		$this->dbTable = $dbTable;
+
+		return $result;
+	}
 }

application/models/organisation/Standort_model.php

@@ -11,4 +11,29 @@ class Standort_model extends DB_Model
 		$this->dbTable = 'public.tbl_standort';
 		$this->pk = 'standort_id';
 	}
+
+	public function searchStandorte($filter)
+	{
+		$filter = strtoLower($filter);
+		$qry = "
+			SELECT 
+				s.kurzbz, s.standort_id
+			FROM 
+			    public.tbl_standort s
+			WHERE 
+			    lower (s.kurzbz) LIKE '%". $this->db->escape_like_str($filter)."%'
+			OR
+				lower (s.bezeichnung) LIKE '%". $this->db->escape_like_str($filter)."%'";
+
+
+		return $this->execQuery($qry);
+	}
+
+	public function getStandorteByFirma($firma_id)
+	{
+		$this->addSelect("DISTINCT ON (standort_id) bezeichnung, standort_id");
+
+		return $this->loadWhere(array("firma_id" => $firma_id));
+	}
 }
+

application/models/organisation/Studienjahr_model.php

@@ -29,4 +29,54 @@ class Studienjahr_model extends DB_Model
 
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * Get the current Studienjahr. During the summer term, continue using the previous Studienjahr.
+	 *
+	 * @param int $days
+	 * @return array|stdClass|null
+	 */
+	public function getLastOrAktStudienjahr($days = 60)
+	{
+		if (!is_numeric($days))
+		{
+			$days = 60;
+		}
+
+		$query = '
+			SELECT *
+			FROM public.tbl_studienjahr
+			JOIN public.tbl_studiensemester USING (studienjahr_kurzbz)
+			WHERE start < NOW() - \'' . $days . ' DAYS\'::INTERVAL
+			ORDER by start DESC
+			LIMIT 1
+		';
+
+		return $this->execQuery($query);
+	}
+
+	/**
+	 * Get the current Studienjahr. During the summer term, get the upcoming next Studienjahr.
+	 *
+	 * @param int $days
+	 * @return array|stdClass|null
+	 */
+	public function getAktOrNextStudienjahr($days = 62)
+	{
+		if (!is_numeric($days))
+		{
+			$days = 62;
+		}
+
+		$query = '
+			SELECT *
+			FROM public.tbl_studienjahr
+			JOIN public.tbl_studiensemester using(studienjahr_kurzbz)
+			WHERE start < NOW() + \'' . $days . ' DAYS\'::INTERVAL
+			ORDER by start DESC
+			LIMIT 1
+		';
+
+		return $this->execQuery($query);
+	}
 }

application/models/organisation/Studienplan_model.php

@@ -106,4 +106,32 @@ class Studienplan_model extends DB_Model
 			'tbl_studienplan_lehrveranstaltung.semester' => $semester
 		));
 	}
+
+	public function getAllOesForLv($lehrveranstaltung_id)
+	{
+		$this->addDistinct('oe_kurzbz');
+
+		$this->addJoin('lehre.tbl_studienplan_lehrveranstaltung lv', 'studienplan_id');
+		$this->addJoin('lehre.tbl_studienordnung', 'studienordnung_id');
+		$this->addJoin('public.tbl_studiengang', 'studiengang_kz');
+
+		return $this->loadWhere([
+			'lv.lehrveranstaltung_id' => $lehrveranstaltung_id
+		]);
+	}
+
+	public function getStudienplaeneByPrestudents($prestudent_id)
+	{
+		$this->addDistinct();
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('sem.start AS start_stsem');
+		$this->addJoin('lehre.tbl_studienordnung o', 'studienordnung_id');
+		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+		$this->addJoin('public.tbl_studiensemester sem', 'sem.studiensemester_kurzbz = o.gueltigvon', 'LEFT');
+		$this->addOrder('sem.start');
+
+		return $this->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
+	}
 }

application/models/organisation/Studiensemester_model.php

@@ -13,35 +13,35 @@ class Studiensemester_model extends DB_Model
 		$this->hasSequence = false;
 	}
 
-    /**
-     * Get actual Studiensemester.
-     *
-     * @return array
-     */
-    public function getAkt()
-    {
-        return $this->loadWhere(array(
-                'start <= ' => 'NOW()',
-                'ende >= '  => 'NOW()'
-            )
-        );
-    }
+	/**
+	 * Get actual Studiensemester.
+	 *
+	 * @return array
+	 */
+	public function getAkt()
+	{
+		return $this->loadWhere(array(
+				'start <= ' => 'NOW()',
+				'ende >= '  => 'NOW()'
+			)
+		);
+	}
 
 	// Get next study semester
 	public function getNext()
-    {
-        $query = '
-            SELECT *
-            FROM
-                public.tbl_studiensemester
-            WHERE
-                start > now()
-            ORDER BY start
-            LIMIT 1;
-        ';
+	{
+		$query = '
+			SELECT *
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				start > now()
+			ORDER BY start
+			LIMIT 1;
+		';
 
-        return $this->execQuery($query);
-    }
+		return $this->execQuery($query);
+	}
 
 	/**
 	 * getLastOrAktSemester
@@ -182,10 +182,10 @@ class Studiensemester_model extends DB_Model
 			return success(array());
 
 		$query = "
-            SELECT  *
-            FROM    public.tbl_studiensemester
-            WHERE   ( ?::date < ende AND ?::date > start )
-            ORDER BY start DESC";
+			SELECT  *
+			FROM	public.tbl_studiensemester
+			WHERE   ( ?::date < ende AND ?::date > start )
+			ORDER BY start DESC";
 
 		return $this->execQuery($query, array($from, $to));
 	}
@@ -200,7 +200,7 @@ class Studiensemester_model extends DB_Model
 	{
 		$query = "SELECT studiensemester_kurzbz, start, ende FROM public.vw_studiensemester
 				WHERE studiensemester_kurzbz <> ?
-		        ORDER BY delta, start LIMIT 1";
+				ORDER BY delta, start LIMIT 1";
 
 		return $this->execQuery($query, array($studiensemester_kurzbz));
 	}
@@ -211,7 +211,46 @@ class Studiensemester_model extends DB_Model
 					FROM public.tbl_studiensemester
 					WHERE start >= NOW() OR (start <= NOW() AND ende >= NOW())
 					ORDER BY start';
-					
+
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * Liefert ausgehend von heutigen Datum $plus studiensemester in die Zukunft und $minus Studiensemester in die Vergangenheit
+	 *
+	 * @param integer $plus Optional. Wieviele Studiensemester in die Zukunft sollen ausgegeben werden. Wenn NULL werden alle zukuenftigen geliefert.
+	 * @param integer $minus Optional. Wieviele Studiensemester in die Vergangenheit sollen ausgegeben werden. Wenn NULL werden alle vergangenen geliefert.
+	 *
+	 * @return stdClass
+	 */
+	public function addPlusMinus($plus = null, $minus = null)
+	{
+		$this->addSelect($this->pk);
+		$this->addOrder('ende');
+		if ($plus)
+			$this->addLimit($plus);
+		$this->db->where('start >= NOW()', null, false);
+		$plus = $this->db->get_compiled_select($this->dbTable);
+
+		$this->addSelect($this->pk);
+		$this->addOrder('start', 'DESC');
+		if ($minus)
+			$this->addLimit($minus);
+		$this->db->where('start <= NOW()', null, false);
+		$minus = $this->db->get_compiled_select($this->dbTable);
+		
+		$this->db->where_in($this->pk, '(' . $plus . ') UNION (' . $minus . ')', false);
+	}
+
+	/**
+	 * Holt letzen zwei Ziffern des Studienjahres von Studiensemester, z.B. 24 für WS2024 und SS2025
+	 * @param studiensemester_kurzbz
+	 * @return string Studienjahr Nummer
+	 */
+	public function getStudienjahrNumberFromStudiensemester($studiensemester_kurzbz)
+	{
+		$studienjahrNumber = mb_substr($studiensemester_kurzbz, 4, 2);
+		if (is_numeric($studienjahrNumber) && mb_substr($studiensemester_kurzbz, 0, 2) == 'SS') (int)$studienjahrNumber -= 1;
+		return $studienjahrNumber;
+	}
 }

application/models/person/Adresse_model.php

@@ -24,4 +24,4 @@ class Adresse_model extends DB_Model
 		$this->addSelect($select);
 		return $this->loadWhere(array('person_id' => $person_id, 'zustelladresse'=> true));
 	}
-}
+}

application/models/person/Benutzer_model.php

@@ -1,4 +1,7 @@
 <?php
+
+use \CI3_Events as Events;
+
 class Benutzer_model extends DB_Model
 {
 
@@ -74,22 +77,88 @@ class Benutzer_model extends DB_Model
 	 */
 	public function generateAlias($uid)
 	{
-		$aliasres = '';
 		$this->addLimit(1);
 		$this->addSelect('vorname, nachname');
 		$this->addJoin('public.tbl_person', 'person_id');
 		$nameresult = $this->loadWhere(array('uid' => $uid));
 
-		if (hasData($nameresult))
-		{
-			$aliasdata = getData($nameresult);
-			$alias = $this->_sanitizeAliasName($aliasdata[0]->vorname).'.'.$this->_sanitizeAliasName($aliasdata[0]->nachname);
-			$aliasexists = $this->aliasExists($alias);
+		if (isError($nameresult))
+			return $nameresult;
 
-			if (hasData($aliasexists) && !getData($aliasexists)[0])
-				$aliasres = $alias;
-		}
-		return success($aliasres);
+		if (!hasData($nameresult))
+			return success('');
+		
+		$aliasdata = current(getData($nameresult));
+
+		return $this->generateAliasFromName($aliasdata->vorname, $aliasdata->nachname);
+	}
+
+	/**
+	 * Generates alias for a vor- and nachname.
+	 *
+	 * @param string						$vorname
+	 * @param string						$nachname
+	 *
+	 * @return stdClass
+	 */
+	public function generateAliasFromName($vorname, $nachname)
+	{
+		$alias = $this->_sanitizeAliasName($vorname . '.' . $nachname);
+		
+		$result = $this->aliasExists($alias);
+
+		if (isError($result))
+			return $result;
+
+		if (current(getData($result)))
+			return success('');
+
+		return success($alias);
+	}
+
+	/**
+	 * Generates a matrikelnummer
+	 *
+	 * @param string						$oe_kurzbz
+	 *
+	 * @return stdClass
+	 */
+	public function generateMatrikelnummer($oe_kurzbz)
+	{
+		$matrikelnummer = false;
+
+		Events::trigger(
+			'generate_matrikelnummer',
+			function ($value) use ($matrikelnummer) {
+				$matrikelnummer = $value;
+			},
+			$oe_kurzbz
+		);
+
+		if ($matrikelnummer !== false)
+			return success($matrikelnummer);
+
+		return success(null);
+	}
+
+	/**
+	 * Generates an activation key
+	 *
+	 * @return string
+	 */
+	public function generateActivationkey()
+	{
+		$this->load->library('CryptLib');
+
+		$key = '';
+		for ($i=0; $i<32; $i++)
+			$key .= ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'][mt_rand(0, 15)];
+
+		$value = uniqid(mt_rand(), true);
+		$length = strlen($value);
+		$value = str_pad($value, $length + 32 - ($length % 32), chr(0));
+
+		return md5($this->cryptlib->RIJNDAEL_256_ECB($value, $key, true));
 	}
 
 	// --------------------------------------------------------------------------------------------
@@ -100,9 +169,10 @@ class Benutzer_model extends DB_Model
 	 * @param string $str
 	 * @return string
 	 */
+
 	private function _sanitizeAliasName($str)
 	{
 		$str = sanitizeProblemChars($str);
-		return mb_strtolower(str_replace(' ','_', $str));
+		return mb_strtolower(str_replace(' ', '_', $str));
 	}
 }

application/models/person/Notiz_model.php

@@ -139,12 +139,51 @@ class Notiz_model extends DB_Model
 	 */
 	public function getNotiz($person_id)
 	{
-		// Join with the table public.tbl_notizzuordnung using notiz_id
+		$this->addSelect('public.tbl_notiz.*');
 		$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
 
 		return $this->loadWhere(array('person_id' => $person_id));
 	}
 
+	/**
+	 * gets all Notizen with Documententries for a certain type and type_id
+	 * @param String type of id eg. person_id, prestudent_id, mitarbeiter_uid, projekt_kurzbz, projektphase_id, projekttask_id,
+	 *         bestellung_id, lehreinheit_id, anrechnung_id, uid)
+	 * @param $id the corresponding id, part of public.tbl_notizzuordnung
+	 */
+	public function getNotizWithDocEntries($id, $type)
+	{
+			$qry = "
+				SELECT 
+						n.*, count(dms_id) as countDoc, z.notizzuordnung_id,
+						TO_CHAR (CASE 
+							WHEN n.updateamum >= n.insertamum THEN n.updateamum 
+							ELSE n.insertamum
+						END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate,
+						regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped,
+						TO_CHAR(n.start::timestamp, 'DD.MM.YYYY') AS start_format,
+						TO_CHAR(n.ende::timestamp, 'DD.MM.YYYY') AS ende_format,
+						z.notiz_id, z.person_id as id, ? as type_id
+						
+				FROM
+						public.tbl_notiz n
+				JOIN 
+							public.tbl_notizzuordnung z USING (notiz_id)
+				LEFT JOIN 
+							public.tbl_notiz_dokument dok USING (notiz_id)
+				LEFT JOIN 
+							campus.tbl_dms_version USING (dms_id)
+				WHERE 
+				   z.$type  = ?
+				GROUP BY 
+					notiz_id, z.notizzuordnung_id
+			";
+
+		return $this->execQuery($qry, array($type, $id));
+
+	}
+
+
 	/**
 	 * gets all Notizen for a person with a specific title
 	 * @param $person_id
@@ -231,6 +270,4 @@ class Notiz_model extends DB_Model
 		
 		return $this->loadWhere(array('anrechnung_id' => $anrechnung_id));
 	}
-	// ------------------------------------------------------------------------------------------------------
-
 }

application/models/person/Notizdokument_model.php

@@ -0,0 +1,14 @@
+<?php
+class Notizdokument_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_notiz_dokument';
+		$this->pk= array('notiz_id' , 'dms_id');
+	}
+}

application/models/person/Notizzuordnung_model.php

@@ -11,4 +11,38 @@ class Notizzuordnung_model extends DB_Model
 		$this->dbTable = 'public.tbl_notizzuordnung';
 		$this->pk = 'notizzuordnung_id';
 	}
+
+	public function isValidType($type)
+	{
+		$validTypes = [];
+
+		$qry = "
+			SELECT column_name
+			FROM information_schema.columns
+			WHERE table_schema = 'public'
+			AND table_name   = 'tbl_notizzuordnung'
+			AND column_name not in ('notizzuordnung_id', 'notiz_id')
+		";
+
+		$type_arr = $this->execQuery($qry);
+		$type_arr = $type_arr->retval;
+
+		foreach ($type_arr as $t)
+		{
+			$validTypes[] = $t->column_name;
+		}
+
+		//TODO(manu) param id
+		if (in_array($type, $validTypes) )
+		//if (in_array($type, $validTypes) ||($type == 'software_id')) //Just for testing
+		{
+			return success("Type " . $type . " is valid");
+		//	$result = success('Type of Id is valid');
+		}
+		else
+		{
+			return error("Type " . $type . " is NOT valid");
+		}
+		//return $result;
+	}
 }

application/models/person/Person_model.php

@@ -294,15 +294,15 @@ class Person_model extends DB_Model
 	{
 		$qry = "SELECT person_id
 				FROM public.tbl_prestudent p
-				JOIN 
+				JOIN
 				(
 					SELECT DISTINCT ON(prestudent_id) *
 					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id IN 
+					WHERE prestudent_id IN
 						(
-							SELECT prestudent_id 
-							FROM public.tbl_prestudent 
-							WHERE person_id IN 
+							SELECT prestudent_id
+							FROM public.tbl_prestudent
+							WHERE person_id IN
 							(
 								SELECT p2.person_id
 								FROM public.tbl_person p
@@ -316,8 +316,8 @@ class Person_model extends DB_Model
 					ORDER BY prestudent_id, datum DESC, insertamum DESC
 				) ps USING(prestudent_id)
 				JOIN public.tbl_status USING(status_kurzbz)
-				WHERE status_kurzbz = 'Interessent' 
-				AND studiengang_kz IN 
+				WHERE status_kurzbz = 'Interessent'
+				AND studiengang_kz IN
 				(
 					SELECT studiengang_kz
 					FROM public.tbl_prestudent p
@@ -374,5 +374,38 @@ class Person_model extends DB_Model
 			'prestudent_id' => $prestudent_id
 		]);
 	}
-}
 
+	public function checkUnruly($vorname, $nachname, $gebdatum)
+	{
+		$qry = "SELECT person_id, vorname, nachname, gebdatum, unruly
+				FROM tbl_person
+				WHERE tbl_person.vorname = ? 
+					AND tbl_person.nachname = ? 
+					AND tbl_person.gebdatum = ? 
+					AND tbl_person.unruly = TRUE;";
+
+		return $this->execQuery($qry, [$vorname, $nachname, $gebdatum]);
+	}
+
+	public function checkUnrulyWhere($where, $paramsArray)
+	{
+		$qry =  'SELECT *
+				FROM tbl_person p
+				WHERE '.$where.';';
+
+		return $this->execQuery($qry, $paramsArray);
+	}
+
+	public function updateUnruly($person_id, $unruly)
+	{
+		$result = $this->update($person_id, array(
+			'unruly' => $unruly
+		));
+
+		if (isError($result)) {
+			return error($result->msg, EXIT_ERROR);
+		} else if (isSuccess($result) && hasData($result)) {
+			return success($result);
+		}
+	}
+}

application/models/ressource/Firma_model.php

@@ -11,4 +11,18 @@ class Firma_model extends DB_Model
 		$this->dbTable = 'public.tbl_firma';
 		$this->pk = 'firma_id';
 	}
+
+	public function searchFirmen($filter)
+	{
+		$filter = strtoLower($filter);
+		$qry = "
+			SELECT 
+				f.name, f.firma_id
+			FROM 
+			    public.tbl_firma f
+			WHERE 
+			    lower (f.name) LIKE '%". $this->db->escape_like_str($filter)."%'";
+
+		return $this->execQuery($qry);
+	}
 }

application/models/ressource/Mitarbeiter_model.php

@@ -216,4 +216,26 @@ class Mitarbeiter_model extends DB_Model
 	
 		return success($kurzbz);
 	}
+
+	public function searchMitarbeiter($filter)
+	{
+		$filter = strtoLower($filter);
+		$qry = "
+			SELECT 
+					ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter
+			FROM 
+			    public.tbl_mitarbeiter ma 
+			JOIN 
+			    public.tbl_benutzer b on (ma.mitarbeiter_uid = b.uid)
+			JOIN 
+			    public.tbl_person p on (p.person_id = b.person_id)
+			WHERE 
+			    lower (p.nachname) LIKE '%". $this->db->escape_like_str($filter)."%'
+			OR
+				lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%'
+			OR
+				(ma.mitarbeiter_uid) LIKE '%". $this->db->escape_like_str($filter)."%'";
+
+		return $this->execQuery($qry);
+	}
 }

application/models/system/Issue_model.php

@@ -22,13 +22,23 @@ class Issue_model extends DB_Model
 	 */
 	public function getOpenIssues($fehlercodes, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
 	{
-		$params = array($fehlercodes);
+		$params = array();
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
-		$qry = 'SELECT issue_id, fehlercode, inhalt, fehlercode_extern, inhalt_extern, person_id, oe_kurzbz,
-       					behebung_parameter, datum, verarbeitetvon, verarbeitetamum
-				FROM system.tbl_issue
-				WHERE fehlercode IN ?
-				AND verarbeitetamum IS NULL';
+		$qry = 'SELECT
+					iss.issue_id, iss.fehlercode, fe.fehler_kurzbz, iss.inhalt, iss.fehlercode_extern,
+					iss.inhalt_extern, iss.person_id, iss.oe_kurzbz, iss.behebung_parameter,
+					iss.datum, iss.verarbeitetvon, iss.verarbeitetamum
+				FROM
+					system.tbl_issue iss
+					JOIN system.tbl_fehler fe USING (fehlercode)
+				WHERE
+					verarbeitetamum IS NULL';
+
+		if (!isEmptyArray($fehlercodes))
+		{
+			$qry .= ' AND fehlercode IN ?';
+			$params[] = $fehlercodes;
+		}
 
 		if (!isEmptyString($fehlercode_extern))
 		{
@@ -59,7 +69,7 @@ class Issue_model extends DB_Model
 	 * @param string $fehlercode_extern if provided, only issues with this external fehlercode are counted (for identifying issues from external systems).
 	 * @return Object success with number of issues or error
 	 */
-	public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
+	public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null, $behebung_parameter = null)
 	{
 		$params = array($fehlercode);
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
@@ -85,6 +95,19 @@ class Issue_model extends DB_Model
 			$params[] = $oe_kurzbz;
 		}
 
+		if (isset($behebung_parameter) && !isEmptyArray($behebung_parameter))
+		{
+			// convert array to JSON string for postgres
+			$behebung_parameter_string = json_encode($behebung_parameter);
+
+			if ($behebung_parameter_string)
+			{
+				// check if jsonb value is equal to the passed parameters array (if value contains array and array contains value)
+				$qry .= ' AND behebung_parameter @> ? AND behebung_parameter <@ ?';
+				$params = array_merge($params, array($behebung_parameter_string, $behebung_parameter_string));
+			}
+		}
+
 		return $this->execQuery($qry, $params);
 	}
 }

application/models/system/Recipient_model.php

@@ -327,7 +327,7 @@ class Recipient_model extends DB_Model
 						pr.nachname,
 						ms.person_id,
 						mrou.token
-			  ORDER BY sent DESC';
+			  ORDER BY sent DESC LIMIT 1500';
 
 		return $this->execQuery($sql, array($person_id, $functions, $person_id));
 	}

application/models/vertragsbestandteil/GehaltsTyp_model.php

@@ -0,0 +1,28 @@
+<?php
+
+class GehaltsTyp_model extends DB_Model
+{
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'hr.tbl_gehaltstyp';
+		$this->pk = 'gehaltstyp_kurzbz';
+	}
+
+	/**
+	 * Gets Gehaltstyp for a Gehaltsbestandteil.
+	 * @param int gehaltsbestandteil_id
+	 * @return object the typ
+	 */
+	public function getGehaltstypByGehaltsbestandteil($gehaltsbestandteil_id)
+	{
+		$gehaltsTyp = null;
+		$this->addJoin('hr.tbl_gehaltsbestandteil', 'gehaltstyp_kurzbz');
+		$result = $this->loadWhere(['gehaltsbestandteil_id' => $gehaltsbestandteil_id]);
+
+		if (hasData($result)) $gehaltsTyp = getData($result)[0];
+
+		return $gehaltsTyp;
+	}
+}

application/views/Studentenverwaltung.php

@@ -0,0 +1,55 @@
+<?php
+	$includesArray = array(
+		'title' => 'Studentenverwaltung',
+		'axios027' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'vue3' => true,
+		'primevue3' => true,
+		#'filtercomponent' => true,
+		'tabulator5' => true,
+		'tinymce5' => true,
+		'phrases' => array(
+			'global',
+			'ui',
+			'notiz',
+		),
+		'customCSSs' => [
+			'public/css/components/vue-datepicker.css',
+			'public/css/components/primevue.css',
+			'public/css/Studentenverwaltung.css'
+		],
+		'customJSs' => [
+			#'vendor/npm-asset/primevue/tree/tree.min.js',
+			#'vendor/npm-asset/primevue/toast/toast.min.js'
+		],
+		'customJSModules' => [
+			'public/js/apps/Studentenverwaltung.js'
+		]
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<?php
+$configArray = [
+	'generateAlias' => !defined('GENERATE_ALIAS_STUDENT') ? true : GENERATE_ALIAS_STUDENT,
+	'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? false : ZGV_DOKTOR_ANZEIGEN,
+	'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? false : ZGV_ERFUELLT_ANZEIGEN
+];
+?>
+
+	<div id="main">
+		<router-view
+			default-semester="<?= $variables['semester_aktuell']; ?>"
+			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
+			stv-root="<?= site_url('Studentenverwaltung'); ?>"
+			cis-root="<?= CIS_ROOT; ?>"
+			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
+			:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
+			>
+		</router-view>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+

application/views/codex/uhstat1.php

@@ -74,16 +74,23 @@ $saved = isset($saved) && $saved === true;
 				<div class="form-group">
 					<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
-								<option
-									value="<?php echo $jahr ?>"
-									<?php echo $jahr == $mutter_geburtsjahr ? " selected" : "" ?>>
-									<?php echo $jahr ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['jahre'] as $jahrKey => $jahr): ?>
+									<option
+										value="<?php echo $jahrKey ?>"
+										<?php echo $jahrKey == $mutter_geburtsjahr ? " selected" : "" ?>>
+										<?php echo $jahr ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('mutter_geburtsjahr').value = 9999; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('mutter_geburtsjahr'); ?>
 					</div>
 				</div>
@@ -94,16 +101,23 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
-									<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['nation'] as $nation): ?>
+									<option
+										value="<?php echo $nation->nation_code ?>"
+										<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('mutter_geburtsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('mutter_geburtsstaat'); ?>
 					</div>
 				</div>
@@ -114,16 +128,23 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
-									<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['nation'] as $nation): ?>
+									<option
+										value="<?php echo $nation->nation_code ?>"
+										<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('mutter_bildungsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('mutter_bildungsstaat'); ?>
 					</div>
 				</div>
@@ -161,16 +182,23 @@ $saved = isset($saved) && $saved === true;
 				<div class="form-group">
 					<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
-								<option
-									value="<?php echo $jahr ?>"
-									<?php echo $vater_geburtsjahr == $jahr ? " selected" : "" ?>>
+						<div class="input-group">
+							<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['jahre'] as $jahrKey => $jahr): ?>
+									<option
+										value="<?php echo $jahrKey ?>"
+										<?php echo $vater_geburtsjahr == $jahrKey ? " selected" : "" ?>>
 										<?php echo $jahr ?>
 									</option>
-							<?php endforeach; ?>
-						</select>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('vater_geburtsjahr').value = 9999; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('vater_geburtsjahr'); ?>
 					</div>
 				</div>
@@ -181,16 +209,23 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
-										<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['nation'] as $nation): ?>
+									<option
+										value="<?php echo $nation->nation_code ?>"
+										<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+											<?php echo $nation->nation_text ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('vater_geburtsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('vater_geburtsstaat'); ?>
 					</div>
 				</div>
@@ -201,16 +236,23 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
-										<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
+						<div class="input-group">
+							<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+								<?php foreach ($formMetaData['nation'] as $nation): ?>
+									<option
+										value="<?php echo $nation->nation_code ?>"
+										<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+											<?php echo $nation->nation_text ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default" onclick="document.getElementById('vater_bildungsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
+									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
+								</button>
+							</span>
+						</div>
 						<?php echo form_error('vater_bildungsstaat'); ?>
 					</div>
 				</div>
@@ -271,7 +313,7 @@ $saved = isset($saved) && $saved === true;
 				</div>
 			</form>
 		<?php endif; ?>
-	</div>
-</div>
+	</div> <!-- subcontainer -->
+</div> <!-- container -->
 
 <?php $this->load->view('templates/FHC-Footer'); ?>

application/views/lehre/Antrag/Create.php

@@ -52,4 +52,4 @@ $this->load->view(
 $this->load->view(
 	'templates/FHC-Footer',
 	$sitesettings
-);
+);

application/views/lehre/lvplanung/lvTemplateUebersicht.php

@@ -0,0 +1,29 @@
+<?php
+$includesArray = array(
+	'title' => 'LV Template Übersicht',
+	'vue3' => true,
+	'axios027' => true,
+	'bootstrap5' => true,
+	'tabulator5' => true,
+	'fontawesome6' => true,
+	'primevue3' => true,
+	'navigationcomponent' => true,
+	'filtercomponent' => true,
+	'customJSModules' => array('public/js/apps/lehre/lvplanung/LvTemplates.js'),
+	'customCSSs' => array(
+	    'public/css/Fhc.css',
+	    'public/css/lvTemplateUebersicht.css'
+	)
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<div id="main">
+    <!-- Navigation component -->
+    <core-navigation-cmpt></core-navigation-cmpt>
+
+    <lv-template-uebersicht></lv-template-uebersicht>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

application/views/system/infocenter/infocenterDetails.php

@@ -27,7 +27,8 @@
 			'public/js/infocenter/rueckstellung.js',
 			'public/js/infocenter/zgvUeberpruefung.js',
 			'public/js/infocenter/docUeberpruefung.js',
-			'public/js/infocenter/stammdaten.js'
+			'public/js/infocenter/stammdaten.js',
+			'public/js/infocenter/personcheck.js'
 		),
 		'phrases' => array(
 			'infocenter',
@@ -38,6 +39,14 @@
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
+
+	<script>
+		// Embed PHP data into JS as JSON to access from script files
+		const viewData = {
+			checkPerson: <?php echo json_encode(array('unruly' => $unruly, 'duplicate' => $duplicate)); ?>,
+		};
+	</script>
+
 	<div id="wrapper">
 	
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -74,22 +83,8 @@
 						</div>
 					</div>
 				</div>
-				<?php if (!is_null($duplicated)): ?>
-					<div class="row alert-warning">
-						<h3 class="header col-lg-12">
-							<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
-						</h3>
-						<div class="text-left col-lg-12">
-							<?php
-							foreach ($duplicated as $duplicate)
-							{
-								echo  'Person ID: ' . $duplicate->person_id . '<br />';
-							}
-							?>
-						</div>
-	
-					</div>
-				<?php endif; ?>
+				<br/>
+					<?php $this->load->view('system/infocenter/personCheck.php', array('unruly' => $unruly, 'duplicate' => $duplicate)); ?>
 				<br/>
 				<section>
 					<div class="row">
@@ -201,5 +196,4 @@
 	</div> <!-- ./wrapper -->
 	<button id="scrollToTop" title="Go to top"><i class="fa fa-chevron-up"></i></button>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

application/views/system/infocenter/personCheck.php

@@ -0,0 +1,34 @@
+
+<div class="row alert-info" id="unruly" style="display: none;">
+	<h3 class="header col-lg-12">
+		<?php echo $this->p->t('infocenter', 'unrulyPersonFound') . ':'; ?>
+	</h3>
+	<div class="text-left col-lg-12" id="unrulylist">
+		<?php
+		if($unruly) {
+			foreach ($unruly as $unruled)
+			{
+				echo '<p>Person ID: ' . $unruled->person_id . '<p/>';
+			}
+		}
+		?>
+	</div>
+</div>
+
+<div class="row alert-warning" id="duplicate" style="display: none;">
+
+	<h3 class="header col-lg-12">
+		<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
+	</h3>
+	<div class="text-left col-lg-12" id="duplicatelist">
+		<?php
+		if($duplicate) {
+			foreach ($duplicate as $dupe)
+			{
+				echo '<p>Person ID: ' . $dupe->person_id . '<p/>';
+			}
+		}
+		?>
+	</div>
+
+</div>

application/views/templates/FHC-Header.php

@@ -41,6 +41,7 @@
 			{
 				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/fontawesome.min.css');
 				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/solid.min.css');
+				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/regular.min.css'); // NOTE(chris): for favorites in stv
 				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/brands.min.css');
 			}
 

cis/private/tools/zeitaufzeichnung.php

@@ -1014,9 +1014,9 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 		}
 
 		echo "	<a href='".$_SERVER['PHP_SELF']."?projektübersichtexport=1".($passuid ? '&uid='.$user : '')."' style='font-size: larger;'>Projektübersichtexport</a>";
-		      			if($anzprojekte > 0)
-		      				echo "<a style='font-size: larger; text-decoration: none; cursor: default'> | </a><a href='".$_SERVER['PHP_SELF']."?projektexport=1".($passuid ? '&uid='.$user : '')."' style='font-size: larger;'>".$p->t("zeitaufzeichnung/projektexport")."</a>";
-				echo "</td>
+		//if($anzprojekte > 0)
+		echo "<a style='font-size: larger; text-decoration: none; cursor: default'> | </a><a href='".$_SERVER['PHP_SELF']."?projektexport=1".($passuid ? '&uid='.$user : '')."' style='font-size: larger;'>".$p->t("zeitaufzeichnung/projektexport")."</a>";
+		echo "</td>
 		      		<td class='menubox' height='10px'>";
 		if ($p->t("dms_link/handbuchZeitaufzeichnung")!='')
 		{

include/lehrveranstaltung.class.php

@@ -2861,5 +2861,34 @@ class lehrveranstaltung extends basis_db
 			return false;
 		}
 	}
+
+	/**
+	 * Lädt alle vorhandenen Templates und gibt Id und Label ("bezeichnung [kurzbz]") zurück
+	 *
+	 * @return array
+	 */
+	public function loadAllTemplates()
+	{
+		$qry = "SELECT
+					tbl_lehrveranstaltung.lehrveranstaltung_id as id, CONCAT(tbl_lehrveranstaltung.bezeichnung, ' [', tbl_lehrveranstaltung.kurzbz, ']') as label
+				FROM
+					lehre.tbl_lehrveranstaltung
+				WHERE
+					tbl_lehrveranstaltung.lehrtyp_kurzbz = 'tpl'
+			";
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$this->result[] = $row;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg='Fehler bei Datenbankabfrage ' .$this->db_last_error();
+			return false;
+		}
+	}
 }
 ?>

include/tw/vilesci_menu_main.inc.php

@@ -70,6 +70,7 @@ $menu=array
 		'link'=>'left.php?categorie=Lehre', 'target'=>'nav',
 		'Gruppenverwaltung'=>array('name'=>'Gruppen', 'permissions'=>array('admin','lv-plan','support','lehre/gruppe'), 'link'=>'stammdaten/lvbgruppenverwaltung.php', 'target'=>'main'),
 		'Lehrveranstaltung'=>array('name'=>'Lehrveranstaltung', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
+		'lvTemplateUebersicht'=>array('name'=>'LV-Template Übersicht', 'link'=>'../index.ci.php/lehre/lvplanung/LvTemplateUebersicht', 'target'=>'_blank'),
 		'Studienordnung'=>array('name'=>'Studienordnung', 'link'=>'lehre/studienordnung.php', 'target'=>'_blank','permissions'=>array('lehre/studienordnung')),
 		'StudienplanGueltigkeit'=>array('name'=>'Studienplan Gültigkeit', 'link'=>'lehre/studienplan_gueltigkeit.php', 'target'=>'main','permissions'=>array('lehre/studienordnung')),
 		'StudienplanVorruecken'=>array('name'=>'Studienplan vorrücken', 'link'=>'lehre/studienplan_vorrueckung.php', 'target'=>'main','permissions'=>array('lehre/studienplan')),

public/css/Studentenverwaltung.css

@@ -0,0 +1,115 @@
+@import './Fhc.css';
+@import './components/searchbar.css';
+@import './components/verticalsplit.css';
+@import './components/FilterComponent.css';
+@import './components/Tabs.css';
+@import './components/Notiz.css';
+
+html {
+  font-size: .875em;
+}
+
+.navbar-dark .navbar-brand:focus {
+	box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
+	z-index: 3;
+}
+
+.searchbar {
+	margin-right: 0!important;
+}
+.searchbar > .input-group {
+	margin-right: 0!important;
+}
+.searchbar > .input-group > * {
+	border-radius: 0!important;
+}
+
+.stv {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+}
+.stv > header {
+	flex: 0 0 auto;
+}
+.stv > div {
+	flex: 1 1 auto;
+}
+
+#sidebarMenu {
+	width: 0%;
+}
+
+.tabulator-row.disabled.tabulator-row-odd .tabulator-cell {
+	color: var(--gray-400);
+}
+.tabulator-row.disabled.tabulator-row-even .tabulator-cell {
+	color: var(--gray-500);
+}
+
+/* Dropdown Toolbar Interessent, submenu */
+.dropend .dropdown-toggle.d-flex::after {
+	height: 0;
+}
+
+@media (min-width: 768px) {
+	#sidebarMenu {
+		visibility: visible!important;
+		transform: none;
+		position: inherit;
+		z-index: 1;
+	}
+}
+
+
+@media (max-width: 769px) {
+	.stv-verband {
+		max-height: calc(100% - 3rem);
+		overflow: auto;
+	}
+}
+
+
+.stv-verband .p-treetable-tbody > tr > td {
+	display: flex;
+	padding-top: .25rem!important;
+	padding-bottom: .25rem!important;
+}
+.stv-verband .p-treetable-tbody > tr > td > button {
+	flex: 0 0 auto;
+}
+.stv-verband .p-treetable-tbody > tr > td > span {
+	flex: 1 1 auto;
+}
+
+
+.stv-verband.p-tree {
+	/*overflow: auto;*/
+}
+.stv-verband.p-tree .p-treenode-icon {
+	display: none;
+}
+
+
+.stv-list {
+	display: flex;
+	flex-direction: column;
+}
+.stv-list > #filterTableDataset {
+	flex: 1 1 auto;
+}
+
+.toast.toast-success {
+	color: #0f5132;
+	background-color: #d1e7dd!important;
+	border-color: #badbcc!important;
+}
+.toast.toast-danger {
+	color: #842029;
+	background-color: #f8d7da!important;
+	border-color: #f5c2c7!important;
+}
+
+.has-filter .fa-filter {
+	color: var(--bs-success);
+}

public/css/Tabulator5.css

@@ -39,8 +39,18 @@
 	z-index: 999999;
 }
 
+.tabulator {
+	font-size: 1rem;
+}
+
 .tabulator-cell .btn {
 	padding: 0 .7rem;
 	min-height: 25px;
 	min-width: 25px;
 }
+
+.tabulator-row.tabulator-selectable:focus {
+	box-shadow: 0 0 0 .24rem rgba(13,110,253,.25);
+	z-index: 1;
+	outline: 0;
+}

public/css/components/Notiz.css

@@ -0,0 +1,6 @@
+.notizTitle {
+    color: darkred;
+}
+.notizText {
+    color: darkblue;
+}

public/css/lvTemplateUebersicht.css

@@ -0,0 +1,3 @@
+html {
+    font-size: .75em;
+}

public/js/RESTClient.js

@@ -121,8 +121,8 @@ export const CoreRESTClient = {
 	 */
 	getError: function(response) {
 
-		if (typeof response[CORE_REST_CLIENT_RETVAL] === "object"
-			&& Object.keys(response[CORE_REST_CLIENT_RETVAL]).length > 0
+		if (typeof response === "object"
+			&& Object.keys(response).length > 0
 			&& response.hasOwnProperty(CORE_REST_CLIENT_RETVAL))
 		{
 			return response[CORE_REST_CLIENT_RETVAL];
@@ -136,7 +136,7 @@ export const CoreRESTClient = {
 	 */
 	getErrorCode: function(response) {
 
-		if (typeof response[CORE_REST_CLIENT_RETVAL] === "object" && response.hasOwnProperty(CORE_REST_CLIENT_ERROR))
+		if (typeof response === "object" && response.hasOwnProperty(CORE_REST_CLIENT_ERROR))
 		{
 			return response[CORE_REST_CLIENT_ERROR];
 		}

public/js/api/checkperson.js

@@ -0,0 +1,23 @@
+export default {
+	updatePersonUnrulyStatus(person_id, unrulyParam) {
+
+		try {
+			const payload = {person_id, unruly: unrulyParam}
+			const url = '/api/frontend/v1/checkperson/CheckPerson/updatePersonUnrulyStatus';
+			return this.$fhcApi.post(url, payload, null);
+		} catch (error) {
+			throw error;
+		}
+
+	},
+	filterPerson(payload, base = ''){
+
+		try {
+			const url = base + '/api/frontend/v1/checkperson/CheckPerson/filterPerson';
+			return axios.post(url, payload)
+		} catch (error) {
+			throw error;
+		}
+
+	}
+}

public/js/api/fhcapifactory.js

@@ -20,7 +20,10 @@ import phrasen from "./phrasen.js";
 import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
+import stv from "./stv.js";
+import notiz from "./notiz.js";
 import betriebsmittel from "./betriebsmittel.js";
+import checkperson from "./checkperson.js";
 
 export default {
     search,
@@ -28,5 +31,8 @@ export default {
     navigation,
     filter,
     studstatus,
-    betriebsmittel
-};
+    stv,
+    notiz,
+    betriebsmittel,
+    checkperson
+};

public/js/api/notiz.js

@@ -0,0 +1,5 @@
+import person from "./notiz/person.js";
+
+export default {
+	person
+}