new function loadAllTemplates()

Umbenennung Lehreinheit in LV-Teil

application/config/Events.php

@@ -0,0 +1,14 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+/**
+ * NOTE(chris): example:
+	Events::on('stv_conf_student', function (&$res) {
+		$res['test'] = [
+			'title' => 'TEST',
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
+		];
+	});
+ */

application/config/anrechnung.php

@@ -6,10 +6,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 // Deadline for Application given as Time-Interval after Semesterstart.
 $config['interval_blocking_application'] = 'P1M';
 
-// Application submission period given by start- and enddate.
-$config['submit_application_start'] = '05.09.2022';
-$config['submit_application_end'] = '22.09.2022';
-
 // Lehrveranstaltungen with these grades will be blocked for application
 $config['grades_blocking_application'] = array(
 	5,  // nicht genügend
@@ -19,4 +15,12 @@ $config['grades_blocking_application'] = array(
 	14, // nicht bestanden,
 	15, // nicht teilgenommen
 	18  // unentschuldigt
-);
+);
+
+//Enables Fachbereichsleiter instead of LV Leiter
+$config['fbl'] = FALSE;
+//Enables Info Mails
+$config['send_mail'] = TRUE;
+
+// Display fields to explain equivalence of ECTS and LV-Inhalte
+$config['explain_equivalence'] = TRUE;

application/config/db_crypt.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Copyright (C) 2023 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+// NOTE: if database encryption is _not_ used then leave this array empty!
+$config['encryption_passwords'] = array(
+	// 'password name 1' => 'password 1'
+	// 'password name 2' => 'password 2'
+	// 'password name ...' => 'password ...'
+	// 'password name N' => 'password N'
+);
+

application/config/migratecontract.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Copyright (C) 2023 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['migratecontract_oe_default'] = 'TODO_OE_DEFAULT';
+
+$config['migratecontract_matching_ba1_vertragsart'] = array(
+    '101'=>'dvbund',
+    '102'=>'dvanderengk',
+    '103'=>'echterdv',
+    '104'=>'studentischehilfskr',
+    '105'=>'externerlehrender',
+    '106'=>'dvanderenbet',
+    '107'=>'werkvertrag',
+    '108'=>'studentischehilfskr',
+    '109'=>'ueberlassungsvertrag',
+    '110'=>'echterfreier',
+    '111'=>'echterdv' //All-In
+);

application/config/navigation.php

@@ -31,6 +31,14 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 20,
 					'requiredPermissions' => 'admin:w'
+				),
+				'bismeldestichtagsverwaltung' => array(
+					'link' => site_url('codex/Bismeldestichtag'),
+					'icon' => '',
+					'description' => 'BIS-Meldestichtagsverwaltung',
+					'expand' => true,
+					'sort' => 30,
+					'requiredPermissions' => 'admin:w'
 				)
 			)
 		),
@@ -47,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',
@@ -120,11 +134,18 @@ $config['navigation_header'] = array(
 					'sort' => 30,
 					'requiredPermissions' => 'system/issues_verwalten:r'
 				),
+				'plausichecks' => array(
+					'link' => site_url('system/issues/Plausichecks'),
+					'description' => 'Plausichecks',
+					'expand' => true,
+					'sort' => 40,
+					'requiredPermissions' => 'system/issues_verwalten:r'
+				),
 				'gruppenmanagement' => array(
 					'link' => site_url('person/Gruppenmanagement'),
 					'description' => 'Gruppenmanagement',
 					'expand' => true,
-					'sort' => 40,
+					'sort' => 50,
 					'requiredPermissions' => 'lehre/gruppenmanager:r'
 				)
 			)
@@ -157,7 +178,14 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 20,
 					'requiredPermissions' => 'system/developer:r'
-				)
+				),
+                'anrechnungen' => array(
+                    'link' => site_url('lehre/anrechnung/AdminAnrechnung'),
+                    'description' => 'Anrechnungen',
+                    'expand' => true,
+                    'sort' => 30,
+                    'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
+                )
 			)
 		)
 	)
@@ -177,6 +205,15 @@ $config['navigation_menu']['Vilesci/index'] = array(
 	)
 );
 
+$config['navigation_menu']['Vilesci/index'] = array(
+    'dashboard' => array(
+        'link' => '#',
+        'description' => 'Dashboard',
+        'icon' => 'dashboard',
+        'sort' => 1
+    )
+);
+
 $config['navigation_menu']['organisation/Reihungstest/index'] = array(
 	'reihungstestverwalung' => array(
 		'link' => base_url('vilesci/stammdaten/reihungstestverwaltung.php'),
@@ -256,14 +293,31 @@ $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'),
 		'description' => 'Fehler Zuständigkeiten',
-		'icon' => 'cogs',
+		'icon' => 'users',
 		'sort' => 100,
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
-	)
+	),
+	'fehlerkonfiguration' => array(
+		'link' => site_url('system/issues/IssuesKonfiguration'),
+		'description' => 'Fehler Konfiguration',
+		'icon' => 'cogs',
+		'sort' => 200,
+		'target' => '_blank',
+		'requiredPermissions' => array('admin:rw')
+	),
 );
 

application/config/studierendenantrag.php

@@ -0,0 +1,170 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['frist_rueckzahlung_studiengebuer_WS'] = '15.10.';
+$config['frist_rueckzahlung_studiengebuer_SS'] = '15.03.';
+
+// TODO(chris): review this!
+#$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => null];
+$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => 'Akte'];
+
+/**
+ * UPLOAD
+ */
+
+/**
+ * Allowed filetypes for attachment upload in unterbrechung antrag
+ *
+ * @var array           An array of fileextensions
+ */
+$config['unterbrechung_dms_filetypes'] = ['jpg', 'pdf'];
+
+
+/**
+ * GRADES
+ */
+
+/**
+ * On wiederholung the student must repeat certain lvs.
+ * This lvs will be graded with this id
+ *
+ * @var integer			tbl_note.note
+ */
+$config['wiederholung_note_angerechnet'] = 19;
+
+/**
+ * On wiederholung the student can not attend certain lvs.
+ * Those lvs will be graded with this id
+ *
+ * @var integer			tbl_note.note
+ */
+$config['wiederholung_note_nicht_zugelassen'] = 20;
+
+
+/**
+ * JOBS
+ */
+
+/**
+ * The Job will remind for every Unterbrecher who has a
+ * wiedereinstieg_datum between the date the Job is run
+ * and the modified date
+ * e.g.: If the Job is running on 2023-04-20 and the modifier
+ * is '+3 days' it will remind of everyone that
+ * has a wiedereinstiegs_datum between 2023-04-20 and 2023-04-23
+ *
+ * @var string	        A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+3 days';
+
+/**
+ * The Job will sent a request to everyone who faild the 3rd committee exam
+ * and respecting the given conditions (not repeated yet, stg not in blacklist)
+ * to decide if he/she will repeat or not
+ *
+ * First request
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['wiederholung_job_request_1_date_modifier'] = '+0 days';
+
+/**
+ * Second request
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['wiederholung_job_request_2_date_modifier'] = '+3 weeks';
+
+/**
+ * Final deadline - after this the student will be abgemeldet if he hasn't chosen yet
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['wiederholung_job_deadline_date_modifier'] = '+1 month';
+
+/**
+ * before this exam dates for Wiederholer will be ignored
+ *
+ * @var string           A string formated as Date
+ *
+ */
+$config['digitalization_start'] = '2022-07-01';
+
+
+
+
+/**
+ * Objection period - the student will be abgemeldet if he hasn't objected in this period
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['abmeldung_job_deadline_date_modifier'] = '+2 weeks';
+
+
+
+/**
+ * System User - uid of a user that is allowed to set prestudentstatus
+ *
+ * @var string
+ */
+$config['antrag_job_systemuser'] = '';
+
+
+/**
+ * WHITELISTS
+ */
+
+/**
+ * List of stati who entitle a prestudent to create an Antrag
+ *
+ * @var array			Array of tbl_status.status_kurzbz's
+ */
+$config['antrag_prestudentstatus_whitelist'] = ['Student', 'Diplomand'];
+$config['antrag_prestudentstatus_whitelist_abmeldung'] = ['Student', 'Diplomand', 'Unterbrecher'];
+
+
+/**
+ * BLACKLISTS
+ */
+
+/**
+ * List of Statusgründe that prevent a prestudent from create an Wiederholungsantrag
+ *
+ * @var array			An array of tbl_status_grund.statusgrund_id's
+ */
+$config['status_gruende_wiederholer'] = [16, 15];
+
+/**
+ * Blacklisted for abmeldung anträge
+ *
+ * @var array           An array of tbl_studiengang.studiengang_kz's
+ */
+$config['stgkz_blacklist_abmeldung'] = [];
+
+/**
+ * Blacklisted for unterbrechung anträge
+ *
+ * @var array           An array of tbl_studiengang.studiengang_kz's
+ */
+$config['stgkz_blacklist_unterbrechung'] = [];
+
+/**
+ * Blacklisted for wiederholung anträge
+ *
+ * @var array           An array of tbl_studiengang.studiengang_kz's
+ */
+$config['stgkz_blacklist_wiederholung'] = [];
+
+/**
+ * Blacklisted noten for negative committee exams
+ * noten with this ids won't be seen as negative
+ *
+ * @var array           An array of noten ids
+ */
+$config['note_blacklist_wiederholung'] = [];

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

@@ -0,0 +1,16 @@
+<?php
+ 
+if ( !defined("PHPUNIT_TEST") ) {
+    show_404();
+}
+ 
+class Test extends CI_Controller
+{
+    public function index()
+    {
+        // Yep... This is all we need.
+        ini_set('error_reporting', E_ALL); // or error_reporting(E_ALL);
+        ini_set('display_errors', '1');
+        ini_set('display_startup_errors', '1');
+    }
+}

application/controllers/api/frontend/fas/studstatus/Wiederholung.php

@@ -0,0 +1,163 @@
+<?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 (FAS) and the AntragLib (back-end)
+ * This controller works with calls on the HTTP GET or POST and the output is always RDF
+ */
+class Wiederholung extends Auth_Controller
+{
+
+	/**
+	 * Calls the parent's constructor and loads the FilterCmptLib
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getLvs' => ['student/studierendenantrag:r', 'student/noten:r'],
+			'moveLvsToZeugnis' => ['student/studierendenantrag:w', 'student/noten:w']
+		]);
+
+		// Libraries
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'global',
+			'studierendenantrag'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getLvs($prestudent_id)
+	{
+		// header für no cache
+		$this->output->set_header("Cache-Control: no-cache");
+		$this->output->set_header("Cache-Control: post-check=0, pre-check=0", false);
+		$this->output->set_header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+		$this->output->set_header("Pragma: no-cache");
+		$this->output->set_header("Content-type: application/xhtml+xml");
+
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$sem_akt = $this->variablelib->getVar('semester_aktuell');
+
+
+		$result = $this->antraglib->getLvsForPrestudent($prestudent_id, $sem_akt);
+		if (isError($result))
+			return $result;
+		$lvs = $result->retval;
+
+		$rdf_url = 'http://www.technikum-wien.at/antragnote';
+
+		$this->load->view('lehre/Antrag/Wiederholung/getLvs.rdf.php', [
+			'url' => $rdf_url,
+			'lvs' => $lvs
+		]);
+	}
+
+	public function moveLvsToZeugnis()
+	{
+		$anzahl = $this->input->post('anzahl');
+		$student_uid = $this->input->post('student_uid');
+		$this->load->model('education/Studierendenantraglehrveranstaltung_model', 'StudierendenantraglehrveranstaltungModel');
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$errormsg = array();
+
+		for($i=0; $i<$anzahl; $i++)
+		{
+			$id = $this->input->post('studierendenantrag_lehrveranstaltung_id_' . $i);
+			$result =$this->StudierendenantraglehrveranstaltungModel->load($id);
+			if(isError($result))
+			{
+				$errormsg[] = getError($result);
+			}
+			elseif(!hasData($result))
+			{
+				$errormsg[] = $this->p->t('studierendenantrag', 'error_no_lv_in_application');
+			}
+			else
+			{
+				$antragLv = getData($result)[0];
+				$result= $this->ZeugnisnoteModel->load([
+					'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
+					'student_uid'=> $student_uid,
+					'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
+				]);
+				if(isError($result))
+				{
+					$errormsg[] = getError($result);
+				}
+				else
+				{
+					if (hasData($result))
+					{
+						$result = $this->ZeugnisnoteModel->update(
+							[
+								'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
+								'student_uid'=> $student_uid,
+								'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
+							],
+							[
+								'note'=> $antragLv->note,
+								'uebernahmedatum' => date('c'),
+								'benotungsdatum' => $antragLv->insertamum,
+								'updateamum' => date('c'),
+								'bemerkung'=>$antragLv->anmerkung,
+								'updatevon'=>getAuthUID()
+							]
+						);
+					}
+					else
+					{
+						$result = $this->ZeugnisnoteModel->insert([
+							'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
+							'student_uid'=> $student_uid,
+							'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz,
+							'note'=> $antragLv->note,
+							'uebernahmedatum' => date('c'),
+							'benotungsdatum' => $antragLv->insertamum,
+							'insertamum' => date('c'),
+							'bemerkung'=>$antragLv->anmerkung,
+							'insertvon'=>getAuthUID()
+						]);
+					}
+					if(isError($result))
+					{
+						$errormsg[] = getError($result);
+					}
+				}
+			}
+		}
+
+		if($errormsg)
+			$return = false;
+		else
+			$return = true;
+
+		$this->load->view('lehre/Antrag/Wiederholung/moveLvs.rdf.php', [
+			'return' => $return,
+			'errormsg' => $errormsg
+		]);
+	}
+}

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

@@ -0,0 +1,231 @@
+<?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 FilterCmptLib (back-end)
+ * Provides data to the ajax get calls about the filter component
+ * Listens to ajax post calls to change the 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
+{
+	const FILTER_UNIQUE_ID = 'filterUniqueId'; // Name of the filter cmpt unique id (mandatory)
+	const FILTER_TYPE = 'filterType'; // The filter type (PHP filter definition) used (mandatory)
+	const FILTER_ID = 'filterId'; // The id of the used filter (optional)
+
+	/**
+	 * Calls the parent's constructor and loads the FilterCmptLib
+	 */
+	public function __construct()
+	{
+		// NOTE: FilterCmpt has its own permissions checks
+		parent::__construct([
+			'getFilter' => self::PERM_LOGGED,
+			'removeFilterField' => self::PERM_LOGGED,
+			'addFilterField' => self::PERM_LOGGED,
+			'applyFilterFields' => self::PERM_LOGGED,
+			'removeCustomFilter' => self::PERM_LOGGED,
+			'saveCustomFilter' => self::PERM_LOGGED,
+			'reloadDataset' => self::PERM_LOGGED
+		]);
+
+		// Loads the FiltersModel
+		$this->load->model('system/Filters_model', 'FiltersModel');
+
+		// Loads the FilterCmptLib with HTTP GET/POST parameters
+		$this->_startFilterCmptLib();
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Retrieves data about the current filter from the session and will be written on the output in JSON format
+	 */
+	public function getFilter()
+	{
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$session = $this->filtercmptlib->getSession();
+		if (is_object($session)) {
+			// If stdClass it is an retval object
+			$session = $this->getDataOrTerminateWithError($session);
+		}
+		$this->terminateWithSuccess($session);
+	}
+
+	/**
+	 * Remove an applied filter (SQL where condition) from the current filter
+	 */
+	public function removeFilterField()
+	{
+		$this->form_validation->set_rules('filterField', 'filterField', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->filtercmptlib->removeFilterField($this->input->post('filterField'));
+
+		if (!$result)
+			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess('Field removed');
+	}
+
+	/**
+	 * Add a filter (SQL where clause) to be applied to the current filter
+	 */
+	public function addFilterField()
+	{
+		$this->form_validation->set_rules('filterField', 'filterField', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->filtercmptlib->addFilterField($this->input->post('filterField'));
+
+		if (!$result)
+			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess('Field added');
+	}
+
+	/**
+	 * Apply the filter changes
+	 */
+	public function applyFilterFields()
+	{
+		$this->form_validation->set_rules('filterFields', 'filterFields', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->filtercmptlib->applyFilterFields($this->input->post('filterFields'));
+
+		if (!$result)
+			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess('Applied');
+	}
+
+	/**
+	 * Save the current filter as a custom filter for this user with the given description
+	 */
+	public function saveCustomFilter()
+	{
+		$this->form_validation->set_rules('customFilterName', 'customFilterName', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->filtercmptlib->saveCustomFilter($this->input->post('customFilterName'));
+
+		if (!$result)
+			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess('Saved');
+	}
+
+	/**
+	 * Remove a custom filter by its filterId
+	 */
+	public function removeCustomFilter()
+	{
+		$this->form_validation->set_rules('filterId', 'filterId', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->filtercmptlib->removeCustomFilter($this->input->post('filterId'));
+
+		if (!$result)
+			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess('Removed');
+	}
+
+	/**
+	 * Reloads the dataset
+	 */
+	public function reloadDataset()
+	{
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$this->filtercmptlib->reloadDataset();
+
+		$this->terminateWithSuccess('Success');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Loads the FilterCmptLib with the FILTER_UNIQUE_ID parameter
+	 * If the parameter FILTER_UNIQUE_ID is not given then the execution of the controller is terminated and
+	 * an error message is printed
+	 */
+	private function _startFilterCmptLib()
+	{
+		$filterUniqueId = null;
+		$filterType = null;
+		$filterId = null;
+
+		$validations = [
+			[
+				'field' => self::FILTER_UNIQUE_ID,
+				'label' => self::FILTER_UNIQUE_ID,
+				'rules' => 'required'
+			],
+			[
+				'field' => self::FILTER_TYPE,
+				'label' => self::FILTER_TYPE,
+				'rules' => 'required'
+			],
+		];
+
+		$this->load->library('form_validation');
+
+		if ($this->input->method() == 'get')
+			$this->form_validation->set_data($this->input->get());
+		$this->form_validation->set_rules($validations);
+
+		if ($this->form_validation->run()) {
+			$filterUniqueId = $this->input->post_get(self::FILTER_UNIQUE_ID);
+			$filterType = $this->input->post_get(self::FILTER_TYPE);
+			$filterId = $this->input->post_get(self::FILTER_ID);
+
+			// Loads the FilterCmptLib that contains all the used logic
+			$this->load->library(
+				'FilterCmptLib',
+				array(
+					'filterUniqueId' => $filterUniqueId,
+					'filterType' => $filterType,
+					'filterId' => $filterId
+				)
+			);
+
+			// Start the component
+			$this->filtercmptlib->start();
+		}
+	}
+}
+

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

@@ -0,0 +1,101 @@
+<?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 NavigationLib (back-end)
+ * Provides data to the ajax get calls about the filter
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Navigation extends FHCAPI_Controller
+{
+	const NAVIGATION_PAGE_PARAM = 'navigation_page'; // Navigation page parameter name
+
+	/**
+	 * Loads the NavigationLib where the used logic lies
+	 */
+	public function __construct()
+    {
+        parent::__construct([
+        	'menu' => self::PERM_LOGGED,
+        	'header' => self::PERM_LOGGED
+        ]);
+
+		$this->_loadNavigationLib(); // Loads the NavigationLib with parameters
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * This function creates the left Menu for each Page
+	 * @param NAVIGATION_PAGE_PARAM GET Parameter witch holds the currently called Page
+	 * @return JSON object with the Menu Entries
+	 */
+	public function menu()
+	{
+		$menuArray = $this->navigationlib->getMenuArray($this->input->get(self::NAVIGATION_PAGE_PARAM));
+
+		$this->terminateWithSuccess($menuArray);
+	}
+
+	/**
+	 * This function creates the Top Menu for each Page
+	 * @param NAVIGATION_PAGE_PARAM GET Parameter witch holds the currently called Page
+	 * @return JSON object with the Menu Entries
+	 */
+	public function header()
+	{
+		$headerArray = $this->navigationlib->getHeaderArray($this->input->get(self::NAVIGATION_PAGE_PARAM));
+
+		$this->terminateWithSuccess($headerArray);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Loads the NavigationLib with the NAVIGATION_PAGE_PARAM parameter
+	 * If the parameter NAVIGATION_PAGE_PARAM is not given then the execution of the controller is terminated and
+	 * an error message is printed
+	 */
+	private function _loadNavigationLib()
+	{
+		// If the parameter NAVIGATION_PAGE_PARAM is present in the HTTP GET or POST
+		if (isset($_GET[self::NAVIGATION_PAGE_PARAM]) || isset($_POST[self::NAVIGATION_PAGE_PARAM]))
+		{
+			// If it is present in the HTTP GET
+			if (isset($_GET[self::NAVIGATION_PAGE_PARAM]))
+			{
+				$navigationPage = $this->input->get(self::NAVIGATION_PAGE_PARAM); // is retrieved from the HTTP GET
+			}
+			elseif (isset($_POST[self::NAVIGATION_PAGE_PARAM])) // Else if it is present in the HTTP POST
+			{
+				$navigationPage = $this->input->post(self::NAVIGATION_PAGE_PARAM); // is retrieved from the HTTP POST
+			}
+
+			// Loads the NavigationLib that contains all the used logic
+			$this->load->library('NavigationLib', array(self::NAVIGATION_PAGE_PARAM => $navigationPage));
+		}
+		else // Otherwise an error will be written in the output
+		{
+			show_error('Parameter "' . self::NAVIGATION_PAGE_PARAM . '" not provided!');
+		}
+	}
+}

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

@@ -0,0 +1,46 @@
+<?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 PhrasesLib (back-end)
+ * Provides data to the ajax get calls about the Phrasen plugin
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Phrasen extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'loadModule' => self::PERM_ANONYMOUS
+		]);
+	}
+	
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param string $module
+	 */
+	public function loadModule($module)
+	{
+		$this->load->library('PhrasesLib', [$module], 'pj');
+		$this->terminateWithSuccess(json_decode($this->pj->getJSON()));
+	}
+}

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

@@ -0,0 +1,69 @@
+<?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 SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Searchbar extends FHCAPI_Controller
+{
+	const SEARCHSTR_PARAM = 'searchstr';
+	const TYPES_PARAM = 'types';
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		// NOTE(chris): additional permission checks will be done in SearchBarLib
+		parent::__construct([
+			'search' => self::PERM_LOGGED
+		]);
+
+		// Load the library SearchBarLib
+		$this->load->library('SearchBarLib');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function search()
+	{
+		$this->load->library('form_validation');
+
+		// Checks if the searchstr and the types parameters are in the POSTed JSON
+		$this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required');
+		$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
+
+		// Convert to json the result from searchbarlib->search
+		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
+		if (property_exists($result, 'error'))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$this->terminateWithSuccess($result);
+	}
+}
+

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/betriebsmittel/BetriebsmittelP.php

@@ -0,0 +1,387 @@
+<?php
+
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+use \DateTime as DateTime;
+
+class BetriebsmittelP extends FHCAPI_Controller
+{
+	private $person_id = null;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'addNewBetriebsmittel' => self::PERM_LOGGED,
+			'updateBetriebsmittel' => self::PERM_LOGGED,
+			'loadBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'deleteBetriebsmittel' => self::PERM_LOGGED,
+			'getTypenBetriebsmittel' => ['admin:r', 'assistenz:r'],
+			'loadInventarliste' => ['admin:r', 'assistenz:r']
+		]);
+
+		//Load Models
+		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
+		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
+
+		// Additional Permission Checks
+		if ($this->router->method == 'addNewBetriebsmittel') {
+			$this->person_id = current(array_slice($this->uri->rsegments, 2));
+			
+			$this->checkPermissionsForPerson(
+				$this->person_id,
+				['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
+				['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
+			);
+		} elseif ($this->router->method == 'updateBetriebsmittel' || $this->router->method == 'deleteBetriebsmittel') {
+			$betriebsmittelperson_id = current(array_slice($this->uri->rsegments, 2));
+			$result = $this->BetriebsmittelpersonModel->load($betriebsmittelperson_id);
+			if (!hasData($result))
+				show_404();
+			$this->person_id = current(getData($result))->person_id;
+			
+			$this->checkPermissionsForPerson(
+				$this->person_id,
+				['admin:rw', 'mitarbeiter:rw', 'basis/betriebsmittel:rw'],
+				['admin:rw', 'assistenz:rw', 'basis/betriebsmittel:rw']
+			);
+		}
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'wawi'
+		]);
+	}
+
+	public function getAllBetriebsmittel($type_id, $id)
+	{
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	protected function validateNewOrUpdate()
+	{
+		$this->form_validation->set_rules('betriebsmitteltyp', 'Typ', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired')
+		]);
+
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric|less_than_equal_to[9999.99]', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric')
+		]);
+
+		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required|is_valid_date', [
+			'required' => $this->p->t('ui', 'error_fieldRequired')
+		]);
+
+		if ($this->input->post('ausgegebenam') && $this->input->post('retouram')) {
+			$this->form_validation->set_rules('retouram', 'Retour am', [
+				'is_valid_date',
+				['is_not_before_ausgegebenam', function ($value) {
+					return (new DateTime($value) >= new DateTime($this->input->post('ausgegebenam')));
+				}]
+			], [
+				'is_not_before_ausgegebenam' => $this->p->t('wawi', 'error_retourdatumVorAusgabe')
+			]);
+		} else {
+			$this->form_validation->set_rules('retouram', 'Retour am', 'is_valid_date');
+		}
+
+		$this->form_validation->set_rules('anmerkung', 'Anmerkung', 'max_length[256]');
+
+		if ($this->input->post('betriebsmitteltyp') == 'Inventar') {
+			// Inventar
+			$this->form_validation->set_rules('betriebsmittel_id', 'Inventarnummer', 'required');
+		} elseif ($this->input->post('betriebsmitteltyp') == 'Zutrittskarte') {
+			// Zutrittskarte
+			if ($this->input->post('nummer') === null && $this->input->post('nummer') === null) {
+				$this->form_validation->set_rules('nummer', 'Nummer', 'required', [
+					'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
+				]);
+				$this->form_validation->set_rules('nummer2', 'Nummer2', 'required', [
+					'required' => $this->p->t('wawi', 'error_zutrittskarteOhneNummer')
+				]);
+			} else {
+				if ($this->input->post('nummer') === null) {
+					$result = $this->BetriebsmittelpersonModel->loadViewWhere([
+						'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
+						'nummer2' => $this->input->post('nummer2'),
+						'person_id !=' => $this->person_id,
+						'retouram IS NULL' => null
+					]);
+					if (hasData($result))
+						$this->form_validation->set_rules('nummer2', 'Nummer2', 'is_array', [
+							'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
+						]);
+				} else {
+					$result = $this->BetriebsmittelpersonModel->loadViewWhere([
+						'betriebsmitteltyp' => $this->input->post('betriebsmitteltyp'),
+						'nummer' => $this->input->post('nummer'),
+						'person_id !=' => $this->person_id,
+						'retouram IS NULL' => null
+					]);
+					if (hasData($result))
+						$this->form_validation->set_rules('nummer', 'Nummer', 'is_array', [
+							'is_array' => $this->p->t('wawi', 'error_bmZutrittskarteOccupied', (array)current(getData($result)))
+						]);
+				}
+			}
+		}
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+	}
+
+	public function addNewBetriebsmittel($person_id)
+	{
+		$this->form_validation->set_rules('uid', 'UID', [
+			['uid_in_person', function ($value) use ($person_id) {
+				if ($value === null)
+					return true;
+				$this->load->model('person/Benutzer_model', 'BenutzerModel');
+				$result = $this->BenutzerModel->loadWhere([
+					'uid' => $value,
+					'person_id' => $person_id
+				]);
+
+				return hasData($result);
+			}]
+		], [
+			'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
+		]);
+		$this->validateNewOrUpdate();
+
+		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+		$nummer = $this->input->post('nummer');
+		$nummer2 = $this->input->post('nummer2');
+		$beschreibung = $this->input->post('beschreibung');
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
+		$anmerkung = $this->input->post('anmerkung');
+		$kaution = $this->input->post('kaution');
+		$ausgegebenam = $this->input->post('ausgegebenam');
+		$retouram = $this->input->post('retouram');
+		$uid = $this->input->post('uid');
+
+		// NOTE(chris): transform_kartennummer
+		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
+			$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
+
+		$this->db->trans_start();
+
+		if ($betriebsmitteltyp != 'Inventar') {
+			$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
+			if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
+				$result = $this->BetriebsmittelModel->loadWhere([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer2' => $nummer2
+				]);
+			} else {
+				$result = $this->BetriebsmittelModel->loadWhere([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer
+				]);
+			}
+			$data = $this->getDataOrTerminateWithError($result);
+
+			if ($data) {
+				$data = current($data);
+				if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
+					$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
+						'nummer' => $nummer,
+						'nummer2' => $nummer2,
+						'beschreibung' => $beschreibung,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]);
+					$this->getDataOrTerminateWithError($result);
+				}
+				$betriebsmittel_id = $data->betriebsmittel_id;
+			} else {
+				$result = $this->BetriebsmittelModel->insert([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer,
+					'nummer2' => $nummer2,
+					'beschreibung' => $beschreibung,
+					'reservieren' => false,
+					'ort_kurzbz' => null,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID(),
+				]);
+				$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		$result = $this->BetriebsmittelpersonModel->insert([
+			'person_id' => $person_id,
+			'betriebsmittel_id' => $betriebsmittel_id,
+			'anmerkung' => $anmerkung,
+			'kaution' => $kaution,
+			'ausgegebenam' => $ausgegebenam,
+			'retouram' => $retouram,
+			'uid' => $uid,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->db->trans_complete();
+
+		$this->terminateWithSuccess(true);
+	}
+
+	public function updateBetriebsmittel($betriebsmittelperson_id)
+	{
+		$this->validateNewOrUpdate();
+
+		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
+		$nummer = $this->input->post('nummer');
+		$nummer2 = $this->input->post('nummer2');
+		$beschreibung = $this->input->post('beschreibung');
+		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
+		$anmerkung = $this->input->post('anmerkung');
+		$kaution = $this->input->post('kaution');
+		$ausgegebenam = $this->input->post('ausgegebenam');
+		$retouram = $this->input->post('retouram');
+
+		// NOTE(chris): transform_kartennummer
+		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)
+			$nummer = is_numeric($nummer) ? ltrim($nummer, "0") : hexdec(implode("", array_reverse(str_split(trim($nummer)))));
+
+		$this->db->trans_start();
+
+		if ($betriebsmitteltyp != 'Inventar') {
+			$found = false;
+			if ($nummer !== null && $betriebsmittel_id !== null) {
+				$result = $this->BetriebsmittelModel->load($betriebsmittel_id);
+				$data = $this->getDataOrTerminateWithError($result);
+				if ($data && current($data)->nummer == $nummer) {
+					$found = true;
+				}
+			}
+
+			if (!$found) {
+				$this->BetriebsmittelModel->addOrder('updateamum', 'DESC');
+				if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer === null) {
+					$result = $this->BetriebsmittelModel->loadWhere([
+						'betriebsmitteltyp' => $betriebsmitteltyp,
+						'nummer2' => $nummer2
+					]);
+				} else {
+					$result = $this->BetriebsmittelModel->loadWhere([
+						'betriebsmitteltyp' => $betriebsmitteltyp,
+						'nummer' => $nummer
+					]);
+				}
+				$data = $this->getDataOrTerminateWithError($result);
+			}
+
+			if ($data) {
+				$data = current($data);
+				if ($data->nummer !== $nummer || $data->nummer2 !== $nummer2 || $data->beschreibung !== $beschreibung) {
+					$result = $this->BetriebsmittelModel->update($data->betriebsmittel_id, [
+						'nummer' => $nummer,
+						'nummer2' => $nummer2,
+						'beschreibung' => $beschreibung,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]);
+					$this->getDataOrTerminateWithError($result);
+				}
+				$betriebsmittel_id = $data->betriebsmittel_id;
+			} else {
+				$result = $this->BetriebsmittelModel->insert([
+					'betriebsmitteltyp' => $betriebsmitteltyp,
+					'nummer' => $nummer,
+					'nummer2' => $nummer2,
+					'beschreibung' => $beschreibung,
+					'reservieren' => false,
+					'ort_kurzbz' => null,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID(),
+				]);
+				$betriebsmittel_id = $this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		$result = $this->BetriebsmittelpersonModel->update($betriebsmittelperson_id, [
+			'betriebsmittel_id' => $betriebsmittel_id,
+			'anmerkung' => $anmerkung,
+			'kaution' => $kaution,
+			'ausgegebenam' => $ausgegebenam,
+			'retouram' => $retouram,
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->db->trans_complete();
+
+		$this->terminateWithSuccess(true);
+	}
+
+	public function loadBetriebsmittel($betriebsmittelperson_id)
+	{
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($betriebsmittelperson_id, 'betriebsmittelperson_id');
+
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result)) {
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function deleteBetriebsmittel($betriebsmittelperson_id)
+	{
+		$result = $this->BetriebsmittelpersonModel->delete(
+			array('betriebsmittelperson_id' => $betriebsmittelperson_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' => 'Betriebsmittelperson_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
+
+	public function getTypenBetriebsmittel()
+	{
+		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
+
+		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
+		$result = $this->BetriebsmitteltypModel->load(); // load All
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function loadInventarliste($searchString)
+	{
+		$result = $this->BetriebsmittelModel->loadInventarliste($searchString);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}
+
+

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

@@ -0,0 +1,187 @@
+<?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 \REST_Controller as REST_Controller;
+use \Studierendenantrag_model as Studierendenantrag_model;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Abmeldung extends FHCAPI_Controller
+{
+
+	/**
+	 * Calls the parent's constructor and loads the AntragLib
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getDetailsForNewAntrag' => self::PERM_LOGGED,
+			'getDetailsForAntrag' => self::PERM_LOGGED,
+			'createAntrag' => self::PERM_LOGGED,
+			'cancelAntrag' => self::PERM_LOGGED
+		]);
+
+		// Libraries
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Retrieves data of the current studiengang for the current user
+	 */
+
+	public function getDetailsForNewAntrag($prestudent_id)
+	{
+		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, true))
+			$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
+
+		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
+		$result = $this->getDataOrTerminateWithError($result);
+		
+		if (!$result) {
+			$this->terminateWithError(
+				$this->p->t('studierendenantrag', 'error_no_student'),
+				self::ERROR_TYPE_AUTH,
+				REST_Controller::HTTP_FORBIDDEN
+			);
+		} elseif ($result == -3) {
+			$this->terminateWithError(
+				$this->p->t('studierendenantrag', 'error_stg_blacklist'),
+				self::ERROR_TYPE_AUTH,
+				REST_Controller::HTTP_FORBIDDEN
+			);
+		} elseif ($result == -1) {
+			$result = $this->antraglib->getDetailsForLastAntrag(
+                $prestudent_id,
+                [
+                    Studierendenantrag_model::TYP_ABMELDUNG,
+                    Studierendenantrag_model::TYP_ABMELDUNG_STGL
+                ]
+            );
+
+			$data = $this->getDataOrTerminateWithError($result);
+			
+			$data->canCancel = (
+				$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
+				$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
+			);
+
+			$this->terminateWithSuccess($data);
+		}
+
+		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getDetailsForAntrag($studierendenantrag_id)
+	{
+		if (!$this->antraglib->isEntitledToShowAntrag($studierendenantrag_id))
+			return show_404();
+
+		$result = $this->antraglib->getDetailsForAntrag($studierendenantrag_id);
+		
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if ($data->typ !== Studierendenantrag_model::TYP_ABMELDUNG_STGL && $data->typ !== Studierendenantrag_model::TYP_ABMELDUNG)
+			return show_404();
+
+		$data->canCancel = (
+			$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
+			$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
+		);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function createAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
+		$this->form_validation->set_rules('grund', 'Grund', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$grund = $this->input->post('grund');
+		$studiensemester = $this->input->post('studiensemester');
+		$prestudent_id = $this->input->post('prestudent_id');
+
+		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
+		$result = $this->getDataOrTerminateWithError($result);
+		if (!$result)
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
+		elseif ($result == -3)
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_stg_blacklist'), self::ERROR_TYPE_GENERAL);
+		elseif ($result < 0)
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->antraglib->createAbmeldung($prestudent_id, $studiensemester, getAuthUID(), $grund);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$result = $this->antraglib->getDetailsForAntrag($data);
+		if (!hasData($result))
+			return $this->terminateWithSuccess(true);
+
+		$data = getData($result);
+		$data->canCancel = (boolean)$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function cancelAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('antrag_id', 'Antrag ID', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$antrag_id = $this->input->post('antrag_id');
+
+		if (!$this->antraglib->isEntitledToCancelAntrag($antrag_id))
+			$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
+
+		$result = $this->antraglib->cancelAntrag($antrag_id, getAuthUID());
+		$this->getDataOrTerminateWithError($result);
+
+		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
+		if (!hasData($result))
+			$this->terminateWithSuccess($antrag_id);
+		
+		$data = getData($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+}

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

@@ -0,0 +1,429 @@
+<?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 \stdClass as stdClass;
+use \Studierendenantrag_model as Studierendenantrag_model;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Leitung extends FHCAPI_Controller
+{
+
+	/**
+	 * Calls the parent's constructor and loads the AntragLib
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getActiveStgs' => ['student/antragfreigabe:r', 'student/studierendenantrag:r'],
+			'getAntraege' => ['student/antragfreigabe:r', 'student/studierendenantrag:r'],
+			'getHistory' => ['student/antragfreigabe:r', 'student/studierendenantrag:r'],
+			'getPrestudents' => 'student/studierendenantrag:w',
+			'approveAntrag' => 'student/antragfreigabe:w',
+			'rejectAntrag' => 'student/antragfreigabe:w',
+			'reopenAntrag' => 'student/studierendenantrag:w',
+			'pauseAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
+			'unpauseAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
+			'objectAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
+			'approveObjection' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
+			'denyObjection' => ['student/antragfreigabe:w', 'student/studierendenantrag:w']
+		]);
+
+		// Libraries
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag',
+			'lehre'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getActiveStgs()
+	{
+		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
+		$studiengaenge = array_merge($studiengaenge, $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: []);
+		
+		$result = $this->StudierendenantragModel->loadStgsWithAntraege($studiengaenge);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getAntraege($studiengang = null, $extra = null)
+	{
+		if ($studiengang && $studiengang == 'todo') {
+			$studiengang = $extra;
+			$extra = true;
+		} else {
+			$extra = false;
+		}
+
+		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
+		if(!is_array($studiengaenge))
+			$studiengaenge = [];
+
+
+		$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+		if(!is_array($stgsNeuanlage))
+			$stgsNeuanlage = [];
+
+		$studiengaenge = array_unique(array_merge($studiengaenge, $stgsNeuanlage));
+
+		if ($studiengang) {
+			if (!in_array($studiengang, $studiengaenge))
+				$this->terminateWithError(
+					'Forbidden',
+					self::ERROR_TYPE_AUTH,
+					REST_Controller::HTTP_FORBIDDEN
+				);
+			$studiengaenge = [$studiengang];
+		}
+
+		$antraege = [];
+		if ($studiengaenge) {
+			$result = $extra
+				? $this->StudierendenantragModel->loadActiveForStudiengaenge($studiengaenge)
+				: $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
+
+			$antraege = $this->getDataOrTerminateWithError($result);
+		}
+
+		$this->terminateWithSuccess($antraege ?: []);
+	}
+
+	public function getHistory($studierendenantrag_id)
+	{
+		if (!$this->antraglib->isEntitledToSeeHistoryForAntrag($studierendenantrag_id))
+			$this->terminateWithError(
+				'Forbidden',
+				self::ERROR_TYPE_AUTH,
+				REST_Controller::HTTP_FORBIDDEN
+			);
+
+		$result = $this->antraglib->getAntragHistory($studierendenantrag_id);
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data ?: []);
+	}
+
+	public function getPrestudents()
+	{
+		$query = $this->input->post('query');
+
+		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+
+		$result = $this->antraglib->getAktivePrestudentenInStgs($studiengaenge, $query);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($result ?: []);
+	}
+
+	public function approveAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				['isEntitledToApproveAntrag', [$this->antraglib, 'isEntitledToApproveAntrag']],
+			],
+			[
+				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
+			]
+		);
+		$this->form_validation->set_rules(
+			'typ',
+			'Typ',
+			'required|in_list[' . implode(',', [
+				Studierendenantrag_model::TYP_ABMELDUNG,
+				Studierendenantrag_model::TYP_ABMELDUNG_STGL,
+				Studierendenantrag_model::TYP_UNTERBRECHUNG,
+				Studierendenantrag_model::TYP_WIEDERHOLUNG
+			]) . ']'
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+		switch ($this->input->post('typ')) {
+			case Studierendenantrag_model::TYP_ABMELDUNG:
+			case Studierendenantrag_model::TYP_ABMELDUNG_STGL:
+				$result = $this->antraglib->approveAbmeldung([$studierendenantrag_id], getAuthUID());
+				break;
+			case Studierendenantrag_model::TYP_UNTERBRECHUNG:
+				$result = $this->antraglib->approveUnterbrechung([$studierendenantrag_id], getAuthUID());
+				break;
+			case Studierendenantrag_model::TYP_WIEDERHOLUNG:
+				$result = $this->antraglib->approveWiederholung($studierendenantrag_id, getAuthUID());
+				break;
+		}
+		$this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($studierendenantrag_id);
+	}
+
+	public function rejectAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				['isEntitledToRejectAntrag', [$this->antraglib, 'isEntitledToRejectAntrag']],
+			],
+			[
+				'isEntitledToRejectAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
+			]
+		);
+		$this->form_validation->set_rules('grund', 'Grund', 'required');
+		$this->form_validation->set_rules(
+			'typ',
+			'Typ',
+			'required|in_list[' . implode(',', [
+				Studierendenantrag_model::TYP_UNTERBRECHUNG
+			]) . ']'
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+		$grund = $this->input->post('grund');
+
+		$result = $this->antraglib->rejectUnterbrechung([$studierendenantrag_id], getAuthUID(), $grund);
+		$this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($studierendenantrag_id);
+	}
+
+	public function reopenAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				['isEntitledToReopenAntrag', [$this->antraglib, 'isEntitledToReopenAntrag']],
+			],
+			[
+				'isEntitledToReopenAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
+			]
+		);
+		$this->form_validation->set_rules(
+			'typ',
+			'Typ',
+			'required|in_list[' . implode(',', [
+				Studierendenantrag_model::TYP_WIEDERHOLUNG
+			]) . ']'
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->reopenWiederholung($studierendenantrag_id, getAuthUID());
+		$this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($studierendenantrag_id);
+	}
+
+	public function pauseAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				['isEntitledToPauseAntrag', [$this->antraglib, 'isEntitledToPauseAntrag']],
+				['antragCanBeManualPaused', [$this->antraglib, 'antragCanBeManualPaused']]
+			],
+			[
+				'isEntitledToPauseAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'antragCanBeManualPaused' => $this->p->t(
+					'studierendenantrag',
+					'error_not_pauseable',
+					['id' => $this->input->post('studierendenantrag_id')]
+				)
+			]
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->pauseAntrag($studierendenantrag_id, getAuthUID());
+		$this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($studierendenantrag_id);
+	}
+
+	public function unpauseAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				['isEntitledToUnpauseAntrag', [$this->antraglib, 'isEntitledToUnpauseAntrag']],
+				['antragCanBeManualUnpaused', [$this->antraglib, 'antragCanBeManualUnpaused']]
+			],
+			[
+				'isEntitledToUnpauseAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'antragCanBeManualUnpaused' => $this->p->t(
+					'studierendenantrag',
+					'error_not_paused',
+					['id' => $this->input->post('studierendenantrag_id')]
+				)
+			]
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->unpauseAntrag($studierendenantrag_id, getAuthUID());
+		$this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($studierendenantrag_id);
+	}
+
+	public function objectAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				['isEntitledToObjectAntrag', [$this->antraglib, 'isEntitledToObjectAntrag']],
+				['canBeObjected', function ($a) {
+					return $this->antraglib->hasType($a, Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+				}]
+			],
+			[
+				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'canBeObjected' => $this->p->t(
+					'studierendenantrag',
+					'error_no_objection'
+				)
+			]
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->objectAbmeldung($studierendenantrag_id, getAuthUID());
+		$this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($studierendenantrag_id);
+	}
+
+	public function approveObjection()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				['isEntitledToObjectAntrag', [$this->antraglib, 'isEntitledToObjectAntrag']],
+				['isObjected', function ($a) {
+					return $this->antraglib->hasStatus($a, Studierendenantragstatus_model::STATUS_OBJECTED);
+				}]
+			],
+			[
+				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'isObjected' => $this->p->t(
+					'studierendenantrag',
+					'error_not_objected'
+				)
+			]
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+		
+		$result = $this->antraglib->cancelAntrag($studierendenantrag_id, getAuthUID());
+		$this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($studierendenantrag_id);
+	}
+
+	public function denyObjection()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			[
+				'required',
+				['isEntitledToObjectAntrag', [$this->antraglib, 'isEntitledToObjectAntrag']],
+				['isObjected', function ($a) {
+					return $this->antraglib->hasStatus($a, Studierendenantragstatus_model::STATUS_OBJECTED);
+				}]
+			],
+			[
+				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'isObjected' => $this->p->t(
+					'studierendenantrag',
+					'error_not_objected'
+				)
+			]
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+		$grund = $this->input->post('grund');
+
+		$result = $this->antraglib->denyObjectionAbmeldung($studierendenantrag_id, getAuthUID(), $grund);
+		$this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($studierendenantrag_id);
+	}
+}

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

@@ -0,0 +1,226 @@
+<?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 \Studierendenantrag_model as Studierendenantrag_model;
+use \DateTime as DateTime;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Unterbrechung extends FHCAPI_Controller
+{
+
+	/**
+	 * Calls the parent's constructor and loads the AntragLib
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getDetailsForNewAntrag' => self::PERM_LOGGED,
+			'getDetailsForAntrag' => self::PERM_LOGGED,
+			'createAntrag' => self::PERM_LOGGED,
+			'cancelAntrag' => self::PERM_LOGGED
+		]);
+
+		// Configs
+		$this->load->config('studierendenantrag');
+
+		// Libraries
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag',
+			'ui'
+		]);
+	}
+
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getDetailsForNewAntrag($prestudent_id)
+	{
+		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, false))
+			$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
+
+		$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		if (!$result) {
+			$this->terminateWithError(
+				$this->p->t('studierendenantrag', 'error_no_student'),
+				self::ERROR_TYPE_AUTH,
+				REST_Controller::HTTP_FORBIDDEN
+			);
+		} elseif ($result == -1) {
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_UNTERBRECHUNG);
+			
+			$data = $this->getDataOrTerminateWithError($result);
+
+			return $this->terminateWithSuccess($data);
+		} elseif ($result == -2) {
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id);
+
+			$data = $this->getDataOrTerminateWithError($result);
+
+			return $this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_pending', [
+                'typ' => $this->p->t('studierendenantrag', 'antrag_typ_' . $result->typ)
+            ]));
+		} elseif ($result == -3) {
+			$this->terminateWithError(
+				$this->p->t('studierendenantrag', 'error_stg_blacklist'),
+				self::ERROR_TYPE_AUTH,
+				REST_Controller::HTTP_FORBIDDEN
+			);
+		}
+
+		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($prestudent_id, null);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getDetailsForAntrag($studierendenantrag_id)
+	{
+		if (!$this->antraglib->isEntitledToShowAntrag($studierendenantrag_id))
+			return show_404();
+
+		$result = $this->antraglib->getDetailsForAntrag($studierendenantrag_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if ($data->typ !== Studierendenantrag_model::TYP_UNTERBRECHUNG)
+			return show_404();
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function createAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
+		$this->form_validation->set_rules('grund', 'Grund', 'required');
+		$this->form_validation->set_rules(
+			'datum_wiedereinstieg',
+			'Datum Wiedereinstieg',
+			'required|callback_isValidDate|callback_isDateInFuture',
+			[
+				'isValidDate' => $this->p->t('ui', 'error_invalid_date'),
+				'isDateInFuture' => $this->p->t('ui', 'error_invalid_date')
+			]
+		);
+
+		if (!$this->form_validation->run()) {
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$grund = $this->input->post('grund');
+		$studiensemester = $this->input->post('studiensemester');
+		$prestudent_id = $this->input->post('prestudent_id');
+		$datum_wiedereinstieg = $this->input->post('datum_wiedereinstieg');
+		$dms_id = null;
+
+		$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id, $studiensemester, $datum_wiedereinstieg);
+
+		$result = $this->getDataOrTerminateWithError($result);
+		
+		if (!$result)
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
+		elseif ($result == -3)
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_stg_blacklist'), self::ERROR_TYPE_GENERAL);
+		elseif ($result < 0)
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
+		
+		if (isset($_FILES['attachment']) && (!isset($_FILES['attachment']['error']) || $_FILES['attachment']['error'] != UPLOAD_ERR_NO_FILE)) {
+			$this->load->library('DmsLib');
+
+			$dms = $this->config->item('unterbrechung_dms');
+			if (!count(array_filter($dms, function ($v) {
+				return $v !== null;
+			})))
+				$dms = ['kategorie_kurzbz' => 'Akte'];
+			$dms['version'] = 0;
+
+			$allowed_filetypes = $this->config->item('unterbrechung_dms_filetypes') ?: ['*'];
+			$result = $this->dmslib->upload($dms, 'attachment', $allowed_filetypes);
+
+			$data = $this->getDataOrTerminateWithError($result);
+			
+			$dms_id = $data['dms_id'];
+		}
+
+		$result = $this->antraglib->createUnterbrechung($prestudent_id, $studiensemester, getAuthUID(), $grund, $datum_wiedereinstieg, $dms_id);
+
+		$antragId = $this->getDataOrTerminateWithError($result);
+		
+		$result = $this->antraglib->getDetailsForAntrag($antragId);
+
+		if (!hasData($result))
+			$this->terminateWithSuccess($antragId);
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function cancelAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('antrag_id', 'Antrag ID', 'required');
+
+		if (!$this->form_validation->run()) {
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$antrag_id = $this->input->post('antrag_id');
+
+		$result = $this->antraglib->cancelAntrag($antrag_id, getAuthUID());
+
+		$this->getDataOrTerminateWithError($result);
+
+		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
+
+		if (!hasData($result))
+			return $this->terminateWithSuccess($antrag_id);
+	
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function isValidDate($date)
+	{
+		try {
+		    new DateTime($date);
+		} catch (Exception $e) {
+			return false;
+		}
+		return true;
+	}
+
+	public function isDateInFuture($date)
+	{
+		return new DateTime() < new DateTime($date);
+	}
+}

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

@@ -0,0 +1,258 @@
+<?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 \REST_Controller as REST_Controller;
+use \Studierendenantragstatus_model as Studierendenantragstatus_model;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the AntragLib (back-end)
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Wiederholung extends FHCAPI_Controller
+{
+
+	/**
+	 * Calls the parent's constructor and loads the FilterCmptLib
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getDetailsForNewAntrag' => self::PERM_LOGGED,
+			'createAntrag' => self::PERM_LOGGED,
+			'cancelAntrag' => self::PERM_LOGGED,
+			'getLvs' => self::PERM_LOGGED,
+			'saveLvs' => ['student/studierendenantrag:w']
+		]);
+
+		// Libraries
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'global',
+			'studierendenantrag'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Retrieves data of the current studiengang for the current user
+	 */
+
+	public function getDetailsForNewAntrag($prestudent_id)
+	{
+		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, false))
+			$this->terminateWithError('Forbidden', self::ERROR_TYPE_AUTH, REST_Controller::HTTP_FORBIDDEN);
+
+		$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		if (!$result) {
+			$this->terminateWithError(
+				$this->p->t('studierendenantrag', 'error_no_student_no_failed_exam'),
+				self::ERROR_TYPE_AUTH,
+				REST_Controller::HTTP_FORBIDDEN
+			);
+		} elseif ($result == -1) {
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_WIEDERHOLUNG);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id, $data->datum, $data->studiensemester_kurzbz);
+			// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
+			$pruefungsdata = current(getData($result));
+
+			$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
+			$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
+			$data->pruefungsdatum = $pruefungsdata->datum;
+
+			$this->terminateWithSuccess($data);
+		} elseif ($result == -2) {
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id);
+			$result = $this->getDataOrTerminateWithError($result);
+
+			$this->terminateWithError(
+				$this->p->t('studierendenantrag', 'error_antrag_pending', [
+					'typ' => $this->p->t('studierendenantrag', 'antrag_typ_' . $result->typ)
+				]),
+				self::ERROR_TYPE_GENERAL,
+				REST_Controller::HTTP_BAD_REQUEST
+			);
+		} elseif ($result == -3) {
+			$this->terminateWithError(
+				$this->p->t('studierendenantrag', 'error_stg_blacklist'),
+				self::ERROR_TYPE_GENERAL,
+				REST_Controller::HTTP_BAD_REQUEST
+			);
+		}
+
+		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
+		// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
+		$pruefungsdata = current(getData($result));
+
+		$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
+		$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
+		$data->pruefungsdatum = $pruefungsdata->datum;
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function createAntrag()
+	{
+		$this->createAntragWithStatus(true);
+	}
+
+	public function cancelAntrag()
+	{
+		$this->createAntragWithStatus(false);
+	}
+
+	protected function createAntragWithStatus($repeat)
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
+		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		$studiensemester = $this->input->post('studiensemester');
+
+		$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		if (!$result) {
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
+		} elseif ($result == -1) {
+			$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+			$result = $this->getDataOrTerminateWithError($result);
+			if (!$result)
+				$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_prestudentstatus', [
+					'prestudent_id' => $prestudent_id
+				]), self::ERROR_TYPE_GENERAL);
+			if (!in_array(current($result)->status_kurzbz, $this->config->item('antrag_prestudentstatus_whitelist')))
+				$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_student'), self::ERROR_TYPE_GENERAL);
+		} elseif ($result == -2) {
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_antrag_exists'), self::ERROR_TYPE_GENERAL);
+		} elseif ($result == -3) {
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_stg_blacklist'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->antraglib->createWiederholung($prestudent_id, $studiensemester, getAuthUID(), $repeat);
+		$antragId = $this->getDataOrTerminateWithError($result);
+
+		$result = $this->antraglib->getDetailsForAntrag($antragId);
+
+		if (!hasData($result))
+			$this->terminateWithSuccess(true);
+
+		$data = getData($result);
+
+		$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
+		// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
+		$pruefungsdata = current(getData($result));
+
+		$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
+		$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
+		$data->pruefungsdatum = $pruefungsdata->datum;
+
+		$this->terminateWithSuccess($data);
+	}
+
+
+	public function getLvs($antrag_id)
+	{
+		$result = $this->antraglib->getLvsForAntrag($antrag_id);
+		if (isError($result)) {
+			$error = getError($result);
+			if ($error == 'Forbidden')
+				$this->terminateWithError(
+					$error,
+					self::ERROR_TYPE_AUTH,
+					REST_Controller::HTTP_FORBIDDEN
+				);
+			$this->terminateWithError(
+				$error,
+				self::ERROR_TYPE_GENERAL
+			);
+		}
+		$lvs = getData($result);
+
+		$this->terminateWithSuccess($lvs);
+	}
+
+	public function saveLvs()
+	{
+		$forbiddenLvs = $this->input->post('forbiddenLvs');
+		$mandatoryLvs = $this->input->post('mandatoryLvs');
+		$antragsLvs = array_merge($forbiddenLvs, $mandatoryLvs);
+
+		if (!$antragsLvs)
+			$this->terminateWithError($this->p->t('studierendenantrag', 'error_no_lv'), self::ERROR_TYPE_GENERAL);
+
+		$insert = array_map(function ($lv) {
+			return [
+				'studierendenantrag_id' => $lv['studierendenantrag_id'],
+				'lehrveranstaltung_id' => $lv['lehrveranstaltung_id'],
+				'note' => $lv['zugelassen']
+                    ? ($lv['zugelassen'] == 1 ? 0 : $this->config->item('wiederholung_note_angerechnet'))
+                    : $this->config->item('wiederholung_note_nicht_zugelassen'),
+				'anmerkung' => $lv['anmerkung'],
+				'insertvon' => getAuthUID(),
+				'studiensemester_kurzbz' => $lv['studiensemester_kurzbz']
+			];
+		}, $antragsLvs);
+
+		$antrag_ids = array_unique(array_map(function ($lv) {
+			return $lv['studierendenantrag_id'];
+		}, $insert));
+
+		foreach ($antrag_ids as $antrag_id) {
+			$result = $this->StudierendenantragModel->loadIdAndStatusWhere([
+				'studierendenantrag_id' => $antrag_id
+			]);
+			$antrag = $this->getDataOrTerminateWithError($result);
+			if (!$antrag)
+				$this->terminateWithError(
+					$this->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $antrag_id]),
+					self::ERROR_TYPE_GENERAL
+				);
+			$antrag = current($antrag);
+
+			if ($antrag->status != Studierendenantragstatus_model::STATUS_CREATED
+				&& $antrag->status != Studierendenantragstatus_model::STATUS_LVSASSIGNED)
+				$this->terminateWithError(
+					$this->p->t('studierendenantrag', 'error_antrag_locked'),
+					self::ERROR_TYPE_GENERAL
+				);
+		}
+
+		$result = $this->antraglib->saveLvs($insert);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}

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

@@ -0,0 +1,140 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Overview on Bismeldestichtage
+ */
+class Bismeldestichtag extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'admin:r',
+				'getStudiensemester' => 'admin:r',
+				'getBismeldestichtage' => 'admin:r',
+				'addBismeldestichtag' => 'admin:rw',
+				'deleteBismeldestichtag' => 'admin:rw'
+			)
+		);
+
+		// Load models
+		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		// Loads phrases system
+		$this->loadPhrases(
+			array(
+				'bismeldestichtag'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function index()
+	{
+		$this->load->view('codex/bismeldestichtag.php');
+	}
+
+	public function getStudiensemester()
+	{
+		// load semester list
+		$semList = array();
+		$this->StudiensemesterModel->addSelect('studiensemester_kurzbz');
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$semRes = $this->StudiensemesterModel->load();
+
+		if (hasData($semRes))
+		{
+			$semList = getData($semRes);
+		}
+
+		// load current semester
+		$currSem = null;
+		$semRes = $this->StudiensemesterModel->getAkt();
+
+		if (hasData($semRes))
+		{
+			$currSem = getData($semRes)[0]->studiensemester_kurzbz;
+		}
+
+		// output data
+		$this->outputJsonSuccess(
+			array('semList' => $semList, 'currSem' => $currSem)
+		);
+	}
+
+	public function getBismeldestichtage()
+	{
+		$this->BismeldestichtagModel->addSelect(
+			'meldestichtag_id, meldestichtag,
+			tbl_bismeldestichtag.studiensemester_kurzbz, sem.start AS semester_start,
+			tbl_bismeldestichtag.insertamum, tbl_bismeldestichtag.insertvon, tbl_bismeldestichtag.updateamum, tbl_bismeldestichtag.updatevon'
+		);
+		$this->BismeldestichtagModel->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz', 'LEFT');
+		$this->BismeldestichtagModel->addOrder('semester_start');
+		$this->BismeldestichtagModel->addOrder('meldestichtag', 'DESC');
+		$this->BismeldestichtagModel->addOrder('meldestichtag_id', 'DESC');
+		$this->outputJson($this->BismeldestichtagModel->load());
+	}
+
+	public function addBismeldestichtag()
+	{
+		// get request data
+		$request = $this->getPostJSON();
+
+		// check request data
+		if (!property_exists($request, 'meldestichtag') || isEmptyString($request->meldestichtag))
+			$this->terminateWithJsonError('Error occured: Meldestichtag missing');
+		if (!property_exists($request, 'studiensemester_kurzbz') || isEmptyString($request->studiensemester_kurzbz))
+			$this->terminateWithJsonError('Error occured: Studiensemester missing');
+
+		$meldestichtag = $request->meldestichtag;
+		$studiensemester_kurzbz = $request->studiensemester_kurzbz;
+
+		// check if Bismeldestichtag already exists
+		$this->BismeldestichtagModel->addSelect('1');
+		$bismeldestichtagRes = $this->BismeldestichtagModel->loadWhere(
+			array('meldestichtag' => $meldestichtag, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
+		);
+
+		// return success if already exists
+		if (hasData($bismeldestichtagRes))
+			$this->outputJsonSuccess('Bismeldestichtag already exists');
+		else
+		{
+			// insert new if Stichtag does not exist
+			$this->outputJson($this->BismeldestichtagModel->insert(
+				array(
+					'meldestichtag' => $request->meldestichtag,
+					'studiensemester_kurzbz' => $request->studiensemester_kurzbz,
+					'insertvon' => getAuthUID()
+				)
+			));
+		}
+	}
+
+	public function deleteBismeldestichtag()
+	{
+		// get request data
+		$request = $this->getPostJSON();
+
+		// check request data
+		if (!property_exists($request, 'meldestichtag_id'))
+			$this->terminateWithJsonError('Error occured: Meldestichtag Id missing');
+
+		$meldestichtag_id = $request->meldestichtag_id;
+
+		// deletetion
+		$this->outputJson($this->BismeldestichtagModel->delete($meldestichtag_id));
+	}
+}

application/controllers/codex/UHSTAT1.php

@@ -0,0 +1,454 @@
+<?php
+
+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;
+
+	private $_uid;
+	private $_uhstat1Fields = array();
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		// load ci libs
+		$this->load->library('form_validation');
+
+		// load ci helpers
+		$this->load->helper(array('form', 'url'));
+
+		// load libraries
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+
+		// load models
+		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->load->model('codex/Abschluss_model', 'AbschlussModel');
+		$this->load->model('codex/Uhstat1daten_model', 'Uhstat1datenModel');
+
+		$this->loadPhrases(
+			array(
+				'ui',
+				'uhstat'
+			)
+		);
+
+		$this->_uid = getAuthUID();
+
+		// set form field information
+		$this->_uhstat1Fields = array(
+			'mutter_geburtsstaat' => array('name' => 'Geburtsstaat Mutter'),
+			'mutter_geburtsjahr' => array('name' => 'Geburtsjahr Mutter'),
+			'mutter_bildungsstaat' => array('name' => 'Bildungsstaat Mutter'),
+			'mutter_bildungmax' => array(
+				'name' => 'Geburtsjahr Mutter',
+				'rules' => array(
+					'callback_bildungsstaat_bildungmax_check[m]' => array(
+						'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
+					)
+				)
+			),
+			'vater_geburtsstaat' => array('name' => 'Geburtsstaat Vater'),
+			'vater_geburtsjahr' => array('name' => 'Geburtsjahr Vater'),
+			'vater_bildungsstaat' => array('name' => 'Bildungsstaat Vater'),
+			'vater_bildungmax' => array('name' => 'Geburtsjahr Vater'),
+			'vater_bildungmax' => array(
+				'name' => 'Geburtsjahr Vater',
+				'rules' => array(
+					'callback_bildungsstaat_bildungmax_check[v]' => array(
+						'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
+					)
+				)
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function index()
+	{
+		$formMetaData = $this->_getFormMetaData();
+
+		if (isError($formMetaData)) show_error(getError($formMetaData));
+
+		if (!hasData($formMetaData)) show_error("No form meta data could be loaded");
+
+		$uhstatData = $this->_getUHSTAT1Data();
+
+		if (isError($uhstatData)) show_error(getError($uhstatData));
+
+		$this->load->view("codex/uhstat1.php", array(
+				'formMetaData' => getData($formMetaData),
+				'uhstatData' => getData($uhstatData)
+			)
+		);
+	}
+
+	/**
+	 * Add or update UHSTAT1 data
+	 */
+	public function saveUHSTAT1Data()
+	{
+		$saved = false;
+
+		$person_id = $this->_getValidPersonId('sui');
+
+		$this->form_validation->set_error_delimiters('<span class="text-danger">', '</span>');
+
+		foreach ($this->_uhstat1Fields as $field => $params)
+		{
+			// all fields are required
+			$ruleNames = 'required';
+			$ruleMessages = array('required' => $this->p->t('uhstat', 'angabeFehlt'));
+
+			// add additional rules
+			if (isset($params['rules']))
+			{
+				foreach ($params['rules'] as $ruleName => $ruleMessage)
+				{
+					$ruleNames .= '|'.$ruleName;
+					$ruleMessages = array_merge($ruleMessages, $ruleMessage);
+				}
+			}
+
+			$this->form_validation->set_rules(
+				$field,
+				$params['name'],
+				$ruleNames,
+				$ruleMessages
+			);
+		}
+
+		$uhstat1datenRes = null;
+		if ($this->form_validation->run()) // if valid
+		{
+			// get post fields
+			$uhstatData = array();
+			foreach ($this->_uhstat1Fields as $field => $params)
+			{
+				$uhstatData[$field] = $this->input->post($field);
+			}
+
+			// check if entry already exists
+			$uhstat1datenloadRes = $this->Uhstat1datenModel->loadWhere(array('person_id' => $person_id));
+
+			// if yes, update
+			if (hasData($uhstat1datenloadRes))
+			{
+				$uhstatData['updateamum'] = 'NOW()';
+				$uhstatData['updatevon'] = $this->_uid;
+				$uhstat1datenRes = $this->Uhstat1datenModel->update(
+					array('person_id' => $person_id),
+					$uhstatData
+				);
+			}
+			else // otherwise insert
+			{
+				$uhstatData['insertamum'] = 'NOW()';
+				$uhstatData['insertvon'] = $this->_uid;
+				$uhstat1datenRes = $this->Uhstat1datenModel->insert(
+					array_merge($uhstatData, array('person_id' => $person_id))
+				);
+			}
+		}
+
+		$formMetaData = $this->_getFormMetaData();
+
+		if (isError($formMetaData)) show_error(getError($formMetaData));
+
+		if (!hasData($formMetaData)) show_error("No form meta data could be loaded");
+
+		$successMessage = '';
+		$errorMessage = '';
+		// pass success/error messages to view
+		if (isset($uhstat1datenRes))
+		{
+			if (isSuccess($uhstat1datenRes))
+			{
+				$successMessage = $this->p->t('uhstat', 'erfolgreichGespeichert');
+				$saved = true;
+			}
+			else
+				$errorMessage = $this->p->t('uhstat', 'fehlerBeimSpeichern');
+		}
+
+		// load view with form data
+		$this->load->view("codex/uhstat1.php", array(
+				'formMetaData' => getData($formMetaData),
+				'saved' => $saved,
+				'successMessage' => $successMessage,
+				'errorMessage' => $errorMessage
+			)
+		);
+	}
+
+	/**
+	 * Check callback for Bildungsstaat - if Bildungsstaat is Austria, a highest education should be in Austria.
+	 * @param $bildungmax
+	 * @param $bildungsstaat_typ - mother (m) or father (v)
+	 * @return bool true if valid, false otherwise
+	 */
+	public function bildungsstaat_bildungmax_check($bildungmax, $bildungsstaat_typ)
+	{
+		// valid if no type passed
+		if (!isset($bildungsstaat_typ) || !isset($bildungmax)) return true;
+
+		// get correct input
+		if ($bildungsstaat_typ == 'm') // mutter
+			$bildungsstaat = $this->input->post('mutter_bildungsstaat');
+		elseif ($bildungsstaat_typ == 'v') // vater
+			$bildungsstaat = $this->input->post('vater_bildungsstaat');
+		else
+			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");
+		$abschlussRes = $this->AbschlussModel->load($bildungmax);
+
+		if (hasData($abschlussRes))
+		{
+			$in_oesterreich = getData($abschlussRes)[0]->in_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;
+	}
+
+	/**
+	 * Deletes UHSTAT1 entry.
+	 */
+	public function deleteUHSTAT1Data()
+	{
+		$saved = false;
+
+		// uhstat data can only be deleted with permission
+		if (!$this->_checkPermission('suid')) show_error('no permission');
+
+		$person_id = $this->_getValidPersonId('suid');
+
+		$uhstat1datenRes = $this->Uhstat1datenModel->delete(
+			array('person_id' => $person_id)
+		);
+
+		$formMetaData = $this->_getFormMetaData();
+
+		if (isError($formMetaData)) show_error(getError($formMetaData));
+
+		if (!hasData($formMetaData)) show_error("No form meta data could be loaded");
+
+		$successMessage = '';
+		$errorMessage = '';
+		// pass success/error messages to view
+		if (isset($uhstat1datenRes))
+		{
+			if (isSuccess($uhstat1datenRes))
+			{
+				$successMessage = $this->p->t('uhstat', 'erfolgreichGeloescht');
+			}
+			else
+				$errorMessage = $this->p->t('uhstat', 'fehlerBeimLoeschen');
+		}
+
+		// load view with form data
+		$this->load->view("codex/uhstat1.php", array(
+				'formMetaData' => getData($formMetaData),
+				'successMessage' => $successMessage,
+				'errorMessage' => $errorMessage
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Gets initial data needed to display UHSTAT1 form.
+	 */
+	private function _getFormMetaData()
+	{
+		$person_id = $this->_getValidPersonId('s');
+
+		// read only display param
+		$readOnly = $this->input->get('readOnly');
+
+		// depending on permissions, editing or deleting is possible
+		$editPermission = $this->_checkPermission('sui');
+		$deletePermission = $this->_checkPermission('suid');
+
+		$languageIdx = $this->_getLanguageIndex();
+
+		$formMetaData = array(
+			'nation' => array(),
+			'abschluss_oesterreich' => array(),
+			'abschluss_nicht_oesterreich' => array(),
+			'jahre' => array(),
+			'person_id' => $person_id,
+			'editPermission' => $editPermission,
+			'deletePermission' => $deletePermission,
+			'readOnly' => $readOnly
+		);
+
+		// get person data
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->PersonModel->addSelect("vorname, nachname");
+		$personRes = $this->PersonModel->load($person_id);
+
+		if (isError($personRes)) return $personRes;
+
+		if (hasData($personRes))
+		{
+			$person = getData($personRes)[0];
+			$formMetaData['vorname'] = $person->vorname;
+			$formMetaData['nachname'] = $person->nachname;
+		}
+
+		$nationTextFieldName = $languageIdx == 1 ? 'langtext' : 'engltext';
+
+		// get nation list
+		$this->load->model('codex/Nation_model', 'NationModel');
+
+		$this->NationModel->addSelect("nation_code, $nationTextFieldName AS nation_text");
+		$this->NationModel->addOrder("nation_text");
+		$nationRes = $this->NationModel->loadWhere('sperre IS NULL OR sperre = FALSE');
+
+		if (isError($nationRes)) return $nationRes;
+
+		if (hasData($nationRes))
+		{
+			$nations = getData($nationRes);
+
+			// put austria in beginning of selection
+			foreach ($nations as $nation)
+			{
+				if ($nation->nation_code == self::CODEX_OESTERREICH) array_unshift($nations, $nation);
+			}
+
+			$formMetaData['nation'] = $nations;
+		}
+
+		// get abschluss list
+		$abschlussRes = $this->AbschlussModel->getActiveAbschluesse($languageIdx);
+
+		if (isError($abschlussRes)) return $abschlussRes;
+
+		$abschlussData = getData($abschlussRes);
+
+		if (hasData($abschlussRes))
+		{
+			foreach (getData($abschlussRes) as $abschluss)
+			{
+				if ($abschluss->in_oesterreich === true)
+					$formMetaData['abschluss_oesterreich'][] = $abschluss;
+				elseif ($abschluss->in_oesterreich === false)
+					$formMetaData['abschluss_nicht_oesterreich'][] = $abschluss;
+				else
+				{
+					$formMetaData['abschluss_oesterreich'][] = $abschluss;
+					$formMetaData['abschluss_nicht_oesterreich'][] = $abschluss;
+				}
+			}
+		}
+
+		// get realistic birth years, dated back from current year
+		$currYear = date("Y");
+		$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);
+	}
+
+	/**
+	 * Gets initial data needed to display UHSTAT1 form.
+	 */
+	private function _getUHSTAT1Data()
+	{
+		$person_id = $this->_getValidPersonId('s');
+
+		$this->Uhstat1datenModel->addSelect(
+			implode(', ', array_keys($this->_uhstat1Fields))
+		);
+		$uhstatRes = $this->Uhstat1datenModel->loadWhere(array('person_id' => $person_id));
+
+		if (isError($uhstatRes)) return $uhstatRes;
+
+		return success(hasData($uhstatRes) ? getData($uhstatRes)[0] : null);
+	}
+
+	/**
+	 * Gets language index of currently logged in user.
+	 * @return int (the index, start at 1)
+	 */
+	private function _getLanguageIndex()
+	{
+		$idx = 1;
+		$this->SpracheModel->addSelect('index');
+		$langRes = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
+
+		if (hasData($langRes))
+		{
+			$idx = getData($langRes)[0]->index;
+		}
+
+		return $idx;
+	}
+
+	/**
+	 * Gets Id of person having permissions to manage UHSTAT1 data.
+	 * Can be passed as parameter or be in session.
+	 * @return int person_id
+	 */
+	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])
+			&& isset($_SESSION[self::LOGIN_SESSION_INDEX])
+		)
+			return $_SESSION[self::PERSON_ID_SESSION_INDEX];
+
+		// if person id passed directly...
+		$person_id = $this->input->post('person_id');
+		if (!isset($person_id)) $person_id = $this->input->get('person_id');
+
+		if (!isset($person_id) || !is_numeric($person_id)) show_error("invalid person id");
+
+		// ...check if there is a permission for editing UHSTAT1 data
+		if ($this->_checkPermission($berechtigungsArt)) return $person_id;
+
+		show_error("No permission");
+	}
+
+	/**
+	 * Checks if logged user has the UHSTAT management permission.
+	 * @param $art - type of permission, e.g. suid for full permissions
+	 * @return bool
+	 */
+	private function _checkPermission($art)
+	{
+		return $this->permissionlib->isBerechtigt(self::BERECHTIGUNG_UHSTAT_VERWALTEN, $art);
+	}
+}

application/controllers/components/Filter.php

@@ -9,6 +9,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
  * NOTE: extends the FHC_Controller instead of the Auth_Controller because the FilterCmpt has its
  * 	own permissions check
+ * TODO(chris): deprecated
  */
 class Filter extends FHC_Controller
 {
@@ -26,6 +27,9 @@ class Filter extends FHC_Controller
 		// Loads authentication library and starts authentication
 		$this->load->library('AuthLib');
 
+		// Loads the FiltersModel
+		$this->load->model('system/Filters_model', 'FiltersModel');
+
 		// Loads the FilterCmptLib with HTTP GET/POST parameters
 		$this->_startFilterCmptLib();
 	}

application/controllers/components/Phrasen.php

@@ -0,0 +1,22 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * TODO(chris): deprecated
+ */
+class Phrasen extends FHC_Controller
+{
+	
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param string $module
+	 */
+	public function loadModule($module)
+	{
+		$this->load->library('PhrasesLib', [$module], 'pj');
+		$this->outputJsonSuccess(json_decode($this->pj->getJSON()));
+	}
+}

application/controllers/components/SearchBar.php

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- *
+ * TODO(chris): deprecated
  */
 class SearchBar extends FHC_Controller
 {
@@ -17,8 +17,17 @@ class SearchBar extends FHC_Controller
 	{
 		parent::__construct();
 
+		// Loads the AuthLib _without_ starting the authentication
+		// NOTE:
+		// 	- A user must be authenticated via another controller to access this one
+		//	- It is loaded to be able to call the isLogged function later
+		$this->load->library('AuthLib');
+		
 		// Load the library SearchBarLib
 		$this->load->library('SearchBarLib');
+
+		// Checks if the user is authenticated, otherwise returns an error code in JSON format
+		if (!isLogged()) $this->terminateWithJsonError(SearchBarLib::ERROR_NOT_AUTH);
 	}
 
 	//------------------------------------------------------------------------------------------------------------------

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

@@ -37,6 +37,9 @@ class AnrechnungJob extends JOB_Controller
 		$this->load->helper('hlp_sancho_helper');
 
         $this->load->library('AnrechnungLib');
+
+        // Load configs
+        $this->load->config('anrechnung');
 	}
 
 	/**
@@ -213,7 +216,7 @@ class AnrechnungJob extends JOB_Controller
 					'datentabelle'  => $anrechnungen_table,
 					'link'          => anchor($url, 'Anrechnungsanträge Übersicht')
 				);
-	
+
 				// Send mail
 				sendSanchoMail(
 					'AnrechnungAntragStellen',
@@ -227,6 +230,82 @@ class AnrechnungJob extends JOB_Controller
 		$this->logInfo('SUCCEDED: Sending emails to STGL about yesterdays new Anrechnungen succeded.');
 	}
 
+    // Send Sancho mail to LV-Leitung (fallback Lectors) that were requested for recommendation yesterday.
+    public function sendMailRecommendationRequests(){
+
+        $this->logInfo('Start AnrechnungJob sendMailRecommendationRequests to inform lecturers about yesterdays requests for recommendation.');
+
+        // Get Anrechnungen, für die gestern eine Empfehlung angefragt worden ist
+        $this->AnrechnungModel->addSelect('astat.anrechnung_id, astat.datum, astat.insertamum');
+        $this->AnrechnungModel->addDistinct('astat.anrechnung_id');
+        $this->AnrechnungModel->addJoin('lehre.tbl_anrechnung_anrechnungstatus astat', 'anrechnung_id');
+
+        $result = $this->AnrechnungModel->loadWhere('
+            studiensemester_kurzbz = (SELECT studiensemester_kurzbz FROM tbl_studiensemester WHERE now()::date BETWEEN start AND ende)
+            AND genehmigt_von IS NULL
+            AND empfehlung_anrechnung IS NULL
+            AND status_kurzbz = '. $this->db->escape(self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR) .' -- in Bearbeitung durch Lektor
+            AND NOW()::date = (astat.datum + interval \'1 day\')                    -- nur gestrige Empfehlungsanfrage
+            ORDER BY astat.anrechnung_id, astat.datum DESC, astat.insertamum DESC   -- nur letzten status dabei prüfen
+        ');
+
+        // Exit, wenn es gestern keine Empfehlungsanfragen gab
+        if (!hasData($result))
+        {
+            $this->logInfo('End AnrechnungJob sendMailRecommendationRequests, because no recommendations were requested yesterday.');
+            exit;
+        }
+
+        $anrechnung_id_arr = array_column(getData($result), 'anrechnung_id');
+
+        $arr_lvLector_arr = array();
+        foreach ($anrechnung_id_arr as $anrechnung_id)
+        {
+            // Get full name of Fachbereichsleitung or LV Leitung.
+            if($this->config->item('fbl') === TRUE)
+            {
+                $arr_lvLector_arr[] = $this->anrechnunglib->getLeitungOfLvOe($anrechnung_id);
+            }
+            else
+            {
+                $arr_lvLector_arr[] = $this->anrechnunglib->getLectors($anrechnung_id); // Returns LV Leitung. If not present, then all lectors of LV.
+            }
+        }
+
+        // Unique lector array to send only one mail per lector
+        $arr_lvLector_arr = array_unique($arr_lvLector_arr, SORT_REGULAR);
+
+        // Link to 'Anrechnungen prüfen' dashboard
+        $url =
+            CIS_ROOT. 'cis/index.php?menu='.
+            CIS_ROOT. 'cis/menu.php?content_id=&content='.
+            CIS_ROOT. index_page(). self::REVIEW_ANRECHNUNG_URI;
+
+        foreach ($arr_lvLector_arr as $lvLector_arr)
+        {
+            foreach ($lvLector_arr as $lector)
+            {
+                // Prepare mail content
+                $fields = array(
+                    'vorname'       => $lector->vorname,
+                    'stgl_name'     => 'Die Studiengangsleitung',
+                    'link'          => anchor($url, 'Anrechnungsanträge Übersicht')
+                );
+
+                // Send mail
+                sendSanchoMail(
+                    'AnrechnungEmpfehlungAnfordern',
+                    $fields,
+                    $lector->uid. '@'. DOMAIN,
+                    'Deine Empfehlung wird benötigt zur Anerkennung nachgewiesener Kenntnisse'
+                );
+            }
+        }
+
+        $this->logInfo('SUCCEDED AnrechnungJob sendMailRecommendationRequests');
+
+    }
+
 	/**
 	 * Send Sancho mail to students, whose Anrechnungen were approved 24 hours ago.
 	 */
@@ -308,7 +387,7 @@ class AnrechnungJob extends JOB_Controller
 
 		$db = new DB_Model();
 		$result = $db->execReadOnlyQuery($qry);
-		
+
 		// Exit if there are no rejected Anrechnungen
 		if (!hasData($result))
 		{
@@ -361,9 +440,9 @@ html;
 
         $result = $this->AnrechnungModel->loadWhere('
             studiensemester_kurzbz = (
-                SELECT studiensemester_kurzbz FROM tbl_studiensemester WHERE now()::date BETWEEN start AND ende)
+                SELECT studiensemester_kurzbz FROM tbl_studiensemester WHERE now()::date BETWEEN start AND ende
             )
-            AND genehmigt_von IS NULL                             
+            AND genehmigt_von IS NULL
             AND empfehlung_anrechnung IS NULL
             AND status_kurzbz = '. $this->db->escape(self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR) .' -- in Bearbeitung durch Lektor
             AND NOW()::date = (astat.datum + interval \'1 week\')                   -- eine Woche nach Empfehlungsanfrage
@@ -376,7 +455,7 @@ html;
             $this->logInfo('End AnrechnungJob sendMailRemindRecommendation, because no recommendations to be done.');
             exit;
         }
-        
+
         $anrechnung_id_arr = array_column(getData($result), 'anrechnung_id');
 
         $arr_lvLector_arr = array();
@@ -435,7 +514,7 @@ html;
 					'vorname' => $stgl->vorname
 				);
 			}
-			
+
 			return $stglMailAdress_arr;
 		}
 		// If not available, get assistance mail address

application/controllers/jobs/AntragJob.php

@@ -0,0 +1,707 @@
+<?php
+
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+use \DateTime as DateTime;
+
+class AntragJob extends JOB_Controller
+{
+	/**
+	 * API constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Configs
+		$this->load->config('studierendenantrag');
+
+		// Loads SanchoHelper
+		$this->load->helper('hlp_sancho_helper');
+
+		$this->load->library('AntragLib');
+
+		// Load Model
+		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->load->model('education/Studierendenantragstatus_model', 'StudierendenantragstatusModel');
+		$this->load->model('education/Pruefung_model', 'PruefungModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->loadPhrases([
+			'lehre'
+		]);
+	}
+
+	/**
+	 * Send infomail to Stgl
+	 */
+	public function sendStglSammelmail()
+	{
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$this->logInfo('Start Job sendStglSammelmail');
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$this->StudierendenantragModel->addJoin('public.tbl_prestudent', 'prestudent_id');
+		$this->db->group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();
+
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();
+
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();
+
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
+		$this->db->group_end();
+
+		$result =  $this->StudierendenantragModel->load();
+		if(isError($result))
+			return $this->logError(getError($result));
+
+		if(!hasData($result))
+			return $this->logInfo('End Job sendStglSammelmail: 0 Mails sent');
+
+		$antraege = getData($result);
+
+		$stgs = array();
+		$stgLeitungen = array();
+
+		foreach ($antraege as $antrag)
+		{
+			if (!isset($stgs[$antrag->studiengang_kz]))
+			{
+				$result = $this->StudiengangModel->getLeitung($antrag->studiengang_kz);
+				if (isError($result))
+				{
+					$this->logError(getError($result));
+					continue;
+				}
+				if (!hasData($result))
+				{
+					$this->logError('Keine Leitung für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
+					continue;
+				}
+
+				$leitung = current(getData($result));
+				if (!isset($stgLeitungen[$leitung->uid]))
+				{
+					$stgLeitungen[$leitung->uid] = [ 'Details' => $leitung, 'stgs' => [] ];
+				}
+				$stgLeitungen[$leitung->uid]['stgs'][] = $antrag->studiengang_kz;
+
+				$result = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
+				if (isError($result))
+				{
+					$this->logError(getError($result));
+					continue;
+				}
+				if (!hasData($result))
+				{
+					$this->logError('Keine Details für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
+					continue;
+				}
+				$details = current(getData($result));
+
+				$stgs[$antrag->studiengang_kz] = [
+					'Abmeldung' => [],
+					'Unterbrechung' => [],
+					'Wiederholung' => [],
+					'Details' => $details
+				];
+			}
+			$stgs[$antrag->studiengang_kz][str_replace('Stgl', '', $antrag->typ)] = $antrag;
+		}
+
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$result = $this->SpracheModel->loadWhere(['content' => true]);
+		if (isError($result)) {
+			$this->logError(getError($result));
+			$languages = [DEFAULT_LANGUAGE];
+		} elseif (!hasData($result)) {
+			$languages = [DEFAULT_LANGUAGE];
+		} else {
+			$languages = array_map(function ($row) {
+				return $row->sprache;
+			}, getData($result));
+		}
+
+		$count = 0;
+		foreach ($stgLeitungen as $leitung)
+		{
+			$data = [
+				'name' => trim($leitung['Details']->vorname . ' ' . $leitung['Details']->nachname),
+				'vorname' => $leitung['Details']->vorname,
+				'nachname' => $leitung['Details']->nachname
+			];
+
+			foreach ($languages as $lang) {
+				unset($this->p);
+				$this->loadPhrases(['studierendenantrag'], $lang);
+
+				$table = '';
+				foreach ($leitung['stgs'] as $studiengang_kz) {
+					$rows = '';
+					$stg = $stgs[$studiengang_kz];
+					foreach (['Abmeldung', 'Unterbrechung', 'Wiederholung'] as $typ) {
+						$c = count($stg[$typ]);
+						if ($c) {
+							$rows .= $this->p->t('studierendenantrag', 'mail_part_x_new_' . $typ, ['count' => $c]);
+						}
+					}
+					$table .= $this->p->t('studierendenantrag', 'mail_part_table', [
+                        'stg_bezeichnung' => $stg['Details']->bezeichnung,
+                        'stg_orgform_kurzbz' => $stg['Details']->orgform_kurzbz,
+                        'rows' => $rows
+                    ]);
+				}
+				$data['table_' . $lang] = $table;
+			}
+
+			$data['table'] = $data['table_' . DEFAULT_LANGUAGE];
+			$data['leitungLink'] = APP_ROOT. 'index.ci.php/lehre/Studierendenantrag/leitung';
+
+			//Mail an Stgl und Assistenz
+			$to = $leitung['Details']->uid . '@' . DOMAIN;
+			$cc = $leitung['Details']->email;
+
+			// NOTE(chris): Sancho mail
+			if (sendSanchoMail(
+				"Sancho_Mail_Antrag_Stgl",
+				$data,
+				$to,
+				'Anträge - Aktion(en) erforderlich',
+				DEFAULT_SANCHO_HEADER_IMG,
+				DEFAULT_SANCHO_FOOTER_IMG,
+				'',
+				$cc
+			))
+				$count++;
+		}
+
+		$this->logInfo($count . " Emails erfolgreich versandt");
+
+		$this->logInfo('End Job sendStglSammelmail');
+	}
+
+	/**
+	 * Send reminder to Assistant for Wiedereinstieg Unterbrecher
+	 *
+	 */
+	public function sendReminderWiedereinstieg()
+	{
+		$now = new DateTime();
+		$modifier = $this->config->item('unterbrechung_job_remind_wiedereinstieg_date_modifier');
+		if (!$modifier)
+			return $this->logError('Konnte Job nicht starten: Config "unterbrechung_job_remind_wiedereinstieg_date_modifiers" nicht gesetzt');
+
+		$end = new DateTime();
+		$end->modify($modifier);
+
+		$this->logInfo(sprintf(
+			'Start Job sendReminderWiedereinstieg (Wiedereinstieg zwischen %s - %s)',
+			$now->format('Y-m-d'),
+			$end->format('Y-m-d')
+		));
+
+		$result = $this->StudierendenantragModel->getAntraegeWhereWiedereinstiegBetween($now, $end);
+
+		if(isError($result))
+		{
+			$this->logError(getError($result));
+			$this->logInfo('Ende Job sendReminderWiedereinstieg');
+			return;
+		}
+
+		$antraege = getData($result) ?: [];
+		$count = 0;
+		foreach ($antraege as $antrag)
+		{
+			$res = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
+			$stg = '';
+			$orgform = '';
+			if (hasData($res)) {
+				$studiengang = current(getData($res));
+				$stg = $studiengang->bezeichnung;
+				$orgform = $studiengang->orgform_kurzbz;
+			}
+
+			$datum = new DateTime($antrag->datum_wiedereinstieg);
+			$data = array(
+				'prestudent' => $antrag->prestudent_id,
+				'name' => trim($antrag->vorname . ' '. $antrag->nachname),
+				'datum_wiedereinstieg' => $datum->format('d.m.Y'),
+				'vorname' => $antrag->vorname,
+				'nachname' => $antrag->nachname,
+				'Orgform' => $orgform,
+				'stg' => $stg
+			);
+			$result = $this->StudentModel->loadWhere(['prestudent_id'=> $antrag->prestudent_id]);
+			if (hasData($result)) {
+				$student = current(getData($result));
+				$data['UID'] = $student->student_uid;
+			}
+
+			// NOTE(chris): Sancho mail
+			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
+			{
+				$count++;
+				$this->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $antrag->studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_REMINDERSENT,
+					'insertvon' => 'AntragJob'
+				]);
+			}
+		}
+		$this->logInfo($count . ' Reminder gesendet - Ende Job sendReminderWiedereinstieg');
+	}
+
+	/**
+	 * Set Wiederholer after deadline to Abbrecher
+	 *
+	 */
+	public function handleWiederholerDeadline()
+	{
+		$this->logInfo('Start Job handleWiederholerDeadline');
+
+		$this->load->library('PrestudentLib');
+
+		$insertvon = $this->config->item('antrag_job_systemuser');
+		if (!$insertvon) {
+			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
+			$this->logInfo('Ende Job handleWiederholerDeadline');
+			return;
+		}
+
+		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
+		if (!$modifier_deadline) {
+			$this->logError('Config "wiederholung_job_deadline_date_modifier" nicht gesetzt');
+			$this->logInfo('Ende Job handleWiederholerDeadline');
+			return;
+		}
+
+		$digi_start= $this->config->item('digitalization_start');
+		if($digi_start)
+			$digi_start = new DateTime($digi_start);
+
+		$dateDeadline = new DateTime();
+		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
+
+		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed(
+			[
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_2
+			],
+			$dateDeadline,
+			$digi_start
+		);
+		if(isError($result))
+		{
+			$this->logError(getError($result));
+		}
+		else
+		{
+			$prestudents = getData($result) ?: [];
+			$count = 0;
+
+			$prestudents = $this->prestudentsGetUnique($prestudents);
+
+
+			foreach ($prestudents as $prestudent)
+			{
+				$result = $this->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $prestudent->studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED,
+					'insertvon' => 'AntragJob'
+				]);
+				if (isError($result)) {
+					$this->logError(getError($result));
+				} else {
+					$deregisterStatus = getData($result);
+
+					$result = $this->antraglib->pauseAntrag(
+						$prestudent->studierendenantrag_id,
+						Studierendenantragstatus_model::INSERTVON_DEREGISTERED
+					);
+					if (isError($result))
+						$this->logError(getError($result));
+
+					$result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, '', $insertvon);
+					if (isError($result)) {
+						$this->StudierendenantragstatusModel->delete($deregisterStatus);
+						$this->logError(getError($result));
+					} else {
+						$count++;
+						
+						$datum_kp = new DateTime($prestudent->datum);
+						$dataMail = array(
+							'name'=> trim($prestudent->vorname . ' '. $prestudent->nachname),
+							'vorname' => $prestudent->vorname,
+							'nachname' => $prestudent->nachname,
+							'pers_kz'=> $prestudent->matrikelnr,
+							'stg' => $prestudent->bezeichnung,
+							'lvbezeichnung' => $prestudent->lvbezeichnung,
+							'datum_kp' => $datum_kp->format('d.m.Y'),
+							'studiensemester'=> $prestudent->studiensemester_kurzbz,
+							'Orgform'=> $prestudent->orgform,
+							'prestudent_id' => $prestudent->prestudent_id,
+							'fristablauf' => $dateDeadline->format('d.m.Y')
+						);
+
+						$email = $this->StudentModel->getEmailFH($this->StudentModel->getUID($prestudent->prestudent_id));
+						// Mail to Student
+						if (!sendSanchoMail('Sancho_Mail_Antrag_W_DL_Stud', $dataMail, $email, 'Wiederholung: Frist abgelaufen')) {
+							$this->logWarning("Failed to send Notification to " . $email);
+						}
+
+						$result = $this->StudiengangModel->load($prestudent->studiengang_kz);
+						if (!hasData($result)) {
+							$this->logWarning('No Studiengang found');
+							continue;
+						}
+						$studiengang = current(getData($result));
+						$email = $studiengang->email;
+						// Mail to Assistenz
+						if (!sendSanchoMail('Sancho_Mail_Antrag_W_DL_Assist', $dataMail, $email, 'Wiederholung: Frist abgelaufen')) {
+							$this->logWarning("Failed to send Notification to " . $email);
+						}
+					}
+				}
+			}
+			$this->logInfo($count . " Students set to Abbrecher");
+		}
+
+		$this->logInfo('Ende Job handleWiederholerDeadline');
+	}
+
+	/**
+	 * Set Abmeldungen after deadline to Abbrecher
+	 *
+	 */
+	public function handleAbmeldungenStglDeadline()
+	{
+		$this->logInfo('Start Job handleAbmeldungenStglDeadline');
+
+		$insertvon = $this->config->item('antrag_job_systemuser');
+		if (!$insertvon) {
+			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
+			$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
+			return;
+		}
+
+		$modifier_deadline = $this->config->item('abmeldung_job_deadline_date_modifier');
+		if (!$modifier_deadline) {
+			$this->logError('Config "abmeldung_job_deadline_date_modifier" nicht gesetzt');
+			$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
+			return;
+		}
+
+		$dateDeadline = new DateTime();
+		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
+
+		$this->StudierendenantragModel->addSelect('tbl_studierendenantrag.studierendenantrag_id');
+		$this->StudierendenantragModel->addSelect('prestudent_id');
+		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
+		$this->StudierendenantragModel->addSelect('s.insertamum');
+		$this->StudierendenantragModel->addSelect('s.insertvon');
+		$this->StudierendenantragModel->addJoin('public.tbl_student pts', 'prestudent_id');
+		$this->StudierendenantragModel->addSelect('pts.student_uid');
+
+		$this->StudierendenantragModel->db->where_in(
+			'public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)',
+			$this->config->item('antrag_prestudentstatus_whitelist_abmeldung')
+		);
+
+		$result = $this->StudierendenantragModel->getWithLastStatusWhere([
+            'typ' => Studierendenantrag_model::TYP_ABMELDUNG_STGL,
+            'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
+            's.insertamum <=' => $dateDeadline->format('c')
+        ]);
+
+		if(isError($result))
+		{
+			$this->logError(getError($result));
+		}
+		else
+		{
+			$antraege = getData($result) ?: [];
+			$count = 0;
+
+			foreach ($antraege as $antrag)
+			{
+				$result = $this->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $antrag->studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED,
+					'insertvon' => 'AntragJob'
+				]);
+				if (isError($result))
+					$this->logError(getError($result));
+				else {
+					$deregisterStatus = getData($result);
+
+					$result = $this->antraglib->pauseAntrag($antrag->studierendenantrag_id, Studierendenantragstatus_model::INSERTVON_DEREGISTERED);
+					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',
+	                    $statusgrund->statusgrund_id,
+	                    $antrag->insertamum,
+	                    null,
+	                    $antrag->insertvon ?: $insertvon
+	                );
+					if (isError($result)) {
+						$this->StudierendenantragstatusModel->delete($deregisterStatus);
+						$this->logError(getError($result));
+					} else {
+						$count++;
+						$result = $this->PrestudentModel->load($antrag->prestudent_id);
+						if(!hasData($result)) {
+							$this->logWarning('No Prestudent found');
+							continue;
+						}
+						$prestudent = current(getData($result));
+						$result = $this->StudiengangModel->load($prestudent->studiengang_kz);
+						if(!hasData($result)) {
+							$this->logWarning('No Studiengang found');
+							continue;
+						}
+						$studiengang = current(getData($result));
+						$result = $this->PersonModel->loadPrestudent($antrag->prestudent_id);
+						if(!hasData($result))
+						{
+							$this->logWarning('No Person found');
+							continue;
+						}
+						$person = current(getData($result));
+						$email = $studiengang->email;
+						$dataMail = array(
+							'prestudent' => 'UID: ' . $antrag->student_uid . ', PreStudentId: ' . $antrag->prestudent_id,
+							'studiensemester' => $antrag->studiensemester_kurzbz,
+							'name' => trim($person->vorname . ' '. $person->nachname),
+						);
+
+						if(!sendSanchoMail('Sancho_Mail_Antrag_A_Assist', $dataMail, $email, 'Einspruchsfrist abgelaufen'))
+						{
+							$this->logWarning("Failed to send Notification to " . $email);
+						}
+					}
+				}
+			}
+			$this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher");
+		}
+		$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
+	}
+
+	/**
+	 * Send Request to Student do Decide between Wiederholung and Verzicht
+	 *
+	 */
+	public function sendAufforderungWiederholer()
+	{
+		$this->logInfo('Start Job sendAufforderungWiederholer');
+
+		$modifier_request_1 = $this->config->item('wiederholung_job_request_1_date_modifier');
+		$modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier');
+		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
+
+		$digi_start = $this->config->item('digitalization_start');
+		if ($digi_start) {
+			try {
+				$digi_start = new DateTime($digi_start);
+			} catch(Exception $e) {
+			}
+		}
+
+		if ($modifier_deadline) {
+			$dateDeadline = new DateTime();
+			$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
+			
+			if ($digi_start)
+				$dateDeadline = max($digi_start, $dateDeadline);
+		} else {
+			$dateDeadline = $digi_start ?: null;
+		}
+
+		//first request
+		if ($modifier_request_1) {
+			$dateStichtag = new DateTime();
+			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_1));
+			if (!$dateDeadline || $dateStichtag > $dateDeadline)
+				$this->sendReminder(
+					'Request1',
+					null,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+					$dateDeadline,
+					$dateStichtag,
+					$modifier_deadline,
+					'Aufforderung: Bekanntgabe Wiederholung'
+				);
+		} else
+			$this->logError('Config "wiederholung_job_request_1_date_modifier" nicht gesetzt');
+
+		//second request
+		if ($modifier_request_2) {
+			$dateStichtag = new DateTime();
+			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_2));
+			if (!$dateDeadline || $dateStichtag > $dateDeadline)
+				$this->sendReminder(
+					'Request2',
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
+					$dateDeadline,
+					$dateStichtag,
+					$modifier_deadline,
+					'Reminder Aufforderung: Bekanntgabe Wiederholung'
+				);
+		} else
+			$this->logError('Config "wiederholung_job_request_2_date_modifier" nicht gesetzt');
+
+		$this->logInfo('Ende Job sendAufforderungWiederholer');
+	}
+
+	protected function prestudentsGetUnique($prestudents)
+    {
+		$result = [];
+		foreach ($prestudents as $prestudent) {
+			if (!isset($result[$prestudent->prestudent_id]))
+				$result[$prestudent->prestudent_id] = $prestudent;
+			else {
+				if ($result[$prestudent->prestudent_id]->datum > $prestudent->datum)
+					$result[$prestudent->prestudent_id] = $prestudent;
+			}
+		}
+		return $result;
+	}
+
+	protected function sendReminder($name, $status_from, $status_to, $deadline, $date_stichtag, $modifier_deadline, $subject)
+	{
+		$this->logInfo('Start Job sendAufforderungWiederholer ' . $name);
+
+		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $date_stichtag, $deadline);
+
+		if(isError($result))
+		{
+			$this->logError(getError($result));
+		}
+		else
+		{
+			$prestudents = getData($result) ?: [];
+			$count = 0;
+
+			$prestudents = $this->prestudentsGetUnique($prestudents);
+
+			foreach ($prestudents as $prestudent)
+			{
+				$stg_kz = $prestudent->studiengang_kz;
+				if (in_array($stg_kz, $this->config->item('stgkz_blacklist_wiederholung')))
+					continue;
+				$url = site_url('lehre/Studierendenantrag/wiederholung/' . $prestudent->prestudent_id);
+				$urlCIS = CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/wiederholung/' . $prestudent->prestudent_id;
+				$email = $this->StudentModel->getEmailFH($this->StudentModel->getUID($prestudent->prestudent_id));
+
+				$fristende = new DateTime($prestudent->datum);
+				$fristende->add(DateInterval::createFromDateString($modifier_deadline));
+
+				$datum_kp = new DateTime($prestudent->datum);
+
+				$result = $this->StudiensemesterModel->getNextFrom($prestudent->studiensemester_kurzbz);
+				$next_sem = "";
+				$sem_after_next_sem = "";
+				if (hasData($result)) {
+					$next_sem = current(getData($result))->studiensemester_kurzbz;
+					$result = $this->StudiensemesterModel->getNextFrom($next_sem);
+					if (hasData($result)) {
+						$sem_after_next_sem = current(getData($result))->studiensemester_kurzbz;
+					}
+				}
+
+				$dataMail = array(
+					'name'=> trim($prestudent->vorname . ' '. $prestudent->nachname),
+					'vorname' => $prestudent->vorname,
+					'nachname' => $prestudent->nachname,
+					'pers_kz'=> $prestudent->matrikelnr,
+					'stg' => $prestudent->bezeichnung,
+					'lvbezeichnung' => $prestudent->lvbezeichnung,
+					'datum_kp' => $datum_kp->format('d.m.Y'),
+					'studiensemester'=> $prestudent->studiensemester_kurzbz,
+					'Orgform'=> $prestudent->orgform,
+					'prestudent_id' => $prestudent->prestudent_id,
+					'url' => $url,
+					'urlCIS' => $urlCIS,
+					'fristablauf' => $fristende->format('d.m.Y'),
+					'pre_wiederholer_sem' => $next_sem,
+					'wiederholer_sem' => $sem_after_next_sem,
+					'sem' => $prestudent->ausbildungssemester
+				);
+
+				// NOTE(chris): Sancho mail
+				if(sendSanchoMail('Sancho_Mail_Antrag_W_' . $name, $dataMail, $email, $subject))
+				{
+					$antrag_id = null;
+					$result = $this->StudierendenantragModel->loadWhere([
+						'prestudent_id' => $prestudent->prestudent_id,
+						'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
+					]);
+					if (isError($result))
+						$this->logError(getError($result));
+					elseif (hasData($result))
+						$antrag_id = current(getData($result) ?: []) -> studierendenantrag_id;
+					if ($antrag_id == null)
+					{
+						$result = $this->StudierendenantragModel->insert([
+							'prestudent_id' => $prestudent->prestudent_id,
+							'studiensemester_kurzbz'=> $prestudent->studiensemester_kurzbz,
+							'datum' => date('c'),
+							'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
+							'insertvon' => 'AntragJob'
+						]);
+						if (isError($result))
+							$this->logError(getError($result));
+						else
+							$antrag_id = getData($result);
+					}
+					if ($antrag_id)
+					{
+						$result = $this->StudierendenantragstatusModel->insert([
+							'studierendenantrag_id' => $antrag_id,
+							'studierendenantrag_statustyp_kurzbz' => $status_to,
+							'insertvon' => 'AntragJob'
+						]);
+						if (isError($result))
+							$this->logError(getError($result));
+					}
+					$count++;
+				}
+			}
+			$this->logInfo($count . " Mails '" . $subject . "' sent");
+		}
+		$this->logInfo('Ende Job sendAufforderungWiederholer ' . $name);
+	}
+}

application/controllers/jobs/ESIJob.php

@@ -0,0 +1,165 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+require_once('schedulers/ESIScheduler.php');
+
+/**
+ * Controller for initialising generateESI job
+ */
+class ESIJob extends JQW_Controller
+{
+	const ESI_PREFIX = 'urn:schac:personalUniqueCode:int:esi:at:';
+	const INSERT_VON = 'generateEsiJob';
+
+	/**
+	 * Controller initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// load models
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('person/Kennzeichen_model', 'KennzeichenModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Initialises generateESI job, handles job queue, logs infos/errors
+	 */
+	public function generateESI()
+	{
+		//$jobType = 'DVUHSendPruefungsaktivitaeten';
+		$this->logInfo(ESIScheduler::JOB_TYPE_GENERATE_ESI.' job start');
+
+		// Gets the latest jobs
+		$lastJobs = $this->getLastJobs(ESIScheduler::JOB_TYPE_GENERATE_ESI);
+
+		if (isError($lastJobs))
+		{
+			$this->logError(getCode($lastJobs).': '.getError($lastJobs), ESIScheduler::JOB_TYPE_GENERATE_ESI);
+		}
+		else
+		{
+			$this->updateJobs(
+				getData($lastJobs), // Jobs to be updated
+				array(JobsQueueLib::PROPERTY_START_TIME), // Job properties to be updated
+				array(date('Y-m-d H:i:s')) // Job properties new values
+			);
+
+			$person_arr = $this->_getInputObjArray(getData($lastJobs));
+
+			foreach ($person_arr as $persobj)
+			{
+				if (!isset($persobj->person_id))
+					$this->logError("Error when generating ESI: invalid parameters");
+				else
+				{
+					$person_id = $persobj->person_id;
+
+					// check if there already is an active ESI
+					$this->KennzeichenModel->addSelect('1');
+					$activeKennzeichenRes = $this->KennzeichenModel->loadWhere(
+						array('person_id' => $person_id, 'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ, 'aktiv' => true)
+					);
+
+					if (hasData($activeKennzeichenRes))
+					{
+						$this->logError("Active ESI for person Id $person_id already exists");
+						continue;
+					}
+
+					// get Matrikelnr for person for which ESI should be generated
+					$this->PersonModel->addSelect('matr_nr');
+					$personRes = $this->PersonModel->load($person_id);
+
+					if (!hasData($personRes))
+					{
+						$this->logError("Person with Id $person_id not found");
+						continue;
+					}
+
+					$matr_nr = getData($personRes)[0]->matr_nr;
+
+					if (isEmptyString($matr_nr))
+					{
+						$this->logError("Matrikelnummer for person with Id $person_id is empty");
+						continue;
+					}
+
+					$esi = self::ESI_PREFIX.$matr_nr;
+
+					// check if ESI was already used
+					$this->KennzeichenModel->addSelect('1');
+					$existingKennzeichenRes = $this->KennzeichenModel->loadWhere(
+						array('person_id' => $person_id, 'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ, 'inhalt' => $esi)
+					);
+
+					if (hasData($existingKennzeichenRes))
+					{
+						$this->logError("ESI $esi for person Id $person_id already exists");
+						continue;
+					}
+
+					// if everything ok, save the esi for the person
+					$saveEsiResult = $this->KennzeichenModel->insert(
+						array(
+							'person_id' => $person_id,
+							'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ,
+							'inhalt' => $esi,
+							'aktiv' => true,
+							'insertvon' => self::INSERT_VON
+						)
+					);
+
+					if (isError($saveEsiResult))
+					{
+						$this->logError("Error when sending ESI, person Id $person_id ".getError($saveEsiResult));
+					}
+				}
+			}
+
+			// Update jobs properties values
+			$this->updateJobs(
+				getData($lastJobs), // Jobs to be updated
+				array(JobsQueueLib::PROPERTY_STATUS, JobsQueueLib::PROPERTY_END_TIME), // Job properties to be updated
+				array(JobsQueueLib::STATUS_DONE, date('Y-m-d H:i:s')) // Job properties new values
+			);
+
+			if (hasData($lastJobs)) $this->updateJobsQueue(ESIScheduler::JOB_TYPE_GENERATE_ESI, getData($lastJobs));
+		}
+
+		$this->logInfo(ESIScheduler::JOB_TYPE_GENERATE_ESI.' job stop');
+	}
+
+	// --------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Extracts input data from jobs.
+	 * @param $jobs
+	 * @return array with jobinput
+	 */
+	private function _getInputObjArray($jobs)
+	{
+		$mergedUsersArray = array();
+
+		if (count($jobs) == 0) return $mergedUsersArray;
+
+		foreach ($jobs as $job)
+		{
+			$decodedInput = json_decode($job->input);
+			if ($decodedInput != null)
+			{
+				foreach ($decodedInput as $el)
+				{
+					$mergedUsersArray[] = $el;
+				}
+			}
+		}
+		return $mergedUsersArray;
+	}
+}

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',
@@ -22,7 +22,39 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_INOUT_0003' => 'CORE_INOUT_0003',
 			'CORE_INOUT_0004' => 'CORE_INOUT_0004',
 			'CORE_INOUT_0005' => 'CORE_INOUT_0005',
-			'CORE_INOUT_0006' => 'CORE_INOUT_0006'
+			'CORE_INOUT_0006' => 'CORE_INOUT_0006',
+			'CORE_INOUT_0007' => 'CORE_INOUT_0007',
+			'CORE_INOUT_0008' => 'CORE_INOUT_0008',
+			'CORE_INOUT_0009' => 'CORE_INOUT_0009',
+			'CORE_STG_0001' => 'CORE_STG_0001',
+			'CORE_STG_0002' => 'CORE_STG_0002',
+			'CORE_STG_0003' => 'CORE_STG_0003',
+			'CORE_STG_0004' => 'CORE_STG_0004',
+			'CORE_STUDENTSTATUS_0002' => 'CORE_STUDENTSTATUS_0002',
+			'CORE_STUDENTSTATUS_0003' => 'CORE_STUDENTSTATUS_0003',
+			'CORE_STUDENTSTATUS_0004' => 'CORE_STUDENTSTATUS_0004',
+			'CORE_STUDENTSTATUS_0005' => 'CORE_STUDENTSTATUS_0005',
+			'CORE_STUDENTSTATUS_0006' => 'CORE_STUDENTSTATUS_0006',
+			'CORE_STUDENTSTATUS_0007' => 'CORE_STUDENTSTATUS_0007',
+			'CORE_STUDENTSTATUS_0008' => 'CORE_STUDENTSTATUS_0008',
+			'CORE_STUDENTSTATUS_0009' => 'CORE_STUDENTSTATUS_0009',
+			'CORE_STUDENTSTATUS_0010' => 'CORE_STUDENTSTATUS_0010',
+			'CORE_STUDENTSTATUS_0011' => 'CORE_STUDENTSTATUS_0011',
+			'CORE_STUDENTSTATUS_0012' => 'CORE_STUDENTSTATUS_0012',
+			'CORE_STUDENTSTATUS_0013' => 'CORE_STUDENTSTATUS_0013',
+			'CORE_STUDENTSTATUS_0014' => 'CORE_STUDENTSTATUS_0014',
+			'CORE_STUDENTSTATUS_0015' => 'CORE_STUDENTSTATUS_0015',
+			'CORE_STUDENTSTATUS_0016' => 'CORE_STUDENTSTATUS_0016',
+			'CORE_PERSON_0001' => 'CORE_PERSON_0001',
+			'CORE_PERSON_0002' => 'CORE_PERSON_0002',
+			'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/jobs/PlausiIssueProducer.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Job for producing core Plausicheck issues
+ */
+class PlausiIssueProducer extends PlausiIssueProducer_Controller
+{
+	private $_currentStudiensemester;
+	protected $_app = 'core';
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->library('issues/PlausicheckDefinitionLib');
+
+		// load models
+		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
+
+		// get current Studiensemester
+		$studiensemesterRes = $this->StudiensemesterModel->getAkt();
+		if (hasData($studiensemesterRes)) $this->_currentStudiensemester = getData($studiensemesterRes)[0]->studiensemester_kurzbz;
+
+		// set fehler which can be produced by the job
+		// structure: fehler_kurzbz => class (library) name for resolving
+		$this->_fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
+	}
+
+	/**
+	 * Runs issue production job.
+	 * @param studiensemester_kurzbz string job is run for students of a certain semester.
+	 * @param studiengang_kz int job is run for students of certain Studiengang.
+	 */
+	public function run($studiensemester_kurzbz = null, $studiengang_kz = null)
+	{
+		// get Studiensemester
+		if (isEmptyString($studiensemester_kurzbz)) $studiensemester_kurzbz = $this->_currentStudiensemester;
+
+		// producing issues for semester and optionally Studiengang
+		$this->producePlausicheckIssues(array('studiensemester_kurzbz' => $studiensemester_kurzbz, 'studiengang_kz' => $studiengang_kz));
+	}
+}

application/controllers/jobs/ReihungstestJob.php

@@ -3,6 +3,9 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class ReihungstestJob extends JOB_Controller
 {
+
+	const LAST_DAYS_PRESTUDENTSTATUS = 5;
+
 	/**
 	 * Constructor
 	 */
@@ -464,7 +467,7 @@ class ReihungstestJob extends JOB_Controller
 		$this->PrestudentstatusModel->addJoin('public.tbl_person', 'person_id');
 
 		$yesterdays_applicants_arr = $this->PrestudentstatusModel->loadWhere('
-			status_kurzbz = \'Interessent\' AND
+			status_kurzbz IN (\'Interessent\', \'Bewerber\') AND
 			typ = \'b\' AND
 			bestaetigtam = current_date - 1
 		');
@@ -727,33 +730,27 @@ class ReihungstestJob extends JOB_Controller
 			tbl_reihungstest.reihungstest_id,
 			tbl_studienplan.studienplan_id,
 			tbl_reihungstest.studiensemester_kurzbz,
-			tbl_studienordnung.studiengang_kz
+			tbl_studienordnung.studiengang_kz,
+			tbl_studienplan.orgform_kurzbz
 		FROM
 			public.tbl_reihungstest
-			JOIN public.tbl_rt_studienplan ON(tbl_rt_studienplan.reihungstest_id=tbl_reihungstest.reihungstest_id)
-			JOIN lehre.tbl_studienplan USING(studienplan_id)
-			JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+				JOIN public.tbl_rt_studienplan ON(tbl_rt_studienplan.reihungstest_id=tbl_reihungstest.reihungstest_id)
+				JOIN lehre.tbl_studienplan USING(studienplan_id)
+				JOIN lehre.tbl_studienordnung USING(studienordnung_id)
 		WHERE
-			NOT EXISTS(
-				SELECT 1 FROM lehre.tbl_studienplan_semester
-				WHERE studienplan_id=tbl_rt_studienplan.studienplan_id
-					AND tbl_studienplan_semester.studiensemester_kurzbz=tbl_reihungstest.studiensemester_kurzbz
+			EXISTS (
+				SELECT studienplan_id
+				FROM lehre.tbl_studienordnung sordnung
+					JOIN lehre.tbl_studienplan USING (studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester USING (studienplan_id)
+				WHERE sordnung.studiengang_kz = tbl_studienordnung.studiengang_kz
+					AND tbl_studienplan_semester.studiensemester_kurzbz = tbl_reihungstest.studiensemester_kurzbz
+					AND tbl_studienplan.studienplan_id NOT IN
+					(
+						SELECT studienplan_id FROM tbl_rt_studienplan WHERE reihungstest_id = tbl_reihungstest.reihungstest_id
+					)
 			)
-			AND tbl_reihungstest.datum >= now()
-			AND NOT EXISTS(
-				SELECT
-					1
-				FROM
-					public.tbl_rt_studienplan rtstp
-					JOIN lehre.tbl_studienplan stp USING(studienplan_id)
-					JOIN lehre.tbl_studienordnung sto USING(studienordnung_id)
-					JOIN lehre.tbl_studienplan_semester stpsem USING(studienplan_id)
-				WHERE
-					sto.studiengang_kz=tbl_studienordnung.studiengang_kz
-					AND rtstp.reihungstest_id=tbl_reihungstest.reihungstest_id
-					AND stpsem.studiensemester_kurzbz=tbl_reihungstest.studiensemester_kurzbz
-			)
-		";
+			AND tbl_reihungstest.datum >= now()";
 
 		$db = new DB_Model();
 		$result_rt = $db->execReadOnlyQuery($qry);
@@ -763,7 +760,9 @@ class ReihungstestJob extends JOB_Controller
 				// find an active studyplan for the same degree program with is valid in this semester
 				$result_stpl = $this->StudienplanModel->getStudienplaeneBySemester(
 					$row_rt->studiengang_kz,
-					$row_rt->studiensemester_kurzbz
+					$row_rt->studiensemester_kurzbz,
+					null,
+					$row_rt->orgform_kurzbz
 				);
 
 				if (hasData($result_stpl)) {
@@ -826,7 +825,7 @@ class ReihungstestJob extends JOB_Controller
 						AND tbl_studiengang.typ IN ('b', 'm')
 				)
 				SELECT * FROM prst
-				WHERE prestudenstatus_datum >= (SELECT CURRENT_DATE - 1)
+				WHERE prestudenstatus_datum >= (SELECT CURRENT_DATE - ". self::LAST_DAYS_PRESTUDENTSTATUS .")
 				AND (studiengang_typ = 'b' OR (studiengang_typ = 'm' AND EXISTS (SELECT 1 /* Master Studiengänge berücksichtigen wenn auch Bachelor im gleichen Semester */
 																					FROM prst prstb
 																					WHERE studiengang_typ = 'b'
@@ -868,7 +867,8 @@ class ReihungstestJob extends JOB_Controller
 							tbl_person.nachname,
 							tbl_person.vorname,
 							tbl_prestudent.*,
-							tbl_studiengang.typ AS studiengang_typ
+							tbl_studiengang.typ AS studiengang_typ,
+							tbl_prestudentstatus.datum
 						FROM PUBLIC.tbl_person
 							JOIN PUBLIC.tbl_prestudent USING (person_id)
 							JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
@@ -901,7 +901,7 @@ class ReihungstestJob extends JOB_Controller
 								$mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AufnahmeHoeherePrio'][]
 									= $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
 							}
-							elseif ($rowNiedrPrios->laststatus == 'Bewerber')
+							elseif ($rowNiedrPrios->laststatus == 'Bewerber' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum)
 							{
 								// Abgewiesenen-Status mit Statusgrund "Aufnahme anderer Studiengang" (ID 5) setzen
 								$lastStatus = $this->PrestudentstatusModel->getLastStatus($rowNiedrPrios->prestudent_id);
@@ -927,7 +927,7 @@ class ReihungstestJob extends JOB_Controller
 										= $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
 								}
 							}
-							elseif ($rowNiedrPrios->laststatus == 'Wartender')
+							elseif ($rowNiedrPrios->laststatus == 'Wartender' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum)
 							{
 								// Abgewiesenen-Status mit Statusgrund "Aufnahme anderer Studiengang" (ID 5) setzen
 								// Mail zur Info an Assistenz schicken
@@ -1023,7 +1023,7 @@ class ReihungstestJob extends JOB_Controller
 			{
 				$studiengang = $this->StudiengangModel->load($stg);
 				$mailcontent = '';
-
+				$content = false;
 				foreach ($orgform AS $art=>$value)
 				{
 					// Orgform nur dazu schreiben, wenn es mehr als Eine gibt
@@ -1044,6 +1044,7 @@ class ReihungstestJob extends JOB_Controller
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
 						$mailcontent .= '</tbody></table><br><br>';
+						$content = true;
 					}
 					if (isset($value['AufnahmeHoeherePrio']) && !isEmptyArray($value['AufnahmeHoeherePrio']))
 					{
@@ -1058,6 +1059,7 @@ class ReihungstestJob extends JOB_Controller
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
 						$mailcontent .= '</tbody></table>';
+						$content = true;
 					}
 					if (isset($value['AbgewiesenHoeherePrio']) && !isEmptyArray($value['AbgewiesenHoeherePrio']))
 					{
@@ -1071,6 +1073,7 @@ class ReihungstestJob extends JOB_Controller
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
 						$mailcontent .= '</tbody></table>';
+						$content = true;
 					}
 					if ($bcc != '' && isset($value['AbgewiesenWeilBewerber']) && !isEmptyArray($value['AbgewiesenWeilBewerber']))
 					{
@@ -1085,13 +1088,14 @@ class ReihungstestJob extends JOB_Controller
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
 						$mailcontent .= '</tbody></table>';
+						$content = true;
 					}
 				}
 
 				$mailcontent_data_arr['table'] = $mailcontent;
 
 				// Send email in Sancho design
-				if (!isEmptyString($mailcontent))
+				if (!isEmptyString($mailcontent) && $content === true)
 				{
 					sendSanchoMail(
 						'Sancho_ReihungstestteilnehmerJob',

application/controllers/jobs/schedulers/ESIScheduler.php

@@ -0,0 +1,108 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Scheduler for generating ESI (European Student Identifier)
+ */
+class ESIScheduler extends JQW_Controller
+{
+	const JOB_TYPE_GENERATE_ESI = 'generateESI';
+	const KENNZEICHENTYP_KURZBZ = 'esi';
+
+	private $_active_status_kurzbz = array('Student', 'Diplomand');
+
+	/**
+	 * Controller initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Creates jobs queue entries for generateESI job.
+	 * @param string $studiensemester_kurzbz semester for which ESIs should be generated
+	 */
+	public function generateESI($studiensemester_kurzbz = null)
+	{
+		// if no semester given, get current studiensemester
+		if (!isset($studiensemester_kurzbz))
+		{
+			$semRes = $this->StudiensemesterModel->getAkt();
+
+			if (hasData($semRes))
+			{
+				$studiensemester_kurzbz = getData($semRes)[0]->studiensemester_kurzbz;
+			}
+		}
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$this->logInfo('Start job queue scheduler '.self::JOB_TYPE_GENERATE_ESI);
+
+			$qry = "
+				SELECT
+					DISTINCT person_id
+				FROM
+					public.tbl_person pers
+					JOIN public.tbl_prestudent ps USING (person_id)
+					JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
+				WHERE
+					pss.studiensemester_kurzbz = ?
+					AND pers.matr_nr IS NOT NULL
+					AND pss.status_kurzbz IN ?
+					AND NOT EXISTS ( -- has no ESI yet
+						SELECT 1
+						FROM
+							public.tbl_kennzeichen
+						WHERE
+							person_id = pers.person_id
+							AND kennzeichentyp_kurzbz = ?
+							AND aktiv
+					)
+					AND NOT EXISTS ( -- making sure it's not an incoming
+						SELECT 1
+						FROM
+							public.tbl_prestudentstatus
+						WHERE
+							prestudent_id = ps.prestudent_id
+							AND status_kurzbz = 'Incoming'
+					)";
+
+			$db = new DB_Model();
+			$jobInputResult = $db->execReadOnlyQuery($qry, array($studiensemester_kurzbz, $this->_active_status_kurzbz, self::KENNZEICHENTYP_KURZBZ));
+
+			// If an error occured then log it
+			if (isError($jobInputResult))
+			{
+				$this->logError(getError($jobInputResult));
+			}
+			elseif (hasData($jobInputResult)) // if persons found
+			{
+				// Add the new job to the jobs queue
+				$addNewJobResult = $this->addNewJobsToQueue(
+					self::JOB_TYPE_GENERATE_ESI, // job type
+					$this->generateJobs( // gnerate the structure of the new job
+						JobsQueueLib::STATUS_NEW,
+						json_encode(getData($jobInputResult))
+					)
+				);
+
+				// If error occurred return it
+				if (isError($addNewJobResult)) $this->logError(getError($addNewJobResult));
+			}
+		}
+		else
+		{
+			$this->logError('Error when getting Studiensemester');
+		}
+
+		$this->logInfo('End job queue scheduler '.self::JOB_TYPE_GENERATE_ESI);
+	}
+}

application/controllers/jobs/vertragsbestandteil_test/VertragsbestandteilTest.php

@@ -0,0 +1,114 @@
+<?php
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+/**
+ * Description of VertragsbestandteilTest
+ *
+ * @author bambi
+ */
+class VertragsbestandteilTest extends JOB_Controller
+{
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->library('vertragsbestandteil/VertragsbestandteilLib', 
+			null, 'VertragsbestandteilLib');
+		$this->load->library('vertragsbestandteil/GehaltsbestandteilLib', 
+			null, 'GehaltsbestandteilLib');
+	}
+	
+	public function testFetch() 
+	{
+		$dienstverhaeltnis_id = 1;
+		$stichtag = null;
+		
+		foreach($this->VertragsbestandteilLib->fetchVertragsbestandteile(
+			$dienstverhaeltnis_id, $stichtag) as $vertragsbestandteil) 
+		{
+			//print_r($vertragsbestandteil);
+			echo $vertragsbestandteil . "\n";
+		}
+	}
+	
+	public function testUpdate() 
+	{
+		$now = new DateTime();
+		
+		$data = new stdClass();
+		$data->vertragsbestandteil_id = 32;
+		$data->von = '2022-12-05';
+		
+		$data->wochenstunden = 45.0;
+		$data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_STUNDEN;
+		
+		$vb = VertragsbestandteilFactory::getVertragsbestandteil($data);
+		
+		try
+		{
+			$this->VertragsbestandteilLib->storeVertragsbestandteil($vb);
+			echo "Update successful.\n";
+		}
+		catch( Exception $ex ) 
+		{
+			echo "Update failed.\n";
+		}
+	}
+
+	
+	public function testInsert()
+	{
+		$now = new DateTime();
+		
+		$data = new stdClass();
+		$data->dienstverhaeltnis_id = 1;
+		$data->von = '2022-12-01';
+		$data->insertamum = $now->format(DateTime::ATOM);
+		$data->insertvon = 'ma0080';
+		$data->vertragsbestandteiltyp_kurzbz = VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_FUNKTION;
+		
+		$data->benutzerfunktion_id = 112667;
+		$data->anmerkung = 'test funkton';
+		$data->kuendigungsrelevant = false;
+		
+		$vb = VertragsbestandteilFactory::getVertragsbestandteil($data);
+		
+		try
+		{
+			$this->VertragsbestandteilLib->storeVertragsbestandteil($vb);
+			echo "Insert successful.\n";
+		}
+		catch( Exception $ex ) 
+		{
+			echo "Insert failed.\n";
+		}
+	}
+	
+	public function testGehaltsbestandteilInsert() 
+	{
+		$data = new stdClass();
+		$data->gehaltsbestandteil_id = 2;
+		/*
+		$data->dienstverhaeltnis_id = 39;
+		$data->vertragsbestandteil_id = 123;
+		$data->gehaltstyp_kurzbz = 'zulage';
+		$data->von = '2023-04-01';
+		$data->bis = '2023-08-31';
+		$data->anmerkung = 'test anmerkung';
+		$data->grundbetrag = 100;
+		$data->betrag_valorisiert = 100;
+		$data->valorisierung = true;
+		*/
+		$data->auszahlungen = 12;
+		
+		$gb = new \vertragsbestandteil\Gehaltsbestandteil();
+		$gb->hydrateByStdClass($data);
+		
+		print_r($gb->toStdClass());
+		
+		$this->GehaltsbestandteilLib->storeGehaltsbestandteil($gb);
+	}
+}

application/controllers/lehre/Antrag/Attachment.php

@@ -0,0 +1,82 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \REST_Controller as REST_Controller;
+
+/**
+ */
+class Attachment extends FHC_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+
+		$this->load->library('DmsLib');
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param integer		$dms_id
+	 *
+	 * @return void
+	 */
+	public function show($dms_id)
+	{
+		$result = $this->StudierendenantragModel->loadWhere(['dms_id' => $dms_id]);
+		if (!getData($result))
+			return show_404();
+
+		if (!$this->permissionlib->isBerechtigt('student/antragfreigabe'))
+		{
+			$isSamePerson = false;
+			$antraege = getData($result);
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			foreach ($antraege as $antrag)
+			{
+				$prestudent = $this->PrestudentModel->load($antrag->prestudent_id);
+				if(hasData($prestudent))
+				{
+					if(current(getData($prestudent))->person_id == getAuthPersonId())
+					{
+						$isSamePerson = true;
+						break;
+					}
+				}
+			}
+
+			if ($isSamePerson == false)
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN); // set the HTTP header as unauthorized
+
+				$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
+
+				// Prints the main error message
+				$this->eprintflib->printError('You are not allowed to access to this content');
+				// Prints the called controller name
+				$this->eprintflib->printInfo('Controller name: '.$this->router->class);
+				// Prints the called controller method name
+				$this->eprintflib->printInfo('Method name: '.$this->router->method);
+				// Prints the required permissions needed to access to this method
+				$this->eprintflib->printInfo('Required permissions: student/antragfreigabe');
+
+				return show_error('You are not entitled to read this document');
+			}
+		}
+
+		$result = $this->dmslib->download($dms_id);
+		if (isError($result))
+			return show_error(getError($result));
+
+		$this->outputFile(getData($result));
+	}
+}

application/controllers/lehre/Antrag/Wiederholung.php

@@ -0,0 +1,48 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+use \Studierendenantrag_model as Studierendenantrag_model;
+use \REST_Controller as REST_Controller;
+
+/**
+ */
+class Wiederholung extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+        parent::__construct([
+			'assistenz'=> 'student/studierendenantrag:w'
+		]);
+
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag'
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function assistenz($antrag_id)
+	{
+
+		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
+
+		if (isError($result))
+			return show_error(getError($result));
+
+		if (!hasData($result))
+			return show_404();
+
+		$this->load->view('lehre/Antrag/Wiederholung/Student', [
+			'antrag_id' => $antrag_id,
+			'antrag' => getData($result)
+		]);
+	}
+}

application/controllers/lehre/Studierendenantrag.php

@@ -0,0 +1,190 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \stdClass as stdClass;
+
+/**
+ */
+class Studierendenantrag extends FHC_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+        parent::__construct();
+
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('AntragLib');
+
+		// Load Models
+		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag'
+		]);
+
+        if (strtolower($this->router->method) === 'leitung')
+        	$this->_isAllowed([
+        		'leitung' => ['student/studierendenantrag:r', 'student/antragfreigabe:r']
+        	]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function index()
+	{
+		$dataAntrag = $this->StudierendenantragModel->loadForPerson(getAuthPersonId());
+		if (isError($dataAntrag))
+			return show_error(getError($dataAntrag));
+		$dataAntrag = (getData($dataAntrag) ? : []);
+		$prestudentenArr = array();
+
+		foreach ($dataAntrag as $antrag)
+		{
+			if (!isset($prestudentenArr[$antrag->prestudent_id]))
+			{
+				$prestudentenArr[$antrag->prestudent_id] = array(
+					'allowedNewTypes' => array(),
+					'antraege'=> array(),
+					'bezeichnungStg' => $antrag->bezeichnung,
+					'bezeichnungOrgform' => $antrag->orgform
+				);
+				
+				$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
+
+				$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
+
+				$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
+			}
+			if ($antrag->studierendenantrag_id == null)
+				continue;
+			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL && (!$antrag->isapproved))
+				continue;
+
+			$prestudentenArr[$antrag->prestudent_id]['antraege'][] = $antrag;
+		}
+
+		$this->load->view('lehre/Antrag/Student/List', [
+			'antraege' => $prestudentenArr
+		]);
+	}
+
+	public function leitung()
+	{
+		$stgL = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
+
+		$stgA = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: [];
+
+		$this->load->view('lehre/Antrag/Leitung/List', [
+			'stgA' => $stgA,
+			'stgL' => $stgL
+		]);
+	}
+
+	public function abmeldung($prestudent_id, $studierendenantrag_id = null)
+	{
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Abmeldung'
+		]);
+	}
+
+	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
+	{
+
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'AbmeldungStgl'
+		]);
+	}
+
+	public function unterbrechung($prestudent_id, $studierendenantrag_id = null)
+	{
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Unterbrechung'
+		]);
+	}
+
+	public function wiederholung($prestudent_id, $studierendenantrag_id = null)
+	{
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Wiederholung'
+		]);
+	}
+
+	/**
+	 * Checks if the caller is allowed to access to this content with the given permissions
+	 * If it is not allowed will set the HTTP header with code 401
+	 * Wrapper for permissionlib->isEntitled
+	 */
+	private function _isAllowed($requiredPermissions)
+	{
+		// Loads permission lib
+		$this->load->library('PermissionLib');
+
+		// Checks if this user is entitled to access to this content
+		if (!$this->permissionlib->isEntitled($requiredPermissions, $this->router->method))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_UNAUTHORIZED); // set the HTTP header as unauthorized
+
+			$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
+
+			// Prints the main error message
+			$this->eprintflib->printError('You are not allowed to access to this content');
+			// Prints the called controller name
+			$this->eprintflib->printInfo('Controller name: '.$this->router->class);
+			// Prints the called controller method name
+			$this->eprintflib->printInfo('Method name: '.$this->router->method);
+			// Prints the required permissions needed to access to this method
+			$this->eprintflib->printInfo('Required permissions: '.$this->_rpsToString($requiredPermissions, $this->router->method));
+
+			exit; // immediately terminate the execution
+		}
+	}
+
+	/**
+	 * Converts an array of permissions to a string that contains them as a comma separated list
+	 * Ex: "<permission 1>, <permission 2>, <permission 3>"
+	 */
+	private function _rpsToString($requiredPermissions, $method)
+	{
+		$strRequiredPermissions = ''; // string that contains all the required permissions needed to access to this method
+
+		if (isset($requiredPermissions[$method])) // if the called method is present in the permissions array
+		{
+			// If it is NOT then convert it into an array
+			$rpsMethod = $requiredPermissions[$method];
+			if (!is_array($rpsMethod))
+			{
+				$rpsMethod = array($rpsMethod);
+			}
+
+			// Copy all the permissions into $strRequiredPermissions separated by a comma
+			for ($i = 0; $i < count($rpsMethod); $i++)
+			{
+				$strRequiredPermissions .= $rpsMethod[$i].', ';
+			}
+
+			$strRequiredPermissions = rtrim($strRequiredPermissions, ', ');
+		}
+
+		return $strRequiredPermissions;
+	}
+}

application/controllers/lehre/anrechnung/AdminAnrechnung.php

@@ -0,0 +1,187 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class AdminAnrechnung extends Auth_Controller
+{
+	public function __construct()
+	{
+		// Set required permissions
+		parent::__construct(
+			array(
+				'index'     => 'lehre/anrechnungszeitfenster:rw',
+				'save'      => 'lehre/anrechnungszeitfenster:rw',
+				'edit'      => 'lehre/anrechnungszeitfenster:rw',
+				'delete'    => 'lehre/anrechnungszeitfenster:rw'
+			)
+		);
+		
+		// Load models
+		$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
+		$this->load->model('education/Anrechnungszeitraum_model', 'AnrechnungszeitraumModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		
+		// Load libraries
+		$this->load->library('WidgetLib');
+		$this->load->library('PermissionLib');
+		$this->load->library('AnrechnungLib');
+
+		
+		// Load language phrases
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui',
+                'lehre',
+                'anrechnung',
+                'table'
+			)
+		);
+
+		$this->_setAuthUID();
+		
+		$this->setControllerId();
+	}
+	
+	public function index()
+	{
+        // Set nearest Studiensemester as default
+        $result = $this->StudiensemesterModel->getNearest();
+        $studiensemester_kurzbz = hasData($result) ? getData($result)[0]->studiensemester_kurzbz : '';
+
+        // Get existing Anrechnungszeitraeume
+        $this->AnrechnungszeitraumModel->addOrder('anrechnungszeitraum_id', 'DESC');
+        $result = $this->AnrechnungszeitraumModel->load();
+        $anrechnungszeitraum_arr = hasData($result) ? getData($result) : array();
+
+		$viewData = array(
+            'studiensemester_kurzbz' => $studiensemester_kurzbz,
+            'anrechnungszeitraum_arr' => $anrechnungszeitraum_arr
+        );
+		
+		$this->load->view('lehre/anrechnung/adminAnrechnung.php', $viewData);
+	}
+
+    /**
+     * Save new Anrechnungszeitraum.
+     */
+    public function save()
+    {
+        $this->_validate($this->input->post());
+
+        $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+        $anrechnungstart = $this->input->post('anrechnungstart');
+        $anrechnungende = $this->input->post('anrechnungende');
+
+        $result = $this->AnrechnungszeitraumModel->insertAzr($studiensemester_kurzbz, $anrechnungstart, $anrechnungende);
+
+        if (isError($result))
+        {
+            $this->terminateWithJsonError(getError($result));
+        }
+
+        if (hasData($result))
+        {
+            $this->outputJsonSuccess(array('anrechnungszeitraum_id' => getData($result)));
+        }
+    }
+
+    /**
+     * Edit Anrechnungszeitraum.
+     */
+    public function edit()
+    {
+        $this->_validate($this->input->post());
+
+        $anrechnungszeitraum_id = $this->input->post('anrechnungszeitraum_id');
+        $studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+        $anrechnungstart = $this->input->post('anrechnungstart');
+        $anrechnungende = $this->input->post('anrechnungende');
+        
+        $result = $this->AnrechnungszeitraumModel->updateAzr(
+            $anrechnungszeitraum_id,
+            $studiensemester_kurzbz,
+            $anrechnungstart,
+            $anrechnungende
+        );
+
+        if (isError($result))
+        {
+            $this->terminateWithJsonError(getError($result));
+        }
+
+        if (hasData($result))
+        {
+            $this->outputJsonSuccess(array('anrechnungszeitraum_id' => getData($result)));
+        }
+    }
+
+    /**
+     * Delete Anrechnungszeitraum.
+     */
+    public function delete()
+    {
+        $anrechnungszeitraum_id = $this->input->post('anrechnungszeitraum_id');
+
+        $result = $this->AnrechnungszeitraumModel->deleteAzr($anrechnungszeitraum_id);
+
+        if (isError($result))
+        {
+            $this->terminateWithJsonError(getError($result));
+        }
+
+        if (hasData($result))
+        {
+            $this->outputJsonSuccess(array('anrechnungszeitraum_id' => getData($result)));
+        }
+    }
+
+    /**
+     * Validates post parameters.
+     *
+     * @param $post
+     */
+    private function _validate($post)
+    {
+        $studiensemester_kurzbz = $post['studiensemester_kurzbz'];
+        $anrechnungstart = $post['anrechnungstart'];
+        $anrechnungende = $post['anrechnungende'];
+
+        if (isEmptyString($studiensemester_kurzbz)
+            || isEmptyString($anrechnungstart)
+            || isEmptyString($anrechnungende))
+        {
+            $this->terminateWithJsonError($this->p->t('ui', 'errorFelderFehlen'));
+        }
+
+        if ($anrechnungstart > $anrechnungende)
+        {
+            $this->terminateWithJsonError($this->p->t('ui', 'errorStartdatumNachEndedatum'));
+        }
+
+        $result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
+        $studiensemester = getData($result)[0];
+
+        if ($anrechnungstart < $studiensemester->start || $anrechnungstart > $studiensemester->ende)
+        {
+            $this->terminateWithJsonError($this->p->t('ui', 'errorStartdatumNichtInStudiensemester'));
+        }
+
+        if ($anrechnungende < $studiensemester->start || $anrechnungende > $studiensemester->ende)
+        {
+            $this->terminateWithJsonError($this->p->t('ui', 'errorEndedatumNichtInStudiensemester'));
+        }
+
+
+    }
+
+    /**
+     * 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/lehre/anrechnung/ApproveAnrechnungDetail.php

@@ -33,6 +33,9 @@ class approveAnrechnungDetail extends Auth_Controller
 			)
 		);
 
+		//Load configs
+		$this->load->config('anrechnung');
+
 		// Load models
 		$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
 		$this->load->model('education/Anrechnungstatus_model', 'AnrechnungstatusModel');
@@ -90,7 +93,8 @@ class approveAnrechnungDetail extends Auth_Controller
 		$antragData = $this->anrechnunglib->getAntragData(
 			$anrechnungData->prestudent_id,
 			$anrechnungData->studiensemester_kurzbz,
-			$anrechnungData->lehrveranstaltung_id
+			$anrechnungData->lehrveranstaltung_id,
+            $anrechnungData->anrechnung_id
 		);
 
 		// Get Empfehlung data
@@ -209,71 +213,64 @@ class approveAnrechnungDetail extends Auth_Controller
 	 */
 	public function requestRecommendation()
 	{
-		$data = $this->input->post('data');
+		$anrechnung_id = $this->input->post('anrechnung_id');
 
-		if(isEmptyArray($data))
+		if(isEmptyString($anrechnung_id))
 		{
 			return $this->outputJsonError('Fehler beim Übertragen der Daten.');
 		}
 
 		$retval = array();
-		$counter = 0;
+        
+        // Check if Anrechnungs-LV has lector
+        if (!$this->anrechnunglib->LVhasLector($anrechnung_id))
+        {
+            $this->terminateWithJsonError('LV has no lector');
+        }
 
-		foreach ($data as $item)
-		{
-			// Check if Anrechnungs-LV has lector
-			if (!$this->anrechnunglib->LVhasLector($item['anrechnung_id']))
-			{
-				// Count up LV with no lector
-				$counter++;
+        // Get Fachbereichsleitung or LV Leitung.
+        if($this->config->item('fbl') === TRUE)
+        {
+            $result = $this->anrechnunglib->getLeitungOfLvOe($anrechnung_id);
+        }
+        else
+        {
+            // If LV Leitung is not present, gets all LV lectors.
+            $result = $this->anrechnunglib->getLectors($anrechnung_id);
+        }
 
-				// Break, if LV has no lector
-				break;
-			}
+        $empfehlungsanfrage_an = !isEmptyArray($result) ? implode(', ', array_column($result, 'fullname')) : '';
 
-			// Get full name of LV Leitung.
-			// If LV Leitung is not present, get full name of LV lectors.
-			$lector_arr = $this->anrechnunglib->getLectors($item['anrechnung_id']);
-			$empfehlungsanfrage_an = !isEmptyArray($lector_arr)
-				? implode(', ', array_column($lector_arr, 'fullname'))
-				: '';
-
-			// Request Recommendation
-			if($this->anrechnunglib->requestRecommendation($item['anrechnung_id']))
-			{
-				$retval[]= array(
-					'anrechnung_id' => $item['anrechnung_id'],
-					'status_kurzbz' => self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR,
-					'status_bezeichnung' => $this->anrechnunglib->getStatusbezeichnung(self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR),
-					'empfehlung_anrechnung' => null,
-					'empfehlungsanfrageAm' => (new DateTime())->format('d.m.Y'),
-					'empfehlungsanfrageAn' => $empfehlungsanfrage_an
-				);
-			}
-		}
-
-		/**
-		 * Send mails to lectors
-		 * NOTE: mails are sent at the end to ensure sending only ONE mail to each LV-Leitung or lector
-		 * even if they are required for more recommendations
-		 * */
-		if (!isEmptyArray($retval))
-		{
-			self::_sendSanchoMailToLectors($retval);
-
-			// Output json to ajax
-			return $this->outputJsonSuccess($retval);
-		}
+        // Request Recommendation
+        if ($this->anrechnunglib->requestRecommendation($anrechnung_id))
+        {
+            $retval[]= array(
+                'anrechnung_id' => $anrechnung_id,
+                'status_kurzbz' => self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR,
+                'status_bezeichnung' => $this->anrechnunglib->getStatusbezeichnung(self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR),
+                'empfehlung_anrechnung' => null,
+                'empfehlungsanfrageAm' => (new DateTime())->format('d.m.Y'),
+                'empfehlungsanfrageAn' => $empfehlungsanfrage_an
+            );
+        }
 
 		// Output json to ajax
-		if (isEmptyArray($retval) && $counter > 0)
-		{
-			return $this->outputJsonError(
-				"Empfehlung wurde nicht angefordert,\nDer LV sind keine LektorInnen zugeteilt."
-			);
-		}
+        if ($empfehlungsanfrage_an == '')
+        {
+            $this->terminateWithJsonError(
+                "Empfehlung wurde nicht angefordert,\nDer LV sind keine LektorInnen zugeteilt."
+            );
+        }
 
-		return $this->outputJsonError($this->p->t('ui', 'errorNichtAusgefuehrt'));
+		if (isEmptyArray($retval))
+		{
+            $this->terminateWithJsonError("Empfehlung wurde nicht angefordert");
+		}
+        else
+        {
+            // Output json to ajax
+            return $this->outputJsonSuccess($retval);
+        }
 	}
 
 	/**
@@ -467,39 +464,33 @@ class approveAnrechnungDetail extends Auth_Controller
 
 	/**
 	 * Send mail to lectors asking for recommendation. (first to LV-Leitung, if not present to all lectors of lv)
-	 * @param $mail_params
+	 * @param $anrechnung_id
 	 * @return bool
 	 */
-	private function _sendSanchoMailToLectors($mail_params)
+	private function _sendSanchoMailToLectors($anrechnung_id)
 	{
-		// Get Lehrveranstaltungen
-		$anrechnung_arr = array();
-
-		foreach ($mail_params as $item)
-		{
-			$this->AnrechnungModel->addSelect('lehrveranstaltung_id, studiensemester_kurzbz');
-			$anrechnung_arr[]= array(
-				'lehrveranstaltung_id' => $this->AnrechnungModel->load($item['anrechnung_id'])->retval[0]->lehrveranstaltung_id,
-				'studiensemester_kurzbz' => $this->AnrechnungModel->load($item['anrechnung_id'])->retval[0]->studiensemester_kurzbz
-			);
-		}
-
-		$anrechnung_arr = array_unique($anrechnung_arr, SORT_REGULAR);
-
+        $lehrveranstaltung_id = $this->AnrechnungModel->load($anrechnung_id)->retval[0]->lehrveranstaltung_id;
+        $studiensemester_kurzbz =  $this->AnrechnungModel->load($anrechnung_id)->retval[0]->studiensemester_kurzbz;
 
 		/**
-		 * Get lectors (prio for LV-Leitung, if not present to all lectors of LV.
+         * Get mail receivers.
+		 * If config is default (lectors): prio for LV-Leitung, if not present to all lectors of LV.
 		 * Anyway this function will receive a unique array to avoid sending more mails to one and the same lector.
 		 * **/
-		$lector_arr = $this->_getLectors($anrechnung_arr);
+        if ($this->config->item('fbl') === TRUE)
+        {
+            $receiver_arr = $this->_getLeitungOfLvOe($lehrveranstaltung_id);
+        }
+        else
+        {
+            $receiver_arr = $this->_getLectors($studiensemester_kurzbz, $lehrveranstaltung_id);
+        }
 
-
-
-		// Send mail to lectors
-		foreach ($lector_arr as $lector)
+		// Send mail
+		foreach ($receiver_arr as $receiver)
 		{
-			$to = $lector->uid;
-			$vorname = $lector->vorname;
+			$to = $receiver->uid. '@'. DOMAIN;;
+			$vorname = $receiver->vorname;
 
 			// Get full name of stgl
 			$this->load->model('person/Person_model', 'PersonModel');
@@ -537,35 +528,30 @@ class approveAnrechnungDetail extends Auth_Controller
 	 * @param $anrechnung_arr
 	 * @return array
 	 */
-	private function _getLectors($anrechnung_arr)
+	private function _getLectors($studiensemester_kurzbz, $lehrveranstaltung_id)
 	{
 		$lector_arr = array();
 
-		// Get lectors
-		foreach($anrechnung_arr as $anrechnung)
-		{
-			$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-			$result = $this->LehrveranstaltungModel->getLecturersByLv($anrechnung['studiensemester_kurzbz'], $anrechnung['lehrveranstaltung_id']);
+        $result = $this->LehrveranstaltungModel->getLecturersByLv($studiensemester_kurzbz, $lehrveranstaltung_id);
 
-			if (!$result = getData($result))
-			{
-				show_error('Failed retrieving lectors of Lehrveranstaltung');
-			}
+        if (!$result = getData($result))
+        {
+            show_error('Failed retrieving lectors of Lehrveranstaltung');
+        }
 
-			// Check if lv has LV-Leitung
-			$key = array_search(true, array_column($result, 'lvleiter'));
+        // Check if lv has LV-Leitung
+        $key = array_search(true, array_column($result, 'lvleiter'));
 
-			// If lv has LV-Leitung, keep only the one
-			if ($key !== false)
-			{
-				$lector_arr[]= $result[$key];
-			}
-			// ...otherwise keep all lectors
-			else
-			{
-				$lector_arr = array_merge($lector_arr, $result);
-			}
-		}
+        // If lv has LV-Leitung, keep only the one
+        if ($key !== false)
+        {
+            $lector_arr[]= $result[$key];
+        }
+        // ...otherwise keep all lectors
+        else
+        {
+            $lector_arr = array_merge($lector_arr, $result);
+        }
 
 		/**
 		 * NOTE: This step is only done to make the array unique by uid, vorname and nachname in the following step
@@ -584,6 +570,14 @@ class approveAnrechnungDetail extends Auth_Controller
 
 	}
 
+    // Get Leitungen of Lehrveranstaltungs-Organisationseinheit
+    private function _getLeitungOfLvOe($lehrveranstaltung_id)
+    {
+        $result = $this->LehrveranstaltungModel->getLeitungOfLvOe($lehrveranstaltung_id);
+
+        return hasData($result) ? getData($result) : show_error('Failed retrieving Leitung of Lehrveranstaltungs-Organisationseinheit');
+    }
+
 	private function _saveEmpfehlungsNotiz($anrechnung_id, $empfehlungstext, $notiz_id)
 	{
 		$this->load->model('person/Notiz_model', 'NotizModel');
@@ -606,8 +600,5 @@ class approveAnrechnungDetail extends Auth_Controller
 			trim($empfehlungstext),
 			$this->_uid
 		);
-
-
 	}
-
 }

application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php

@@ -28,6 +28,9 @@ class approveAnrechnungUebersicht extends Auth_Controller
 			)
 		);
 
+		// Load configs
+		$this->load->config('anrechnung');
+
 		// Load models
 		$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
 		$this->load->model('education/Anrechnungstatus_model', 'AnrechnungstatusModel');
@@ -78,6 +81,19 @@ class approveAnrechnungUebersicht extends Auth_Controller
 			show_error(getError($studiengang_kz_arr));
 		}
 
+        // Get oes the user is entitled for
+        $oe_kurzbz_arr_schreibberechtigt = array();
+        if ($oe_arr = $this->permissionlib->getOE_isEntitledFor(self::BERECHTIGUNG_ANRECHNUNG_GENEHMIGEN))
+        {
+            foreach($oe_arr as $oe)
+            {
+                $berechtigt = $this->permissionlib->isBerechtigt(self::BERECHTIGUNG_ANRECHNUNG_GENEHMIGEN, 'suid', $oe);
+
+                if ($berechtigt) $oe_kurzbz_arr_schreibberechtigt[]= $oe;
+            }
+        }
+
+        // Check if permission is readonly
         $hasReadOnlyAccess =
             $this->permissionlib->isBerechtigt(self::BERECHTIGUNG_ANRECHNUNG_GENEHMIGEN, 's')
             && !$this->permissionlib->isBerechtigt(self::BERECHTIGUNG_ANRECHNUNG_GENEHMIGEN, 'suid');
@@ -87,9 +103,11 @@ class approveAnrechnungUebersicht extends Auth_Controller
 
 		$viewData = array(
 			'studiensemester_selected' => $studiensemester_kurzbz,
-			'studiengaenge_entitled' => $studiengang_kz_arr,
+            'studiengaenge_entitled' => $studiengang_kz_arr,                // alle STG mit Lese- und Schreibberechtigung
+            'oes_schreibberechtigt' => $oe_kurzbz_arr_schreibberechtigt,    // alle STG nur mit Schreibberechtigung
             'hasReadOnlyAccess' => $hasReadOnlyAccess,
-            'hasCreateAnrechnungAccess' => $hasCreateAnrechnungAccess
+            'hasCreateAnrechnungAccess' => $hasCreateAnrechnungAccess,
+            'configFachbereichsleitung' => $this->config->item('fbl')
 		);
 
 		$this->load->view('lehre/anrechnung/approveAnrechnungUebersicht.php', $viewData);
@@ -207,14 +225,20 @@ class approveAnrechnungUebersicht extends Auth_Controller
 			// Request Recommendation
 			if($this->anrechnunglib->requestRecommendation($item['anrechnung_id']))
 			{
-				// Get full name of LV Leitung.
-				// If LV Leitung is not present, get full name of LV lectors.
-				$lector_arr = $this->anrechnunglib->getLectors($item['anrechnung_id']);
-				$empfehlungsanfrage_an = !isEmptyArray($lector_arr)
-					? implode(', ', array_column($lector_arr, 'fullname'))
-					: '';
+                // Get full name of Fachbereichsleitung or LV Leitung.
+                if($this->config->item('fbl') === TRUE)
+                {
+                    $result = $this->anrechnunglib->getLeitungOfLvOe($item['anrechnung_id']);
+                }
+                else
+                {
+                    // If LV Leitung is not present, get full name of LV lectors.
+                    $result = $this->anrechnunglib->getLectors($item['anrechnung_id']);
+                }
 
-				$retval[]= array(
+                $empfehlungsanfrage_an = !isEmptyArray($result) ? implode(', ', array_column($result, 'fullname')) : '';
+
+                $retval[]= array(
 					'anrechnung_id' => $item['anrechnung_id'],
 					'status_kurzbz' => self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR,
 					'status_bezeichnung' => $this->anrechnunglib->getStatusbezeichnung(self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR),
@@ -225,23 +249,18 @@ class approveAnrechnungUebersicht extends Auth_Controller
 			}
 		}
 
-		/**
-		 * Send mails to lectors
-		 * NOTE: mails are sent at the end to ensure sending only ONE mail to each LV-Leitung or lector
-		 * even if they are required for more recommendations
-		 * */
-		if (!isEmptyArray($retval))
-		{
-			self::_sendSanchoMailToLectors($retval);
-		}
-
 		// Output json to ajax
-		if (isEmptyArray($retval) && $counter == 0)
+		if (isEmptyArray($retval))
 		{
-			return $this->outputJsonError('Es wurden keine Empfehlungen angefordert');
+            if ($counter > 0)
+            {
+                $this->terminateWithJsonError('Bei '. $counter.' LV sind keine LektorInnen zugeteilt.');
+            }
+
+			$this->terminateWithJsonError('Es wurden keine Empfehlungen angefordert');
 		}
 
-		return $this->outputJsonSuccess($retval);
+		$this->outputJsonSuccess($retval);
 	}
 
 	/**
@@ -316,7 +335,7 @@ class approveAnrechnungUebersicht extends Auth_Controller
 	 * @param $mail_params
 	 * @return bool
 	 */
-	private function _sendSanchoMailToLectors($mail_params)
+	private function _sendSanchoMail($mail_params)
 	{
 		// Get Lehrveranstaltungen
 		$anrechnung_arr = array();
@@ -332,18 +351,25 @@ class approveAnrechnungUebersicht extends Auth_Controller
 
 		$anrechnung_arr = array_unique($anrechnung_arr, SORT_REGULAR);
 
-
-		/**
-		 * Get lectors (prio for LV-Leitung, if not present to all lectors of LV.
-		 * Anyway this function will receive a unique array to avoid sending more mails to one and the same lector.
-		 * **/
-		$lector_arr = $this->_getLectors($anrechnung_arr);
+        /**
+         * Get mail receivers.
+         * If retrieving lectors: prio for LV-Leitung, if not present to all lectors of LV.
+         * This function will receive a unique array to avoid sending more mails to one and the same user.
+         **/
+        if($this->config->item('fbl') === TRUE)
+        {
+            $receiver_arr = $this->_getLeitungOfLvOe($anrechnung_arr);
+        }
+        else
+        {
+            $receiver_arr = $this->_getLectors($anrechnung_arr);
+        }
 
 		// Send mail to lectors
-		foreach ($lector_arr as $lector)
+		foreach ($receiver_arr as $receiver)
 		{
-			$to = $lector->uid;
-			$vorname = $lector->vorname;
+			$to = $receiver->uid. '@'. DOMAIN;
+			$vorname = $receiver->vorname;
 
 			// Get full name of stgl
 			$this->load->model('person/Person_model', 'PersonModel');
@@ -427,4 +453,34 @@ class approveAnrechnungUebersicht extends Auth_Controller
 
 		return $lector_arr;
 	}
+
+    /**
+     * Get Leitungen of Lehrveranstaltungs-Organisationseinheit with unique uids.
+     *
+     * @param $anrechnung_arr
+     * @return array
+     */
+    private function _getLeitungOfLvOe($anrechnung_arr)
+    {
+        $oeLeitung_arr = array();
+
+        // Get Leitungen
+        foreach($anrechnung_arr as $anrechnung)
+        {
+            $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+            $result = $this->LehrveranstaltungModel->getLeitungOfLvOe($anrechnung['lehrveranstaltung_id']);
+
+            if (!hasData($result))
+            {
+                show_error('No Leitung found');
+            }
+
+            $oeLeitung_arr = array_merge($oeLeitung_arr, getData($result));
+        }
+
+        // Make array unique
+        $oeLeitung_arr = array_unique($oeLeitung_arr, SORT_REGULAR);
+
+        return $oeLeitung_arr;
+    }
 }

application/controllers/lehre/anrechnung/RequestAnrechnung.php

@@ -80,11 +80,7 @@ class requestAnrechnung extends Auth_Controller
 		$prestudent_id = getData($result)[0]->prestudent_id;
 		
 		// Check if application deadline is expired
-		$is_expired = self::_isExpired(
-			$this->config->item('submit_application_start'),
-			$this->config->item('submit_application_end'),
-			$studiensemester_kurzbz
-		);
+		$is_expired = $this->_isExpired($studiensemester_kurzbz);
 		
 		// Check if Lehrveranstaltung was already graded with application blocking grades
 		$is_blocked = self::_LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id);
@@ -93,7 +89,7 @@ class requestAnrechnung extends Auth_Controller
 		$anrechnungData = $this->anrechnunglib->getAnrechnungDataByLv($lehrveranstaltung_id, $studiensemester_kurzbz, $prestudent_id);
 
 		// Get Antrag data
-		$antragData = $this->anrechnunglib->getAntragData($prestudent_id, $studiensemester_kurzbz, $lehrveranstaltung_id);
+		$antragData = $this->anrechnunglib->getAntragData($prestudent_id, $studiensemester_kurzbz, $lehrveranstaltung_id, $anrechnungData->anrechnung_id);
 		
 		$viewData = array(
 			'antragData' => $antragData,
@@ -115,6 +111,13 @@ class requestAnrechnung extends Auth_Controller
 		$lehrveranstaltung_id = $this->input->post('lv_id');
 		$studiensemester_kurzbz = $this->input->post('studiensemester');
 		$bestaetigung = $this->input->post('bestaetigung');
+		$begruendung_ects = $this->config->item('explain_equivalence') === TRUE
+			? $this->input->post('begruendung_ects')
+			: NULL;
+		$begruendung_lvinhalt = $this->config->item('explain_equivalence') === TRUE
+			? $this->input->post('begruendung_lvinhalt')
+			: NULL;
+
 
 		// Validate data
 		if (empty($_FILES['uploadfile']['name']))
@@ -125,7 +128,9 @@ class requestAnrechnung extends Auth_Controller
 		if (isEmptyString($begruendung_id) ||
 			isEmptyString($anmerkung) ||
 			isEmptyString($lehrveranstaltung_id) ||
-			isEmptyString($studiensemester_kurzbz))
+			isEmptyString($studiensemester_kurzbz) ||
+			($this->config->item('explain_equivalence') === TRUE && isEmptyString($begruendung_ects)) ||
+			($this->config->item('explain_equivalence') === TRUE && isEmptyString($begruendung_lvinhalt)))
 		{
 			return $this->outputJsonError($this->p->t('ui', 'errorFelderFehlen'));
 		}
@@ -152,10 +157,10 @@ class requestAnrechnung extends Auth_Controller
 			return $this->outputJsonError($this->p->t('anrechnung', 'antragBereitsGestellt'));
 		}
 		
-		// Exit if application is not for actual studysemester
-		if (!self::_applicationIsForActualSS($studiensemester_kurzbz))
+		// Exit if application is a past ( < actual ) studysemester
+		if (self::_applicationIsPastSS($studiensemester_kurzbz))
 		{
-			return $this->outputJsonError($this->p->t('anrechnung', 'antragNurImAktSS'));
+			return $this->outputJsonError($this->p->t('anrechnung', 'antragNichtFuerVerganganeSS'));
 		}
 		
 		// Upload document
@@ -168,7 +173,7 @@ class requestAnrechnung extends Auth_Controller
 		
 		// Hold just inserted DMS ID
 		$lastInsert_dms_id = $result->retval['dms_id'];
-		
+
 		// Save Anrechnung and Anrechnungstatus
 		$result = $this->AnrechnungModel->createAnrechnungsantrag(
 			$prestudent_id,
@@ -176,7 +181,9 @@ class requestAnrechnung extends Auth_Controller
 			$lehrveranstaltung_id,
 			$begruendung_id,
 			$lastInsert_dms_id,
-			$anmerkung
+			$anmerkung,
+            $begruendung_ects,
+            $begruendung_lvinhalt
 		);
 		
 		if (isError($result))
@@ -234,32 +241,30 @@ class requestAnrechnung extends Auth_Controller
 	 * @return bool True if deadline is expired
 	 * @throws Exception
 	 */
-	private function _isExpired($start, $ende, $studiensemester_kurzbz)
+	private function _isExpired($studiensemester_kurzbz)
 	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+        $today = new DateTime('today midnight');
 
-		// If start is not given, set to Semesterstart.
-		if (!isset($start) || isEmptyString($start))
-		{
-			$this->StudiensemesterModel->addSelect('start');
-			$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
-			$start = getData($result)[0]->start;
-		}
+        // Load all Anrechnungszeitfenster for this Studiensemester
+        $this->load->model('education/Anrechnungszeitraum_model', 'AnrechnungszeitraumModel');
+        $result = $this->AnrechnungszeitraumModel->loadWhere(array('studiensemester_kurzbz' => $studiensemester_kurzbz));
 
-		// If ende is not given, set to Semesterende.
-		if (!isset($ende) || isEmptyString($ende))
-		{
-			$this->StudiensemesterModel->addSelect('ende');
-			$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
-			$ende = getData($result)[0]->ende;
-		}
+        if (hasData($result))
+        {
+            // Loop through Anrechnungszeitfenster
+            foreach (getData($result) as $azrObj)
+            {
+                $start = new DateTime($azrObj->anrechnungstart);
+                $ende = new DateTime($azrObj->anrechnungende);
 
-		$today = new DateTime('today midnight');
-		$start = new DateTime($start);
-		$ende = new DateTime($ende);
+                // Return false if today is at least within one Anrechnungszeitraum
+                if (($today >= $start && $today <= $ende)) return false;
 
-		// True if expired
-		return ($today < $start || $today > $ende);
+            }
+        }
+
+        // Return true if today is in none Anrechnungszeitraum
+        return true;
 	}
 
 	/**
@@ -312,18 +317,21 @@ class requestAnrechnung extends Auth_Controller
 	}
 
 	/**
-	 * Check if applications' study semester is actual study semester.
+	 * Check if applications' study semester is < actual study semester.
 	 *
 	 * @param $studiensemester_kurzbz
 	 * @return bool
 	 */
-	private function _applicationIsForActualSS($studiensemester_kurzbz)
+	private function _applicationIsPastSS($studiensemester_kurzbz)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$result = $this->StudiensemesterModel->getNearest();
-		$actual_ss = getData($result)[0]->studiensemester_kurzbz;
+		$actual_ss = getData($result)[0];
 
-		return $studiensemester_kurzbz == $actual_ss;
+		$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
+		$anrechnung_ss = getData($result)[0];
+
+		return $anrechnung_ss->ende < $actual_ss->start;
 	}
 
 	private function _LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id)

application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php

@@ -28,6 +28,9 @@ class reviewAnrechnungDetail extends Auth_Controller
 			)
 		);
 
+		// Load configs
+		$this->load->config('anrechnung');
+
 		// Load models
 		$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
 		$this->load->model('education/Anrechnungstatus_model', 'AnrechnungstatusModel');
@@ -84,16 +87,21 @@ class reviewAnrechnungDetail extends Auth_Controller
 		$antragData = $this->anrechnunglib->getAntragData(
 			$anrechnungData->prestudent_id,
 			$anrechnungData->studiensemester_kurzbz,
-			$anrechnungData->lehrveranstaltung_id
+			$anrechnungData->lehrveranstaltung_id,
+            $anrechnungData->anrechnung_id
 		);
 
 		// Get Empfehlung data
 		$empfehlungData = $this->anrechnunglib->getEmpfehlungData($anrechnung_id);
 
+        // False if LV-Leitung is present and user is not LV-Leitung. Otherwise always true.
+        $isEmpfehlungsberechtigt = $this->anrechnunglib->isEmpfehlungsberechtigt($anrechnung_id);
+
 		$viewData = array(
 			'antragData' => $antragData,
 			'anrechnungData' => $anrechnungData,
-			'empfehlungData' => $empfehlungData
+			'empfehlungData' => $empfehlungData,
+            'isEmpfehlungsberechtigt' => $isEmpfehlungsberechtigt
 		);
 
 		$this->load->view('lehre/anrechnung/reviewAnrechnungDetail.php', $viewData);
@@ -140,10 +148,13 @@ class reviewAnrechnungDetail extends Auth_Controller
 			 * Send mails to STGL (if not present STGL, send to STGL assistance)
 			 * NOTE: mails are sent at the end to ensure sending only one mail to each STGL
 			 * */
-			if (!$this->_sendSanchoMails($json, true))
-			{
-				return $this->outputJsonError('Failed sending emails');
-			}
+            if ($this->config->item('send_mail') === TRUE)
+            {
+                if (!$this->_sendSanchoMails($json, true))
+                {
+                    return $this->outputJsonError('Failed sending emails');
+                }
+            }
 
 			return $this->outputJsonSuccess($json);
 		}
@@ -191,10 +202,13 @@ class reviewAnrechnungDetail extends Auth_Controller
 		if (isset($json) && !isEmptyArray($json))
 		{
 			// Send mails to STGL (if not present STGL, send to STGL assistance)
-			if (!$this->_sendSanchoMails($json, false))
-			{
-				return $this->outputJsonError('Failed sending emails');
-			}
+            if ($this->config->item('send_mail') === TRUE)
+            {
+                if (!$this->_sendSanchoMails($json, false))
+                {
+                    return $this->outputJsonError('Failed sending emails');
+                }
+            }
 
 			return $this->outputJsonSuccess($json);
 		}
@@ -253,8 +267,14 @@ class reviewAnrechnungDetail extends Auth_Controller
 			show_error('Failed retrieving Anrechnung');
 		}
 
-		$result = $this->LehrveranstaltungModel
-			->getLecturersByLv($result->studiensemester_kurzbz, $result->lehrveranstaltung_id);
+		if($this->config->item('fbl') === TRUE)
+        {
+            $result = $this->LehrveranstaltungModel->getLeitungOfLvOe($result->lehrveranstaltung_id);
+        }
+		else
+        {
+            $result = $this->LehrveranstaltungModel->getLecturersByLv($result->studiensemester_kurzbz, $result->lehrveranstaltung_id);
+        }
 
 		if($result = getData($result))
 		{
@@ -282,14 +302,20 @@ class reviewAnrechnungDetail extends Auth_Controller
 			show_error('Failed retrieving Anrechnung');
 		}
 
-		$result = $this->LehrveranstaltungModel
-			->getLecturersByLv($result->studiensemester_kurzbz, $result->lehrveranstaltung_id);
+		if($this->config->item('fbl') === TRUE)
+        {
+			$result = $this->LehrveranstaltungModel->getLeitungOfLvOe($result->lehrveranstaltung_id);
+        }
+		else
+        {
+			$result = $this->LehrveranstaltungModel->getLecturersByLv($result->studiensemester_kurzbz, $result->lehrveranstaltung_id);
+        }
 
 		if($result = getData($result))
 		{
-			$entitled_lector_arr = array_column($result, 'uid');
+			$entitled_uid_arr = array_column($result, 'uid');
 
-			if (in_array($this->_uid, $entitled_lector_arr))
+			if (in_array($this->_uid, $entitled_uid_arr))
 			{
 				return;
 			}

application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php

@@ -26,6 +26,9 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 			)
 		);
 
+		// Load configs
+		$this->load->config('anrechnung');
+
 		// Load models
 		$this->load->model('education/Anrechnung_model', 'AnrechnungModel');
 		$this->load->model('education/Anrechnungstatus_model', 'AnrechnungstatusModel');
@@ -72,7 +75,8 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 		}
 
 		$viewData = array(
-			'studiensemester_selected' => $studiensemester_kurzbz
+			'studiensemester_selected' => $studiensemester_kurzbz,
+            'configFachbereichsleitung' => $this->config->item('fbl')
 		);
 
 		$this->load->view('lehre/anrechnung/reviewAnrechnungUebersicht.php', $viewData);
@@ -111,16 +115,19 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 			 * Send mails to STGL (if not present STGL, send to STGL assistance)
 			 * NOTE: mails are sent at the end to ensure sending only one mail to each STGL
 			 * */
-			if (!$this->_sendSanchoMails($json, true))
-			{
-				show_error('Failed sending emails');
-			}
+            if ($this->config->item('send_mail') === TRUE)
+            {
+                if (!$this->_sendSanchoMails($json, true))
+                {
+                    show_error('Failed sending emails');
+                }
+            }
 
 			return $this->outputJsonSuccess($json);
 		}
 		else
 		{
-			return $this->outputJsonError($this->p->t('ui', 'errorNichtAusgefuehrt'));
+			$this->terminateWithJsonError($this->p->t('ui', 'errorNichtAusgefuehrt'));
 		}
 	}
 
@@ -154,10 +161,13 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 		if (isset($json) && !isEmptyArray($json))
 		{
 			// Send mails to STGL (if not present STGL, send to STGL assistance)
-			if (!$this->_sendSanchoMails($json, false))
-			{
-				show_error('Failed sending emails');
-			}
+            if ($this->config->item('send_mail') === TRUE)
+            {
+                if (!$this->_sendSanchoMails($json, false))
+                {
+                    show_error('Failed sending emails');
+                }
+            }
 
 			return $this->outputJsonSuccess($json);
 		}
@@ -217,14 +227,20 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 			show_error('Failed retrieving Anrechnung');
 		}
 
-		$result = $this->LehrveranstaltungModel
-			->getLecturersByLv($result->studiensemester_kurzbz, $result->lehrveranstaltung_id);
+        if ($this->config->item('fbl') === TRUE)
+        {
+            $result = $this->LehrveranstaltungModel->getLeitungOfLvOe($result->lehrveranstaltung_id);
+        }
+        else
+        {
+            $result = $this->LehrveranstaltungModel->getLecturersByLv($result->studiensemester_kurzbz, $result->lehrveranstaltung_id);
+        }
 
 		if($result = getData($result))
 		{
-			$entitled_lector_arr = array_column($result, 'uid');
+			$entitled_uid_arr = array_column($result, 'uid');
 
-			if (in_array($this->_uid, $entitled_lector_arr))
+			if (in_array($this->_uid, $entitled_uid_arr))
 			{
 				return;
 			}

application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php

@@ -35,6 +35,7 @@ class LehrauftragAkzeptieren extends Auth_Controller
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('codex/Bisverwendung_model', 'BisverwendungModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model', 'DienstverhaeltnisModel');
 
 		// Load libraries
 		$this->load->library('WidgetLib');
@@ -94,9 +95,9 @@ class LehrauftragAkzeptieren extends Auth_Controller
 			'lektor' => true,
 			'aktiv' => true
 		));
-		
+
 		$is_external_lector = hasData($result) ? true : false;
-		
+
 		$view_data = array(
 			'studiensemester_selected' => $studiensemester_kurzbz,
 			'is_external_lector' => $is_external_lector
@@ -207,15 +208,41 @@ class LehrauftragAkzeptieren extends Auth_Controller
 	 */
 	public function checkInkludierteLehre()
 	{
-		$result = $this->BisverwendungModel->getLast($this->_uid, false);
-
-		if (hasData($result))
+		if(defined('DIENSTVERHAELTNIS_SUPPORT') && DIENSTVERHAELTNIS_SUPPORT)
 		{
-			$this->outputJsonSuccess(!is_null($result->retval[0]->inkludierte_lehre) && $result->retval[0]->inkludierte_lehre != 0);
+			// Bei neuer Vertragsstruktur wird nur anhand des echten DVs entschieden ob eine Anzeige
+			// des Stundensatzes erfolgt oder nicht.
+			$result = $this->DienstverhaeltnisModel->getDVByPersonUID($this->_uid, null, date('Y-m-d'));
+
+			if (hasData($result))
+			{
+				$data = getData($result);
+				foreach($data as $row)
+				{
+					if($row->vertragsart_kurzbz == 'echterdv')
+						$this->outputJsonSuccess(true);
+					else
+						$this->outputJsonSuccess(false);
+				}
+			}
+			else
+			{
+				$this->outputJsonError(getError($result));
+			}
 		}
 		else
 		{
-			$this->outputJsonError(getError($result));
+			// DEPRECATED
+			$result = $this->BisverwendungModel->getLast($this->_uid, false);
+
+			if (hasData($result))
+			{
+				$this->outputJsonSuccess(!is_null($result->retval[0]->inkludierte_lehre) && $result->retval[0]->inkludierte_lehre != 0);
+			}
+			else
+			{
+				$this->outputJsonError(getError($result));
+			}
 		}
 	}
 

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/public/js/Components.php

@@ -0,0 +1,43 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Components extends FHC_Controller
+{
+	/**
+	 * @return void
+	 */
+	public function primevue(...$args)
+	{
+		$path = implode('/', $args);
+		$target = FHCPATH . 'vendor/npm-asset/primevue/' . $path;
+		if (!file_exists($target))
+			return show_404();
+		
+		$newUrl = str_repeat('../', count($args));
+
+		$ext = substr($path, -7) == '.min.js' ? '.esm.min.js' : '.esm.js';
+
+		$contents = file_get_contents($target);
+		
+		$contents = preg_replace_callback('/import([^;]*)from\s*[\'"]vue[\'"];/i', function ($matches) {
+			return 'let ' . str_replace(' as ', ': ', $matches[1]) . ' = Vue;';
+		}, $contents);
+		
+		$contents = preg_replace_callback('/(import[^;]*[\'"])(primevue[^\'"]+)([\'"])/i', function ($matches) use ($ext, $newUrl) {
+			if (is_file(FHCPATH . 'vendor/npm-asset/' . $matches[2])) {
+				$newUrl .= $matches[2];
+			} else {
+				$testfile = $matches[2] . '/index' . $ext;
+				if (file_exists(FHCPATH . 'vendor/npm-asset/' . $testfile))
+					$newUrl .= $testfile;
+				else
+					$newUrl .= $matches[2] . strrchr($matches[2], '/') . $ext;
+			}
+			return $matches[1] . $newUrl . $matches[3];
+		}, $contents);
+		
+		$this->output->set_content_type('text/javascript');
+		$this->output->set_output($contents);
+	}
+}

application/controllers/system/MigrateContract.php

@@ -0,0 +1,759 @@
+<?php
+/*
+ * Job zur einmaligen Migration der Mitarbeiterverträge aus der tbl_bisverwendung in die neue
+ * Vertragsstruktur im HR Schema
+ *
+ * Aufruf pro Person
+ * php index.ci.php system/MigrateContract/index/oesi
+ *
+ * Aufruf fuer Alle
+ * php index.ci.php system/MigrateContract/index
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class MigrateContract extends CLI_Controller
+{
+
+	private $matching_ba1_vertragsart;
+	private $OE_DEFAULT;
+
+	protected $configerrors;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->model('codex/bisverwendung_model', 'BisVerwendungModel');
+		$this->load->model('person/benutzerfunktion_model', 'BenutzerfunktionModel');
+
+		$this->load->config('migratecontract');
+
+		$this->OE_DEFAULT = $this->config->item('migratecontract_oe_default');
+		$this->matching_ba1_vertragsart = $this->config->item('migratecontract_matching_ba1_vertragsart');
+		$this->configerrors = array();
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function checkConfig()
+	{
+	    echo "OE_DEFAULT: " . $this->OE_DEFAULT . "\n";
+	    echo "matching_ba1_vertragsart: " . print_r($this->matching_ba1_vertragsart, true);
+
+	    $this->checkOE_DEFAULT();
+	    $this->checkMatching_ba1_vertragsart();
+
+	    if( count($this->configerrors) > 0 )
+	    {
+		foreach($this->configerrors AS $configerror)
+		{
+		    echo $configerror . "\n";
+		}
+		die("Fehler in der Konfiguration. Abbruch!\n");
+	    }
+	    else
+	    {
+		echo "Konfiguration OK.\n";
+	    }
+	}
+
+	protected function checkOE_DEFAULT()
+	{
+	    $db = new DB_Model();
+	    $oesql = 'SELECT * FROM public.tbl_organisationseinheit WHERE oe_kurzbz = ?';
+	    $oeres = $db->execReadOnlyQuery($oesql, array($this->OE_DEFAULT));
+	    if( !hasData($oeres) )
+	    {
+		$this->configerrors[] = 'Default Organisationseinheit: "'
+		    . $this->OE_DEFAULT . '" nicht gefunden.';
+	    }
+	}
+
+	protected function checkMatching_ba1_vertragsart() {
+	    $db = new DB_Model();
+	    foreach( $this->matching_ba1_vertragsart AS $vertragsart_kurzbz )
+	    {
+		$vasql = 'SELECT * FROM hr.tbl_vertragsart WHERE vertragsart_kurzbz = ?';
+		$vares = $db->execReadOnlyQuery($vasql, array($vertragsart_kurzbz));
+		if( !hasData($vares) )
+		{
+		    $this->configerrors[] = 'Vertragsart "' . $vertragsart_kurzbz
+			. '" nicht gefunden.';
+		}
+	    }
+	}
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function index($user = null)
+	{
+		$this->checkConfig();
+
+		if (!is_null($user))
+		{
+			$contracts = $this->_transformUser($user);
+
+			/*
+			Format:
+			$contracts['dv'][]['vbs'][]
+			*/
+			//$this->outputJson($contracts);
+			var_dump($contracts);
+			$this->_saveJSON($contracts);
+		}
+		else
+		{
+			$qry = "SELECT distinct mitarbeiter_uid FROM bis.tbl_bisverwendung";
+			$db = new DB_Model();
+
+			$resultUser = $db->execReadOnlyQuery($qry);
+			if (hasData($resultUser))
+			{
+				$users = getData($resultUser);
+				foreach($users as $user)
+				{
+					$contracts = $this->_transformUser($user->mitarbeiter_uid);
+					$this->_saveJSON($contracts);
+				}
+			}
+
+		}
+	}
+
+	private function _saveJSON($contracts)
+	{
+		$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model','DienstverhaeltnisModel');
+		$this->load->model('vertragsbestandteil/Vertragsbestandteil_model','VertragsbestandteilModel');
+		$this->load->model('vertragsbestandteil/VertragsbestandteilStunden_model','VertragsbestandteilStundenModel');
+		$this->load->model('vertragsbestandteil/VertragsbestandteilZeitaufzeichnung_model','VertragsbestandteilZeitaufzeichnungModel');
+		$this->load->model('vertragsbestandteil/VertragsbestandteilFreitext_model','VertragsbestandteilFreitextModel');
+		$this->load->model('vertragsbestandteil/VertragsbestandteilFunktion_model','VertragsbestandteilFunktionModel');
+		$this->load->model('vertragsbestandteil/VertragsbestandteilKarenz_model','VertragsbestandteilKarenzModel');
+
+		$failed = false;
+		$this->db->trans_begin();
+
+		foreach($contracts['dv'] as $row_dv)
+		{
+			// Dienstvertrag erstellen
+			$resultDV = $this->DienstverhaeltnisModel->insert(
+				array(
+				'mitarbeiter_uid' => $row_dv['mitarbeiter_uid'],
+				'vertragsart_kurzbz' => $row_dv['vertragsart_kurzbz'],
+				'oe_kurzbz' => $row_dv['oe_kurzbz'],
+				'von' => $row_dv['von'],
+				'bis' => $row_dv['bis'],
+				'insertamum' => date('Y-m-d H:i:s'),
+				'insertvon' => 'MigrateContract'
+				)
+			);
+
+			if (isSuccess($resultDV) && hasData($resultDV))
+			{
+				$dv_id = getData($resultDV);
+
+				// Vertragsbetandteile erstellen
+				foreach($row_dv['vbs'] as $row_vbs)
+				{
+					$resultVBS = $this->VertragsbestandteilModel->insert(
+						array(
+						'dienstverhaeltnis_id' => $dv_id,
+						'vertragsbestandteiltyp_kurzbz' => $row_vbs['vertragsbestandteiltyp_kurzbz'],
+						'von' => $row_vbs['von'],
+						'bis' => $row_vbs['bis'],
+						'insertamum' => date('Y-m-d H:i:s'),
+						'insertvon' => 'MigrateContract'
+						)
+					);
+
+					if (isSuccess($resultVBS) && hasData($resultVBS))
+					{
+						$vbs_id = getData($resultVBS);
+						echo 'VBS:'.$vbs_id;
+
+						switch($row_vbs['vertragsbestandteiltyp_kurzbz'])
+						{
+							case 'stunden':
+								$resultVBS = $this->_insertVBSStunden($vbs_id, $row_vbs);
+								break;
+							case 'zeitaufzeichnung':
+								$resultVBS = $this->_insertVBSZeitaufzeichnung($vbs_id, $row_vbs);
+								break;
+							case 'funktion':
+								$resultVBS = $this->_insertVBSFunktion($vbs_id, $row_vbs);
+								break;
+							case 'freitext':
+								$resultVBS = $this->_insertVBSFreitext($vbs_id, $row_vbs);
+								break;
+							case 'karenz':
+								$resultVBS = $this->_insertVBSKarenz($vbs_id, $row_vbs);
+								break;
+						}
+
+						if (isError($resultVBS))
+						{
+							echo "FAILED:".getError($resultVBS);
+							$failed = true;
+						}
+					}
+					else
+					{
+						$failed = true;
+					}
+				}
+			}
+			else
+			{
+				$failed = true;
+			}
+		}
+
+		if(!$failed)
+		{
+			$this->db->trans_commit();
+		}
+		else
+		{
+			echo "ROLLBACK";
+			$this->db->trans_rollback();
+		}
+	}
+
+	private function _insertVBSKarenz($vbs_id, $row_vbs)
+	{
+		return $this->VertragsbestandteilKarenzModel->insert(
+			array(
+			'vertragsbestandteil_id' => $vbs_id,
+			'karenztyp_kurzbz' => $row_vbs['karenztyp_kurzbz']
+			)
+		);
+	}
+
+	private function _insertVBSFreitext($vbs_id, $row_vbs)
+	{
+		return $this->VertragsbestandteilFreitextModel->insert(
+			array(
+			'vertragsbestandteil_id' => $vbs_id,
+			'freitexttyp_kurzbz' => $row_vbs['freitexttyp_kurzbz'],
+			'titel' => $row_vbs['titel'],
+			'anmerkung' => $row_vbs['anmerkung']
+			)
+		);
+	}
+
+	private function _insertVBSFunktion($vbs_id, $row_vbs)
+	{
+		return $this->VertragsbestandteilFunktionModel->insert(
+			array(
+			'vertragsbestandteil_id' => $vbs_id,
+			'benutzerfunktion_id' => $row_vbs['benutzerfunktion_id']
+			)
+		);
+	}
+
+	private function _insertVBSZeitaufzeichnung($vbs_id, $row_vbs)
+	{
+		return $this->VertragsbestandteilZeitaufzeichnungModel->insert(
+			array(
+			'vertragsbestandteil_id' => $vbs_id,
+			'zeitaufzeichnung' => $row_vbs['zeitaufzeichnung'],
+			'azgrelevant' => $row_vbs['azgrelevant'],
+			'homeoffice' => $row_vbs['homeoffice']
+			)
+		);
+	}
+
+	private function _insertVBSStunden($vbs_id, $row_vbs)
+	{
+		return $this->VertragsbestandteilStundenModel->insert(
+			array(
+			'vertragsbestandteil_id' => $vbs_id,
+			'wochenstunden' => $row_vbs['wochenstunden'],
+			'teilzeittyp_kurzbz' => $row_vbs['teilzeittyp_kurzbz']
+			)
+		);
+	}
+
+	/**
+	 * Ermittelt die neue Vertragsstruktur fuer einen User
+	 */
+	private function _transformUser($user)
+	{
+		$contracts = array();
+		$this->BisVerwendungModel->addOrder('beginn');
+		$result_verwendung = $this->BisVerwendungModel->loadWhere(array("mitarbeiter_uid" => $user));
+
+		if (isError($result_verwendung))
+			die("Failed to load Verwendung");
+
+		if (hasData($result_verwendung))
+		{
+			$verwendung = getData($result_verwendung);
+
+			foreach ($verwendung as $row_verwendung)
+			{
+				$dv = $this->_getOrCreateDV($contracts, $row_verwendung);
+
+				// Ende des DV aktualisieren
+				if ($contracts['dv'][$dv]['bis'] < $row_verwendung->ende || $row_verwendung->ende == '')
+					$contracts['dv'][$dv]['bis'] = $row_verwendung->ende;
+
+				// Stundenbestandteil pruefen
+				$this->_addVertragsbestandteilStunden($contracts, $dv, $row_verwendung);
+
+				// Befristung
+				$this->_addVertragsbestandteilFreitextBefristung($contracts, $dv, $row_verwendung);
+
+				// All-In
+				$this->_addVertragsbestandteilFreitextAllIn($contracts, $dv, $row_verwendung);
+
+				// Zeitaufzeichnung
+				$this->_addVertragsbestandteilZeitaufzeichnung($contracts, $dv, $row_verwendung);
+
+				// Karenz
+				$this->_addVertragsbestandteilKarenz($contracts, $dv, $row_verwendung);
+
+				// Inkludierte Lehre
+				// Kuendigungsfrist
+				// Urlaubsanspruch
+			}
+
+			// Funktion
+			$this->_addVertragsbestandteilFunktion($contracts, $user);
+
+		}
+
+		return $contracts;
+	}
+
+	/**
+	 * Fuegt Karenzierungseintraege zu bestehenden Dienstverhaeltnissen hinzu
+	 */
+	private function _addVertragsbestandteilKarenz(&$contracts, $dv, $row_verwendung)
+	{
+		if ($row_verwendung->beschausmasscode == 5)
+		{
+			$dtstart = new DateTime($row_verwendung->beginn);
+			$dtende = new DateTime($row_verwendung->ende);
+			$interval = $dtende->diff($dtstart);
+			$dauer = $interval->format('%a');
+
+			// TODO: klären ob das so machbar ist
+			if ($dauer < 65)
+				$karenztyp = 'papamonat';
+			elseif ($dauer < 120)
+				$karenztyp = 'bildungskarenz';
+			else
+				$karenztyp = 'elternkarenz';
+
+			// VBS anlegen und Funktion zuweisen
+			$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'karenz';
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['karenztyp_kurzbz'] = $karenztyp;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['geplanter_geburtstermin'] = null;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['tatsaechlicher_geburtstermin'] = null;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['hint'] = 'Dauer:'.$dauer;
+		}
+	}
+
+	/**
+	 * Holt die Funktionen die Vertragsrelevant sind und verknüpft diese
+	 */
+	private function _addVertragsbestandteilFunktion(&$contracts, $user)
+	{
+		// Alle Funktionen holen die Vertragsrelevant sind
+		$this->BenutzerfunktionModel->addOrder('datum_von');
+		$this->BenutzerfunktionModel->addJoin('public.tbl_funktion','funktion_kurzbz');
+		$resultFunktionen = $this->BenutzerfunktionModel->loadWhere(array('uid' => $user, 'vertragsrelevant' => true));
+
+		if (isSuccess($resultFunktionen) && hasData($resultFunktionen))
+		{
+			$funktionen = getData($resultFunktionen);
+
+			foreach ($funktionen as  $row_funktion)
+			{
+				$funktion_added = 0;
+				$dv = '';
+
+				// Passendes DV suchen
+				foreach ($contracts['dv'] as $key_dv => $row_contract)
+				{
+					// Eine Funktion kann zu mehreren DV zugeordnet sein
+					// es werden daher alle durchsucht ob es reinfaellt und ggf mehrfach zugeordnet
+					if ((isset($row_funktion->datum_von) && $row_funktion->datum_von >= $row_contract['von'])
+					 && ($row_contract['bis'] == '' || $row_contract['bis'] >= $row_funktion->datum_von)
+					 && (
+							(
+							isset($row_funktion->datum_bis) && isset($row_contract['bis'])
+							&& $row_funktion->datum_bis <= $row_contract['bis']
+							)
+							|| $row_funktion->datum_bis == ''
+							|| (isset($row_funktion->datum_bis) && !isset($row_contract['bis']))
+						)
+					)
+					{
+
+						$dv = $key_dv;
+
+						// Startdatum und Endedatum ermitteln wenn die Funktion ueber das DV hinausgeht
+						// Wenn die Dauer laenger ist, wird beim Beginn/Ende des DV abgegrenzt
+						$dtstart_fkt = new DateTime($row_funktion->datum_von);
+						$dtstart_dv = new DateTime($row_contract['von']);
+						if ($dtstart_fkt < $dtstart_dv)
+							$startdatum = $row_contract['von'];
+						else
+							$startdatum = $row_funktion->datum_von;
+
+						$dtende_fkt = new DateTime($row_funktion->datum_bis);
+						$dtende_dv = new DateTime($row_contract['bis']);
+						if ($dtende_fkt < $dtende_dv)
+							$endedatum = $row_funktion->datum_bis;
+						else
+							$endedatum = $row_contract['bis'];
+
+						// VBS anlegen und Funktion zuweisen
+						$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
+						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'funktion';
+						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $startdatum;
+						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $endedatum;
+						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['benutzerfunktion_id'] = $row_funktion->benutzerfunktion_id;
+						$contracts['dv'][$dv]['vbs'][$newVBSIndex]['hint'] = $row_funktion->funktion_kurzbz.' '.$row_funktion->datum_von.' - '.$row_funktion->datum_bis;
+						$funktion_added++;
+					}
+				}
+				if ($funktion_added == 0)
+				{
+					echo "\nFunktion nicht zugeordnet: ".$row_funktion->funktion_kurzbz.' '.$row_funktion->datum_von.' - '.$row_funktion->datum_bis;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Prueft ob schon ein Vertragsbestandteil fuer Zeitaufzeichnung vorhanden ist das in den Zeitraum passt
+	 * bzw direkt anschließt. Wenn es direkt anschließend ist und die Art gleich sind wird die Laufzeit verlaengert
+	 * Ansonsten wird ein neuer VBS angelegt
+	 */
+	private function _addVertragsbestandteilZeitaufzeichnung(&$contracts, $dv, $row_verwendung)
+	{
+		if( is_null($row_verwendung->zeitaufzeichnungspflichtig) || is_null($row_verwendung->azgrelevant) )
+		{
+		    return;
+		}
+
+		if (isset($contracts['dv'][$dv]['vbs']))
+		{
+			foreach ($contracts['dv'][$dv]['vbs'] as $index_vbs=>$row_vbs)
+			{
+				if ($row_vbs['vertragsbestandteiltyp_kurzbz'] == 'zeitaufzeichnung')
+				{
+					if ($this->_isVBSAngrenzend($row_verwendung, $row_vbs)
+						&& $row_vbs['zeitaufzeichnung'] == $row_verwendung->zeitaufzeichnungspflichtig
+						&& $row_vbs['azgrelevant'] == $row_verwendung->azgrelevant
+						&& $row_vbs['homeoffice'] == $row_verwendung->homeoffice
+					)
+					{
+						// Zeitaufzeichnungsarten bleiben gleich - Ende des VBS verlaengern
+						$contracts['dv'][$dv]['vbs'][$index_vbs]['bis'] = $row_verwendung->ende;
+						return true;
+					}
+				}
+			}
+		}
+
+		// kein passender VBS gefunden - neuen anlegen
+		$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
+		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'zeitaufzeichnung';
+		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
+		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
+		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['zeitaufzeichnung'] = $row_verwendung->zeitaufzeichnungspflichtig;
+		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['azgrelevant'] = $row_verwendung->azgrelevant;
+		$contracts['dv'][$dv]['vbs'][$newVBSIndex]['homeoffice'] = $row_verwendung->homeoffice;
+
+		return true;
+	}
+
+	/**
+	 * Fueg einen Freitextbestandteil fuer All-In zum DV hinzu
+	 */
+	private function _addVertragsbestandteilFreitextAllIn(&$contracts, $dv, $row_verwendung)
+	{
+		if ($row_verwendung->ba1code == 111) // All-In
+		{
+			$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'freitext';
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['freitexttyp_kurzbz'] = 'allin';
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['titel'] = 'allin';
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['anmerkung'] = 'allin';
+		}
+		return true;
+	}
+
+	/**
+	 * Fueg einen Freitextbestandteil fuer die Berfristung zum DV hinzu
+	 */
+	private function _addVertragsbestandteilFreitextBefristung(&$contracts, $dv, $row_verwendung)
+	{
+		if ($row_verwendung->ba2code == 1) // Befristung
+		{
+			$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'freitext';
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['freitexttyp_kurzbz'] = 'befristung';
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['titel'] = 'befristung';
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['anmerkung'] = 'befristung';
+		}
+		return true;
+	}
+
+	/**
+	 * Prueft ob schon ein Vertragsbestandteil mit diesem Stundenausmass vorhanden ist das in den Zeitraum passt
+	 * bzw direkt anschließt. Wenn es direkt anschließend ist und die Stunden gleich sind wird die Laufzeit verlaengert
+	 * Ansonsten wird ein neuer VBS angelegt
+	 */
+	private function _addVertragsbestandteilStunden(&$contracts, $dv, $row_verwendung)
+	{
+		// Nur anlegen wenn im aktuellen Eintrag auch Stunden eingetragen sind
+		if ($row_verwendung->vertragsstunden != '')
+		{
+			if (isset($contracts['dv'][$dv]['vbs']))
+			{
+				foreach ($contracts['dv'][$dv]['vbs'] as $index_vbs=>$row_vbs)
+				{
+					if ($row_vbs['vertragsbestandteiltyp_kurzbz'] == 'stunden' || ($row_vbs['vertragsbestandteiltyp_kurzbz'] == 'karenz' && $row_verwendung->vertragsstunden === '0.00'))
+					{
+						if ($this->_isVBSAngrenzend($row_verwendung, $row_vbs) && ((isset($row_vbs['wochenstunden']) && $row_vbs['wochenstunden'] == $row_verwendung->vertragsstunden) || $row_verwendung->vertragsstunden === '0.00'))
+						{
+							// stunden bleiben gleich - Ende des VBS verlaengern
+							$contracts['dv'][$dv]['vbs'][$index_vbs]['bis'] = $row_verwendung->ende;
+							return true;
+						}
+					}
+				}
+			}
+
+			// kein passender VBS gefunden - neuen anlegen
+			$newVBSIndex = $this->_getNewVBSIndex($contracts, $dv);
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['vertragsbestandteiltyp_kurzbz'] = 'stunden';
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['von'] = $row_verwendung->beginn;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['bis'] = $row_verwendung->ende;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['wochenstunden'] = $row_verwendung->vertragsstunden;
+			$contracts['dv'][$dv]['vbs'][$newVBSIndex]['teilzeittyp_kurzbz'] = null;
+		}
+		return true;
+	}
+
+	/**
+	 * Prueft ob die Verwendung direkt an den Vertragsbestandteil angrenzt
+	 * @return boolean true wenn ja, sonst false
+	 */
+	private function _isVBSAngrenzend($verwendung, $vbs)
+	{
+		// Beginn Minus 1 Tag
+		$dtstart = new DateTime($verwendung->beginn);
+		$dtstartMinus1 = $dtstart->sub(new DateInterval('P1D'))->format('Y-m-d');
+
+		if ($vbs['bis'] == ''
+			|| $vbs['bis'] == $dtstartMinus1)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Create a new DV or Returns the Index of an existing
+	 */
+	private function _getOrCreateDV(&$contracts, $row_verwendung)
+	{
+		$unternehmen = $this->OE_DEFAULT;
+		$resultUnternehmen = $this->_getUnternehmen($row_verwendung);
+		if(hasData($resultUnternehmen))
+		{
+			$unternehmen = getData($resultUnternehmen)[0]->oe_kurzbz;
+		}
+		else
+		{
+			// Fallback Unternehmen wird verwendet falls keine Zuordnung ermittelt werden kann
+		}
+
+		if (isset($contracts['dv']) && is_array($contracts['dv']))
+		{
+			foreach($contracts['dv'] as $indexdv => $row_dv)
+			{
+				// Vertragsart ist die selbe und selbes Unternehmen
+				if ($row_dv['vertragsart_kurzbz'] == $this->matching_ba1_vertragsart[$row_verwendung->ba1code]
+					&& $row_dv['oe_kurzbz'] == $unternehmen
+				)
+				{
+
+					$dtstart = new DateTime($row_verwendung->beginn);
+
+					// Zeitraum passt zur Verwendung
+					if ($row_dv['von'] <= $row_verwendung->beginn // Beginn Datum Pruefen
+						&& ( // Ende innerhalb des DV
+							(isset($row_dv['bis']) && $row_verwendung->ende != '' && ($row_dv['bis'] == '' || $row_dv['bis'] >= $row_verwendung->ende)
+							)
+							|| // direkt angrenzend an dieses DV
+							(isset($row_dv['bis'])
+							&& ($row_dv['bis'] == ''
+								|| $row_dv['bis'] == $dtstart->sub(new DateInterval('P1D'))->format('Y-m-d')
+								)
+							)
+						)
+					)
+					{
+						return $indexdv;
+					}
+				}
+			}
+		}
+
+		$newDvIndex = $this->_getNewDVIndex($contracts);
+		$contracts['dv'][$newDvIndex]['mitarbeiter_uid'] = $row_verwendung->mitarbeiter_uid;
+		$contracts['dv'][$newDvIndex]['von'] = $row_verwendung->beginn;
+		$contracts['dv'][$newDvIndex]['bis'] = $row_verwendung->ende;
+		$contracts['dv'][$newDvIndex]['oe_kurzbz'] = $unternehmen;
+		$contracts['dv'][$newDvIndex]['vertragsart_kurzbz'] = $this->matching_ba1_vertragsart[$row_verwendung->ba1code];
+
+		return $newDvIndex;
+	}
+
+	/**
+	 * Ermittelt in welchem Unternehmen die Person zum betreffenden Zeitpunkt ist.
+	 */
+	private function _getUnternehmen($row_verwendung)
+	{
+
+		$resultUnternehmen = $this->_findUnternehmen($row_verwendung->mitarbeiter_uid, "'kstzuordnung', 'oezuordnung'", $row_verwendung->beginn);
+
+		// Wenn zeitlich keine passende Unternehmenszuordnung vorhanden ist, dann suchen ob generell eine Zuordnung ermittelt werden kann
+		if(!hasData($resultUnternehmen))
+		{
+			$resultUnternehmen = $this->_findUnternehmen($row_verwendung->mitarbeiter_uid, "'kstzuordnung', 'oezuordnung'");
+
+			// Falls nicht wird nach erweiterten Funktionen gesucht um die Zuordnung zu ermitteln.
+			if(!hasData($resultUnternehmen))
+			{
+				$resultUnternehmen = $this->_findUnternehmen($row_verwendung->mitarbeiter_uid, "'kstzuordnung', 'oezuordnung','hilfskraft','Leitung','fbk','fbl'");
+			}
+		}
+
+		return $resultUnternehmen;
+	}
+
+	/**
+	 * Detailsuche fuer die Ermittlung des Unternehmenszuordnung einer Person
+	 */
+	private function _findUnternehmen($uid, $fkt=null, $datum=null)
+	{
+		$db = new DB_Model();
+
+		$qry = "
+		WITH RECURSIVE meine_oes(oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz) as
+		(
+			SELECT
+				oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz
+			FROM
+				public.tbl_organisationseinheit
+			WHERE
+				oe_kurzbz=(SELECT
+						oe_kurzbz
+					FROM
+						public.tbl_benutzerfunktion
+					WHERE
+						uid=".$db->escape($uid);
+
+		if(!is_null($datum))
+			$qry.=" AND ".$db->escape($datum)." BETWEEN datum_von AND COALESCE(datum_bis, '2999-12-31')";
+
+		if(!is_null($fkt))
+			$qry.=" AND funktion_kurzbz in ($fkt)";
+
+		$qry.="
+					ORDER BY funktion_kurzbz, datum_von LIMIT 1)
+			UNION ALL
+			SELECT
+				o.oe_kurzbz, o.oe_parent_kurzbz, o.organisationseinheittyp_kurzbz
+			FROM
+				public.tbl_organisationseinheit o, meine_oes
+			WHERE
+				o.oe_kurzbz=meine_oes.oe_parent_kurzbz
+		)
+		SELECT
+			oe_kurzbz
+		FROM
+			meine_oes
+		WHERE
+			oe_parent_kurzbz is null
+		LIMIT 1
+		";
+
+		$resultUnternehmen = $db->execReadOnlyQuery($qry);
+		return $resultUnternehmen;
+	}
+
+	/**
+	 * Ermittelt den nächsten (freien) Index für den Vertragsbetandteil
+	 */
+	private function _getNewVBSIndex($contracts, $dv)
+	{
+		if (isset($contracts['dv'][$dv]['vbs']))
+			return max(array_keys($contracts['dv'][$dv]['vbs'])) + 1;
+		else
+			return 0;
+	}
+
+	/**
+	 * Ermittelt den nächsten (freien) Index für das Dienstverhältnis
+	 */
+	private function _getNewDVIndex($contracts)
+	{
+		if (isset($contracts['dv']) && is_array($contracts['dv']))
+			return max(array_keys($contracts['dv'])) + 1;
+		else
+			return 0;
+	}
+
+	/**
+	 * Habilitation wird aus der Tabelle bis.tbl_bisverwendung in die Tabelle public.tbl_mitarbeiter uebernommen
+	 * Sofern die Person einmal in den Verwendungen eine habiliation eingetragen hat wird diese in den MA-Datensatz übernommen
+	 * Da es in der regel öfter vorkommt dass das hakerl vergessen wurde beim Vertragswechsel als dass die person die habiliation verliert.
+	 */
+	public function migrateHabilitation()
+	{
+		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$db = new DB_Model();
+
+		$qry = "
+		SELECT
+			distinct mitarbeiter_uid
+		FROM
+			bis.tbl_bisverwendung
+		WHERE
+			habilitation=true";
+
+		$resultHabilitation = $db->execReadOnlyQuery($qry);
+
+		if (isSuccess($resultHabilitation) && hasData($resultHabilitation))
+		{
+			$habilitationen = getData($resultHabilitation);
+
+			foreach ($habilitationen as  $row_habilitationen)
+			{
+ 				$this->MitarbeiterModel->update($row_habilitationen->mitarbeiter_uid, array('habilitation'=>true));
+			}
+		}
+	}
+}

application/controllers/system/MigrateHourlyRate.php

@@ -0,0 +1,268 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class MigrateHourlyRate extends CLI_Controller
+{
+	CONST DEFAULT_DATE = '1970-01-01';
+	CONST STUNDENSTAZTYP_LEHRE = 'lehre';
+	CONST STUNDENSTAZTYP_KALKULATORISCH = 'kalkulatorisch';
+	
+	private $OE_DEFAULT;
+	private $_ci;
+
+	protected $configerrors;
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->_ci = & get_instance();
+		
+		$this->load->model('codex/Bisverwendung_model', 'BisVerwendungModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$this->load->model('ressource/Stundensatz_model', 'StundensatzModel');
+
+		$this->load->config('migratecontract');
+
+		$this->OE_DEFAULT = $this->config->item('migratecontract_oe_default');
+		$this->configerrors = array();
+	}
+
+	public function checkConfig()
+	{
+	    echo "OE_DEFAULT: " . $this->OE_DEFAULT . "\n";
+
+	    $this->checkOE_DEFAULT();
+
+	    if( count($this->configerrors) > 0 )
+	    {
+		foreach($this->configerrors AS $configerror)
+		{
+		    echo $configerror . "\n";
+		}
+		die("Fehler in der Konfiguration. Abbruch!\n");
+	    }
+	    else
+	    {
+		echo "Konfiguration OK.\n";
+	    }
+	}
+
+	public function index($user = null)
+	{
+		$this->checkConfig();
+
+		echo "Lehre Stundensaetze werden migriert.\n";
+		$mitarbeiterResult = $this->_getMitarbeiterStunden($user);
+		if (isError($mitarbeiterResult)) return $mitarbeiterResult;
+		if (!hasData($mitarbeiterResult)) return error('Keine Mitarbeiterstunden gefunden');
+
+		$mitarbeiterArray = getData($mitarbeiterResult);
+
+		foreach ($mitarbeiterArray as $mitarbeiter)
+		{
+			$this->_getUnternehmen($mitarbeiter);
+			$insertResult = $this->_addStundensatz($mitarbeiter, self::STUNDENSTAZTYP_LEHRE, self::DEFAULT_DATE);
+			if (isError($insertResult)) return $insertResult;
+		}
+		
+		if( $this->checkIfSAPSyncTableExists() )
+		{
+			echo "SAP Sync Tabelle gefunden. SAP Stundensaetze werden migriert.\n";
+			$sapResult = $this->_getSapStunden($user);
+			if (isError($sapResult)) return $sapResult;
+			if (!hasData($sapResult)) return error('Keinen kalkulatorischen Stundensaetze gefunden');
+
+			$mitarbeiterArray = getData($sapResult);
+
+			foreach ($mitarbeiterArray as $mitarbeiter)
+			{
+				$this->_getUnternehmen($mitarbeiter);
+				$insertResult = $this->_addStundensatz($mitarbeiter, self::STUNDENSTAZTYP_KALKULATORISCH, date_format(date_create($mitarbeiter->beginn), 'Y-m-d'));
+				if (isError($insertResult)) return $insertResult;
+			}
+		}
+		else
+		{
+		    echo "SAP Sync Tabelle nicht gefunden. Ignoriere SAP Stundensaetze.\n";
+		}
+	}
+
+	protected function checkOE_DEFAULT()
+	{
+	    $db = new DB_Model();
+	    $oesql = 'SELECT * FROM public.tbl_organisationseinheit WHERE oe_kurzbz = ?';
+	    $oeres = $db->execReadOnlyQuery($oesql, array($this->OE_DEFAULT));
+	    if( !hasData($oeres) )
+	    {
+		$this->configerrors[] = 'Default Organisationseinheit: "'
+		    . $this->OE_DEFAULT . '" nicht gefunden.';
+	    }
+	}
+
+	protected function checkIfSAPSyncTableExists()
+	{
+	    $dbModel = new DB_Model();
+	    $params = array(
+		DB_NAME,
+		'sync',
+		'tbl_sap_stundensatz'
+	    );
+
+	    $sql = "SELECT
+			    1 AS exists
+		    FROM
+			    information_schema.tables
+		    WHERE
+			    table_catalog = ? AND
+			    table_schema = ? AND
+			    table_name = ?";
+
+	    $res = $dbModel->execReadOnlyQuery($sql, $params);
+
+	    if( hasData($res) )
+	    {
+		return true;
+	    }
+	    else
+	    {
+		return false;
+	    }
+	}
+
+
+	private function _getSapStunden($user = null)
+	{
+		$dbModel = new DB_Model();
+		$params = array();
+		
+		$qry = "SELECT ss.mitarbeiter_uid as uid,
+						ss.sap_kalkulatorischer_stundensatz as stundensatz,
+						ss.insertamum as beginn
+				FROM sync.tbl_sap_stundensatz ss
+				WHERE ss.sap_kalkulatorischer_stundensatz IS NOT NULL";
+		
+		if (!is_null($user))
+		{
+			$qry .= " AND ss.mitarbeiter_uid = ? ";
+			$params[] = $user;
+		}
+		$qry .= " ORDER BY ss.mitarbeiter_uid";
+
+		return $dbModel->execReadOnlyQuery($qry, $params);
+	}
+	
+	private function _getMitarbeiterStunden($user = null)
+	{
+		$dbModel = new DB_Model();
+		$params = array();
+
+		$qry = "SELECT mitarbeiter.mitarbeiter_uid as uid,
+						stundensatz
+				FROM public.tbl_mitarbeiter mitarbeiter
+				WHERE mitarbeiter.stundensatz != 0.00
+					AND mitarbeiter.stundensatz IS NOT NULL";
+		
+		if (!is_null($user))
+		{
+			$qry .= " AND mitarbeiter.mitarbeiter_uid = ?";
+			$params[] = $user;
+		}
+		
+		$qry .= " ORDER BY mitarbeiter.mitarbeiter_uid";
+
+		return $dbModel->execReadOnlyQuery($qry, $params);
+	}
+
+	private function _addStundensatz($mitarbeiter, $stundensatztyp, $gueltig_von)
+	{
+		return $this->_ci->StundensatzModel->insert(
+			array(
+				'uid' => $mitarbeiter->uid,
+				'stundensatztyp' => $stundensatztyp,
+				'stundensatz' => $mitarbeiter->stundensatz,
+				'oe_kurzbz' => $mitarbeiter->unternehmen,
+				'gueltig_von' => $gueltig_von,
+				'insertamum' => date('Y-m-d H:i:s'),
+				'insertvon' => 'MigrateHours'
+			)
+		);
+	}
+
+	private function _getUnternehmen(&$mitarbeiter)
+	{
+		$bvResult = $this->_ci->BisVerwendungModel->getLast($mitarbeiter->uid);
+
+		$beginn = null;
+		if (hasData($bvResult))
+		{
+			$beginn = getData($bvResult)[0]->beginn;
+		}
+
+		$unternehmenResult = $this->_findUnternehmen($mitarbeiter->uid, "'kstzuordnung', 'oezuordnung'", $beginn);
+
+		if(!hasData($unternehmenResult)) //&& hasData($bvResult)
+		{
+			$unternehmenResult = $this->_findUnternehmen($mitarbeiter->uid, "'kstzuordnung', 'oezuordnung'");
+		}
+
+		$unternehmen = $this->OE_DEFAULT;
+
+		if (hasData($unternehmenResult))
+			$unternehmen = getData($unternehmenResult)[0]->oe_kurzbz;
+
+		$mitarbeiter->unternehmen = $unternehmen;
+	}
+
+	/**
+	 * Detailsuche fuer die Ermittlung des Unternehmenszuordnung einer Person
+	 */
+	private function _findUnternehmen($uid, $fkt=null, $datum=null)
+	{
+		$dbModel = new DB_Model();
+
+		$qry = "
+		WITH RECURSIVE meine_oes(oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz) as 
+		(
+			SELECT 
+				oe_kurzbz, oe_parent_kurzbz, organisationseinheittyp_kurzbz
+			FROM 
+				public.tbl_organisationseinheit 
+			WHERE 
+				oe_kurzbz=(SELECT 
+						oe_kurzbz 
+					FROM 
+						public.tbl_benutzerfunktion 
+					WHERE 
+						uid=".$dbModel->escape($uid);
+
+		if(!is_null($datum))
+			$qry.=" AND ".$dbModel->escape($datum)." BETWEEN datum_von AND COALESCE(datum_bis, '2999-12-31')";
+
+		if(!is_null($fkt))
+			$qry.=" AND funktion_kurzbz in ($fkt)";
+
+		$qry.="
+					ORDER BY funktion_kurzbz, datum_von LIMIT 1)
+			UNION ALL
+			SELECT 
+				o.oe_kurzbz, o.oe_parent_kurzbz, o.organisationseinheittyp_kurzbz
+			FROM 
+				public.tbl_organisationseinheit o, meine_oes 
+			WHERE 
+				o.oe_kurzbz=meine_oes.oe_parent_kurzbz 
+		)
+		SELECT 
+			oe_kurzbz
+		FROM 
+			meine_oes 
+		WHERE 
+			oe_parent_kurzbz is null
+		LIMIT 1
+		";
+
+		return $dbModel->execReadOnlyQuery($qry);
+	}
+	
+}

application/controllers/system/MigrateSalary.php

@@ -0,0 +1,495 @@
+<?php
+/*
+ * Job zur einmaligen Import der Gehälter
+ *
+ * Aufruf (Encode / im Filenmae mit %2F):
+ * php index.ci.php system/MigrateSalary/import filename
+ *
+ */
+/*
+AUFBAU CSV:
+SVNR;Pers-Nr;Name;Dienstverhältnis;LA-Nr;Bezeichnung;2022-09-01;2022-10-01;2022-11-01;2022-12-01;2023-01-01;2023-02-01;2023-03-01
+XXXX XXXXXX;00;Name;5;1000;Gehalt;1.111,10;1.211,10;1.311,10;1.411,10;1.511,10;1.611,10;1.711,10
+*/
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class MigrateSalary extends CLI_Controller
+{
+	private $OE_DEFAULT = 'gst';
+	private $GEHALT_BEGINN_SPALTE = 6; // Beginnend mit 0 => G
+	private $INDEX_LOHNART = 4;
+	private $INDEX_BEZEICHNUNG = 5;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->model('vertragsbestandteil/Gehaltsbestandteil_model', 'GehaltsbestandteilModel');
+		$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model','DienstverhaeltnisModel');
+		$this->load->model('vertragsbestandteil/Vertragsbestandteil_model','VertragsbestandteilModel');
+		$this->load->model('vertragsbestandteil/VertragsbestandteilStunden_model','VertragsbestandteilStundenModel');
+		$this->load->model('vertragsbestandteil/VertragsbestandteilFreitext_model','VertragsbestandteilFreitextModel');
+		$this->load->model('vertragsbestandteil/VertragsbestandteilFunktion_model','VertragsbestandteilFunktionModel');
+
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function import($file)
+	{
+
+		// CSV Laden
+		$file = urldecode($file);
+		if($handle = fopen($file, "r"))
+		{
+			$csvrow = -1;
+			$lastuser = '';
+			$monate = array();
+			$gehaltsarr = array();
+			$gehaltsindex = 0;
+
+			while (($data = fgetcsv($handle, null, ';')) !== FALSE)
+			{
+				$csvrow++;
+				// Kopfzeile ueberspringen
+				if($csvrow == 0)
+				{
+					for($i = $this->GEHALT_BEGINN_SPALTE; $i < count($data); $i++)
+					{
+						$monate[] = $data[$i];
+					}
+					continue;
+				}
+
+				// User zur SVNR ermitteln
+				$svnr = str_replace(' ', '',$data[0]);
+				$resultuser = $this->_getUser($svnr);
+
+				if(!hasData($resultuser))
+				{
+					echo getError($resultuser);
+					break;
+				}
+
+				$user = getData($resultuser)[0]->mitarbeiter_uid;
+				echo "\nUser:".$user;
+
+				if($user != $lastuser && $lastuser != '')
+				{
+					$this->_saveGehalt($lastuser, $gehaltsarr);
+					$gehaltsarr = array();
+					$gehaltsindex = 0;
+					$lastuser = $user;
+				}
+				else
+				{
+					$lastuser = $user;
+				}
+
+				// Gehalt Clustern
+
+				$monat = 0;
+				for ($i = $this->GEHALT_BEGINN_SPALTE; $i < count($data); $i++)
+				{
+					if (count($gehaltsarr) == 0 && $data[$i] != '')
+					{
+						$gehaltsarr[$gehaltsindex]['betrag'] = $data[$i];
+						$gehaltsarr[$gehaltsindex]['lohnart'] = $data[$this->INDEX_LOHNART];
+						$gehaltsarr[$gehaltsindex]['bezeichnung'] = $data[$this->INDEX_BEZEICHNUNG];
+						$gehaltsarr[$gehaltsindex]['beginn'] = $monate[$monat];
+					}
+					else
+					{
+						if ($data[$i] != ''
+							&& isset($gehaltsarr[$gehaltsindex]) && isset($gehaltsarr[$gehaltsindex]['betrag'])
+							&& $gehaltsarr[$gehaltsindex]['betrag'] == $data[$i])
+						{
+							// Gehalt bleibt gleich
+						}
+						else
+						{
+							if ($data[$i] != '')
+							{
+								// Gehalt hat sich geändert
+								if ($monat != 0 && isset($gehaltsarr[$gehaltsindex]))
+									$gehaltsarr[$gehaltsindex]['ende'] = $monate[$monat-1];
+
+								$gehaltsindex++;
+
+								$gehaltsarr[$gehaltsindex]['betrag'] = $data[$i];
+								$gehaltsarr[$gehaltsindex]['lohnart'] = $data[$this->INDEX_LOHNART];
+								$gehaltsarr[$gehaltsindex]['bezeichnung'] = $data[$this->INDEX_BEZEICHNUNG];
+								$gehaltsarr[$gehaltsindex]['beginn'] = $monate[$monat];
+							}
+							elseif(isset($gehaltsarr[$gehaltsindex]))
+							{
+								// Gehalt wurde beendet
+								if($monat!=0)
+									$gehaltsarr[$gehaltsindex]['ende'] = $monate[$monat-1];
+								$gehaltsindex++;
+							}
+						}
+					}
+
+					$monat++;
+				}
+
+				// Zeile zu Ende - Ende Datum setzen wenn nicht für alle Monate ein Eintrag vorhanden ist
+				if($monat < count($monate) && isset($gehaltsarr[$gehaltsindex]))
+					$gehaltsarr[$gehaltsindex]['ende'] = $monate[$monat-1];
+
+			}
+			$this->_saveGehalt($lastuser, $gehaltsarr);
+		}
+	}
+
+	/**
+	 * Ermittelt das passende Dienstverhaeltnis uns speichert den
+	 * Gehaltsbestandteil
+	 */
+	private function _saveGehalt($uid, $gehaltsarr)
+	{
+		$failed = false;
+		$this->db->trans_begin();
+
+		foreach($gehaltsarr as $row_gehalt)
+		{
+			//var_dump($row_gehalt);
+			$auszahlungen = 14;
+			$dvid = '';
+			$vbsid = '';
+			$typ = '';
+			$allin = false;
+
+			//DV und VBS Ermitteln
+			$dv = $this->DienstverhaeltnisModel->getDVByPersonUID($uid, $this->OE_DEFAULT, $row_gehalt['beginn']);
+
+			// Wenn keiner gefunden wird oder mit Monatsersteln nur ein externer gefunden wird, weitersuchen ob im Monat noch ein
+			// "richtiger" Vertrag startet
+			if (!hasData($dv) || getData($dv)[0]->vertragsart_kurzbz='externerLehrender')
+			{
+				$date = new DateTime($row_gehalt['beginn']);
+				$date->modify('last day of this month');
+				$last_day_this_month = $date->format('Y-m-d');
+
+				// Wenn mit Monatsersten kein DV gefunden wird, wird stattdessen mit Monatsletzten gesucht um DVs zu finden
+				// für Personen die erst später im Monat in ihr DV einsteigen
+				$dv = $this->DienstverhaeltnisModel->getDVByPersonUIDOverlapping($uid, $this->OE_DEFAULT, $row_gehalt['beginn'], $last_day_this_month);
+
+				if (!hasData($dv))
+				{
+					echo "\nKein passendes DV gefunden für User ".$uid." und Datum ".$row_gehalt['beginn']." -> ROLLBACK\n";
+					$failed = true;
+					break;
+				}
+				else
+				{
+					$resultdata = getData($dv);
+					foreach($resultdata as $dvdata)
+					{
+						// Externer DV wird in Monatsmitte zu echten DV - daher weitersuchen bei externenDVs da
+						// diese sowieso kein Gehalt zugeordnet haben
+						if($dvdata->vertragsart_kurzbz != 'externerLehrender')
+						{
+							$dvid = $dvdata->dienstverhaeltnis_id;
+							// Gehaltsstart wird auf den Start des DV korrigiert wenn nicht der Monatserste
+							// nur wenn das Beginndatum vor dem DV-Start liegt da sonst das Datum korrigiert wird
+							// wenn der Vertragsbestandteil wechselt
+							if($row_gehalt['beginn'] < $dvdata->von)
+								$row_gehalt['beginn'] = $dvdata->von;
+							break;
+						}
+					}
+				}
+			}
+			else
+			{
+				$resultdata = getData($dv);
+
+				if (count($resultdata) == 1)
+					$dvid = $resultdata[0]->dienstverhaeltnis_id;
+			}
+
+			if ($dvid == '')
+			{
+				echo "Kein oder mehrere DVs gefunden -> ROLLBACK";
+				$failed = true;
+				break;
+			}
+
+			$allin = $this->_isAllIn($dvid, $row_gehalt['beginn']);
+
+			$db = new DB_Model();
+
+			$resultVBS = $this->_getVBS($dvid, $row_gehalt['beginn']);
+
+			if (hasData($resultVBS))
+			{
+				$vbsid = getData($resultVBS)[0]->vertragsbestandteil_id;
+				$vbsbis = getData($resultVBS)[0]->bis;
+			}
+			else
+			{
+				echo "Vertragsbestandteil fuer $uid DV $dvid wurde nicht gefunden mit Beginn ".$row_gehalt['beginn']."-> ROLLBACK";
+				$failed = true;
+				break;
+			}
+
+			if ($row_gehalt['lohnart'] == 1000)
+			{
+				if($allin)
+					$typ = 'grundgehalt';
+				else
+					$typ = 'basisgehalt';
+			}
+			elseif ($row_gehalt['lohnart']==1041 // 14x
+				|| $row_gehalt['lohnart']==1042  // 12x
+				|| $row_gehalt['lohnart']==3410)  // USTDPausch
+			{
+				$typ = 'zusatzvereinbarung';
+
+				// Freitextbestandteil anlegen fuer die Zulage
+				// Gaehalt wird der Zuglage zugeordnet
+
+				$data = array(
+					'dienstverhaeltnis_id' => $dvid,
+					'von' => $row_gehalt['beginn'],
+					'vertragsbestandteiltyp_kurzbz' => 'freitext',
+					'insertamum' => date('Y-m-d H:i:s'),
+					'insertvon' => 'MigrateSalary'
+				);
+				if (isset($row_gehalt['ende']) && $row_gehalt['ende']!='')
+					$data['bis'] = $row_gehalt['ende'];
+
+				$resultVBS = $this->VertragsbestandteilModel->Insert($data);
+				if(!isSuccess($resultVBS))
+				{
+					echo "VBS kann nicht erstellt werden -> ROLLBACK";
+					$failed = true;
+					break;
+				}
+				$vbsid = getData($resultVBS);
+
+				$data = array(
+					'vertragsbestandteil_id' => $vbsid,
+					'freitexttyp_kurzbz' => 'zusatzvereinbarung',
+					'titel' => $row_gehalt['bezeichnung'],
+					'anmerkung' => $row_gehalt['bezeichnung'],
+				);
+				$resultVBSFreitext = $this->VertragsbestandteilFreitextModel->Insert($data);
+				if(!isSuccess($resultVBSFreitext))
+				{
+					echo "VBS Freitext Zusatz kann nicht erstellt werden -> ROLLBACK";
+					$failed = true;
+					break;
+				}
+			}
+			elseif ($row_gehalt['lohnart']==9999) // All-In Custom Lohnart nicht per Default vorhanden
+			{
+				$typ = 'zulage';
+
+				// Freitextbestandteil anlegen fuer die Zulage
+				// Gaehalt wird der Zuglage zugeordnet
+
+				$data = array(
+					'dienstverhaeltnis_id' => $dvid,
+					'von' => $row_gehalt['beginn'],
+					'vertragsbestandteiltyp_kurzbz' => 'freitext',
+					'insertamum' => date('Y-m-d H:i:s'),
+					'insertvon' => 'MigrateSalary'
+				);
+				if (isset($row_gehalt['ende']) && $row_gehalt['ende']!='')
+					$data['bis'] = $row_gehalt['ende'];
+
+				$resultVBS = $this->VertragsbestandteilModel->Insert($data);
+				if(!isSuccess($resultVBS))
+				{
+					echo "VBS AllIn kann nicht erstellt werden -> ROLLBACK";
+					$failed = true;
+					break;
+				}
+				$vbsid = getData($resultVBS);
+
+				$data = array(
+					'vertragsbestandteil_id' => $vbsid,
+					'freitexttyp_kurzbz' => 'allin',
+					'titel' => $row_gehalt['bezeichnung'],
+					'anmerkung' => $row_gehalt['bezeichnung'],
+				);
+				$resultVBSFreitext = $this->VertragsbestandteilFreitextModel->Insert($data);
+				if(!isSuccess($resultVBSFreitext))
+				{
+					echo "VBS Freitext AllIn Zusatz kann nicht erstellt werden -> ROLLBACK";
+					$failed = true;
+					break;
+				}
+			}
+			elseif($row_gehalt['lohnart']==5500) // ATZ
+			{
+				$typ = 'lohnausgleichatz';
+			}
+			else
+			{
+				$typ = 'unbekannt - '.$row_gehalt['lohnart'];
+				echo "\nGehaltstyp unbekannt Lohnart: ".$row_gehalt['lohnart']." -> ROLLBACK";
+				$failed = true;
+				break;
+			}
+
+			// Zulage 12x und Zulage 14x aus der Bezeichnung ermitteln
+			if(strstr($row_gehalt['bezeichnung'], '12x'))
+			{
+				$auszahlungen = 12;
+			}
+
+			// Format ist 7.777,77 und wird umformattiert in 7777.77
+			$betrag = str_replace('.','', $row_gehalt['betrag']);
+			$betrag = str_replace(',','.',$betrag);
+
+			$data = array(
+				'dienstverhaeltnis_id' => $dvid,
+				'vertragsbestandteil_id' => $vbsid,
+				'gehaltstyp_kurzbz' => $typ,
+				'von' => $row_gehalt['beginn'],
+				'grundbetrag' => $betrag,
+				'betrag_valorisiert' => $betrag,
+				'anmerkung' => $row_gehalt['bezeichnung'],
+				'valorisierung' => true,
+				'auszahlungen' => $auszahlungen,
+				'insertamum' => date('Y-m-d H:i:s'),
+				'insertvon' => 'MigrateSalary',
+				'updateamum' => date('Y-m-d H:i:s'),
+				'updatevon' => 'MigrateSalary'
+			);
+
+			if (isset($row_gehalt['ende']) && $row_gehalt['ende'] != '')
+			{
+				// Im Ende steht noch der Monatserste des letzten Monats
+				// Das muss geaendert werden auf den Monatsletzten oder das Ende des DVs
+				$date = new DateTime($row_gehalt['ende']);
+				$date->modify('last day of this month');
+				$last_day_this_month = $date->format('Y-m-d');
+
+				// Wenn das Dienstverhaeltnis in diesem Monat endet und nicht der Monatsletzte ist,
+				// dann muss hier das Ende Datum des DV stehen bzw das Ende
+				// oder das Ende des VBS falls die Person in der Monatsmitte Stunden wechselt
+				$data['bis'] = $last_day_this_month;
+
+				// Wenn der Vertragsbestandteil endet bevor das Gehalt endet, dann wir das Gehaltsende auf VBS Ende gesetzt
+				//echo "Ende des VBS: $vbsbis Ende des Gehalt: ".$data['bis'];
+				if ($vbsbis != '' && $vbsbis < $data['bis'])
+				{
+					$data['bis'] = $vbsbis;
+					//echo "Gehalt auf vbs ende gesetzt";
+				}
+			}
+
+			$ret = $this->GehaltsbestandteilModel->insert($data,
+				$this->GehaltsbestandteilModel->getEncryptedColumns()
+			);
+		}
+
+		if(!$failed)
+		{
+			$this->db->trans_commit();
+		}
+		else
+		{
+			echo "ROLLBACK";
+			$this->db->trans_rollback();
+		}
+	}
+
+	/**
+	 * Prueft ob ein AllIn Vertrag vorhanden ist
+	 */
+	private function _isAllIn($dvid, $datum)
+	{
+		$db = new DB_Model();
+
+		$qry = "
+			SELECT
+				*
+			FROM
+				hr.tbl_vertragsbestandteil
+				JOIN hr.tbl_vertragsbestandteil_freitext USING(vertragsbestandteil_id)
+			WHERE
+				dienstverhaeltnis_id=".$db->escape($dvid)."
+				AND vertragsbestandteiltyp_kurzbz='freitext'
+				AND ".$db->escape($datum)." BETWEEN von AND COALESCE(bis, '2999-12-31')
+				AND freitexttyp_kurzbz='allin'";
+
+		$resultAllIn = $db->execReadOnlyQuery($qry);
+
+		if (hasData($resultAllIn))
+			return true;
+		else
+			return false;
+	}
+
+	private function _getVBS($dvid, $datum)
+	{
+		$db = new DB_Model();
+
+		$qry = "
+			SELECT
+				*
+			FROM
+				hr.tbl_vertragsbestandteil
+			WHERE
+				dienstverhaeltnis_id=".$db->escape($dvid)."
+				AND vertragsbestandteiltyp_kurzbz='stunden'
+				AND ".$db->escape($datum)." BETWEEN von AND COALESCE(bis, '2999-12-31')";
+
+		$resultVBS = $db->execReadOnlyQuery($qry);
+
+		return $resultVBS;
+	}
+
+	/**
+	 * Ermittelt den User zu einer SVNR
+	 */
+	private function _getUser($svnr)
+	{
+		$db = new DB_Model();
+
+		$qry = "
+		SELECT
+			mitarbeiter_uid
+		FROM
+			public.tbl_person
+			JOIN public.tbl_benutzer using(person_id)
+			JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
+		WHERE
+			tbl_person.svnr = ". $db->escape($svnr)."
+			AND EXISTS(
+				SELECT
+					1
+				FROM
+					hr.tbl_dienstverhaeltnis
+				WHERE
+					mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid
+					AND oe_kurzbz=". $db->escape($this->OE_DEFAULT)."
+			)
+		ORDER BY tbl_benutzer.aktiv DESC
+		LIMIT 1;
+		";
+
+		$result = $db->execReadOnlyQuery($qry);
+
+		if (hasdata($result))
+		{
+			return $result;
+		}
+		else
+			return error('Kein Benutzer mit DV und SVNR:'.$svnr.' gefunden');
+	}
+}

application/controllers/system/Navigation.php

@@ -22,6 +22,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  * This controller operates between (interface) the JS (GUI) and the NavigationLib (back-end)
  * Provides data to the ajax get calls about the filter
  * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ * TODO(chris): deprecated
  */
 class Navigation extends FHC_Controller
 {

application/controllers/system/TestVBform.php

@@ -0,0 +1,32 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Test VBform Vue Component
+ */
+class TestVBform extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'system/developer:r'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function index()
+	{
+		$this->load->view('system/logs/testVBform.php');
+	}
+}

application/controllers/system/infocenter/InfoCenter.php

@@ -21,6 +21,7 @@ class InfoCenter extends Auth_Controller
 	const FREIGEGEBEN_PAGE = 'freigegeben';
 	const REIHUNGSTESTABSOLVIERT_PAGE = 'reihungstestAbsolviert';
 	const ABGEWIESEN_PAGE = 'abgewiesen';
+	const AUFGENOMMEN_PAGE = 'aufgenommen';
 	const SHOW_DETAILS_PAGE = 'showDetails';
 	const SHOW_ZGV_DETAILS_PAGE = 'showZGVDetails';
 	const ZGV_UBERPRUEFUNG_PAGE = 'ZGVUeberpruefung';
@@ -115,12 +116,14 @@ class InfoCenter extends Auth_Controller
 				'index' => 'infocenter:r',
 				'freigegeben' => 'infocenter:r',
 				'abgewiesen' => 'infocenter:r',
+				'aufgenommen' => 'infocenter:r',
 				'reihungstestAbsolviert' => 'infocenter:r',
 				'showDetails' => 'infocenter:r',
 				'showZGVDetails' => 'lehre/zgvpruefung:r',
 				'unlockPerson' => 'infocenter:rw',
 				'saveFormalGeprueft' => 'infocenter:rw',
 				'saveDocTyp' => 'infocenter:rw',
+				'updateStammdaten' => 'infocenter:rw',
 				'saveNachreichung' => 'infocenter:rw',
 				'getPrestudentData' => 'infocenter:r',
 				'getLastPrestudentWithZgvJson' => 'infocenter:r',
@@ -141,12 +144,6 @@ class InfoCenter extends Auth_Controller
 				'reloadNotizen' => array('infocenter:r', 'lehre/zgvpruefung:r'),
 				'reloadLogs' => 'infocenter:r',
 				'outputAkteContent' => array('infocenter:r', 'lehre/zgvpruefung:r'),
-				'getPostponeDate' => array('infocenter:r', 'lehre/zgvpruefung:r'),
-				'park' => 'infocenter:rw',
-				'unpark' => 'infocenter:rw',
-				'setOnHold' => 'infocenter:rw',
-				'removeOnHold' => array('infocenter:rw', 'lehre/zgvpruefung:rw'),
-				'getStudienjahrEnd' => array('infocenter:r', 'lehre/zgvpruefung:r'),
 				'setNavigationMenuArrayJson' => 'infocenter:r',
 				'getAbsageData' => 'infocenter:r',
 				'saveAbsageForAll' => 'infocenter:rw',
@@ -163,6 +160,7 @@ class InfoCenter extends Auth_Controller
 		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
 		$this->load->model('crm/ZGVPruefung_model', 'ZGVPruefungModel');
 		$this->load->model('crm/ZGVPruefungStatus_model', 'ZGVPruefungStatusModel');
+		$this->load->model('crm/Rueckstellung_model', 'RueckstellungModel');
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('system/Message_model', 'MessageModel');
@@ -172,11 +170,16 @@ class InfoCenter extends Auth_Controller
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
 		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
 		$this->load->model('codex/Nation_model', 'NationModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
+		$this->load->model('person/adresse_model', 'AdresseModel');
 
 		// Loads libraries
 		$this->load->library('PersonLogLib');
 		$this->load->library('WidgetLib');
 
+		$this->load->config('infocenter');
+
 		$this->loadPhrases(
 			array(
 				'global',
@@ -227,6 +230,16 @@ class InfoCenter extends Auth_Controller
 
 		$this->load->view('system/infocenter/infocenterAbgewiesen.php');
 	}
+	
+	/**
+	 * Aufgenommene page of the InfoCenter tool
+	 */
+	public function aufgenommen()
+	{
+		$this->_setNavigationMenu(self::AUFGENOMMEN_PAGE); // define the navigation menu for this page
+		
+		$this->load->view('system/infocenter/infocenterAufgenommen.php');
+	}
 
 	/**
 	 *
@@ -313,7 +326,7 @@ class InfoCenter extends Auth_Controller
 			show_error('Person does not exist!');
 
 		$origin_page = $this->input->get(self::ORIGIN_PAGE);
-		if ($origin_page == self::INDEX_PAGE)
+		if (in_array($origin_page, array(self::INDEX_PAGE, self::ABGEWIESEN_PAGE)))
 		{
 			// mark person as locked for editing
 			$result = $this->PersonLockModel->lockPerson($person_id, $this->_uid, self::APP);
@@ -324,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);
 
@@ -338,7 +354,8 @@ class InfoCenter extends Auth_Controller
 			$persondata,
 			$prestudentdata,
 			$dokumentdata,
-			$duplicate
+			$duplicate,
+			$unruly
 		);
 
 		$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
@@ -358,7 +375,14 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($result)) show_error(getError($result));
 
-		$redirectLink = '/'.self::INFOCENTER_URI.'?'.self::FHC_CONTROLLER_ID.'='.$this->getControllerId();
+		$origin_page = $this->input->get(self::ORIGIN_PAGE);
+
+		if ($origin_page === self::ABGEWIESEN_PAGE)
+			$redirectLink = self::INFOCENTER_URI. '/' .self::ABGEWIESEN_PAGE;
+		else
+			$redirectLink = '/'.self::INFOCENTER_URI;
+
+		$redirectLink .= '?'.self::FHC_CONTROLLER_ID.'='.$this->getControllerId();
 
 		// Force reload of Dataset after Unlock
 		$redirectLink .= '&'.self::KEEP_TABLESORTER_FILTER.'=true';
@@ -600,7 +624,7 @@ class InfoCenter extends Auth_Controller
 	}
 
 	/**
-	 * Sendet bei einer neuen ZGV Prüfung die Mail raus an den Studiengang
+	 * Sendet bei einer neuen ZGV Prüfung eine Mail an den Studiengang
 	 */
 	private function sendZgvMail($mail, $typ, $person){
 		$data = array(
@@ -691,7 +715,7 @@ class InfoCenter extends Auth_Controller
 
 	/**
 	 * Fügt einen neuen ZGV Status hinzu oder updated einen bestehenden
-	 * Falls es erfolgreich war, sendet er die Mail raus
+	 * Falls es erfolgreich war, wird eine Mail rausgeschickt
 	 */
 	public function zgvRueckfragen()
 	{
@@ -745,7 +769,8 @@ class InfoCenter extends Auth_Controller
 				$this->sendZgvMail($mail, $typ, $person);
 			elseif (isError($insert))
 				$this->terminateWithJsonError('Fehler beim Speichern');
-		}else
+		}
+		else
 		{
 			$insert = $this->ZGVPruefungModel->insert(
 				array(
@@ -775,7 +800,7 @@ class InfoCenter extends Auth_Controller
 		}
 
 		$hold = false;
-		if ($this->personloglib->getOnHoldDate($person_id) !== null)
+		if (hasData($this->RueckstellungModel->getByPersonId($person_id, 'onhold_zgv')))
 			$hold = true;
 
 		$this->outputJsonSuccess(
@@ -1111,14 +1136,14 @@ class InfoCenter extends Auth_Controller
 
 	public function reloadDoks($person_id)
 	{
-		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true);
+		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true, false);
 
 		$this->load->view('system/infocenter/dokNachzureichend.php', array('dokumente_nachgereicht' => $dokumente_nachgereicht->retval));
 	}
 
 	public function reloadUebersichtDoks($person_id)
 	{
-		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false);
+		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false, false);
 
 		$this->DokumentModel->addOrder('bezeichnung');
 		$dokumentdata = array('dokumententypen' => (getData($this->DokumentModel->load())));
@@ -1156,107 +1181,7 @@ class InfoCenter extends Auth_Controller
 			->set_output($aktecontent->retval)
 			->_display();
 	}
-
-	/**
-	 * Gets the date until which a person is parked
-	 * @param $person_id
-	 */
-	public function getPostponeDate($person_id)
-	{
-		$result = array(
-			'type' => null,
-			'date' => null
-		);
-
-		$parkedDate = $this->personloglib->getParkedDate($person_id);
-
-		if (isset($parkedDate))
-		{
-			$result['type'] = 'parked';
-			$result['date'] = $parkedDate;
-		}
-		else
-		{
-			$onholdDate = $this->personloglib->getOnHoldDate($person_id);
-
-			if (isset($onholdDate))
-			{
-				$result['type'] = 'onhold';
-				$result['date'] = $onholdDate;
-			}
-		}
-
-		$this->outputJsonSuccess($result);
-	}
-
-	/**
-	 * Initializes parking of a person, i.e. a person is not expected to do any actions while parked
-	 */
-	public function park()
-	{
-		$person_id = $this->input->post('person_id');
-		$date = $this->input->post('parkdate');
-
-		$result = $this->personloglib->park($person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->_uid);
-
-		$this->outputJson($result);
-	}
-
-	/**
-	 * Removes parking of a person
-	 */
-	public function unPark()
-	{
-		$person_id = $this->input->post('person_id');
-
-		$result = $this->personloglib->unPark($person_id);
-
-		$this->outputJson($result);
-	}
-
-	/**
-	 * Sets a person on hold ("zurückstellen")
-	 */
-	public function setOnHold()
-	{
-		$person_id = $this->input->post('person_id');
-		$date = $this->input->post('onholddate');
-
-		$result = $this->personloglib->setOnHold($person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->_uid);
-
-		$this->outputJson($result);
-	}
-
-	/**
-	 * Removed on hold status of a person
-	 */
-	public function removeOnHold()
-	{
-		$person_id = $this->input->post('person_id');
-
-		$result = $this->personloglib->removeOnHold($person_id);
-
-		$this->outputJson($result);
-	}
-
-	/**
-	 * Gets the End date of the current Studienjahr
-	 */
-	public function getStudienjahrEnd()
-	{
-		$this->load->model('organisation/studienjahr_model', 'StudienjahrModel');
-
-		$result = $this->StudienjahrModel->getCurrStudienjahr();
-
-		$json = null;
-
-		if (hasData($result))
-		{
-			$json = $result->retval[0]->ende;
-		}
-
-		$this->outputJsonSuccess(array($json));
-	}
+	
 
 	/**
 	 * Wrapper for setNavigationMenu, returns JSON message
@@ -1320,6 +1245,128 @@ class InfoCenter extends Auth_Controller
 		$this->outputJsonSuccess('success');
 	}
 
+	public function updateStammdaten()
+	{
+		if (isEmptyString($this->input->post('nachname')) ||
+			isEmptyString($this->input->post('geschlecht')) ||
+			isEmptyString($this->input->post('gebdatum')))
+		{
+			$this->terminateWithJsonError($this->p->t('infocenter', 'stammdatenFeldFehlt'));
+		}
+
+		$datum = explode('.', $this->input->post('gebdatum'));
+
+		if (!checkdate($datum[1], $datum[0], $datum[2]))
+		{
+			$this->terminateWithJsonError($this->p->t('infocenter', 'datumUngueltig'));
+		}
+
+		$person_id = $this->input->post('personid');
+
+		$update = $this->PersonModel->update(
+			array
+			(
+				'person_id' => $person_id
+			),
+			array
+			(
+				'titelpre' => isEmptyString($this->input->post('titelpre')) ? null : $this->input->post('titelpre'),
+				'vorname' => isEmptyString($this->input->post('vorname')) ? null : $this->input->post('vorname'),
+				'nachname' => $this->input->post('nachname'),
+				'titelpost' => isEmptyString($this->input->post('titelpost')) ? null : $this->input->post('titelpost'),
+				'gebdatum' => isEmptyString($this->input->post('gebdatum')) ? null : date("Y-m-d", strtotime($this->input->post('gebdatum'))),
+				'svnr' => isEmptyString($this->input->post('svnr')) ? null : $this->input->post('svnr'),
+				'staatsbuergerschaft' => isEmptyString($this->input->post('buergerschaft')) ? null : $this->input->post('buergerschaft'),
+				'geschlecht' => $this->input->post('geschlecht'),
+				'geburtsnation' => isEmptyString($this->input->post('gebnation')) ? null : $this->input->post('gebnation'),
+				'gebort' => isEmptyString($this->input->post('gebort')) ? null : $this->input->post('gebort'),
+				'updateamum' => date('Y-m-d H:i:s'),
+				'updatevon' => $this->_uid
+			)
+		);
+
+		if (isError($update))
+			$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
+
+		$kontakte = $this->input->post('kontakt');
+		if($kontakte) {
+
+			foreach ($kontakte as $kontakt) {
+				$kontaktExists = $this->KontaktModel->loadWhere(array(
+					'kontakt_id' => $kontakt['id'],
+					'person_id' => $person_id,
+				));
+
+				if (hasData($kontaktExists)) {
+					$kontaktExists = getData($kontaktExists)[0];
+
+					if ($kontaktExists->kontakt === $kontakt['value'])
+						continue;
+
+					$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 (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'));
+					}
+
+				}
+			}
+		}
+
+		$this->outputJsonSuccess('Success');
+	}
+
 	public function saveNachreichung($person_id)
 	{
 		$nachreichungAm = $this->input->post('nachreichungAm');
@@ -1358,7 +1405,6 @@ class InfoCenter extends Auth_Controller
 		if($nachreichungAm < $today)
 			$this->terminateWithJsonError($this->p->t('infocenter', 'nachreichDatumNichtVergangenheit'));
 
-
 		$akte = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'dokument_kurzbz' => $allowedTypes[$typ]));
 
 		if (hasData($akte)) {
@@ -1505,6 +1551,7 @@ class InfoCenter extends Auth_Controller
 		$freigegebenLink = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
 		$reihungstestAbsolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
 		$abgewiesenLink = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
+		$aufgenommenLink = site_url(self::INFOCENTER_URI.'/'.self::AUFGENOMMEN_PAGE);
 
 		$currentFilterId = $this->input->get(self::FILTER_ID);
 		if (isset($currentFilterId))
@@ -1512,6 +1559,7 @@ class InfoCenter extends Auth_Controller
 			$freigegebenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$reihungstestAbsolviertLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$abgewiesenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
+			$aufgenommenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 		}
 
 		$this->navigationlib->setSessionMenu(
@@ -1562,7 +1610,19 @@ class InfoCenter extends Auth_Controller
 					null, 				// subscriptLinkValue
 					'', 				// target
 					30   				// sort
-				)
+				),
+				'aufgenommen' => $this->navigationlib->oneLevel(
+					'Aufgenommene',		// description
+					$aufgenommenLink,				// link
+					null,				// children
+					'check',					// icon
+					null,				// subscriptDescription
+					false,				// expand
+					null,				// subscriptLinkClass
+					null, 				// subscriptLinkValue
+					'', 				// target
+					40   				// sort
+				),
 			)
 		);
 	}
@@ -1590,6 +1650,9 @@ class InfoCenter extends Auth_Controller
 		if ($origin_page === self::ABGEWIESEN_PAGE)
 			$link = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
 
+		if ($origin_page === self::AUFGENOMMEN_PAGE)
+			$link = site_url(self::INFOCENTER_URI.'/'.self::AUFGENOMMEN_PAGE);
+
 		$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
 		if (isset($prevFilterId))
 		{
@@ -1794,14 +1857,14 @@ class InfoCenter extends Auth_Controller
 		if (!isset($stammdaten->retval))
 			return null;
 
-		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false);
+		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false, false);
 
 		if (isError($dokumente))
 		{
 			show_error(getError($dokumente));
 		}
 
-		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true);
+		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true, false);
 
 		if (isError($dokumente_nachgereicht))
 		{
@@ -1996,6 +2059,12 @@ class InfoCenter extends Auth_Controller
 		$this->NationModel->addOrder('langtext');
 		$allNations = getData($this->NationModel->load());
 
+
+		$additional_stg = explode(',', ($this->config->item('infocenter_studiengang_kz')));
+
+		$this->GeschlechtModel->addOrder('sort');
+		$allGenders = getData($this->GeschlechtModel->load());
+
 		$data = array (
 			'zgvpruefungen' => $zgvpruefungen,
 			'abwstatusgruende' => $abwstatusgruende,
@@ -2004,6 +2073,8 @@ class InfoCenter extends Auth_Controller
 			'all_zgvs' => $allZGVs,
 			'all_zgvs_master' => $allZGVsMaster,
 			'all_nations' => $allNations,
+			'additional_stg' => $additional_stg,
+			'all_genders' => $allGenders
 		);
 
 		return $data;
@@ -2164,8 +2235,8 @@ class InfoCenter extends Auth_Controller
 		$prestudentstatus = $prestudent->prestudentstatus;
 		$person_id = $prestudent->person_id;
 		$person = $this->PersonModel->getPersonStammdaten($person_id, true)->retval;
-		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false)->retval;
-		$dokumenteNachzureichen = $this->AkteModel->getAktenWithDokInfo($person_id, null, true)->retval;
+		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false, false)->retval;
+		$dokumenteNachzureichen = $this->AkteModel->getAktenWithDokInfo($person_id, null, true, false)->retval;
 
 		//fill mail variables
 		$interessentbez = $person->geschlecht == 'm' ? 'Ein Interessent' : 'Eine Interessentin';
@@ -2262,12 +2333,10 @@ class InfoCenter extends Auth_Controller
 
 	public function getAbsageData()
 	{
-		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
-		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, ['b', 'm']);
+		$stg_typ = $this->getStudienArtBerechtigung(['b', 'm']);
 
-		if (hasData($stg_typ))
+		if (!is_null($stg_typ))
 		{
-			$stg_typ = getData($stg_typ);
 			$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
 			$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
 			$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(array_column($stg_typ, 'typ'), $studienSemester);
@@ -2283,15 +2352,16 @@ class InfoCenter extends Auth_Controller
 			$this->outputJsonSuccess(null);
 	}
 
-	public function getStudienArtBerechtigung()
+	public function getStudienArtBerechtigung($typ = null)
 	{
 		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
-		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, ['b', 'm', 'l']);
+		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, $typ);
 		return getData($stg_typ);
 	}
+
 	public function getStudienartData()
 	{
-		$this->outputJsonSuccess($this->getStudienArtBerechtigung());
+		$this->outputJsonSuccess($this->getStudienArtBerechtigung(['b', 'm', 'l']));
 	}
 
 	public function saveAbsageForAll()
@@ -2319,4 +2389,4 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Success");
 	}
-}
+}

application/controllers/system/infocenter/Rueckstellung.php

@@ -0,0 +1,135 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+class Rueckstellung extends Auth_Controller
+{
+	private $_ci; // Code igniter instance
+	private $_uid;
+
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'get' => array('infocenter:r', 'lehre/zgvpruefung:r'),
+				'set' => array('infocenter:r', 'lehre/zgvpruefung:r'),
+				'delete' => array('infocenter:r', 'lehre/zgvpruefung:r'),
+				'getStatus' => array('infocenter:rw', 'lehre/zgvpruefung:rw')
+			)
+		);
+		
+		$this->load->model('crm/Rueckstellung_model', 'RueckstellungModel');
+		$this->load->model('crm/RueckstellungStatus_model', 'RueckstellungStatusModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->library('PersonLogLib');
+
+		$this->_setAuthUID(); // sets property uid
+		
+		$this->_ci =& get_instance(); // get code igniter instance
+	}
+	
+	public function get($person_id)
+	{
+		$result = null;
+		$rueckstellung = $this->_ci->RueckstellungModel->getByPersonId($person_id);
+		
+		if (isError($rueckstellung))
+			$this->terminateWithJsonError($this->_ci->p->t('ui', 'fehlerBeimLesen'));
+		
+		if (hasData($rueckstellung))
+		{
+			$rueckstellung = getData($rueckstellung)[0];
+			$fullName = getData($this->_ci->PersonModel->getFullName($rueckstellung->insertvon));
+			
+			$result = array(
+				'von' => $fullName,
+				'bezeichnung' => $rueckstellung->bezeichnung,
+				'bis' => $rueckstellung->datum_bis,
+				'status_kurzbz' => $rueckstellung->status_kurzbz
+			);
+
+			if ($rueckstellung->status_kurzbz === 'parked' && $rueckstellung->datum_bis < date('Y-m-d'))
+			{
+				$this->_ci->RueckstellungModel->delete(array('person_id' => $person_id, 'status_kurzbz' => 'parked'));
+				$result = null;
+			}
+		}
+
+		$this->outputJsonSuccess($result);
+	}
+	
+	public function set()
+	{
+		$person_id = $this->input->post('person_id');
+		$datum_bis = $this->input->post('datum_bis');
+		$status_kurzbz = $this->input->post('status_kurzbz');
+
+		$result = $this->_ci->RueckstellungModel->insert(
+			array('person_id' => $person_id,
+				'status_kurzbz' => $status_kurzbz,
+				'datum_bis' => date_format(date_create($datum_bis), 'Y-m-d'),
+				'insertvon' => $this->_uid
+			)
+		);
+
+		if (isError($result))
+			$this->terminateWithJsonError(getError($result));
+		
+		$this->_log($person_id, $status_kurzbz);
+
+		$this->outputJson($result);
+	}
+	
+	public function delete()
+	{
+		$person_id = $this->input->post('person_id');
+		$status = $this->input->post('status');
+
+		$result = $this->_ci->RueckstellungModel->delete(array('person_id' => $person_id, 'status_kurzbz' => $status));
+
+		if (isError($result))
+			$this->terminateWithJsonError($this->_ci->p->t('ui', 'fehlerBeimSpeichern'));
+
+		$this->outputJson($result);
+	}
+	
+	public function getStatus($aktiv = true)
+	{
+		$this->_ci->RueckstellungStatusModel->addOrder('sort');
+		$result = $this->_ci->RueckstellungStatusModel->loadWhere(array('aktiv' => $aktiv));
+		
+		if (isError($result))
+			$this->terminateWithJsonError($this->_ci->p->t('ui', 'fehlerBeimLesen'));
+		
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	/**
+	 * 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');
+	}
+	
+	private function _log($person_id, $status_kurzbz)
+	{
+		$message = "Person $person_id set to $status_kurzbz";
+		
+		$this->_ci->personloglib->log(
+			$person_id,
+			'Action',
+			array(
+				'name' => 'Person status set',
+				'message' => $message,
+				'success' => true
+			),
+			'bewerbung',
+			'infocenter',
+			null,
+			$this->_uid
+		);
+	}
+}

application/controllers/system/issues/Issues.php

@@ -26,6 +26,7 @@ class Issues extends Auth_Controller
 		// Load models
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->load->model('system/Sprache_model', 'SpracheModel');
 
 		$this->loadPhrases(
 			array(
@@ -45,10 +46,11 @@ class Issues extends Auth_Controller
 	public function index()
 	{
 		$oes_for_issues = $this->_getOesForIssues();
+		$language_index = $this->_getLanguageIndex();
 
 		$this->load->view(
 			'system/issues/issues',
-			$oes_for_issues
+			array_merge($oes_for_issues, array('language_index' => $language_index))
 		);
 	}
 
@@ -166,4 +168,28 @@ class Issues extends Auth_Controller
 			'all_oe_kurzbz_berechtigt' => $all_oe_kurzbz_berechtigt
 		);
 	}
+
+	/**
+	 * Gets language index of currently logged in user.
+	 * @return object int (the index, start at 1)
+	 */
+	private function _getLanguageIndex()
+	{
+		$idx = 1;
+		$this->SpracheModel->addSelect('sprache, index');
+		$langRes = $this->SpracheModel->load();
+
+		if (hasData($langRes))
+		{
+			$userLang = getUserLanguage();
+			$lang = getData($langRes);
+
+			foreach ($lang as $l)
+			{
+				if ($l->sprache == $userLang) $idx = $l->index;
+			}
+		}
+
+		return $idx;
+	}
 }

application/controllers/system/issues/IssuesKonfiguration.php

@@ -0,0 +1,305 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class IssuesKonfiguration extends Auth_Controller
+{
+	private $_uid;
+
+	const STRING_DATA_TYPE = 'string';
+	const INTEGER_DATA_TYPE = 'integer';
+	const FLOAT_DATA_TYPE = 'float';
+
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'admin:r',
+				'getApps' => 'admin:r',
+				'getFehlerKonfigurationByApp' => 'admin:r',
+				'saveFehlerKonfiguration' => 'admin:rw',
+				'deleteKonfiguration' => 'admin:rw',
+				'deleteKonfigurationsWerte' => 'admin:rw'
+			)
+		);
+
+		// Load libraries
+		$this->load->library('IssuesLib');
+		$this->load->library('WidgetLib');
+
+		// Load models
+		$this->load->model('system/Fehlerkonfigurationstyp_model', 'FehlerkonfigurationstypModel');
+		$this->load->model('system/Fehlerkonfiguration_model', 'FehlerkonfigurationModel');
+
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui',
+				'filter',
+				'fehlermonitoring'
+			)
+		);
+
+		$this->_setAuthUID(); // sets property uid
+		$this->setControllerId(); // sets the controller id
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Load initial view.
+	 */
+	public function index()
+	{
+		$this->load->view("system/issues/issuesKonfiguration.php");
+	}
+
+	/**
+	 * Loads all Apps to which Fehler exist.
+	 */
+	public function getApps()
+	{
+		$this->FehlerModel->addDistinct();
+		$this->FehlerModel->addSelect('app');
+		$this->FehlerModel->addJoin('system.tbl_fehler_konfigurationstyp', 'app');
+		$this->FehlerModel->addOrder('app');
+
+		$appRes = $this->FehlerModel->load();
+
+		$this->outputJson($appRes);
+	}
+
+	/**
+	 * Gets all fehlercodes, optionally by app.
+	 */
+	public function getFehlerKonfigurationByApp()
+	{
+		$app = $this->input->get('app');
+
+		// get all Konfiguration types, optionally filtered by app
+		$this->FehlerkonfigurationstypModel->addSelect('konfigurationstyp_kurzbz, konfigurationsdatentyp, beschreibung');
+		$this->FehlerkonfigurationstypModel->addOrder('konfigurationstyp_kurzbz');
+		$konfRes = isEmptyString($app)
+			? $this->FehlerkonfigurationstypModel->load()
+			: $this->FehlerkonfigurationstypModel->loadWhere(array('app' => $app));
+
+		if (isError($konfRes)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlerFehlerKonfigurationLaden'));
+
+		// get all Fehler, optionally filtered by app
+		$params = array('fehlercode_extern' => null);
+		$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz, fehlertyp_kurzbz, fehlertext');
+		$this->FehlerModel->addOrder('fehlercode');
+		if (!isEmptyString($app)) $params['app'] = $app;
+		$fehlerRes = $this->FehlerModel->loadWhere($params);
+
+		if (isError($fehlerRes)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlerFehlerLaden'));
+
+		// return object with retrieved data
+		$konfObj = new StdClass();
+		$konfObj->konfigurationstypen = array();
+		$konfObj->fehler = array();
+
+		if (hasData($konfRes)) $konfObj->konfigurationstypen = getData($konfRes);
+		if (hasData($fehlerRes)) $konfObj->fehler = getData($fehlerRes);
+
+		$this->outputJsonSuccess($konfObj);
+	}
+
+	/**
+	 * Saves a Fehler configuration, inserts new configuration or updates existing.
+	 * Checks if datatype of passed configuration is correct.
+	 */
+	public function saveFehlerKonfiguration()
+	{
+		$result = null;
+		$konfigurationstyp_kurzbz = $this->input->post('konfigurationstyp_kurzbz');
+		$fehlercode = $this->input->post('fehlercode');
+		$konfigurationsWert = $this->input->post('konfigurationsWert');
+
+		// check if all params passed
+		if (isEmptyString($konfigurationstyp_kurzbz)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'ungueltigerKonfigurationstyp'));
+
+		if (isEmptyString($fehlercode)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlercodeFehlt'));
+
+		// separate by semicolon if multiple values passed
+		$konfigurationsWert = explode(';', $konfigurationsWert);
+
+		// check konfigurationswert
+
+		// get the expected data type
+		$dataType = self::STRING_DATA_TYPE;
+		$this->FehlerkonfigurationstypModel->addSelect('konfigurationsdatentyp');
+		$konfigtypRes = $this->FehlerkonfigurationstypModel->loadWhere(array('konfigurationstyp_kurzbz' => $konfigurationstyp_kurzbz));
+
+		if (hasData($konfigtypRes))
+		{
+			$konfigurationsdatentyp = getData($konfigtypRes)[0]->konfigurationsdatentyp;
+			foreach ($konfigurationsWert as $idx => $konfWert)
+			{
+				// check if data type correct
+				$valid = false;
+				switch ($konfigurationsdatentyp)
+				{
+					case self::INTEGER_DATA_TYPE:
+						$valid = (string)(int)$konfWert == $konfWert;
+						$konfigurationsWert[$idx] = (int) $konfWert;
+						break;
+					case self::FLOAT_DATA_TYPE:
+						$valid = (string)(float)$konfWert == $konfWert;
+						$konfigurationsWert[$idx] = (float) $konfWert;
+						break;
+					default:
+						$valid = is_string($konfWert) && preg_match('/^[A-Za-z0-9_]+$/', $konfWert);
+				}
+				if (!$valid) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'ungueltigerKonfigurationswert', array($konfigurationsdatentyp)));
+			}
+		}
+
+		// check if konfiguration already set for the fehlercode
+		$this->FehlerkonfigurationModel->addSelect('konfiguration');
+		$fehlerkonfigurationRes = $this->FehlerkonfigurationModel->loadWhere(
+			array(
+				'konfigurationstyp_kurzbz' => $konfigurationstyp_kurzbz,
+				'fehlercode' => $fehlercode
+			)
+		);
+
+		if (isError($fehlerkonfigurationRes)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlerFehlerKonfigurationLaden'));
+
+		// if konfiguration exists, update by add konfiguration values to existing
+		if (hasData($fehlerkonfigurationRes))
+		{
+			$fehlerkonfiguration = getData($fehlerkonfigurationRes);
+
+			$existingKonf = json_decode($fehlerkonfiguration[0]->konfiguration);
+
+			if (!$existingKonf) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlerJsonDekodierung'));
+
+			if (!is_array($existingKonf)) $existingKonf = array($existingKonf);
+
+			$newKonf = json_encode(array_values(array_unique(array_merge($existingKonf, $konfigurationsWert))));
+			if (!$newKonf) $this->terminateWithJsonError("error when encoding JSON");
+
+			$result = $this->FehlerkonfigurationModel->update(
+				array('konfigurationstyp_kurzbz' => $konfigurationstyp_kurzbz, 'fehlercode' => $fehlercode),
+				array('konfiguration' => $newKonf, 'updateamum' => 'NOW()', 'updatevon' => $this->_uid)
+			);
+		}
+		else // if no konfiguration exists, add new konfiguration entry
+		{
+			$newKonf = json_encode($konfigurationsWert);
+			if (!$newKonf) $this->terminateWithJsonError("error when encoding JSON");
+
+			$result = $this->FehlerkonfigurationModel->insert(
+				array(
+					'konfigurationstyp_kurzbz' => $konfigurationstyp_kurzbz,
+					'fehlercode' => $fehlercode,
+					'konfiguration' => $newKonf,
+					'insertvon' => $this->_uid
+				)
+			);
+		}
+
+		// output result (insert or update)
+		$this->outputJson($result);
+	}
+
+	/**
+	 * Deletes values of a Konfiguration.
+	 */
+	public function deleteKonfigurationsWerte()
+	{
+		$konfigurationstyp_kurzbz = $this->input->post('konfigurationstyp_kurzbz');
+		$fehlercode = $this->input->post('fehlercode');
+		$konfigurationsWert = $this->input->post('konfigurationsWert');
+
+		// check if Konfigurationstyp correctly passed
+		if (isEmptyString($konfigurationstyp_kurzbz)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'ungueltigerKonfigurationstyp'));
+
+		// check if fehlercode correctly passed
+		if (isEmptyString($fehlercode)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlercodeFehlt'));
+
+		// separate by semicolon if multiple values passed
+		$konfigurationsWert = explode(';', $konfigurationsWert);
+
+		// check if konfiguration already set for the fehlercode
+		$this->FehlerkonfigurationModel->addSelect('konfiguration');
+		$fehlerkonfigurationRes = $this->FehlerkonfigurationModel->loadWhere(
+			array(
+				'konfigurationstyp_kurzbz' => $konfigurationstyp_kurzbz,
+				'fehlercode' => $fehlercode
+			)
+		);
+
+		if (!hasData($fehlerkonfigurationRes)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlerFehlerKonfigurationLaden'));
+
+		// if konfiguration exists, update values
+		if (hasData($fehlerkonfigurationRes))
+		{
+			$fehlerkonfiguration = getData($fehlerkonfigurationRes);
+
+			$existingKonf = json_decode($fehlerkonfiguration[0]->konfiguration);
+
+			if (!$existingKonf) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlerJsonDekodierung'));
+
+			if (!is_array($existingKonf)) $existingKonf = array($existingKonf);
+
+			$newKonfArr = array_values(array_diff($existingKonf, $konfigurationsWert));
+
+			// if no konfiguration values left, delete whole entry
+			if (isEmptyArray($newKonfArr))
+			{
+				$this->outputJson(
+					$this->FehlerkonfigurationModel->delete(
+						array('konfigurationstyp_kurzbz' => $konfigurationstyp_kurzbz, 'fehlercode' => $fehlercode)
+					)
+				);
+			}
+			else
+			{
+				$newKonf = json_encode($newKonfArr);
+				if (!$newKonf) $this->terminateWithJsonError("error when encoding JSON");
+
+				// if there are still values, delete only part of the konfiguration
+				$this->outputJson(
+					$this->FehlerkonfigurationModel->update(
+						array('konfigurationstyp_kurzbz' => $konfigurationstyp_kurzbz, 'fehlercode' => $fehlercode),
+						array('konfiguration' => $newKonf, 'updateamum' => 'NOW()', 'updatevon' => $this->_uid)
+					)
+				);
+			}
+		}
+	}
+
+	/**
+	 * Deletes a Konfiguration.
+	 */
+	public function deleteKonfiguration()
+	{
+		$konfigurationstyp_kurzbz = $this->input->post('konfigurationstyp_kurzbz');
+		$fehlercode = $this->input->post('fehlercode');
+
+		// check if Konfigurationstyp correctly passed
+		if (isEmptyString($konfigurationstyp_kurzbz)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'ungueltigerKonfigurationstyp'));
+
+		// check if fehlercode correctly passed
+		if (isEmptyString($fehlercode)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlercodeFehlt'));
+
+		$this->outputJson(
+			$this->FehlerkonfigurationModel->delete(
+				array('konfigurationstyp_kurzbz' => $konfigurationstyp_kurzbz, 'fehlercode' => $fehlercode)
+			)
+		);
+	}
+
+	/**
+	 * 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/issues/IssuesZustaendigkeiten.php

@@ -26,7 +26,6 @@ class IssuesZustaendigkeiten extends Auth_Controller
 		// Load models
 		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 		$this->load->model('system/Fehler_model', 'FehlerModel');
-		$this->load->model('system/Fehler_model', 'FehlerModel');
 		$this->load->model('system/Fehlerzustaendigkeiten_model', 'FehlerzustaendigkeitenModel');
 
 		$this->loadPhrases(
@@ -70,7 +69,7 @@ class IssuesZustaendigkeiten extends Auth_Controller
 	{
 		$app = $this->input->get('app');
 
-		//$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz, fehlertext, fehlertyp_kurzbz');
+		$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz, fehlertext, fehlertyp_kurzbz, app');
 		$this->FehlerModel->addOrder('fehlercode');
 
 		$fehlerRes = isset($app) ? $this->FehlerModel->loadWhere(array('app' => $app)) : $this->FehlerModel->load();

application/controllers/system/issues/Plausichecks.php

@@ -0,0 +1,194 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Plausichecks extends Auth_Controller
+{
+	const GENERIC_ISSUE_OCCURED_TEXT = 'Issue aufgetreten';
+
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => array('system/issues_verwalten:r'),
+				'runChecks' => array('system/issues_verwalten:r')
+			)
+		);
+
+		// Load libraries
+		$this->load->library('issues/PlausicheckProducerLib', array('app' => 'core'));
+		$this->load->library('issues/PlausicheckDefinitionLib');
+		$this->load->library('WidgetLib');
+
+		// Load models
+		$this->load->model('system/Fehler_model', 'FehlerModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+
+	/*
+	 * Get data for filtering the plausichecks and load the view.
+	 */
+	public function index()
+	{
+		$filterData = $this->_getFilterData();
+		$this->load->view('system/issues/plausichecks', $filterData);
+	}
+
+	/**
+	 * Initiate plausichecks run.
+	 */
+	public function runChecks()
+	{
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		$fehler_kurzbz = $this->input->get('fehler_kurzbz');
+
+		// issues array for passing issue texts
+		$allIssues = array();
+		// all fehler kurzbz which are going to be checked
+		$fehlerKurzbz = !isEmptyString($fehler_kurzbz) ? array($fehler_kurzbz) : $this->plausicheckdefinitionlib->getFehlerKurzbz();
+		$fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
+		// set Studiengang to null if not passed
+		if (isEmptyString($studiengang_kz)) $studiengang_kz = null;
+
+		// get the data returned by Plausicheck
+		foreach ($fehlerKurzbz as $fehler_kurzbz)
+		{
+			// get Text and fehlercode of the Fehler
+			$this->FehlerModel->addSelect('fehlercode, fehlertext, fehlertyp_kurzbz');
+			$fehlerRes = $this->FehlerModel->loadWhere(array('fehler_kurzbz' => $fehler_kurzbz));
+
+			if (isError($fehlerRes)) $this->terminateWithJsonError(getError($fehlerRes));
+
+			// do not check error if no data
+			if (!hasData($fehlerRes)) continue;
+
+			// get the error data
+			$fehler = getData($fehlerRes)[0];
+
+			// initialize issue array
+			$allIssues[$fehler_kurzbz] = array('fehlercode' => $fehler->fehlercode, 'data' => array());
+
+			// get library name for producing issue
+			$libName = $fehlerLibMappings[$fehler_kurzbz];
+
+			// execute the check
+			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue(
+				$libName,
+				$fehler_kurzbz,
+				array(
+					'studiensemester_kurzbz' => $studiensemester_kurzbz,
+					'studiengang_kz' => $studiengang_kz
+				)
+			);
+
+			if (isError($plausicheckRes)) $this->terminateWithJsonError(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;
+
+					// optionally replace fehler parameters in text, output the fehlertext
+					if (!isEmptyString($fehler->fehlertext))
+					{
+						$fehlercode = $fehler->fehlercode;
+						$fehlerText = $fehler->fehlertext;
+						$fehlerTyp = $fehler->fehlertyp_kurzbz;
+
+						if (!isEmptyArray($fehlertext_params))
+						{
+							// replace placeholder with params, if present
+							if (count($fehlertext_params) != substr_count($fehlerText, '%s'))
+								$this->terminateWithJsonError('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehler_kurzbz);
+
+							$fehlerText = vsprintf($fehlerText, $fehlertext_params);
+						}
+
+						if (isset($person_id)) $fehlerText .= "; person_id: $person_id";
+						if (isset($oe_kurzbz)) $fehlerText .= "; oe_kurzbz: $oe_kurzbz";
+
+						$issueObj = new StdClass();
+						$issueObj->fehlertext = $fehlerText;
+						$issueObj->type = $fehlerTyp;
+						$allIssues[$fehler_kurzbz]['data'][] = $issueObj;
+					}
+					else // if no issue text found, use generic text
+					{
+						$fehlerText = self::GENERIC_ISSUE_OCCURED_TEXT;
+					}
+
+					// add generic parameters to issue text
+					if (isset($person_id)) $fehlerText .= "; person_id: $person_id";
+					if (isset($oe_kurzbz)) $fehlerText .= "; oe_kurzbz: $oe_kurzbz";
+				}
+			}
+		}
+
+		$this->outputJsonSuccess($allIssues);
+	}
+
+	/**
+	 * Get the data needed for filtering for limiting checks.
+	 */
+	private function _getFilterData()
+	{
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$studiensemesterRes = $this->StudiensemesterModel->load();
+
+		if (isError($studiensemesterRes)) show_error(getError($studiensemesterRes));
+
+		$currSemRes = $this->StudiensemesterModel->getAkt();
+
+		if (isError($currSemRes)) show_error(getError($currSemRes));
+
+		$this->StudiengangModel->addSelect('studiengang_kz, tbl_studiengang.bezeichnung, tbl_studiengang.typ,
+			tbl_studiengangstyp.bezeichnung AS typbezeichnung, UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel');
+		$this->StudiengangModel->addJoin('public.tbl_studiengangstyp', 'typ');
+		$this->StudiengangModel->addOrder('kuerzel, tbl_studiengang.bezeichnung, studiengang_kz');
+		$studiengaengeRes = $this->StudiengangModel->loadWhere(array('aktiv' => true));
+
+		if (isError($studiengaengeRes)) show_error(getError($studiengaengeRes));
+
+		$fehlerKurzbz = $this->plausicheckdefinitionlib->getFehlerKurzbz();
+
+		$db = new DB_Model();
+
+		// get fehlercodes for fehler_kurzbz
+		$fehlerRes = $db->execReadOnlyQuery(
+			'SELECT
+				fehler_kurzbz, fehlercode
+			FROM
+				system.tbl_fehler
+			WHERE
+				fehler_kurzbz IN ?',
+			array($fehlerKurzbz)
+		);
+
+		if (isError($fehlerRes)) show_error(getError($fehlerRes));
+
+		$fehlerKurzbzCodeMappings = array();
+		if (hasData($fehlerRes))
+		{
+			$fehler = getData($fehlerRes);
+			foreach ($fehler as $fe)
+			{
+				$fehlerKurzbzCodeMappings[$fe->fehler_kurzbz] = $fe->fehlercode;
+			}
+		}
+
+		return array(
+			'semester' => hasData($studiensemesterRes) ? getData($studiensemesterRes) : array(),
+			'currsemester' => hasData($currSemRes) ? getData($currSemRes) : array(),
+			'studiengaenge' => hasData($studiengaengeRes) ? getData($studiengaengeRes) : array(),
+			'fehlerKurzbzCodeMappings' => $fehlerKurzbzCodeMappings
+		);
+	}
+}

application/controllers/system/messages/FASMessages.php

@@ -37,7 +37,7 @@ class FASMessages extends Auth_Controller
 
 		// Loads the view to write a new message with a template
 		$this->load->view(
-			'system/messages/htmlWriteTemplate',
+			'system/messages/FAShtmlWriteTemplate',
 			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents)
 		);
  	}
@@ -53,7 +53,7 @@ class FASMessages extends Auth_Controller
 
 		// Loads the view to write a new message with a template
 		$this->load->view(
-			'system/messages/htmlWriteTemplate',
+			'system/messages/FAShtmlWriteTemplate',
 			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents, $message_id, $recipient_id)
 		);
  	}

application/core/Auth_Controller.php

@@ -7,6 +7,10 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
  */
 abstract class Auth_Controller extends FHC_Controller
 {
+	// Special Permissions
+	const PERM_ANONYMOUS = 'anonymous'; // Everyone
+	const PERM_LOGGED = 'logged_in'; // Every registered user
+
 	/**
 	 * Extends this controller if authentication is required
 	 */
@@ -14,17 +18,41 @@ abstract class Auth_Controller extends FHC_Controller
 	{
         parent::__construct();
 
-		// Loads authentication library and starts authentication
-		$this->load->library('AuthLib');
+		if (!is_array($requiredPermissions) || isEmptyArray($requiredPermissions))
+			show_error('The given permissions is not a valid array or it is an empty one');
+		
+		if (!isset($requiredPermissions[$this->router->method]))
+			show_error('The given permission array does not contain the given method or is not correctly set');
+		
+		$anonAllowed = false;
+		if ($requiredPermissions[$this->router->method] == self::PERM_ANONYMOUS)
+			$anonAllowed = true;
+		elseif (is_array($requiredPermissions[$this->router->method])
+			&& in_array(self::PERM_ANONYMOUS, $requiredPermissions[$this->router->method]))
+			$anonAllowed = true;
 
-		// Checks if the caller is allowed to access to this content
-		$this->_isAllowed($requiredPermissions);
+		if ($anonAllowed) {
+			// Loads authentication library without authentication
+			$this->load->library('AuthLib', [false]);
+
+			// Loads helper since it would only be called on authentication
+			$this->load->helper('hlp_authentication');
+		} else {
+			// Loads authentication library and starts authentication
+			$this->load->library('AuthLib');
+
+			// Checks if the caller is allowed to access to this content
+			$this->_isAllowed($requiredPermissions);
+		}
 	}
 
 	/**
 	 * Checks if the caller is allowed to access to this content with the given permissions
 	 * If it is not allowed will set the HTTP header with code 401
 	 * Wrapper for permissionlib->isEntitled
+	 *
+	 * @param array					$requiredPermissions
+	 * @return void
 	 */
 	private function _isAllowed($requiredPermissions)
 	{
@@ -34,28 +62,145 @@ abstract class Auth_Controller extends FHC_Controller
 		// Checks if this user is entitled to access to this content
 		if (!$this->permissionlib->isEntitled($requiredPermissions, $this->router->method))
 		{
-			$this->output->set_status_header(REST_Controller::HTTP_UNAUTHORIZED); // set the HTTP header as unauthorized
-
-			$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
-
-			// Prints the main error message
-			$this->eprintflib->printError('You are not allowed to access to this content');
-			// Prints the called controller name
-			$this->eprintflib->printInfo('Controller name: '.$this->router->class);
-			// Prints the called controller method name
-			$this->eprintflib->printInfo('Method name: '.$this->router->method);
-			// Prints the required permissions needed to access to this method
-			$this->eprintflib->printInfo('Required permissions: '.$this->_rpsToString($requiredPermissions, $this->router->method));
-
+			$this->_outputAuthError($requiredPermissions);
 			exit; // immediately terminate the execution
 		}
 	}
 
+	/**
+	 * Checks for Permissions depending if the given person is a
+	 * Mitarbeiter and/or Student
+	 * and exits/outputs an error if they are not met.
+	 *
+	 * @param integer 				$person_id
+	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return void
+	 */
+	protected function checkPermissionsForPerson($person_id, $permMa, $permStud)
+	{
+		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud);
+		
+		if ($res) {
+			$perm = array_keys(array_flip(array_merge($res|1 ? $permMa : [], $res|2 ? $permStud : [])));
+			$this->_outputAuthError([$this->router->method => $perm]);
+		}
+	}
+
+	/**
+	 * 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
+	 * and returns the result.
+	 *
+	 * @param integer 				$person_id
+	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
+	 * @param array 				$permStud	Perms if the person is a Student
+	 *
+	 * @return integer				0 if permission is granted
+	 */
+	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
+	{
+		$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');
+		$result = $this->PersonModel->load($person_id);
+		if (hasData($result)) {
+			if ($this->permissionlib->isEntitled(['a' => $permMa], 'a'))
+				return 0;
+			$res = 1;
+		}
+		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
+		$result = $this->PersonModel->load($person_id);
+		if (hasData($result)) {
+			$permStudConverted = [];
+			foreach (getData($result) as $row) {
+				foreach ($permStud as $k => $v) {
+					if (!isset($permStudConverted[$k])) {
+						$permStudConverted[$k] = $this->permissionlib->convertAccessType($v);
+					}
+					if ($this->permissionlib->isBerechtigt($permStudConverted[$k][0], $permStudConverted[$k][1], $row->studiengang_kz))
+						return 0;
+				}
+			}
+			$res += 2;
+		}
+		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.
+	 *
+	 * @param array					$requiredPermissions
+	 * @return void
+	 */
+	protected function _outputAuthError($requiredPermissions)
+	{
+		$this->output->set_status_header(REST_Controller::HTTP_UNAUTHORIZED); // set the HTTP header as unauthorized
+
+		$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
+
+		// Prints the main error message
+		$this->eprintflib->printError('You are not allowed to access to this content');
+		// Prints the called controller name
+		$this->eprintflib->printInfo('Controller name: '.$this->router->class);
+		// Prints the called controller method name
+		$this->eprintflib->printInfo('Method name: '.$this->router->method);
+		// Prints the required permissions needed to access to this method
+		$this->eprintflib->printInfo('Required permissions: '.$this->_rpsToString($requiredPermissions, $this->router->method));
+	}
+
 	/**
 	 * Converts an array of permissions to a string that contains them as a comma separated list
 	 * Ex: "<permission 1>, <permission 2>, <permission 3>"
+	 *
+	 * @param array					$requiredPermissions
+	 * @param string				$method
+	 * @return void
 	 */
-	private function _rpsToString($requiredPermissions, $method)
+	final protected function _rpsToString($requiredPermissions, $method)
 	{
 		$strRequiredPermissions = ''; // string that contains all the required permissions needed to access to this method
 

application/core/CI3_Events.php

@@ -0,0 +1,51 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class CI3_Events
+{
+	const PRIORITY_LOW = 200;
+	const PRIORITY_NORMAL = 100;
+	const PRIORITY_HIGH = 10;
+
+	private static $events = [];
+	private static $eventsSorted = [];
+
+	public static function on($event, $function, $priority = self::PRIORITY_NORMAL)
+	{
+		if (!isset(self::$events[$event]))
+			self::$events[$event] = [];
+
+		self::$events[$event][] = [$priority, $function];
+
+		if (!isset(self::$eventsSorted[$event]))
+			self::$eventsSorted[$event] = true;
+		else
+			self::$eventsSorted[$event] = false;
+	}
+
+	public static function trigger($event, ...$args)
+	{
+		if (!isset(self::$events[$event]))
+			return;
+
+		if (!self::$eventsSorted[$event]) {
+			usort(self::$events[$event], function ($a, $b) {
+				return $a[0] - $b[0];
+			});
+			self::$eventsSorted[$event] = true;
+		}
+		
+		foreach (self::$events[$event] as $conf) {
+			$conf[1](...$args);
+		}
+	}
+}
+
+/**
+ * NOTE(chris): Autoload Events config
+ */
+require_once(APPPATH.'config/Events.php');
+foreach (scandir(APPPATH.'config/extensions') as $dir)
+	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
+		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';

application/core/DB_Model.php

@@ -1,5 +1,24 @@
 <?php
 
+/**
+ * Copyright (C) 2023 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+use \stdClass as stdClass;
+
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
@@ -27,6 +46,15 @@ class DB_Model extends CI_Model
 	const PGSQL_INT8_TYPE = 'int8';
 	const PGSQL_FLOAT4_TYPE = 'float4';
 	const PGSQL_FLOAT8_TYPE = 'float8';
+	const PGSQL_BYTEA_TYPE = 'bytea';
+
+	// Name of the config entry containing an array of password that can be used to encrypt/decrypt
+	const CRYPT_CONF_PASSWORDS = 'encryption_passwords';
+	const CRYPT_CAST = 'cast';
+	const CRYPT_PASSWORD_NAME = 'passwordName';
+	const CRYPT_SELECT_TEMPLATE = 'PGP_SYM_DECRYPT(%s, \'%s\')::%s AS %s';
+	const CRYPT_WHERE_TEMPLATE = 'PGP_SYM_DECRYPT(%s, \'%s\')::%s';
+	const CRYPT_WRITE_TEMPLATE = 'PGP_SYM_ENCRYPT(\'%s\', \'%s\')';
 
 	protected $dbTable;  	// Name of the DB-Table for CI-Insert, -Update, ...
 	protected $pk;  	// Name of the PrimaryKey for DB-Update, Load, ...
@@ -36,7 +64,7 @@ class DB_Model extends CI_Model
 	private $executedQueryMetaData;
 	private $executedQueryListFields;
 
-	private $debugMode;
+	private $debugMode; // Debug mode enable (true) or disabled (false)
 
 	/**
 	 * Constructor
@@ -46,20 +74,23 @@ class DB_Model extends CI_Model
 		// Call parent constructor
 		parent::__construct();
 
-		// Set properties
-		$this->hasSequence = true;
-
-		// Loads DB conns and confs
+		// Loads DB connections and configs
 		$this->load->database($dbtype);
 
+		// Loads the DB config to encrypt/decrypt data
+		$this->config->load('db_crypt');
+
+		// Set properties
+		$this->hasSequence = true;
+		$this->debugMode = isset($this->db->db_debug) && $this->db->db_debug === true;
+
+		// Loads UDF model
 		$this->load->model('system/UDF_model', 'UDFModel');
 
 		// Loads the UDF library
 		$this->load->library('UDFLib');
 		// Loads the logs library
 		$this->load->library('LogLib');
-
-		$this->debugMode = isset($this->db->db_debug) && $this->db->db_debug === true;
 	}
 
 	// ------------------------------------------------------------------------------------------
@@ -85,13 +116,20 @@ class DB_Model extends CI_Model
 	 * @param   array $data  DataArray for Insert
 	 * @return  array
 	 */
-	public function insert($data)
+	public function insert($data, $encryptedColumns = null)
 	{
 		// Check class properties
 		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
 
 		// If this table has UDF and the validation of them is ok
-		if (isError($validate = $this->_prepareUDFsWrite($data, $this->dbTable))) return $validate;
+		$validate = $this->_prepareUDFsWrite($data, $this->dbTable);
+		if (isError($validate)) return $validate;
+
+		// Add the pgp_sym_eccrypt postgresql function to the set clause if needed
+		$this->_addEncrypt($encryptedColumns, $data);
+
+		// Add the pgp_sym_eccrypt postgresql function to the set clause if needed
+		if (!empty($encryptedColumns)) $this->_addEncrypt($encryptedColumns, $data);
 
 		// DB-INSERT
 		$insert = $this->db->insert($this->dbTable, $data);
@@ -135,14 +173,15 @@ class DB_Model extends CI_Model
 	 * @param   array $data  DataArray for Insert
 	 * @return  array
 	 */
-	public function update($id, $data)
+	public function update($id, $data, $encryptedColumns = null)
 	{
 		// Check class properties
 		if (is_null($this->pk)) return error('The given primary key is not valid', EXIT_MODEL);
 		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
 
 		// If this table has UDF and the validation of them is ok
-		if (isError($validate = $this->_prepareUDFsWrite($data, $this->dbTable, $id))) return $validate;
+		$validate = $this->_prepareUDFsWrite($data, $this->dbTable, $id);
+		if (isError($validate)) return $validate;
 
 		$tmpId = $id;
 
@@ -161,6 +200,9 @@ class DB_Model extends CI_Model
 
 		$this->db->where($tmpId);
 
+		// Add the pgp_sym_eccrypt postgresql function to the set clause if needed
+		$this->_addEncrypt($encryptedColumns, $data);
+
 		// DB-UPDATE
 		$update = $this->db->update($this->dbTable, $data);
 
@@ -224,7 +266,7 @@ class DB_Model extends CI_Model
 	 * @param   string $id  ID (Primary Key) for SELECT ... WHERE
 	 * @return  array
 	 */
-	public function load($id = null)
+	public function load($id = null, $encryptedColumns = null)
 	{
 		// Check class properties
 		if (is_null($this->pk)) return error('The given primary key is not valid', EXIT_MODEL);
@@ -245,7 +287,7 @@ class DB_Model extends CI_Model
 			$tmpId = array($this->pk => $id);
 		}
 
-		return $this->loadWhere($tmpId);
+		return $this->loadWhere($tmpId, $encryptedColumns);
 	}
 
 	/**
@@ -253,11 +295,14 @@ class DB_Model extends CI_Model
 	 *
 	 * @return  array
 	 */
-	public function loadWhere($where = null)
+	public function loadWhere($where = null, $encryptedColumns = null)
 	{
 		// Check class properties
 		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
 
+		// Add the pgp_sym_decrypt postgresql function to the select and where clause if needed
+		$this->_addDecryptLoad($encryptedColumns, $where);
+
 		// Execute query
 		$result = $this->db->get_where($this->dbTable, $where);
 
@@ -265,7 +310,7 @@ class DB_Model extends CI_Model
 
 		if ($result)
 		{
-			return success($this->_toPhp($result));
+			return success($this->_toPhp($result, $encryptedColumns));
 		}
 		else
 		{
@@ -303,7 +348,8 @@ class DB_Model extends CI_Model
 			// NOTE: $this->db->list_fields($tables[$t]) doesn't work if there are two tables with
 			// the same name in two different schemas, use this workaround
 			$fields = array();
-			if (isSuccess($lstColumns = $this->_list_columns($schemaAndTable->schema, $schemaAndTable->table)))
+			$lstColumns = $this->_list_columns($schemaAndTable->schema, $schemaAndTable->table);
+			if (isSuccess($lstColumns))
 			{
 				$fields = $lstColumns->retval;
 			}
@@ -381,7 +427,8 @@ class DB_Model extends CI_Model
 					$tmpFilteredArray = array_filter(get_object_vars($sideTableObj));
 					if (isset($tmpFilteredArray) && count($tmpFilteredArray) > 0)
 					{
-						if (($k = $this->_findMainTable($mainTableObj, $returnArray)) === false)
+						$k = $this->_findMainTable($mainTableObj, $returnArray);
+						if ($k === false)
 						{
 							$mainTableObj->{$sideTableProperty} = array($sideTableObj);
 							$returnArray[$returnArrayCounter++] = $mainTableObj;
@@ -758,14 +805,13 @@ class DB_Model extends CI_Model
 	/**
 	 * Like execQuery, but it allows only to perform queries to read data
 	 */
-	public function execReadOnlyQuery($query, $parametersArray = null)
+	public function execReadOnlyQuery($query, $parametersArray = null, $encryptedColumns = null)
 	{
 		$result = error('You are allowed to run only query for reading data'); //
 		$cleanedQuery = trim(preg_replace('/\t|\n|\r|;/', '', $query)); //
 
 		//
-		if (
-			(stripos($cleanedQuery, 'INSERT') > 0 || stripos($cleanedQuery, 'INSERT') == false)
+		if ((stripos($cleanedQuery, 'INSERT') > 0 || stripos($cleanedQuery, 'INSERT') == false)
 			&& (stripos($cleanedQuery, 'UPDATE') > 0 || stripos($cleanedQuery, 'UPDATE') == false)
 			&& (stripos($cleanedQuery, 'CREATE') > 0 || stripos($cleanedQuery, 'CREATE') == false)
 			&& (stripos($cleanedQuery, 'DELETE') > 0 || stripos($cleanedQuery, 'DELETE') == false)
@@ -775,12 +821,29 @@ class DB_Model extends CI_Model
 		{
 			$queryToExec = str_replace(';', '', $query); //
 
-			$result = $this->execQuery($queryToExec, $parametersArray);
+			$result = $this->execQuery($queryToExec, $parametersArray, $encryptedColumns);
 		}
 
 		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
 
@@ -790,13 +853,16 @@ class DB_Model extends CI_Model
 	 *			boolean if the query is of the write type (INSERT, UPDATE, DELETE...)
 	 *			array that represents DB data
 	 */
-	protected function execQuery($query, $parametersArray = null)
+	protected function execQuery($query, $parametersArray = null, $encryptedColumns = null)
 	{
 		$result = null;
 
 		// If the query is empty don't lose time
 		if (!isEmptyString($query))
 		{
+			// Add the pgp_sym_decrypt postgresql function to the given query
+			$this->_addDecryptQuery($encryptedColumns, $query);
+
 			// If there are parameters to bind to the query
 			if (is_array($parametersArray) && count($parametersArray) > 0)
 			{
@@ -812,7 +878,7 @@ class DB_Model extends CI_Model
 			// If no errors occurred
 			if ($resultDB)
 			{
-				$result = success($this->_toPhp($resultDB));
+				$result = success($this->_toPhp($resultDB, $encryptedColumns));
 			}
 			else
 			{
@@ -840,7 +906,8 @@ class DB_Model extends CI_Model
 		$result->schema = DB_Model::DEFAULT_SCHEMA;
 
 		// If a schema is specified
-		if (($pos = strpos($schemaAndTable, '.')) !==  false)
+		$pos = strpos($schemaAndTable, '.');
+		if ($pos !==  false)
 		{
 			$result->schema = substr($schemaAndTable, 0, $pos);
 			$result->table = substr($schemaAndTable, $pos + 1);
@@ -851,6 +918,207 @@ class DB_Model extends CI_Model
 
 	// ------------------------------------------------------------------------------------------
 	// Private methods
+	//
+	//
+
+	/**
+	 * To add the pgp_sym_encrypt function to the set clause where needed
+	 */
+	private function _addEncrypt($encryptedColumns, &$data)
+	{
+		// If encryptedColumns is not defined then exit
+		if (isEmptyArray($encryptedColumns)) return;
+
+		$tmpData = array(); // Temporary array used to copy not encrypted columns
+
+		// For each column that is going to be inserted/updated
+		foreach ($data as $column => $value)
+		{
+			// If the current column is in the list of the columns to be encrypted
+			// and contains the password name element
+			if (array_key_exists($column, $encryptedColumns)
+				&& array_key_exists(self::CRYPT_PASSWORD_NAME, $encryptedColumns[$column]))
+			{
+				// Password to encrypt data
+				$cryptConfPasswords = $this->config->item(self::CRYPT_CONF_PASSWORDS);
+				$encryptionPassword = $cryptConfPasswords[$encryptedColumns[$column][self::CRYPT_PASSWORD_NAME]];
+
+				// Add the encrypted column to the set clause without escaping
+				$this->db->set(
+					$column,
+					sprintf(
+						self::CRYPT_WRITE_TEMPLATE,
+						$value,
+						$encryptionPassword
+					),
+					false // no escaping
+				);
+			}
+			else // otherwise copy this element as it is
+			{
+				$tmpData[$column] = $value;
+			}
+		}
+
+		$data = $tmpData; // this array does not contain encrypted columns
+	}
+
+	/**
+	 * To add the pgp_sym_decrypt function to the given query
+	 */
+	private function _addDecryptQuery($encryptedColumns, &$query)
+	{
+		// If it is request to get encrypted columns
+		if (!isEmptyArray($encryptedColumns))
+		{
+			// For each requested encrypted column
+			foreach ($encryptedColumns as $encryptedColumn => $definition)
+			{
+				// If the requested encrypted column is well defined
+				if (!isEmptyArray($definition)
+					&& array_key_exists(self::CRYPT_CAST, $definition)
+					&& array_key_exists(self::CRYPT_PASSWORD_NAME, $definition))
+				{
+					// And if exists the wanted password to decrypt in the configs
+					if (array_key_exists($definition[self::CRYPT_PASSWORD_NAME], $this->config->item(self::CRYPT_CONF_PASSWORDS)))
+					{
+						// Password to decrypt data
+						$cryptConfPasswords = $this->config->item(self::CRYPT_CONF_PASSWORDS);
+						$decryptionPassword = $cryptConfPasswords[$definition[self::CRYPT_PASSWORD_NAME]];
+
+						// Find and replace all the occurrences of the provided encrypted columns
+						// with the postgresql decryption function
+						$query = str_replace(
+							$encryptedColumn,
+							sprintf(
+								self::CRYPT_WHERE_TEMPLATE,
+								$encryptedColumn,
+								$decryptionPassword,
+								$definition[self::CRYPT_CAST]
+							),
+							$query
+						);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * To add the pgp_sym_decrypt function to the select and where clause where needed
+	 */
+	private function _addDecryptLoad($encryptedColumns, &$where)
+	{
+		// If it is request to get encrypted columns
+		if (!isEmptyArray($encryptedColumns))
+		{
+			// For each requested encrypted column
+			foreach ($encryptedColumns as $encryptedColumn => $definition)
+			{
+				// If the requested encrypted column is well defined
+				if (!isEmptyArray($definition)
+					&& array_key_exists(self::CRYPT_CAST, $definition)
+					&& array_key_exists(self::CRYPT_PASSWORD_NAME, $definition))
+				{
+					// And if exists the wanted password to decrypt in the configs
+					if (array_key_exists($definition[self::CRYPT_PASSWORD_NAME], $this->config->item(self::CRYPT_CONF_PASSWORDS)))
+					{
+						// Password to decrypt data
+						$cryptConfPasswords = $this->config->item(self::CRYPT_CONF_PASSWORDS);
+						$decryptionPassword = $cryptConfPasswords[$definition[self::CRYPT_PASSWORD_NAME]];
+
+						// -----------------------------------------
+						// SELECT
+
+						// Add to the select clause the column to be decrypted
+						// NOTE: this is going to override any previously added column with the same name
+						$this->addSelect(
+							sprintf(
+								self::CRYPT_SELECT_TEMPLATE,
+								$encryptedColumn,
+								$decryptionPassword,
+								$definition[self::CRYPT_CAST],
+								$encryptedColumn
+							)
+						);
+
+						// -----------------------------------------
+						// WHERE
+
+						// If the where parameter is a valid array
+						if (!isEmptyArray($where))
+						{
+							$tmpWhere = array();
+
+							// For each condition of the where clause
+							foreach ($where as $column => $condition)
+							{
+								$operator = null; // operator not found in the column name
+
+								// Custom operators with 2 chars
+								if (strpos($column, '>=') != false
+									|| strpos($column, '<=') != false
+									|| strpos($column, '!=') != false
+									|| strpos($column, '<>') != false
+								)
+								{
+									$operator = ' '.substr(trim($column), -2).' ';
+								}
+								// Custom operators with 1 chars
+								elseif (strpos($column, '>') != false
+									|| strpos($column, '<') != false
+									|| strpos($column, '=') != false
+								)
+								{
+									$operator = ' '.substr(trim($column), -1).' ';
+								}
+								else // default operator
+								{
+									$operator = ' = ';
+								}
+
+								// If the column from the where clause is the same from the encrypted columns definition
+								if (trim($column) == $encryptedColumn
+									|| ($operator != null && substr(trim($column), 0, strlen(trim($column)) - 2) == $encryptedColumn)
+								)
+								{
+									// Then rename the column using the postgresql decryption function
+									$tmpWhere[sprintf(
+										self::CRYPT_WHERE_TEMPLATE,
+										$encryptedColumn,
+										$decryptionPassword,
+										$definition[self::CRYPT_CAST]
+									).$operator] = $condition;
+								}
+								else // otherwise copy the column as it is
+								{
+									$tmpWhere[$column] = $condition;
+								}
+							}
+
+							$where = $tmpWhere; // replace with the new where
+						}
+						// Otherwise if the where parameter is a valid string
+						elseif (!isEmptyString($where))
+						{
+							// Find and replace all the occurrences of the provided encrypted columns
+							// with the postgresql decryption function
+							$where = str_replace(
+								$encryptedColumn,
+								sprintf(
+									self::CRYPT_WHERE_TEMPLATE,
+									$encryptedColumn,
+									$decryptionPassword,
+									$definition[self::CRYPT_CAST]
+								),
+								$where
+							);
+						}
+					}
+				}
+			}
+		}
+	}
 
 	/**
 	 * Invalid ID
@@ -877,11 +1145,11 @@ class DB_Model extends CI_Model
 		{
 			if ($id != null)
 			{
-				$prepareUDFsWrite = $this->udflib->prepareUDFsWrite($data, $this->dbTable, $this->_getUDFsNoPerms($id));
+				$prepareUDFsWrite = $this->udflib->prepareUDFsWrite($data, $schemaAndTable, $this->_getUDFsNoPerms($id));
 			}
 			else
 			{
-				$prepareUDFsWrite = $this->udflib->prepareUDFsWrite($data, $this->dbTable);
+				$prepareUDFsWrite = $this->udflib->prepareUDFsWrite($data, $schemaAndTable);
 			}
 		}
 
@@ -895,7 +1163,7 @@ class DB_Model extends CI_Model
 	 * - A FALSE value on failure
 	 * - Otherwise an object filled with data on success
 	 */
-	private function _toPhp($result)
+	private function _toPhp($result, $encryptedColumns = null)
 	{
 		$udfs = false; // if UDFs are inside the given result set
 		$toPhp = $result; // if there is nothing to convert then return the result from DB
@@ -911,7 +1179,9 @@ class DB_Model extends CI_Model
 			// Looking for booleans, arrays and UDFs
 			foreach ($this->executedQueryMetaData as $eqmd)
 			{
-				// If array type, boolean type OR a UDF
+				// If array type, boolean type, numeric type
+				// Or bytea type
+				// Or UDF type
 				if (strpos($eqmd->type, DB_Model::PGSQL_ARRAY_TYPE) !== false
 					|| $eqmd->type == DB_Model::PGSQL_BOOLEAN_TYPE
 					|| $eqmd->type == DB_Model::PGSQL_INT2_TYPE
@@ -919,6 +1189,7 @@ class DB_Model extends CI_Model
 					|| $eqmd->type == DB_Model::PGSQL_INT8_TYPE
 					|| $eqmd->type == DB_Model::PGSQL_FLOAT4_TYPE
 					|| $eqmd->type == DB_Model::PGSQL_FLOAT8_TYPE
+					|| $eqmd->type == DB_Model::PGSQL_BYTEA_TYPE
 					|| $this->udflib->isUDFColumn($eqmd->name, $eqmd->type))
 				{
 					// If UDFs are inside this result set
@@ -981,6 +1252,21 @@ class DB_Model extends CI_Model
 						{
 							$resultElement->{$toBeConverted->name} = $this->pgFloatPhp($resultElement->{$toBeConverted->name});
 						}
+						// Byte A type
+						elseif ($toBeConverted->type == DB_Model::PGSQL_BYTEA_TYPE)
+						{
+							// If encrypted columns are defined
+							// and if the byte a column is defined as encrypted column
+							if (!isEmptyArray($encryptedColumns)
+								&& array_key_exists($toBeConverted->name, $encryptedColumns))
+							{
+								// keep the column
+							}
+							else // otherwise remove the column from the result
+							{
+								unset($resultElement->{$toBeConverted->name});
+							}
+						}
 					}
 				}
 			}

application/core/FHCAPI_Controller.php

@@ -0,0 +1,236 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Controller using JSON
+ */
+class FHCAPI_Controller extends Auth_Controller
+{
+
+	/**
+	 * Response status
+	 * @see https://github.com/omniti-labs/jsend
+	 */
+	const STATUS_SUCCESS = 'success';
+	const STATUS_FAIL = 'fail';
+	const STATUS_ERROR = 'error';
+
+	/**
+	 * Error types
+	 */
+	const ERROR_TYPE_PHP = 'php';
+	const ERROR_TYPE_EXCEPTION = 'exception';
+	const ERROR_TYPE_GENERAL = 'general';
+	const ERROR_TYPE_404 = '404';
+	const ERROR_TYPE_DB = 'db';
+	const ERROR_TYPE_VALIDATION = 'validation';
+	const ERROR_TYPE_AUTH = 'auth';
+
+	/**
+	 * Return Object
+	 *
+	 * @var array
+	 */
+	private $returnObj = [];
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param array					$requiredPermissions
+	 * @return void
+	 */
+	public function __construct($requiredPermissions = [])
+	{
+		if (is_cli())
+			show_404();
+
+		global $g_result;
+		$g_result = $this;
+
+		ob_start(function ($content) {
+			$http_response_code = http_response_code();
+			// NOTE(chris): For security reasons 404 will be displayed the same everywhere
+			if ($http_response_code == REST_Controller::HTTP_NOT_FOUND)
+				return $content;
+
+			header('Content-Type: application/json; charset=utf-8');
+
+			if (!isset($this->returnObj['meta']) || !isset($this->returnObj['meta']['status'])) {
+				switch ($http_response_code) {
+					case 200:
+						$this->setStatus(self::STATUS_SUCCESS);
+						break;
+					case 400:
+						$this->setStatus(self::STATUS_FAIL);
+						break;
+					default:
+						$this->setStatus(self::STATUS_ERROR);
+						break;
+				}
+			}
+
+			return json_encode($this->returnObj);
+		});
+
+		// NOTE(chris): overwrite error_views_path before constructor
+		load_class('Config')->set_item('error_views_path', VIEWPATH.'errors'.DIRECTORY_SEPARATOR.'json'.DIRECTORY_SEPARATOR);
+
+		parent::__construct($requiredPermissions);
+		
+		// For JSON Requests (as opposed to multipart/form-data) get the $_POST variable from the input stream instead
+		if ($this->input->get_request_header('Content-Type', true) == 'application/json')
+			$_POST = json_decode($this->security->xss_clean($this->input->raw_input_stream), true);
+		elseif (isset($_POST['_jsondata'])) {
+			$_POST = array_merge($_POST, json_decode($_POST['_jsondata'], true));
+			unset($_POST['_jsondata']);
+		}
+	}
+
+
+	// ---------------------------------------------------------------
+	// Handle Output object
+	// ---------------------------------------------------------------
+
+	/**
+	 * @param string|array|object	$data
+	 * @param string				$type (optional)
+	 * @return void
+	 */
+	public function addError($data, $type = null)
+	{
+		if (!isset($this->returnObj['errors']))
+			$this->returnObj['errors'] = [];
+
+		$error = [];
+		
+		if (is_array($data)) {
+			if ($type == self::ERROR_TYPE_VALIDATION)
+				$error['messages'] = $data;
+			else
+				$error = $data;
+		} elseif (is_object($data)) {
+			$error = (array)$data;
+		} else {
+			$error['message'] = $data;
+		}
+		
+		if ($type)
+			$error['type'] = $type;
+
+		if (!isset($error['type']))
+			$error['type'] = self::ERROR_TYPE_GENERAL;
+
+		$this->returnObj['errors'][] = $error;
+	}
+
+	/**
+	 * @param mixed					$data
+	 * @return void
+	 */
+	public function setData($data)
+	{
+		$this->returnObj['data'] = $data;
+	}
+
+	/**
+	 * @param string				$key
+	 * @param mixed					$value
+	 * @return void
+	 */
+	public function addMeta($key, $value)
+	{
+		if (!isset($this->returnObj['meta']))
+			$this->returnObj['meta'] = [];
+		$this->returnObj['meta'][$key] = $value;
+	}
+
+	/**
+	 * @param string				$status
+	 * @return void
+	 */
+	public function setStatus($status)
+	{
+		$this->addMeta('status', $status);
+	}
+
+
+	// ---------------------------------------------------------------
+	// Handle Output object - Shortcut functions
+	// ---------------------------------------------------------------
+
+	/**
+	 * @param mixed					$data (optional)
+	 * @return void
+	 */
+	protected function terminateWithSuccess($data = null)
+	{
+		$this->setData($data);
+		$this->setStatus(self::STATUS_SUCCESS);
+		exit;
+	}
+
+	/**
+	 * @param array					$errors
+	 * @return void
+	 */
+	protected function terminateWithValidationErrors($errors)
+	{
+		$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+		$this->addError($errors, self::ERROR_TYPE_VALIDATION);
+		$this->setStatus(self::STATUS_FAIL);
+		exit(EXIT_ERROR);
+	}
+
+	/**
+	 * @param array					$error
+	 * @param string				$type (optional)
+	 * @param integer				$status (optional)
+	 * @return void
+	 */
+	protected function terminateWithError($error, $type = null, $status = REST_Controller::HTTP_INTERNAL_SERVER_ERROR)
+	{
+		$this->output->set_status_header($status);
+		$this->addError($error, $type);
+		$this->setStatus(self::STATUS_ERROR);
+		exit;
+	}
+
+	/**
+	 * @param stdclass				$result
+	 * @param string				$errortype
+	 * @return void
+	 */
+	protected function getDataOrTerminateWithError($result, $errortype = self::ERROR_TYPE_GENERAL)
+	{
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), $errortype);
+		}
+		return $result->retval;
+	}
+
+
+	// ---------------------------------------------------------------
+	// Security
+	// ---------------------------------------------------------------
+
+	/**
+	 * Outputs an error message and sets the HTTP Header.
+	 * This overwrites the default behaviour to output a json object.
+	 *
+	 * @param array					$requiredPermissions
+	 * @return void
+	 */
+	protected function _outputAuthError($requiredPermissions)
+	{
+		$this->output->set_status_header(isLogged() ? REST_Controller::HTTP_FORBIDDEN : REST_Controller::HTTP_UNAUTHORIZED);
+
+		$this->addError([
+			'message' => 'You are not allowed to access to this content',
+			'controller' => $this->router->class,
+			'method' => $this->router->method,
+			'required_permissions' => $this->_rpsToString($requiredPermissions, $this->router->method)
+		], self::ERROR_TYPE_AUTH);
+	}
+}

application/core/IEncryption.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Copyright (C) 2023 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+interface IEncryption
+{
+	public function getEncryptedColumns(): array;
+}
+

application/core/IssueResolver_Controller.php

@@ -5,18 +5,18 @@
  */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	const ISSUES_FOLDER = 'issues';
-	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');
 	}
 
 	/**
@@ -24,95 +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 = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
 
-				$openIssues = getData($openIssuesRes);
+		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues($openIssues);
 
-				foreach ($openIssues as $issue)
-				{
-					if (isset($this->_codeLibMappings[$issue->fehlercode]))
-					{
-						$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, otherwise it is the core library folder
-						$libRootPath = isset($this->_extensionName) ? 'extensions/' . $this->_extensionName . '/' : '';
-						$issuesLibPath = $libRootPath . self::ISSUES_FOLDER . '/';
-						$issuesLibFilePath = DOC_ROOT . 'application/' . $libRootPath . 'libraries/' . self::ISSUES_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 libary 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

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Job for producing Plausicheck issues
+ */
+abstract class PlausiIssueProducer_Controller extends JOB_Controller
+{
+	protected $_fehlerLibMappings = [];
+	protected $_app;
+
+	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");
+
+		$result = $this->plausicheckproducerlib->producePlausicheckIssues($params);
+
+		// 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/helpers/hlp_common_helper.php

@@ -18,6 +18,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
+
 // ------------------------------------------------------------------------
 // Collection of utility functions for general purpose
 // ------------------------------------------------------------------------
@@ -354,7 +356,8 @@ function sanitizeProblemChars($str)
 		'ss' => '/ß/'
 	);
 
-	return preg_replace($acentos, array_keys($acentos), htmlentities($str, ENT_NOQUOTES | ENT_HTML5, $enc));
+	$tmp = preg_replace($acentos, array_keys($acentos), htmlentities($str, ENT_NOQUOTES | ENT_HTML5, $enc));
+	return html_entity_decode($tmp, ENT_NOQUOTES | ENT_HTML5, $enc);
 }
 
 /**
@@ -405,3 +408,93 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
 	return null;
 }
 
+/**
+ * check if String can be converted to a date
+ */
+function isValidDate($dateString)
+{
+	try
+	{
+		return (new DateTime($dateString)) !== false;
+	}
+	catch(Exception $e)
+	{
+		return false;
+	}
+}
+
+
+// ------------------------------------------------------------------------
+// Collection of utility functions for form validation purposes
+// ------------------------------------------------------------------------
+
+/**
+ * check if string can be converted to a date
+ */
+function is_valid_date($dateString)
+{
+	try
+	{
+		return (new DateTime($dateString)) !== false;
+	}
+	catch(Exception $e)
+	{
+		return false;
+	}
+}
+
+/**
+ * check if given permissions are met
+ */
+function has_write_permissions($value, $permissions = '')
+{
+	if (!$permissions)
+		$permissions = $value;
+	$permissions = explode(',', $permissions);
+
+	$CI =& get_instance();
+	$CI->load->library('AuthLib');
+	$CI->load->library('PermissionLib');
+
+	return $CI->permissionlib->hasAtLeastOne(
+		$permissions,
+		'sometable',
+		PermissionLib::WRITE_RIGHT
+	);
+}
+
+/**
+ * check if has permissions for a studiengang_kz
+ */
+function has_permissions_for_stg($studiengang_kz, $permissions = '')
+{
+	if (!$permissions)
+		return false;
+	$permissions = explode(',', $permissions);
+
+	$CI =& get_instance();
+	$CI->load->library('AuthLib');
+	$CI->load->library('PermissionLib');
+
+	foreach ($permissions as $perm) {
+		if (strpos($perm, PermissionLib::PERMISSION_SEPARATOR) === false) {
+			$CI->addError(
+				'The given permission does not use the correct format',
+				FHCAPI_Controller::ERROR_TYPE_GENERAL
+			);
+			return false;
+		}
+
+		list($perm, $accesstype) = explode(PermissionLib::PERMISSION_SEPARATOR, $perm);
+		$at = '';
+		if (strpos($accesstype, PermissionLib::READ_RIGHT) !== false)
+			$at = PermissionLib::SELECT_RIGHT; // S
+		if (strpos($accesstype, PermissionLib::WRITE_RIGHT) !== false)
+			$at .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
+
+		if ($CI->permissionlib->isBerechtigt($perm, $at, $studiengang_kz))
+			return true;
+	}
+
+	return false;
+}

application/helpers/hlp_header_helper.php

@@ -96,7 +96,8 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 			app_root: "'.APP_ROOT.'",
 			ci_router: "'.$indexPage.'",
 			called_path: "'.$calledPath.'",
-			called_method: "'.$calledMethod.'"
+			called_method: "'.$calledMethod.'",
+			user_language: "'.$user_language.'"
 		};';
 	$toPrint .= "\n";
 	$toPrint .= '</script>';

application/language/english/form_validation_lang.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2019 - 2022, CodeIgniter Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package	CodeIgniter
+ * @author	EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @copyright	Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/)
+ * @license	https://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ * @since	Version 1.0.0
+ * @filesource
+ */
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+$lang['form_validation_has_write_permissions']	= 'You have no rights to edit {field} field.';
+$lang['form_validation_is_valid_date']	= 'The date format is invalid or out of range.';
+$lang['form_validation_has_permissions_for_stg']	= 'You have no rights for stg {field}.';

application/libraries/AnrechnungLib.php

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

application/libraries/AuthLib.php

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

application/libraries/DmsLib.php

@@ -595,6 +595,8 @@ class DmsLib
 		if (isError($insDmsResult)) return $insDmsResult;
 
 		$upload_data['dms_id'] = getData($insDmsResult);
+		if(isset($upload_data['file_type']) && !isset($dms['mimetype']))
+			$dms['mimetype'] = $upload_data['file_type'];
 
 		// Insert DMS version
 		$insVersionResult = $this->_ci->DmsVersionModel->insert(

application/libraries/DocsboxLib.php

@@ -0,0 +1,304 @@
+<?php
+/* Copyright (C) 2022 fhcomplete.net
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+require_once(dirname(__FILE__).'/../../vendor/nategood/httpful/bootstrap.php');
+
+use \ZipArchive as ZipArchive;
+
+/**
+ * Simple client to convert documents using Docsbox
+ */
+class DocsboxLib
+{
+	const ERROR = 1;
+	const SUCCESS = 0;
+	const STATUS_FINISHED = 'finished'; // Docsbox status when a document conversion ended
+	const STATUS_QUEUED = 'queued'; // Docsbox status when a file has been queued for the conversion
+	const STATUS_STARTED = 'started'; // Docsbox status when a file has started being worked
+	const STATUS_WORKING = 'working'; // Docsbox status when a file is being converted
+	const OUTPUT_FILENAME = 'out.zip.pdf'; // File name used by docsbox to save a converted document
+
+	const DEFAULT_FORMAT = 'pdf'; // Default supported format
+
+	// -------------------------------------------------------------------------------------------------
+	// Public static methods
+
+	/**
+	 * Static method used to convert a document using a Docsbox installation (local/remote) over the network
+	 * It return 0 on success and any other integer on error
+	 * NOTE: currently format is not supported
+	 */
+	public static function convert($inputFileName, $outputFileName, $format)
+	{
+		// If a format has not been given
+		if (($format == null) || ($format != null && ctype_space($format) === true)) $format = self::DEFAULT_FORMAT;
+
+		// Posts the file to docsbox
+		$queueId = self::_postFile($inputFileName);
+		// If an error occurred
+		if ($queueId == null) return self::ERROR;
+
+		// Checks and waits if the file has been converted
+		$resultUrl = self::_checkConvertion($queueId);
+		// If an error occurred
+		if ($resultUrl == null) return self::ERROR;
+
+		// Download and rename the converted file
+		$downloaded = self::_downloadFile($resultUrl, $outputFileName);
+		// If an error occurred
+		if (!$downloaded) return self::ERROR;
+
+		return self::SUCCESS;
+	}
+
+	// -------------------------------------------------------------------------------------------------
+	// Private static methods
+
+	/**
+	 * Posts the given file to a Docsboxserver and checks the response to return a valid queue id
+	 * On failure it returns a null value
+	 */
+	private static function _postFile($inputFileName)
+	{
+		$queueId = null;
+
+		try
+		{
+			// Posts the given file and expects a response in JSON format
+			$postFileResponse = \Httpful\Request::post(DOCSBOX_SERVER.DOCSBOX_PATH_API)
+				->attach(array('file' => $inputFileName))
+				->expectsJson()
+				->send();
+
+			// Checks that:
+			// - the response is not empty
+			// - the reponse body has the property id
+			// - the property id is a valid string
+			// - the reponse body has the property status
+			// - docsbox queued the conversion of the posted file
+			if (is_object($postFileResponse)
+				&& isset($postFileResponse->body)
+				&& isset($postFileResponse->body->id)
+				&& $postFileResponse->body->id != '' && $postFileResponse->body->id != null
+				&& isset($postFileResponse->body->status)
+				&& $postFileResponse->body->status == self::STATUS_QUEUED)
+			{
+				$queueId = $postFileResponse->body->id;
+			}
+			else
+			{
+				// If docsbox refused to convert the posted file
+				if (isset($postFileResponse->body->status)
+					&& $postFileResponse->body->status != self::STATUS_QUEUED)
+				{
+					error_log(
+						'Docsbox did not queue the posted file. Returned status: '.
+						$postFileResponse->body->status
+					);
+				}
+				else // any other generic error
+				{
+					error_log(
+						'An error occurred while posting to docsbox. Response: '.
+						print_r($postFileResponse, 1)
+					);
+				}
+			}
+		}
+		catch(\Httpful\Exception\ConnectionErrorException $cee) // Httpful exception
+		{
+			error_log($cee->getMessage());
+		}
+		catch (Exception $e) // any other exception
+		{
+			error_log($e->getMessage());
+		}
+
+		return $queueId;
+	}
+
+	/**
+	 * Check the status of the file convertion identified by the given queue element id
+	 * A URL is returned with the path where it is possible to download the converted file
+	 * If an error occurred then a null value is returned
+	 */
+	private static function _checkConvertion($queueId)
+	{
+		$resultUrl = null;
+		$startConvertionsTime = time(); // time when the file conversion has started
+
+		// Until a timeout has occurred
+		while (time() - $startConvertionsTime <= DOCSBOX_CONVERSION_TIMEOUT)
+		{
+			sleep(DOCSBOX_WAITING_SLEEP_TIME); // takes a nap on every round
+
+			try
+			{
+				// Calls the docsbox server to check the status of the
+				// file conversion using the provided queue id
+				// it expects a response in JSON format
+				$getStatusResponse = \Httpful\Request::get(DOCSBOX_SERVER.DOCSBOX_PATH_API.$queueId)
+					->expectsJson()
+					->send();
+
+				// Checks that:
+				// - the response is not empty
+				// - the reponse body has the property id
+				// - the property id is a valid string
+				// - the reponse body has the property status
+				// - docsbox is working the conversion of the posted file
+				if (is_object($getStatusResponse)
+					&& isset($getStatusResponse->body->id)
+					&& $getStatusResponse->body->id != '' && $getStatusResponse->body->id != null
+					&& isset($getStatusResponse->body->status))
+				{
+					// Checks that docsbox has finished working on the file conversion
+					// and that there is a valid resultUrl property
+					if ($getStatusResponse->body->status == self::STATUS_FINISHED
+						&& isset($getStatusResponse->body->result_url)
+						&& $getStatusResponse->body->result_url != ''
+						&& $getStatusResponse->body->result_url != null)
+					{
+						$resultUrl = $getStatusResponse->body->result_url;
+						break;
+					}
+					// Just started or still working on it
+					elseif ($getStatusResponse->body->status == self::STATUS_WORKING
+						|| $getStatusResponse->body->status == self::STATUS_STARTED)
+					{
+						// go on!
+					}
+					else // any other status is abnormal
+					{
+						error_log(
+							'Not valid status for queue element: '.$queueId.'. Response: '.
+							print_r($getStatusResponse, 1)
+						);
+						break; // interrupt the loop on error
+					}
+				}
+				else // if the response from the docsbox server is not valid
+				{
+					error_log(
+						'An error occurred while checking the docsbox activity. Response: '.
+						print_r($getStatusResponse, 1)
+					);
+					break; // interrupt the loop on error
+				}
+			}
+			catch(\Httpful\Exception\ConnectionErrorException $cee) // Httpful exception
+			{
+				error_log($cee->getMessage());
+				break; // interrupt the loop on error
+			}
+			catch (Exception $e) // any other exception
+			{
+				error_log($e->getMessage());
+				break; // interrupt the loop on error
+			}
+		}
+
+		return $resultUrl;
+	}
+
+	/**
+	 * Download the converted file using the provided URL, unzip it, and renames it into the provided file name
+	 */
+	private static function _downloadFile($resultUrl, $outputFileName)
+	{
+		$downloaded = false; // pessimistic assumption
+
+		try
+		{
+			// Download the file
+			$getFileResponse = \Httpful\Request::get(DOCSBOX_SERVER.$resultUrl)->send();
+
+			// If the downloaded file content is valid and not empty
+			if (isset($getFileResponse->body)
+				&& $getFileResponse->body != null
+				&& $getFileResponse->body != '')
+			{
+				// Output directory where to unzip the downloaded zip file
+				$outputDirectory = dirname($outputFileName);
+				// The path and name of the downloaded zip file
+				$temporaryDownloadedZip = sys_get_temp_dir().'/'.basename($resultUrl);
+
+				// Write the file content into a temporary directory and file
+				if (file_put_contents($temporaryDownloadedZip, $getFileResponse->body) != false)
+				{
+					$zipArchive = new ZipArchive;
+
+					// Open and extract the dowloaded zip file into the directory of the output file
+					if ($zipArchive->open($temporaryDownloadedZip) === true
+						&& $zipArchive->extractTo($outputDirectory) === true
+						&& $zipArchive->close() === true)
+					{
+						// Opened, extracted and closed!
+
+						// Rename the extracted file to the given output file name
+						if (rename($outputDirectory.'/'.self::OUTPUT_FILENAME, $outputFileName))
+						{
+							$downloaded = true;
+						}
+						else
+						{
+							error_log(
+								'An error occurred while renaming the extracted file: '.
+								$outputDirectory.'/'.self::OUTPUT_FILENAME.' into: '.
+								$outputFileName
+							);
+						}
+					}
+					else
+					{
+						error_log(
+							'An error occurred while working the dowloaded zip file: '.
+							$temporaryDownloadedZip
+						);
+					}
+				}
+				else // if an error occurred while writing
+				{
+					error_log(
+						'An error occurred while writing the file content to: '.
+						$temporaryDownloadedZip
+					);
+				}
+			}
+			else // if the downloaded file is not valid
+			{
+				error_log(
+					'An error occurred while downloading the file from the docsbox server: '.
+					print_r($getFileResponse, 1)
+				);
+			}
+		}
+		catch(\Httpful\Exception\ConnectionErrorException $cee)
+		{
+			error_log($cee->getMessage());
+		}
+		catch (Exception $e)
+		{
+			error_log($e->getMessage());
+		}
+
+		return $downloaded;
+	}
+}
+

application/libraries/DocumentLib.php

@@ -14,20 +14,28 @@ class DocumentLib
 		// Gets CI instance
 		$this->ci =& get_instance();
 
-		exec('unoconv --version', $ret_arr);
-
-		if(isset($ret_arr[0]))
+		// Which document converter has to be used
+		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
 		{
-			$hlp = explode(' ', $ret_arr[0]);
-			if(isset($hlp[1]))
-			{
-				$this->unoconv_version = $hlp[1];
-			}
-			else
-				show_error('Could not get Unoconv Version');
+			// Use docsbox!!
 		}
 		else
-			show_error('Unoconv not found - Please install Unoconv');
+		{
+			exec('unoconv --version', $ret_arr);
+
+			if(isset($ret_arr[0]))
+			{
+				$hlp = explode(' ', $ret_arr[0]);
+				if(isset($hlp[1]))
+				{
+					$this->unoconv_version = $hlp[1];
+				}
+				else
+					show_error('Could not get Unoconv Version');
+			}
+			else
+				show_error('Unoconv not found - Please install Unoconv');
+		}
 	}
 
 	/**
@@ -57,9 +65,16 @@ class DocumentLib
 			case 'application/vnd.ms-word':
 			case 'application/vnd.oasis.opendocument.text':
 			case 'text/plain':
-				// Unoconv Version 0.6 seems to fail on converting TXT Files
-				if ($this->unoconv_version == '0.6')
-					return error();
+				if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
+				{
+					// Use docsbox
+				}
+				else
+				{
+					// Unoconv Version 0.6 seems to fail on converting TXT Files
+					if ($this->unoconv_version == '0.6')
+						return error();
+				}
 
 				$ret = $this->convert($filename, $outFile, 'pdf');
 				if(isSuccess($ret))
@@ -105,6 +120,7 @@ class DocumentLib
 
 		finfo_close($finfo);
 
+		$out = null;
 		exec($cmd, $out, $ret);
 		if ($ret != 0)
 		{
@@ -123,13 +139,26 @@ class DocumentLib
 	 */
 	public function convert($inFile, $outFile, $format)
 	{
-		if ($this->unoconv_version == '0.6')
-			$command = 'unoconv -f %1$s  %3$s > %2$s';
-		else
-			$command = 'unoconv -f %s --output %s %s 2>&1';
-		$command = sprintf($command, $format, $outFile, $inFile);
+		$ret = 0;
 
-		exec($command, $out, $ret);
+		// If it is set to use docsbox
+		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
+		{
+			require_once(dirname(__FILE__).'/../application/libraries/DocsboxLib.php');
+
+			$ret = DocsboxLib::convert($inFile, $outFile, $format);
+		}
+		else // otherwise use unoconv
+		{
+			if ($this->unoconv_version == '0.6')
+				$command = 'unoconv -f %1$s  %3$s > %2$s';
+			else
+				$command = 'unoconv -f %s --output %s %s 2>&1';
+			$command = sprintf($command, $format, $outFile, $inFile);
+
+			$out = null;
+			exec($command, $out, $ret);
+		}
 
 		if ($ret != 0)
 		{
@@ -191,6 +220,7 @@ class DocumentLib
 		$cmd .= '/countspaces {  [ exch { dup 32 ne { pop } if  } forall ] length } bind def  >> ';
 		$cmd .= 'setpagedevice viewJPEG"';
 
+		$out = null;
 		exec($cmd, $out, $ret);
 		if ($ret != 0)
 		{

application/libraries/FilterCmptLib.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (C) 2022 fhcomplete.org
  *
@@ -36,6 +37,7 @@ class FilterCmptLib
 	const SESSION_METADATA = 'datasetMetadata';
 	const SESSION_ROW_NUMBER = 'rowNumber';
 	const SESSION_TIMEOUT = 'sessionTimeout';
+	const SESSION_ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// Session dataset elements
 	const SESSION_DATASET = 'dataset';
@@ -62,6 +64,7 @@ class FilterCmptLib
 
 	// ...to specify permissions that are needed to use this FilterCmpt
 	const REQUIRED_PERMISSIONS = 'requiredPermissions';
+	const ENCRYPTED_COLUMNS = 'encryptedColumns';
 
 	// ...stament to retrieve the dataset
 	const QUERY = 'query';
@@ -102,6 +105,7 @@ class FilterCmptLib
 	private $_filterKurzbz;
 	private $_query;
 	private $_requiredPermissions;
+	private $_encryptedColumns;
 	private $_reloadDataset;
 	private $_sessionTimeout;
 
@@ -504,10 +508,12 @@ class FilterCmptLib
 			$saveCustomFilter = true;
 		}
 
-		if ($saveCustomFilter === true) 
+		if ($saveCustomFilter === true)
 		{
-			$this->_setSessionElement(FilterCmptLib::SESSION_SIDE_MENU, 
-				$this->_generateFilterMenu($this->_app, $this->_datasetName));	
+			$this->_setSessionElement(
+				FilterCmptLib::SESSION_SIDE_MENU,
+				$this->_generateFilterMenu($this->_app, $this->_datasetName)
+			);
 		}
 		
 		return $saveCustomFilter;
@@ -717,6 +723,7 @@ class FilterCmptLib
 		$this->_filterKurzbz = null;
 		$this->_query = null;
 		$this->_requiredPermissions = null;
+		$this->_encryptedColumns = null;
 
 		$this->_reloadDataset = true; // by default the dataset is NOT cached in session
 		$this->_sessionTimeout = FilterCmptLib::SESSION_DEFAULT_TIMEOUT;
@@ -727,6 +734,12 @@ class FilterCmptLib
 			$this->_requiredPermissions = $filterCmptArray[FilterCmptLib::REQUIRED_PERMISSIONS];
 		}
 
+		// Retrieved the encrypted columns parameter if present
+		if (isset($filterCmptArray[FilterCmptLib::ENCRYPTED_COLUMNS]))
+		{
+			$this->_encryptedColumns = $filterCmptArray[FilterCmptLib::ENCRYPTED_COLUMNS];
+		}
+
 		// Parameters needed to retrieve univocally a filter from DB
 		if (isset($filterCmptArray[FilterCmptLib::APP]))
 		{
@@ -1129,7 +1142,7 @@ class FilterCmptLib
 			$this->_ci->load->model('system/Filters_model', 'FiltersModel');
 
 			// Execute the given SQL statement suppressing error messages
-			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery);
+			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery, null, $this->_encryptedColumns);
 		}
 
 		return $dataset;

application/libraries/FilterWidgetLib.php

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

application/libraries/IssuesLib.php

@@ -169,6 +169,9 @@ class IssuesLib
 		return $this->_changeIssueStatus($issue_id, $data, $user);
 	}
 
+	// --------------------------------------------------------------------------------------------------------------
+	// Private methods
+
 	/**
 	 * Changes status of an issue.
 	 * @param int $issue_id
@@ -215,8 +218,15 @@ class IssuesLib
 	 * @param string $inhalt_extern
 	 * @return object success or error
 	 */
-	private function _addIssue($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlertext_params = null, $resolution_params = null, $fehlercode_extern = null, $inhalt_extern = null)
-	{
+	private function _addIssue(
+		$fehlercode,
+		$person_id = null,
+		$oe_kurzbz = null,
+		$fehlertext_params = null,
+		$resolution_params = null,
+		$fehlercode_extern = null,
+		$inhalt_extern = null
+	) {
 		if (isEmptyString($person_id) && isEmptyString($oe_kurzbz))
 			return error("Person_id or oe_kurzbz must be set.");
 
@@ -226,9 +236,37 @@ class IssuesLib
 		if (hasData($fehlerRes))
 		{
 			$fehlertextVorlage = getData($fehlerRes)[0]->fehlertext;
-			$fehlertext = isEmptyArray($fehlertext_params) ? $fehlertextVorlage : vsprintf($fehlertextVorlage, $fehlertext_params);
 
-			$openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount($fehlercode, $person_id, $oe_kurzbz, $fehlercode_extern);
+			$fehlertext = $fehlertextVorlage;
+			if (!isEmptyArray($fehlertext_params))
+			{
+				if (count($fehlertext_params) != substr_count($fehlertextVorlage, '%s'))
+					return error('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehlercode);
+
+				$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
+			}
+
+			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))
 			{
@@ -238,20 +276,7 @@ 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(
 							'fehlercode' => $fehlercode,
@@ -267,8 +292,8 @@ class IssuesLib
 						)
 					);
 				}
-				else
-					return success($openIssueCount);
+				else // return success if issue already exists
+					return success("Issue already exists");
 			}
 			else
 				return error("Number of open issues could not be determined");

application/libraries/MailLib.php

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

application/libraries/PermissionLib.php

@@ -21,6 +21,8 @@ require_once(FHCPATH.'include/functions.inc.php');
 require_once(FHCPATH.'include/wawi_kostenstelle.class.php');
 require_once(FHCPATH.'include/benutzerberechtigung.class.php');
 
+use \benutzerberechtigung as benutzerberechtigung;
+
 class PermissionLib
 {
 	// Available rights in the DB
@@ -65,8 +67,10 @@ class PermissionLib
 		if (!is_cli())
 		{
 			// API Caller rights initialization
+			$authObj = $this->_ci->authlib->getAuthObj();
 			self::$bb = new benutzerberechtigung();
-			self::$bb->getBerechtigungen(($this->_ci->authlib->getAuthObj())->{AuthLib::AO_USERNAME});
+			if ($authObj)
+				self::$bb->getBerechtigungen($authObj->{AuthLib::AO_USERNAME});
 		}
 	}
 
@@ -143,19 +147,7 @@ class PermissionLib
 							if (strpos($permissions[$pCounter], PermissionLib::PERMISSION_SEPARATOR) !== false)
 							{
 								// Retrieves permission and required access type from the $requiredPermissions array
-								list($permission, $requiredAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permissions[$pCounter]);
-
-								$accessType = '';
-
-								// Set the access type
-								if (strpos($requiredAccessType, PermissionLib::READ_RIGHT) !== false)
-								{
-									$accessType = PermissionLib::SELECT_RIGHT; // S
-								}
-								if (strpos($requiredAccessType, PermissionLib::WRITE_RIGHT) !== false)
-								{
-									$accessType .= PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT; // UID
-								}
+								list($permission, $accessType) = $this->convertAccessType($permissions[$pCounter]);
 
 								if (!isEmptyString($accessType)) // if compliant
 								{
@@ -166,6 +158,16 @@ class PermissionLib
 									if ($checkPermissions === true) break;
 								}
 							}
+							elseif ($permissions[$pCounter] == Auth_Controller::PERM_ANONYMOUS)
+							{
+								$checkPermissions = true;
+								break;
+							}
+							elseif ($permissions[$pCounter] == Auth_Controller::PERM_LOGGED)
+							{
+								$checkPermissions = isLogged();
+								break;
+							}
 							else
 							{
 								show_error('The given permission does not use the correct format');
@@ -195,6 +197,24 @@ class PermissionLib
 		return $checkPermissions;
 	}
 
+	/**
+	 * Retrieves permission and required access type from the newly formatted permission string
+	 *
+	 * @param string $permission
+	 *
+	 * @return array
+	 */
+	public function convertAccessType($permission)
+	{
+		list($permission, $reqAccessType) = explode(PermissionLib::PERMISSION_SEPARATOR, $permission);
+		$accessType = '';
+		if (strpos($reqAccessType, PermissionLib::READ_RIGHT) !== false)
+			$accessType = PermissionLib::SELECT_RIGHT;
+		if (strpos($reqAccessType, PermissionLib::WRITE_RIGHT) !== false)
+			$accessType = PermissionLib::REPLACE_RIGHT.PermissionLib::DELETE_RIGHT;
+		return [$permission, $accessType];
+	}
+
 	/**
 	 * Checks if at least one of the permissions given as parameter (requiredPermissions) belongs to the authenticated user
 	 * It checks the given permissions against a given method (controller method name) and a given permission type (R and/or W)