fixed: Use of undefined constant & Undefined variable

Merge branch 'bug-71662/Bug_cancelVertrag_Berechtigungspruefung'
Projektarbeiten cancelVertrag permission check bugfix (added array_column to get oes)
2026-06-01 12:19:28 +00:00 · 2026-02-23 08:53:37 +01:00 · 2026-02-18 10:50:59 +01:00 · 2026-02-17 15:15:30 +01:00 · 2026-02-17 12:11:37 +01:00 · 2026-02-17 10:29:10 +01:00
276 changed files with 26293 additions and 4468 deletions
@@ -6,30 +6,30 @@ use CI3_Events as Events;
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["lehreinheit"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Lehreinheit/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
 	);
 });

 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["reservierung"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Reservierungen/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Reservierungen/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
 	);
 });

 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["ferien"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Feiertage/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Feiertage/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Cis/Renderer/Feiertage/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
 	);
 });

@@ -0,0 +1,43 @@
+<?php
+
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['turnitin_link'] = 'https://technikum-wien.turnitin.com/sso/sp/redwood/saml/5IyfmBr2OcSIaWQTKlFCGj/start';
+
+$config['old_abgabe_beurteilung_link'] = 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052';
+
+$config['PAABGABE_EMAIL_JOB_INTERVAL'] = '1 day';
+// used as APP_ROOT.URL_STUDENTS -> cis4
+$config['URL_STUDENTS'] = 'cis.php/Cis/Abgabetool/Student';
+// used as APP_ROOT.URL_MITARBEITER -> old cis 
+$config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
+// used as APP_ROOT.URL_MITARBEITER -> old cis 
+$config['URL_ASSISTENZ'] = 'index.ci.php/Cis/Abgabetool/Assistenz';
+
+// lehre.tbl_paabgabetyp bezeichnung
+//$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
+$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['abstract','zwischen', 'qualgate1', 'qualgate2']; // tbl_paabgabetyp pk
+// paabgabetypen for which betreuer is benachrichtigt via sammelmail
+$config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_BETREUER'] = ['qualgate1', 'qualgate2', 'end'];
+// paabgabetypen for which assistenz is benachrichtigt via sammelmail
+$config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_ASSISTENZ'] = ['end'];
+// paabgabetypen for which student is benachrichtigt via sammelmail -> basically all of them but still defined for consistency
+$config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_STUDENT'] = ['qualgate1', 'qualgate2', 'zwischen', 'note', 'abstract', 'end', 'enda'];
+//$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
+$config['ALLOWED_NOTEN_ABGABETOOL'] = [10, 14]; // tbl_note pk
+// benotete projektarbeiten sperren weitere terminanlage & bearbeitung, diese noten sind ausnahmen dieser Regel
+// wie zB "Nicht beurteilt" & "Noch nicht eingetragen"
+$config['NONFINAL_NOTEN_ABGABETOOL'] = [9];
+$config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
+
+$config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
+$config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ZWEITBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
+
+$config['SIGNATUR_CHECK_PAABGABETYPEN'] = ['end'];
+
+// to be used as "https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" for stg specific moodle routing
+$config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?idnumber=dl';
+
+$config['ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT'] = true;
+$config['ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER'] = true;
@@ -4,7 +4,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');


 // CMS Content Id for CIS4 Menu Root
-$config['cis_menu_root_content_id'] = 11087;
+$config['cis_menu_root_content_id'] = 11091;
 // send Mails for ProfilUpdate
 $config['cis_send_profil_update_mails'] = true;
 // Vilesci CI BaseUrl
@@ -7,3 +7,6 @@ $config['use_vuejs_dev_version'] = false;
 $config['use_bundled_javascript'] = false;
 // systemerror_mailto use in FHC-Alert Plugin - if empty Link will not be rendered
 $config['systemerror_mailto'] = '';
+// use fhcomplete_build_version as path element after public (requires apache mod_rewrite)
+// see <fhc_base_dir>/public/.htaccess_sample for details
+$config['use_fhcomplete_build_version_in_path'] = false;
@@ -336,3 +336,24 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'requiredPermissions' => array('admin:rw')
 	),
 );
+
+$config['navigation_menu']['apps'] = [
+	'stv' => [
+		'link' => site_url('studentenverwaltung'),
+		'description' => 'Studierendenverwaltung',
+		#'icon' => 'users',
+		'requiredPermissions' => array('admin:r', 'assistenz:r')
+	],
+	'lvv' => [
+		'link' => site_url('lVVerwaltung'),
+		'description' => 'LV Verwaltung',
+		#'icon' => 'person-chalkboard',
+		'requiredPermissions' => array('admin:r', 'assistenz:r')
+	],
+	'lav' => [
+		'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
+		'description' => 'Lehraufträge',
+		#'icon' => 'person-chalkboard',
+		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r')
+	]
+];
@@ -1,6 +1,6 @@
 <?php

-defined('BASEPATH') OR exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');

 /*
 | -------------------------------------------------------------------------
@@ -51,7 +51,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 |   my-controller/my-method -> my_controller/my_method
 */
 $route['default_controller'] = defined('CIS4') && CIS4 ? 'Cis4' : 'Vilesci';
-$route['translate_uri_dashes'] = FALSE;
+$route['translate_uri_dashes'] = false;

 // Class name conflicts
 $route['api/v1/organisation/[S|s]tudiengang/(:any)'] = 'api/v1/organisation/studiengang2/$1';
@@ -65,15 +65,22 @@ $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';

+$route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
+$route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
+$route['Abgabetool/Mitarbeiter'] = 'Cis/Abgabetool/Mitarbeiter';
+$route['Abgabetool/Student'] = 'Cis/Abgabetool/Student';
+$route['Abgabetool/Student/(:any)'] = 'Cis/Abgabetool/Student/$1';
+$route['Abgabetool/Deadlines'] = 'Cis/Abgabetool/Deadlines';
+
 // Studierendenverwaltung List Routes
 $route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/index';

 // (studiensemester_kurzbz)/inout[/(incoming|outgoing|gemeinsamestudien)]
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout'] = 'api/frontend/v1/stv/Students/index';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming/$1';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing/$1';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien/$1';

 // (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
 $route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
@@ -29,7 +29,7 @@ $config['similar'] = [

 $config['vector'] = [
 	'priority' => 1,
-	'rank' => "ts_rank({field}, to_tsquery('simple', {word}))",
-	'compare' => "to_tsquery('simple', {word}) @@ {field}"
+	'rank' => "ts_rank({field}, plainto_tsquery('simple', {word}))",
+	'compare' => "plainto_tsquery('simple', {word}) @@ {field}"
 ];

@@ -7,5 +7,43 @@ $CI =& get_instance();


 $config['student'] = $CI->config->item('student', 'search');
+$config['student']['searchfields']['pkz'] = [
+	'alias' => ['personenkennzeichen', 'personalid'],
+	'comparison' => 'equals',
+	'field' => 'matrikelnr'
+];
+$config['student']['searchfields']['matrnr'] = [
+	'alias' => ['matrikelnr', 'matrikelnummer', 'matrno', 'matriculationno', 'matriculationnumber', 'studno', 'studentno', 'studentnumber'],
+	'comparison' => 'equals',
+	'field' => 'matr_nr',
+	'join' => [
+		[
+			'table' => "public.tbl_prestudent",
+			'using' => "prestudent_id"
+		],
+		[
+			'table' => "public.tbl_person",
+			'using' => "person_id"
+		]
+	]
+];

 $config['prestudent'] = $CI->config->item('prestudent', 'search');
+$config['prestudent']['searchfields']['pkz'] = [
+	'alias' => ['personenkennzeichen', 'personalid'],
+	'comparison' => 'equals',
+	'field' => 'matrikelnr',
+	'join' => [
+		'table' => "public.tbl_student",
+		'using' => "prestudent_id"
+	]
+];
+$config['prestudent']['searchfields']['matrnr'] = [
+	'alias' => ['matrikelnr', 'matrikelnummer', 'matrno', 'matriculationno', 'matriculationnumber', 'studno', 'studentno', 'studentnumber'],
+	'comparison' => 'equals',
+	'field' => 'matr_nr',
+	'join' => [
+		'table' => "public.tbl_person",
+		'using' => "person_id"
+	]
+];
@@ -61,9 +61,13 @@ $config['tabs'] =
 		'notes' => [
 			//if true, the count of Messages will be shown in the header of the Tab Messages
 			'showCountNotes' => true
-		]
+		],
+		'combinePeople' => [
+			//multitab should only be shown with this length of selection
+			'validCountMulti' => 2,
+		],
 	];
-	
+
 // List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
 $fieldsZgvDoktor = ['zgvdoktorort', 'zgvdoktordatum', 'zgvdoktornation', 'zgvdoktor_erfuellt', 'zgvdoktor_code'];

@@ -84,6 +88,16 @@ if (!defined('ZGV_DOKTOR_ANZEIGEN') || !ZGV_DOKTOR_ANZEIGEN) {
 	);
 }

+$config['tabs']['projektarbeit']['defaultProjektbetreuerStunden'] =
+	defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR')
+	? FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR
+	: '0.0';
+$config['tabs']['projektarbeit']['defaultProjektbetreuerStundenDiplom'] =
+	defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER')
+	? FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER
+	: '0.0';
+$config['tabs']['projektarbeit']['defaultProjektbetreuerStundensatz'] = '80.0';
+
 $config['student_tab_order'] = [
 	'details',
 	'notes',
@@ -97,6 +111,7 @@ $config['student_tab_order'] = [
 	'grades',
 	'exam',
 	'exemptions',
+	'projektarbeit',
 	'finalexam',
 	'mobility',
 	'jointstudies',
@@ -109,7 +124,9 @@ $config['student_tab_order'] = [
 $config['students_tab_order'] = [
 	'banking',
 	'status',
+	'messages',
 	'groups',
 	'finalexam',
+	'combinePeople',
 	'archive',
 ];
@@ -14,10 +14,10 @@ class Abgabetool extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => self::PERM_LOGGED,
-			'getStudentProjektarbeitAbgabeFile' => self::PERM_LOGGED,
-			'Mitarbeiter' => self::PERM_LOGGED,
-			'Student' => self::PERM_LOGGED,
-			'Deadlines' => self::PERM_LOGGED
+			'Mitarbeiter' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
+			'Assistenz' => array('basis/abgabe_assistenz:rw'),
+			'Student' =>  array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
+			'Deadlines' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
 		]);
 	}

@@ -29,80 +29,69 @@ class Abgabetool extends Auth_Controller
 	 */
 	public function index()
 	{
+		// TODO: routing from index based on berechtigung?

 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);

-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+		} else {
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'Abgabetool']);
+		}
 	}

-	public function Student()
+	public function Student($student_uid_prop = '')
 	{
-
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
+		
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
+		} else {
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolStudent', 'student_uid_prop' => $student_uid_prop]);
+		}
 	}

 	public function Mitarbeiter()
 	{
-
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);

-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
+		} else {
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolMitarbeiter']);
+		}
 	}

+	public function Assistenz($stg_kz_prop = '')
+	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolAssistenz']);
+		} else {
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz', 'stg_kz_prop' => $stg_kz_prop]);
+		}
+	}
+	
 	public function Deadlines()
 	{
-
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);

-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
-	}
-
-
-	public function getStudentProjektarbeitAbgabeFile() 
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->helper('download');
-		
-		$paabgabe_id = $this->_ci->input->get('paabgabe_id');
-		$student_uid = $this->_ci->input->get('student_uid');
-
-		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id) || !isset($student_uid) || isEmptyString($student_uid))
-			$this->terminateWithJsonError($this->p->t('global', 'wrongParameters'), 'general');
-		
-		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-
-		$isZugeteilterBetreuer = count($this->_ci->ProjektarbeitModel->checkZuordnung($student_uid, getAuthUID())->retval) > 0;
-		
-		if(getAuthUID() == $student_uid || $isZugeteilterBetreuer) {
-			$file_path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
-			if(file_exists($file_path)) {
-				
-				header('Content-Description: File Transfer');
-				header('Content-Type: application/octet-stream');
-				header('Expires: 0');
-				header('Cache-Control: must-revalidate');
-				header('Pragma: public');
-				header('Content-Disposition: attachment; filename="'.basename($file_path).'"');
-				header('Content-Length: ' . filesize($file_path));
-
-				flush(); // send headers first just in case
-				readfile($file_path); // read file content to output buffer
-				
-			} else {
-				$this->terminateWithJsonError('File not found');
-			}
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
 		} else {
-			$this->terminateWithJsonError('Keine Zuordnung!');
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'DeadlinesOverview']);
 		}
 	}
 }
@@ -72,7 +72,7 @@ class Documents extends Auth_Controller

 		$stgs = [];
 		$stsemArray = [];
-		$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
+		$buchungstypen = defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : [];
 		$person_ids = [];
 		foreach ($stati as $status) {
 			$person_ids[] = $status->person_id;
@@ -14,7 +14,7 @@ class Pub extends Auth_Controller
 	{
 		parent::__construct(
 		    array(
-			'bild' => ['basis/cis:r']
+			'bild' => ['basis/cis:r', 'assistenz:r']
 		    )
 		);
 	}
@@ -20,11 +20,18 @@ class NeueNachricht extends Auth_Controller
 	 */
 	public function _remap()
 	{
+		$typeid = $this->input->post('typeid');
+		$ids = ($this->input->post('ids') && strpos($this->input->post('ids'), ',')) 
+			? explode(',', $this->input->post('ids'))
+			: $this->input->post('ids');
+
 		//now working
 		$this->load->view('Nachrichten', [
 			'permissions' => [
 				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
-			]
+			],
+			'ids' => $ids,
+			'typeid' => $typeid
 		]);
 	}
 }
@@ -32,6 +32,10 @@ class Studentenverwaltung extends Auth_Controller
 				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
 				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht'),
 				'system/change_outputformat' => $this->permissionlib->getOE_isEntitledFor('system/change_outputformat'),
+				'student/editBakkZgv' => $this->permissionlib->getSTG_isEntitledFor('student/editBakkZgv') ?: array(),
+				'student/editMakkZgv' => $this->permissionlib->getSTG_isEntitledFor('student/editMakkZgv') ?: array(),
+				'student/editDokZgv' => $this->permissionlib->getSTG_isEntitledFor('student/editDokZgv') ?: array(),
+				'student/editBismelden' => $this->permissionlib->isBerechtigt('student/editBismelden')
 			],
 			'variables' => [
 				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
@@ -442,6 +442,10 @@ class Documents extends FHCAPI_Controller
 			'betreuerart_kurzbz',
 			'studiensemester_kurzbz'
 		] as $key) {
+			if (in_array($xsl, array('Ausbildungsver', 'AusbVerEng')) && $key === 'uid')
+			{
+				continue;
+			}
 			$value = $this->input->post_get($key);
 			if ($value !== null)
 				$params .= '&' . $key . '=' . urlencode($value);
@@ -38,34 +38,9 @@ class Lehre extends FHCAPI_Controller
 		parent::__construct([
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
-			'Pruefungen' => self::PERM_LOGGED,
-			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
-			'getStudentProjektabgaben' => self::PERM_LOGGED,
-			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
-			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
-			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED,
-			'postProjektarbeitAbgabe' => self::PERM_LOGGED,
-			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED,
-			'postSerientermin' => self::PERM_LOGGED,
-			'fetchDeadlines' => self::PERM_LOGGED // TODO: mitarbeiter recht prüfen
+			'Pruefungen' => self::PERM_LOGGED
 		]);
-
-		$this->load->library('PhrasesLib');
-
-		$this->loadPhrases(
-			array(
-				'global',
-				'ui',
-				'abgabetool'
-			)
-		);
-
-		$this->load->helper('hlp_sancho_helper');
 		
-		require_once(FHCPATH . 'include/studiengang.class.php');
-		require_once(FHCPATH . 'include/student.class.php');
-		require_once(FHCPATH . 'include/projektarbeit.class.php');
-		require_once(FHCPATH . 'include/projektbetreuer.class.php');
 	}

 	//------------------------------------------------------------------------------------------------------------------
@@ -125,557 +100,5 @@ class Lehre extends FHCAPI_Controller

 		$this->terminateWithSuccess($result);
 	}
-
-	/**
-	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool
-	 */
-	public function getStudentProjektabgaben() {
-		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
-
-		// TODO: error messages
-		
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		$projektarbeit_obj = new projektarbeit();
-		if($projektarbeit_id==-1)
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		if(!$projektarbeit_obj->load($projektarbeit_id))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		$paIsCurrent = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
-		
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
-		
-		// TODO: fetch zweitbetreuer
-		
-		$this->terminateWithSuccess(array($ret, $paIsCurrent));
-	}
-
-	/**
-	 * fetches all projektarbeiten and betreuer for a given student_uid used in cis4 student abgabetool
-	 */
-	public function getStudentProjektarbeiten($uid)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-
-		if (!isset($uid) || isEmptyString($uid))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		
-		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
-		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
-		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
-		
-		if ($isMitarbeiter && $isZugeteilterBetreuer){
-			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer($uid);
-		} else {
-			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
-		}
-
-		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));	
-	}
-	
-	
-
-	/**
-	 * projektarbeit - upload for zwischenabgaben in cis4 student abgabetool
-	 */
-	public function postStudentProjektarbeitZwischenabgabe() 
-	{
-
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		$paabgabe_id = $_POST['paabgabe_id'];
-		$student_uid = $_POST['student_uid'];
-		$bperson_id = $_POST['bperson_id'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
-			|| !isset($student_uid) || isEmptyString($student_uid)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
-			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
-			
-			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
-
-				exec('chmod 640 "'.PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf'.'"');
-
-				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$res = $this->PaabgabeModel->update($paabgabe_id, array(
-					'abgabedatum' => date('Y-m-d'),
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				));
-				
-				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
-				$this->terminateWithSuccess($res);
-			} else {
-				$this->terminateWithError('Error moving File');
-			}
-			
-		} else {
-			$this->terminateWithError('File missing');
-		}
-		
-	}
-
-	/**
-	 * upload für finale abgaben aka Endupload in cis4 student abgabetool
-	 */
-	public function postStudentProjektarbeitEndupload() 
-	{
-
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		$paabgabe_id = $_POST['paabgabe_id'];
-		$student_uid = $_POST['student_uid'];
-		$sprache = $_POST['sprache'];
-		$abstract = $_POST['abstract'];
-		$abstract_en = $_POST['abstract_en'];
-		$schlagwoerter = $_POST['schlagwoerter'];
-		$schlagwoerter_en = $_POST['schlagwoerter_en'];
-		$seitenanzahl = $_POST['seitenanzahl'];
-		$bperson_id = $_POST['bperson_id'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-		
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
-			|| !isset($student_uid) || isEmptyString($student_uid)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		
-		// TODO: maybe check for other params aswell?
-
-		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
-			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
-
-			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
-
-				// Loads Libraries
-				$this->load->library('SignatureLib');
-				
-				// Check if the document is signed
-				$signaturVorhanden = true;
-				$signList = SignatureLib::list(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
-				if (is_array($signList) && count($signList) > 0)
-				{
-					// The document is signed
-					$uploadedDocumentSigned = 'The document is signed';
-				}
-				elseif ($signList === null)
-				{
-					$uploadedDocumentSigned = 'WARNING: signature server error';
-				}
-				else
-				{
-					$signaturVorhanden = false;
-					$uploadedDocumentSigned = 'No document signature found';
-				}
-				$this->addMeta('signaturInfo', $uploadedDocumentSigned);
-
-				if ($signaturVorhanden === false)
-				{
-					$this->signaturFehltEmail($student_uid);
-				}
-				
-				// TODO error handle get data has data the updates
-				// update projektarbeit cols
-				$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-				$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
-					,$schlagwoerter, $schlagwoerter_en, $seitenanzahl);
-
-				
-				// update paabgabe datum
-				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$res = $this->PaabgabeModel->update($paabgabe_id, array(
-					'abgabedatum' => date('Y-m-d'),
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				));
-				
-				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
-
-				$this->terminateWithSuccess($res);
-			} else {
-				$this->terminateWithError('Error moving File');
-			}
-
-		} else {
-			$this->terminateWithError('File missing');
-		}
-		
-	}
-
-	private function signaturFehltEmail($student_uid) {
-		
-		
-		// Mail an Studiengang wenn keine Signatur gefunden wurde
-		$student = new student();
-		if(!$student->load($student_uid))
-			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
-
-		$stg_obj = new studiengang();
-		if(!$stg_obj->load($student->studiengang_kz))
-			$this->terminateWithError($this->p->t('global','fehlerBeimLesenAusDatenbank'), 'general');
-
-		$subject = 'Abgabe ohne Signatur';
-		$tomail = $stg_obj->email;
-		$data = array(
-			'vorname' => $student->vorname,
-			'nachname' => $student->nachname,
-			'studiengang' => $stg_obj->bezeichnung
-		);
-
-		$mailres = sendSanchoMail(
-			'ParbeitsbeurteilungSiganturFehlt',
-			$data,
-			$tomail,
-			$subject,
-			'sancho_header_min_bw.jpg',
-			'sancho_footer_min_bw.jpg'
-		);
-	}
-	
-	private function sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid) {
-
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		
-		$resBetr = $this->ProjektarbeitModel->getProjektbetreuerAnrede($bperson_id);
-
-		$projektarbeit_obj = new projektarbeit();
-
-		if(!$projektarbeit_obj->load($projektarbeit_id))
-			$this->terminateWithError('Ungueltiger Eintrag');
-
-		$num_rows_sem = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
-
-		if( null === $num_rows_sem || false === $num_rows_sem )
-		{
-			$this->terminateWithError($this->p->t('abgabetool','fehlerAktualitaetProjektarbeit'), 'general');
-		}
-		
-		foreach($resBetr->retval as $betreuerRow) {
-
-			// query student benutzer view for every betreuer row
-			$studentUser = $this->ProjektarbeitModel->getProjektarbeitBenutzer($student_uid)->retval[0];
-			
-			// TODO: hasdata, getData etc
-
-			// 1. Begutachter mail ohne Token
-			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
-			$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
-			$projekttyp_kurzbz = $projektarbeit_obj->projekttyp_kurzbz;
-			$subject = $projektarbeit_obj->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
-			$abgabetyp = $paabgabetyp_kurzbz == 'end' ? 'Endabgabe' : 'Zwischenabgabe';
-
-			$maildata = array();
-			$maildata['geehrt'] = "geehrte".($betreuerRow->anrede=="Herr"?"r":"");
-			$maildata['anrede'] = $betreuerRow->anrede;
-			$maildata['betreuer_voller_name'] = $betreuerRow->first;
-			$maildata['student_anrede'] = $studentUser->anrede;
-			$maildata['student_voller_name'] = trim($studentUser->titelpre." ".$studentUser->vorname." ".$studentUser->nachname." ".$studentUser->titelpost);
-			$maildata['abgabetyp'] = $abgabetyp;
-			$maildata['parbeituebersichtlink'] = "<p><a href='".APP_ROOT."cis/private/lehre/abgabe_lektor_frameset.html'>Zur Projektarbeitsübersicht</a></p>";
-			$maildata['bewertunglink'] = $num_rows_sem >= 1 && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
-			$maildata['token'] = "";
-			
-			$mailres = sendSanchoMail(
-				'ParbeitsbeurteilungEndupload',
-				$maildata,
-				$betreuerRow->mitarbeiter_uid."@".DOMAIN,
-				$subject,
-				'sancho_header_min_bw.jpg',
-				'sancho_footer_min_bw.jpg',
-				get_uid()."@".DOMAIN);
-
-			if(!$mailres)
-			{
-				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-			}
-
-			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
-			if ($paabgabetyp_kurzbz == 'end')
-			{
-				// Zweitbegutachter holen
-				$zweitbegutachter = new projektbetreuer();
-				$zweitbegutachterRes = $zweitbegutachter->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid);
-
-				if ($zweitbegutachterRes)
-				{
-					$zweitbegutachterResults = $zweitbegutachter->result;
-
-					foreach ($zweitbegutachterResults as $begutachter)
-					{
-						// token generieren, wenn noch nicht vorhanden und notwendig (wird in methode überprüft)
-						$tokenGenRes = $zweitbegutachter->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
-
-						if (!$tokenGenRes)
-						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
-						}
-						
-						// Zweitbegutachter (evtl. mit Token) holen
-						$zweitbegutachterMitToken = new projektbetreuer();
-						$begutachterMitTokenRes = $zweitbegutachterMitToken->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
-
-						if (!$begutachterMitTokenRes)
-						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
-						}
-						
-						// Email an Zweitbegutachter senden
-						if (isset($zweitbegutachterMitToken->result[0]))
-						{
-							$begutachterMitToken = $zweitbegutachterMitToken->result[0];
-
-							$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
-							$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
-							$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
-							$intern = isset($begutachterMitToken->uid);
-							$mail_link = $intern ? $mail_fulllink : $mail_baselink;
-
-							$zweitbetmaildata = array();
-							$zweitbetmaildata['geehrt'] = "geehrte" . ($begutachterMitToken->anrede == "Herr" ? "r" : "");
-							$zweitbetmaildata['anrede'] = $begutachterMitToken->anrede;
-							$zweitbetmaildata['betreuer_voller_name'] = $begutachterMitToken->voller_name;
-							$zweitbetmaildata['student_anrede'] = $maildata['student_anrede'];
-							$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
-							$zweitbetmaildata['abgabetyp'] = $abgabetyp;
-							$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
-							$zweitbetmaildata['bewertunglink'] = $num_rows_sem >= 1 ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
-							$zweitbetmaildata['token'] = $num_rows_sem >= 1 && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
-							
-							$mailres = sendSanchoMail(
-								'ParbeitsbeurteilungEndupload',
-								$zweitbetmaildata,
-								$begutachterMitToken->email,
-								$subject,
-								'sancho_header_min_bw.jpg',
-								'sancho_footer_min_bw.jpg',
-								get_uid()."@".DOMAIN
-							);
-
-							if (!$mailres)
-							{
-								$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public function getMitarbeiterProjektarbeiten() {
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-
-		$boolParamStr = $this->input->get('showall');
-		$trueStrings = ['true', '1'];
-		$falseStrings = ['false', '0'];
-
-		// Handle missing or invalid parameter
-		if ($boolParamStr === null) {
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		}
-		$boolParamStrLower = strtolower($boolParamStr);
-
-		if (in_array($boolParamStrLower, $trueStrings, true)) {
-			$showAllBool = true;
-		} elseif (in_array($boolParamStrLower, $falseStrings, true)) {
-			$showAllBool = false;
-		} else {
-//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		}
-		
-		$projektarbeiten = $this->ProjektarbeitModel->getMitarbeiterProjektarbeiten(getAuthUID(), $showAllBool);
-		
-		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
-	}
-	
-	public function postProjektarbeitAbgabe() {
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		$paabgabe_id = $_POST['paabgabe_id'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-		$datum = $_POST['datum'];
-		$fixtermin = $_POST['fixtermin'];
-		$kurzbz = $_POST['kurzbz'];
-
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
-			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-		
-		if($paabgabe_id == -1) {
-			$result = $this->PaabgabeModel->insert(
-				array(
-					'projektarbeit_id' => $projektarbeit_id,
-					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
-					'fixtermin' => $fixtermin,
-					'datum' => $datum,
-					'kurzbz' => $kurzbz,
-					'insertvon' => getAuthUID(),
-					'insertamum' => date('Y-m-d H:i:s')
-				)
-			);
-			
-			$this->terminateWithSuccess($result);
-		} else {
-			$result = $this->PaabgabeModel->update(
-				$paabgabe_id,
-				array(
-					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
-					'datum' => $datum,
-					'kurzbz' => $kurzbz,
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				)
-			);
-
-			$this->terminateWithSuccess($result);
-		}
-	}
-	
-	public function deleteProjektarbeitAbgabe() {
-		$paabgabe_id = $_POST['paabgabe_id'];
-		
-		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-
-		$result = $this->PaabgabeModel->load($paabgabe_id);
-		$result = $this->getDataOrTerminateWithError($result);
-		
-		if(count($result) == 0) 
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		// TODO: berechtigung?
-		if($result[0]->insertvon === getAuthUID()) {
-			$result = $this->PaabgabeModel->delete($paabgabe_id);
-			$result = $this->getDataOrTerminateWithError($result);
-			$this->terminateWithSuccess($result);
-		}
-
-		$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-	}
-
-	/**
-	 * endpoint for adding the same paabgabe for multiple projektarbeiten
-	 * can be slow for large n since it queries twice per projektarbeit_id
-	 */
-	public function postSerientermin() {
-		$projektarbeit_ids = $_POST['projektarbeit_ids'];
-		$datum = $_POST['datum'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-		$bezeichnung = $_POST['bezeichnung'];
-		$kurzbz = $_POST['kurzbz'];
-
-		if (!isset($projektarbeit_ids) || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
-			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($kurzbz) || isEmptyString($kurzbz)
-			|| !isset($bezeichnung) || isEmptyString($bezeichnung)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		
-		// old script checks if there already are tbl_paabgabe entries with exact date, type & kurzbz
-		// for each termin - good to check that in principle but should not matter in this place. if necessary
-		// duplicate abgabetermine can be easily deleted manually, also via cronjob@night.
-		
-		// since this entry includes the kurzbz string match, it should have only ever mattered when there were
-		// multiple users entering the exact same set of (date, type, kurzbz) - which is a much more narrow case than the
-		// general "saveMultiple" function should handle
-		
-		// old script afterwards again queries if user is not the zweitbetreuer of any id - this is blocked in the ui
-		// and should never unintentionally happen
-		
-		// TODO: check berechtigung &/|| zuordnung?
-		
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		
-		$res = [];
-		foreach ($projektarbeit_ids as $projektarbeit_id) {
-			
-			$result = $this->PaabgabeModel->insert(
-				array(
-					'projektarbeit_id' => $projektarbeit_id,
-					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
-					'fixtermin' => false,
-					'datum' => $datum,
-					'kurzbz' => $kurzbz,
-					'insertvon' => getAuthUID(),
-					'insertamum' => date('Y-m-d H:i:s')
-				)
-			);
-			
-			$data = $this->getDataOrTerminateWithError($result);
-			
-//			$res[] = $data;
-
-			// send mail to student
-			$result = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
-			$data = $this->getDataOrTerminateWithError($result);
-
-//			$this->addMeta('emaildata'.$projektarbeit_id, $data);
-			
-			$datetime = new DateTime($datum);
-			$dateEmailFormatted = $datetime->format('d.m.Y');
-			
-			$anredeFillString = $data[0]->anrede=="Herr"?"r":"";
-			
-			$fullFormattedNameString = trim($data[0]->titelpre." ".$data[0]->vorname." ".$data[0]->nachname." ".$data[0]->titelpost);
-			$res[] = $fullFormattedNameString;
-			
-			// Prepare mail content
-			$body_fields = array(
-				'anrede' => $data[0]->anrede,
-				'anredeFillString' => $anredeFillString,
-				'datum' => $dateEmailFormatted,
-				'bezeichnung' => $bezeichnung,
-				'fullFormattedNameString' => $fullFormattedNameString,
-				'kurzbz' => $kurzbz
-			);
-
-			$email = $data[0]->uid."@".DOMAIN;
-			
-			sendSanchoMail(
-				'neuerAbgabetermin',
-				$body_fields,
-				$email,
-				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
-			);
-		}
-		
-		$this->terminateWithSuccess($res);
-		
-	}
-	
-	public function fetchDeadlines() {
-		$person_id = $_POST['person_id'];
-		
-		if (!isset($person_id) || isEmptyString($person_id))
-			$person_id = getAuthPersonId();
-		
-		
-		if($person_id !== getAuthPersonId()) {
-			$this->load->library('PermissionLib');
-			$isAdmin = $this->permissionlib->isBerechtigt('admin');
-			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
-		}
-
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-		$result = $this->PaabgabeModel->getDeadlines($person_id);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
 }

@@ -119,7 +119,19 @@ class Lehrveranstaltung extends FHCAPI_Controller
 			if (hasData($lehreinheiten_data))
 			{
 				$lehreinheiten = getData($lehreinheiten_data);
-				$rowData->_children = $lehreinheiten;
+
+				if (!isset($row->_children))
+				{
+					$row->_children = $lehreinheiten;
+				}
+				else
+				{
+					if (!is_array($row->_children))
+					{
+						$row->_children = [$row->_children];
+					}
+					$row->_children = array_merge($row->_children, $lehreinheiten);
+				}
 			}

 			if (!isEmptyString($row->studienplan_lehrveranstaltung_id_parent))
@@ -637,7 +637,7 @@ class ProfilUpdate extends FHCAPI_Controller
 				//? Send email to the Studiengangsassistentinnen
 				$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
 				$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
-				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
+				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id and public.tbl_student.studiengang_kz = public.tbl_prestudent.studiengang_kz");
 				$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
 				$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
 				$this->StudentModel->addGroupBy(["public.tbl_studiengang.email"]);
@@ -12,8 +12,8 @@ class Gruppe extends FHCAPI_Controller
 			'add' => ['admin:rw', 'assistenz:rw'],
 			'delete' => ['admin:rw', 'assistenz:rw'],
 			'deleteFromLVPlan' => ['admin:rw', 'assistenz:rw'],
-			'getBenutzer' => ['admin:r', 'assistenz:r'],
-			'getAll' => ['admin:r', 'assistenz:r'],
+			'getBenutzerSearch' => ['admin:r', 'assistenz:r'],
+			'getAllSearch' => ['admin:r', 'assistenz:r'],
 			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
 		]);

@@ -22,7 +22,8 @@ class Gruppe extends FHCAPI_Controller
 		$this->_ci->load->library('PhrasesLib');
 		$this->loadPhrases(
 			array(
-				'ui'
+				'ui',
+				'lehre'
 			)
 		);

@@ -91,11 +92,11 @@ class Gruppe extends FHCAPI_Controller
 		$lehreinheitgruppe_id = $this->input->post('lehreinheitgruppe_id');

 		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id) || is_null($lehreinheitgruppe_id) || !ctype_digit((string)$lehreinheitgruppe_id))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);

 		$lehreinheitgruppe_result = $this->_ci->LehreinheitgruppeModel->loadWhere(array('lehreinheitgruppe_id' => $lehreinheitgruppe_id));
 		if (!hasData($lehreinheitgruppe_result) || isError($lehreinheitgruppe_result))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);

 		$this->checkPermission($lehreinheit_id);

@@ -108,15 +109,33 @@ class Gruppe extends FHCAPI_Controller
 	}


-	public function getAll()
+	public function getAllSearch()
 	{
+		$query = $this->input->get('query');
+
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', $query);
+
 		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
 											studiengang_kz,
 											semester,
 											bezeichnung,
 											gid,
 											\'false\' as lehrverband');
-		$gruppen_result = $this->_ci->GruppeModel->loadWhere(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
+		$this->_ci->GruppeModel->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
+		$this->_ci->GruppeModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->GruppeModel->db->group_start();
+			$this->_ci->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->group_end();
+		}
+		$this->_ci->GruppeModel->db->group_end();
+
+		$gruppen_result = $this->_ci->GruppeModel->load();

 		$gruppen_array = array();

@@ -135,7 +154,18 @@ class Gruppe extends FHCAPI_Controller
 		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
 		$this->_ci->LehrverbandModel->addOrder('verband');
 		$this->_ci->LehrverbandModel->addOrder('gruppe');
-		$lehrverband_result = $this->_ci->LehrverbandModel->loadWhere(array('tbl_lehrverband.aktiv' => true));
+		$this->_ci->LehrverbandModel->db->where(array('tbl_lehrverband.aktiv' => true));
+
+		$this->_ci->LehrverbandModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->LehrverbandModel->db->group_start();
+			$this->_ci->LehrverbandModel->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->group_end();
+		}
+		$this->_ci->LehrverbandModel->db->group_end();
+		$lehrverband_result = $this->_ci->LehrverbandModel->load();

 		$lehrverband_array = array();

@@ -150,15 +180,40 @@ class Gruppe extends FHCAPI_Controller
 		$this->terminateWithSuccess($all_gruppen);
 	}

-	public function getBenutzer()
+	public function getBenutzerSearch()
 	{
+		$query = $this->input->get('query');
+
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', $query);
+
 		$this->_ci->PersonModel->addSelect('vorname, nachname, uid, semester, UPPER(CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz)) as studiengang');
 		$this->_ci->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
 		$this->_ci->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid', 'LEFT');
 		$this->_ci->PersonModel->addJoin('public.tbl_student', 'uid = student_uid', 'LEFT');
 		$this->_ci->PersonModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');

-		$personen = $this->_ci->PersonModel->loadWhere(array('tbl_benutzer.aktiv' => true));
+		$this->_ci->PersonModel->db->where(array('tbl_benutzer.aktiv' => true));
+
+		$this->_ci->PersonModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->PersonModel->db->group_start();
+			$this->_ci->PersonModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
+			$this->_ci->PersonModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
+			$this->_ci->PersonModel->db->or_where('uid ILIKE', "%" . $word . "%");
+			$this->_ci->PersonModel->db->or_where('CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz) ILIKE', "%" . $word . "%");
+
+			if (is_numeric($word))
+			{
+				$this->_ci->PersonModel->db->or_where('semester', $word);
+			}
+			$this->_ci->PersonModel->db->group_end();
+		}
+		$this->_ci->PersonModel->db->group_end();
+		$personen = $this->_ci->PersonModel->load();
 		$this->terminateWithSuccess(hasData($personen) ? getData($personen) : array());
 	}

@@ -169,6 +169,10 @@ class Lehreinheit extends FHCAPI_Controller
 		{
 			$value = $this->input->post($field);

+			if ($field === 'lehre')
+			{
+				$value = (bool)$value;
+			}
 			if ($value !== null)
 			{
 				$updateData[$field] = $value;
@@ -281,15 +285,43 @@ class Lehreinheit extends FHCAPI_Controller
 	public function delete()
 	{
 		$lehreinheit_id = $this->input->post('lehreinheit_id');
-		$lehreinheit = $this->checkLehreinheit($lehreinheit_id);
-		$this->checkPermission($lehreinheit->lehreinheit_id);

-		$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
+		$errors = array();
+		if (is_array($lehreinheit_id))
+		{
+			foreach ($lehreinheit_id as $le_id)
+			{
+				$lehreinheit = $this->checkLehreinheit($le_id);
+				$this->checkPermission($lehreinheit->lehreinheit_id);

-		if (isError($result))
-			$this->terminateWithValidationErrors(getError($result));
+				$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);

-		$this->terminateWithSuccess('Erfolgreich geloescht');
+				if (isError($result))
+				{
+					$errors[] = getError($result);
+				}
+			}
+		}
+		else
+		{
+			$lehreinheit = $this->checkLehreinheit($lehreinheit_id);
+			$this->checkPermission($lehreinheit->lehreinheit_id);
+
+			$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
+
+			if (isError($result))
+				$this->terminateWithError(getError($result));
+		}
+
+		if (!isEmptyArray($errors))
+		{
+			if (count($errors) !== count($lehreinheit_id))
+				$this->terminateWithSuccess(array('errors' => $errors));
+			else
+				$this->terminateWithError($errors);
+		}
+		else
+			$this->terminateWithSuccess('Erfolgreich geloescht');
 	}

 	public function update()
@@ -15,7 +15,7 @@ class Lektor extends FHCAPI_Controller
 			'deleteLVPlan' => ['admin:rw', 'assistenz:rw'],
 			'deletePerson' => ['admin:rw', 'assistenz:rw'],
 			'getLehrfunktionen' => ['admin:r', 'assistenz:r'],
-			'getLektoren' => ['admin:r', 'assistenz:r'],
+			'getLektorenSearch' => ['admin:r', 'assistenz:r'],
 			'getLektorenByLE' => ['admin:r', 'assistenz:r'],
 			'getLektorDaten' => ['admin:r', 'assistenz:r'],
 			'getLektorVertrag' => ['admin:r', 'assistenz:r'],
@@ -208,12 +208,35 @@ class Lektor extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($this->_ci->LehrfunktionModel->load()));
 	}

-	public function getLektoren()
+	public function getLektorenSearch()
 	{
+		$query = $this->input->get('query');
+
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', $query);
+
 		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
 		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
 		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
-		$this->terminateWithSuccess(getData($this->_ci->MitarbeiterModel->loadWhere(array('public.tbl_benutzer.aktiv' => true))));
+
+		$this->_ci->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
+
+		$this->_ci->MitarbeiterModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->MitarbeiterModel->db->group_start();
+			$this->_ci->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->group_end();
+		}
+		$this->_ci->MitarbeiterModel->db->group_end();
+		$this->_ci->MitarbeiterModel->addOrder('nachname');
+		$this->_ci->MitarbeiterModel->addOrder('vorname');
+		$result = $this->_ci->MitarbeiterModel->load();
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
 	}

 	private function checkLehreinheit($lehreinheit_id)
@@ -47,22 +47,22 @@ class Setup extends FHCAPI_Controller
 	{
 		$tabs['details'] = array (
 			'title' =>  'Details',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Details.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Details.js'),
 			'config' => []
 		);
 		$tabs['gruppen'] = array (
 			'title' =>  'Gruppen',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Gruppen.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Gruppen.js'),
 			'config' => []
 		);
 		$tabs['lektor'] = array (
 			'title' =>  'LektorInnenzuteilung',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Lektor.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Lektor.js'),
 			'config' => []
 		);
 		$tabs['notiz'] = array (
 			'title' =>  'Notizen',
-			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Notiz.js',
+			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Notiz.js'),
 			'config' => []
 		);
 		$this->terminateWithSuccess($tabs);
@@ -5,7 +5,7 @@ if (!defined('BASEPATH'))

 class Tags extends Tag_Controller
 {
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
+	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:r'];

 	public function __construct()
 	{
@@ -1,6 +1,5 @@
 <?php

-
 if (!defined('BASEPATH')) exit('No direct script access allowed');

 class Messages extends FHCAPI_Controller
@@ -14,13 +13,15 @@ class Messages extends FHCAPI_Controller
 			'getMsgVarsPrestudent' => ['admin:r', 'assistenz:r'],
 			'getMsgVarsLoggedInUser' => ['admin:r', 'assistenz:r'],
 			'getNameOfDefaultRecipient' => ['admin:r', 'assistenz:r'],
+			'getNameOfDefaultRecipients' => ['admin:r', 'assistenz:r'],
 			'sendMessage' => ['admin:r', 'assistenz:r'],
 			'deleteMessage' => ['admin:r', 'assistenz:r'],
-			'getVorlagentext' => ['admin:r', 'assistenz:r'],
+			'getDataVorlage' => ['admin:r', 'assistenz:r'],
 			'getPreviewText' => ['admin:r', 'assistenz:r'],
 			'getReplyData' => ['admin:r', 'assistenz:r'],
 			'getPersonId' => ['admin:r', 'assistenz:r'],
 			'getUid' => ['admin:r', 'assistenz:r'],
+			'getUids' => ['admin:r', 'assistenz:r'],
 		]);

 		//Load Models
@@ -37,7 +38,7 @@ class Messages extends FHCAPI_Controller

 		// Load language phrases
 		$this->loadPhrases([
-			'ui'
+			'ui', 'messages'
 		]);
 	}

@@ -52,11 +53,14 @@ class Messages extends FHCAPI_Controller

 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);

-		$data = $this->getDataOrTerminateWithError($result);
+		if (hasData($result))
+		{
+			$data = getData($result);
+			$this->addMeta('count', $data['count']);
+			$this->terminateWithSuccess($data['data']);
+		}

-		$this->addMeta('count', $data['count']);
-
-		$this->terminateWithSuccess($data['data']);
+		$this->terminateWithSuccess(array());
 	}

 	public function getVorlagen()
@@ -66,33 +70,23 @@ class Messages extends FHCAPI_Controller
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');

-		$data = $this->getDataOrTerminateWithError($result);
-		$oe_kurzbz = current($data);
+		if (hasData($result))
+		{
+			$this->load->model('system/Vorlage_model', 'VorlageModel');

-		$this->load->model('system/Vorlage_model', 'VorlageModel');
+			$data = getData($result);

-		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
-		$data = $this->getDataOrTerminateWithError($result);
+			$oe_kurzbz = array_column($data, 'oe_kurzbz');
+			$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz);

-		$this->terminateWithSuccess($data);
+			$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+		}

-		//If admin
-		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
-		$result = $this->VorlageModel->loadWhere(
-			array(
-				'mimetype' => 'text/html'
-			));
-
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess(array());
 	}

-	public function getVorlagentext($vorlage_kurzbz)
+	public function getDataVorlage($vorlage_kurzbz)
 	{
-		//$this->terminateWithError("vor " . $vorlage_kurzbz, self::ERROR_TYPE_GENERAL);
-		//$studiengang_kz = 227; //TODO(Manu) dynamisieren NULL
 		$studiengang_kz = 0;
 		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
 		$this->VorlagestudiengangModel->addOrder('version', 'DESC');
@@ -104,30 +98,53 @@ class Messages extends FHCAPI_Controller
 			]);

 		$data = $this->getDataOrTerminateWithError($result);
-
-		//not correct with Vorlage
 		$vorlage = current($data);
-
-		//$this->terminateWithSuccess($data);
-		$this->terminateWithSuccess($vorlage->text);
+		$this->terminateWithSuccess($vorlage);
 	}

-	public function getMessageVarsPerson($id, $typeId)
+	public function getMessageVarsPerson($typeId)
 	{
-		$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
-		$result = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
-		$data = $this->getDataOrTerminateWithError($result);
+		$ids = $this->input->post('ids');
+		$messageVarsPerson = [];

-		$this->terminateWithSuccess($data);
+		foreach ($ids as $id)
+		{
+			$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
+			$result = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
+			$data = $this->getDataOrTerminateWithError($result);
+			$messageVarsPerson[] = current($data);
+		}
+
+		$this->terminateWithSuccess($messageVarsPerson);
 	}

-	public function getMsgVarsPrestudent($id, $typeId)
+	public function getMsgVarsPrestudent($typeId)
 	{
-		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
-		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
-		$data = $this->getDataOrTerminateWithError($result);
+		$ids = $this->input->post('ids');
+		if(!is_array($ids)) {
+			$ids = array($ids);
+		}
+		$messageVarsPrestudent = [];

-		$this->terminateWithSuccess($data);
+		if($typeId == 'uid')
+		{
+			$prestudent_ids = [];
+			foreach ($ids as $id)
+			{
+				$prestudent_ids[] =  $this->_getPrestudentIdFromUid($id);
+			}
+		}
+		else
+			$prestudent_ids = $ids;
+
+		foreach ($prestudent_ids as $prestudent_id)
+		{
+			$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
+			$data = $this->getDataOrTerminateWithError($result);
+			$messageVarsPrestudent[] = current($data);
+		}
+
+		$this->terminateWithSuccess($messageVarsPrestudent);
 	}

 	public function getMsgVarsLoggedInUser()
@@ -138,27 +155,45 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}

-	public function getNameOfDefaultRecipient($id, $type_id)
+	public function getNameOfDefaultRecipients($type_id)
 	{
-		$id = ($type_id != 'person_id') ? $this->_getPersonId($id, $type_id) : $id;
+		$ids = $this->input->post('ids');
+		if(!is_array($ids)) {
+			$ids = array($ids);
+		}
+		$recipients = [];
+
+		if (empty($ids)) {
+
+			throw new InvalidArgumentException($this->p->t('ui', 'errorMissingOrInvalidParameters', ['parameter'=> 'Id(s)']), self::ERROR_TYPE_GENERAL);
+		}

 		$this->load->model('person/Person_model', 'PersonModel');
+		if($type_id != 'person_id'){
+			foreach ($ids as $id)
+			{
+				$person_id =  $this->_getPersonId($id, $type_id);
+				$result = $this->PersonModel->load($person_id);
+				$data = $this->getDataOrTerminateWithError($result);
+				$name = current($data);
+				$recipients[$id] = $name->vorname . " " . $name->nachname;
+			}
+		}
+		else {
+			foreach ($ids as $id) {
+				$result = $this->PersonModel->load($id);
+				$data = $this->getDataOrTerminateWithError($result);
+				$name = current($data);
+				$recipients[$id] = $name->vorname . " " . $name->nachname;
+			}
+		}

-		$result = $this->PersonModel->load($id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$name = current($data);
-
-		$this->terminateWithSuccess($name->vorname . " " . $name->nachname );
+		$this->terminateWithSuccess($recipients);
 	}

-	public function sendMessage($recipient_id)
+	public function sendMessage($typeId)
 	{
-		//has to be uid
-	//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
-
-		//default setting
-		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
-
+		$resultReturn = [];
 		$uid = getAuthUID();
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$result = $this->BenutzerModel->loadWhere(
@@ -196,49 +231,61 @@ class Messages extends FHCAPI_Controller
 		$body = $this->input->post('body');
 		$relationmessage_id = $this->input->post('relationmessage_id');

-		$typeId = $this->input->post('type_id');
-		$id = $this->input->post('id');
-
-		if($typeId == 'uid')
+		if (isset($_POST['ids']))
 		{
-			$prestudent_id = $this-> _getPrestudentIdFromUid($id);
-
-			//parseMessagetext for variables Prestudent
-			$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
-			$bodyParsed = $this->getDataOrTerminateWithError($result);
-		}
-		if($typeId == 'mitarbeiter_uid')
-		{
-			$person_id = $this->_getPersonId($id, $typeId);
-
-			$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
-			$bodyParsed = $this->getDataOrTerminateWithError($result);
-			$this->terminateWithError($bodyParsed, self::ERROR_TYPE_GENERAL);
-
-		}
-		elseif($typeId == 'person_id')
-		{
-			$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
-			$bodyParsed = $this->getDataOrTerminateWithError($result);
-		}
-		elseif($typeId == 'prestudent_id')
-		{
-		//	$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
-
-			$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
-			$bodyParsed = $this->getDataOrTerminateWithError($result);
-		}
-		else
-		{
-			$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
+			$ids = json_decode($_POST['ids']);
+			unset($_POST['ids']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
 		}

-		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
+		if (!is_array($ids)) {
+			$ids = [$ids];
+		}

-		$this->terminateWithSuccess($result);
+		foreach ($ids as $id)
+		{
+			$receiversPersonId = $typeId == "person_id" ? $id : $this->_getPersonId($id, $typeId);
+
+			if($typeId == 'uid')
+			{
+				$prestudent_id = $this-> _getPrestudentIdFromUid($id);
+
+				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
+				$bodyParsed = $this->getDataOrTerminateWithError($result);
+			}
+			if($typeId == 'mitarbeiter_uid')
+			{
+				$person_id = $this->_getPersonId($id, $typeId);
+
+				$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
+				$bodyParsed = $this->getDataOrTerminateWithError($result);
+			}
+			elseif($typeId == 'person_id')
+			{
+				$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
+				$bodyParsed = $this->getDataOrTerminateWithError($result);
+			}
+			elseif($typeId == 'prestudent_id')
+			{
+				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
+				$bodyParsed = $this->getDataOrTerminateWithError($result);
+			}
+			else
+			{
+				$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
+			}
+
+			$result =$this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
+			$data = $this->getDataOrTerminateWithError($result);
+			$resultReturn[] = current($data);
+
+		}
+		$this->terminateWithSuccess($resultReturn);
 	}

-	public function getPreviewText($id, $type_id)
+	public function getPreviewText($type_id)
 	{
 		if (isset($_POST['data']))
 		{
@@ -246,39 +293,60 @@ class Messages extends FHCAPI_Controller
 			unset($_POST['data']);
 		}
 		else
-			$this->terminateWithError("Textbody missing ", self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('messages', 'errorMissingOrInvalidParameters', ['parameter'=> "Textbody"]), self::ERROR_TYPE_GENERAL);

-		switch($type_id)
+		if (isset($_POST['ids']))
 		{
-			case 'uid':
-				$prestudent_id = $this->_getPrestudentIdFromUid($id);
-				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
-				break;
-			case 'prestudent_id':
-				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
-				break;
-			case 'person_id':
-				$result = $this->MessagesModel->parseMessageTextPerson($id, $data);
-				break;
-			case 'mitarbeiter_uid':
-				{
-					$person_id = $this->_getPersonId($id, $type_id);
-					$result = $this->MessagesModel->parseMessageTextPerson($person_id, $data);
-				}
-				break;
-			default:
-				$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
-				break;
+			$ids = json_decode($_POST['ids']);
+			if(!is_array($ids))
+			{
+				$ids = array($ids);
+			}
+			unset($_POST['ids']);
 		}
+		else
+			$this->terminateWithError($this->p->t('ui', 'errorMissingOrInvalidParameters', ['parameter'=> 'Id(s)']), self::ERROR_TYPE_GENERAL);

-		$bodyParsed = $this->getDataOrTerminateWithError($result);
+		$bodyParsed = [];
+
+		foreach ($ids as $id)
+		{
+			switch($type_id)
+			{
+				case 'uid':
+					$prestudent_id = $this->_getPrestudentIdFromUid($id);
+					$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
+					$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+					break;
+				case 'prestudent_id':
+					$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
+					$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+					break;
+				case 'person_id':
+					$result = $this->MessagesModel->parseMessageTextPerson($id, $data);
+					$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+					break;
+				case 'mitarbeiter_uid':
+					{
+						$person_id = $this->_getPersonId($id, $type_id);
+						$result = $this->MessagesModel->parseMessageTextPerson($person_id, $data);
+						$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+					}
+					break;
+				default:
+					$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $type_id]), self::ERROR_TYPE_GENERAL);
+					break;
+			}
+		}

 		$this->terminateWithSuccess($bodyParsed);
 	}

 	public function getReplyData($messageId)
 	{
-		//TODO(Manu) validation of messageId: if number
+		if (!is_numeric($messageId)) {
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value'=> 'Message ID']), self::ERROR_TYPE_GENERAL);
+		}

 		$this->MessageModel->addSelect('public.tbl_msg_message.*');
 		$this->MessageModel->addSelect('r.*');
@@ -301,7 +369,6 @@ class Messages extends FHCAPI_Controller
 		$replyBody = $this->_getReplyBody($body, $dataMessage[0]->nachname, $dataMessage[0]->vorname, $dataMessage[0]->insertamum);

 		$dataMessage[0]->replyBody = $replyBody;
-		$dataMessage[0]->rest = "Help Manu";
 		$dataMessage[0]->replySubject = $prefix . $subject;

 		$this->terminateWithSuccess($dataMessage);
@@ -349,6 +416,11 @@ class Messages extends FHCAPI_Controller
 				['prestudent_id' => $id]
 			);
 		}
+		else
+		{
+			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
+		}
+

 		$data = $this->getDataOrTerminateWithError($result);
 		$person = current($data);
@@ -356,8 +428,11 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($person->person_id);
 	}

-	public function getUid($id, $typeId)
+	public function getUids($typeId)
 	{
+		$ids = $this->input->post('ids');
+		$benutzerIds = [];
+
 		if (!$typeId)
 		{
 			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Type ID']), self::ERROR_TYPE_GENERAL);
@@ -365,39 +440,50 @@ class Messages extends FHCAPI_Controller
 		elseif ($typeId == 'person_id')
 		{
 			$this->load->model('person/Benutzer_model', 'BenutzerModel');
-			$result = $this->BenutzerModel->loadWhere(
-				['person_id' => $id]
-			);
+			foreach ($ids as $id)
+			{
+				$result = $this->BenutzerModel->loadWhere(
+					['person_id' => $id]
+				);
+				$data = $this->getDataOrTerminateWithError($result);
+				$benutzer = current($data);
+
+				$benutzerIds[$id] = $benutzer->uid;
+			}
 		}
 		elseif($typeId == 'prestudent_id')
 		{
 			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			$result = $this->PrestudentModel->loadWhere(
-				['prestudent_id' => $id]
-			);
+			foreach ($ids as $id)
+			{
+				$result = $this->PrestudentModel->loadWhere(
+					['prestudent_id' => $id]
+				);

-			$data = $this->getDataOrTerminateWithError($result);
-			$person = current($data);
-			$person_id = $person->person_id;
+				$data = $this->getDataOrTerminateWithError($result);
+				$person = current($data);
+				$person_id = $person->person_id;

-			$this->load->model('person/Benutzer_model', 'BenutzerModel');
-			$result = $this->BenutzerModel->loadWhere(
-				['person_id' => $person_id]
-			);
+				$this->load->model('person/Benutzer_model', 'BenutzerModel');
+				$result = $this->BenutzerModel->loadWhere(
+					['person_id' => $person_id]
+				);
+				$data = $this->getDataOrTerminateWithError($result);
+				$benutzer = current($data);
+
+				$benutzerIds[$id] = $benutzer->uid;
+			}
 		}
 		elseif($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
 		{
-			$this->terminateWithSuccess($id);
+			$this->terminateWithSuccess($ids);
 		}
 		else
 		{
-			$this->terminateWithError("MESSAGES::getUID logic for type_id " . $typeId . " not defined yet", self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
 		}

-		$data = $this->getDataOrTerminateWithError($result);
-		$benutzer = current($data);
-
-		$this->terminateWithSuccess($benutzer->uid);
+		$this->terminateWithSuccess($benutzerIds);
 	}

 	private function _getPersonId($id, $typeId)
@@ -416,11 +502,16 @@ class Messages extends FHCAPI_Controller
 				['prestudent_id' => $id]
 			);
 		}
+		else
+		{
+			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
+		}
+

 		$data = $this->getDataOrTerminateWithError($result);
 		if (count($data) < 1)
 		{
-			$this->terminateWithError('Error: Messages API no person_id found.');
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 		}
 		$person = current($data);

@@ -429,7 +520,6 @@ class Messages extends FHCAPI_Controller

 	private function _getPrestudentIdFromUid($uid)
 	{
-	//	$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->loadWhere(
 			['student_uid' => $uid]
@@ -438,7 +528,7 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		if (count($data) < 1)
 		{
-			$this->terminateWithError('Error: Messages API no prestudent_id found.');
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
 		}
 		$student = current($data);

@@ -463,4 +553,4 @@ class Messages extends FHCAPI_Controller
 			date_format(date_create($sentDate), 'd.m.Y H:i'), $receiverName, $receiverSurname, $body
 		);
 	}
-}
+}
@@ -0,0 +1,69 @@
+<?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 Studienplan extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct([
+			'getBySemester' => self::PERM_LOGGED
+		]);
+	}
+
+	public function getBySemester()
+	{
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+		$ausbildungssemester = $this->input->get('ausbildungssemester') ?: null;
+		$orgform_kurzbz = $this->input->get('orgform_kurzbz') ?: null;
+
+		if (!$studiengang_kz || !is_numeric($studiengang_kz))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiengangskennzahl']), self::ERROR_TYPE_GENERAL);
+
+		if (!$studiensemester_kurzbz)
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiensemester']), self::ERROR_TYPE_GENERAL);
+
+		if (isset($ausbildungssemester) && !is_numeric($ausbildungssemester))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Ausbildungssemester']), self::ERROR_TYPE_GENERAL);
+
+
+		//~ $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())
+		//~ {
+			//~ $this->addMeta('fail2', 'fail2');
+			//~ return $this->terminateWithValidationErrors($this->form_validation->error_array());
+		//~ }
+
+
+		$this->addMeta('stg_kz', $studiengang_kz);
+		$this->addMeta('sem', $studiensemester_kurzbz);
+		$this->addMeta('sem2', $ausbildungssemester);
+		$this->addMeta('org', $orgform_kurzbz);
+
+		$result = $this->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester, $orgform_kurzbz);
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+}
@@ -25,7 +25,8 @@ class Studiensemester extends FHCAPI_Controller
 			array(
 				'getAll' => self::PERM_LOGGED,
 				'getAktNext' => self::PERM_LOGGED,
-				'getStudienjahrByStudiensemester' => self::PERM_LOGGED
+				'getStudienjahrByStudiensemester' => self::PERM_LOGGED,
+				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED
 			)
 		);
 		// Load model StudiensemesterModel
@@ -152,4 +153,17 @@ class Studiensemester extends FHCAPI_Controller

 		$this->terminateWithSuccess((getData(success($studienjahrObj))));
 	}
+
+	public function getAllStudiensemesterAndAktOrNext() {
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder("start", "DESC");
+		$result = $this->StudiensemesterModel->getAktOrNextSemester();
+		$aktuell = getData($result)[0];
+		$this->StudiensemesterModel->addSelect('*');
+		$result = $this->StudiensemesterModel->load();
+		$studiensemester = getData($result);
+		
+		$this->terminateWithSuccess(array($studiensemester, $aktuell));
+	}
 }
@@ -20,8 +20,6 @@ class Abschlusspruefung extends FHCAPI_Controller
 			'getBeurteilungen' => ['admin:rw', 'assistenz:rw'],
 			'getAkadGrade' => ['admin:rw', 'assistenz:rw'],
 			'getMitarbeiter' => ['admin:rw', 'assistenz:rw'],
-			'getAllMitarbeiter' => ['admin:rw', 'assistenz:rw'],
-			'getAllPersons' => ['admin:rw', 'assistenz:rw'],
 			'getPruefer' => ['admin:rw', 'assistenz:rw'],
 			'getTypStudiengang' => ['admin:rw', 'assistenz:rw'],
 			'checkForExistingExams' => ['admin:rw', 'assistenz:rw'],
@@ -102,35 +100,45 @@ class Abschlusspruefung extends FHCAPI_Controller
 	{
 		$abschlusspruefung_id = $this->input->post('id');

-		$this->AbschlusspruefungModel->addSelect('lehre.tbl_abschlusspruefung.*');
-		$this->AbschlusspruefungModel->addSelect("
-			CASE
-				WHEN pruefer1 IS NOT NULL
-				THEN CONCAT(p1.nachname, ' ', p1.vorname, COALESCE(' ' || p1.titelpre, ''))
-				ELSE NULL
-   			 END AS p1
-   		");
-		$this->AbschlusspruefungModel->addSelect("
-			CASE
-				WHEN pruefer2 IS NOT NULL
-				THEN CONCAT(p2.nachname, ' ', p2.vorname, COALESCE(' ' || p2.titelpre, ''))
-				ELSE NULL
-   			 END AS p2
-		");
-		$this->AbschlusspruefungModel->addSelect("
-			CASE
-				WHEN pruefer3 IS NOT NULL
-				THEN CONCAT(p3.nachname, ' ', p3.vorname, COALESCE(' ' || p3.titelpre, ''))
-				ELSE NULL
-   			 END AS p3
-		");
-		$this->AbschlusspruefungModel->addSelect("
-			CASE
-				WHEN vorsitz IS NOT NULL
-				THEN CONCAT(pv.nachname, ' ', pv.vorname, COALESCE(' ' || pv.titelpre, ''), ' (', ben.uid , ')' )
-				ELSE NULL
-   			 END AS pv
-		");
+		$this->AbschlusspruefungModel->addSelect(
+			'lehre.tbl_abschlusspruefung.*,
+			p1.person_id AS p1_person_id, p1.vorname AS p1_vorname, p1.nachname AS p1_nachname,
+			p1.titelpre AS p1_titelpre, p1.titelpost AS p1_titelpost,
+			p2.person_id AS p2_person_id, p2.vorname AS p2_vorname, p2.nachname AS p2_nachname,
+			p2.titelpre AS p2_titelpre, p2.titelpost AS p2_titelpost,
+			p3.person_id AS p3_person_id, p3.vorname AS p3_vorname, p3.nachname AS p3_nachname,
+			p3.titelpre AS p3_titelpre, p3.titelpost AS p3_titelpost,
+			pv.person_id AS pv_person_id, pv.vorname AS pv_vorname, pv.nachname AS pv_nachname,
+			pv.titelpre AS pv_titelpre, pv.titelpost AS pv_titelpost, ben.uid AS pv_uid'
+		);
+		//~ $this->AbschlusspruefungModel->addSelect("
+			//~ CASE
+				//~ WHEN pruefer1 IS NOT NULL
+				//~ THEN CONCAT(p1.nachname, ' ', p1.vorname, COALESCE(' ' || p1.titelpre, ''))
+				//~ ELSE NULL
+   			 //~ END AS p1
+   		//~ ");
+		//~ $this->AbschlusspruefungModel->addSelect("
+			//~ CASE
+				//~ WHEN pruefer2 IS NOT NULL
+				//~ THEN CONCAT(p2.nachname, ' ', p2.vorname, COALESCE(' ' || p2.titelpre, ''))
+				//~ ELSE NULL
+   			 //~ END AS p2
+		//~ ");
+		//~ $this->AbschlusspruefungModel->addSelect("
+			//~ CASE
+				//~ WHEN pruefer3 IS NOT NULL
+				//~ THEN CONCAT(p3.nachname, ' ', p3.vorname, COALESCE(' ' || p3.titelpre, ''))
+				//~ ELSE NULL
+   			 //~ END AS p3
+		//~ ");
+		//~ $this->AbschlusspruefungModel->addSelect("
+			//~ CASE
+				//~ WHEN vorsitz IS NOT NULL
+				//~ THEN CONCAT(pv.nachname, ' ', pv.vorname, COALESCE(' ' || pv.titelpre, ''), ' (', ben.uid , ')' )
+				//~ ELSE NULL
+   			 //~ END AS pv
+		//~ ");
 		$this->AbschlusspruefungModel->addJoin('public.tbl_benutzer ben', 'ON (ben.uid = lehre.tbl_abschlusspruefung.vorsitz)', 'LEFT');
 		$this->AbschlusspruefungModel->addJoin('public.tbl_person pv', 'ON (pv.person_id = ben.person_id)', 'LEFT');
 		$this->AbschlusspruefungModel->addJoin('public.tbl_person p1', 'ON (p1.person_id = lehre.tbl_abschlusspruefung.pruefer1)', 'LEFT');
@@ -220,8 +228,10 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->terminateWithSuccess($typStudiengang);
 	}

-	public function getMitarbeiter($searchString)
+	public function getMitarbeiter()
 	{
+		$searchString = $this->input->get('searchString') ?? '';
+
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');

 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'mitAkadGrad');
@@ -232,8 +242,10 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->terminateWithSuccess($result ?: []);
 	}

-	public function getPruefer($searchString)
+	public function getPruefer()
 	{
+		$searchString = $this->input->get('searchString') ?? '';
+
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');

 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'ohneMaUid');
@@ -444,58 +456,4 @@ class Abschlusspruefung extends FHCAPI_Controller
 		}
 		$this->terminateWithSuccess('step3');
 	}
-
-	/*
-	* returns list of all Mitarbeiter
-	* as key value list to be used in select or autocomplete
-	*/
-	public function getAllMitarbeiter()
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
-		$sql = "
-			SELECT
-			    ma.mitarbeiter_uid as mitarbeiter_uid,
-				CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid, ')') as label
-			FROM
-			  public.tbl_mitarbeiter ma
-			  JOIN public.tbl_benutzer bn ON (bn.uid = ma.mitarbeiter_uid)
-			  JOIN public.tbl_person p ON (p.person_id = bn.person_id)
-			ORDER BY
-			p.nachname ASC
-			";
-
-		$result = $this->MitarbeiterModel->execReadOnlyQuery($sql);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	/*
-	* returns list of all Persons
-	* as key value list to be used in select or autocomplete
-	*/
-	public function getAllPersons()
-	{
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		$sql = "
-			SELECT
-			    p.vorname, p.nachname, p.person_id,
-				CONCAT(p.nachname, ' ', p.vorname) as label
-			FROM
-			  public.tbl_person p
-			 -- JOIN public.tbl_benutzer bn ON (p.person_id = bn.person_id)
-			  -- and bn.aktiv = 'true'
-			ORDER BY
-			p.nachname ASC
-			";
-
-		//TODO(manu) check if filter active benutzer
-
-		$result = $this->PersonModel->execReadOnlyQuery($sql);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
 }
@@ -39,7 +39,7 @@ class Archiv extends FHCAPI_Controller
 			'archive' => ['admin:w', 'assistenz:w'],
 			'download' => ['admin:w', 'assistenz:w'],
 			'update' => ['admin:w'],
-			'delete' => ['admin:w', 'assistenz:w']
+			'delete' => ['admin:w', 'assistenz:w'],
 		]);

 		// Load models
@@ -107,13 +107,9 @@ class Archiv extends FHCAPI_Controller

 		$result = $this->AkteModel->load($akte_id);

-
 		if (!hasData($result)) $this->terminateWithError('Akte not found');

-		$data = $this->getDataOrTerminateWithError($result);
-
 		$data = getData($result)[0];
-		//$this->addMeta("daa", $data->inhalt);

 		$fileObj = new stdClass();
 		if (isset($data->inhalt) && $data->inhalt != '')
@@ -133,12 +129,7 @@ class Archiv extends FHCAPI_Controller
 			//header("Content-type: $data->mimetype");
 			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
 			readfile($filename);
-			//echo base64_decode($data->inhalt);
 			die();
-			//~ $fileObj->file = $data->inhalt;
-			//~ $fileObj->name = $data->titel;
-			//~ $fileObj->mimetype = $data->mimetype;
-			//~ $fileObj->disposition = 'attachment';
 		}
 		else
 		{
@@ -146,12 +137,6 @@ class Archiv extends FHCAPI_Controller

 			$result = $this->aktelib->get($akte_id);
 		}
-
-	/*	$fileObj->filename
-	 * 	$fileObj->file
-	 * 	$fileObj->name
-	 * 	$fileObj->mimetype
-	 * 	$fileObj->disposition*/
 	}

 	/**
@@ -298,7 +298,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$reihungstestangetreten =
 			(isset($formData['reihungstestangetreten']) && !empty($formData['reihungstestangetreten']))
 				? $formData['reihungstestangetreten']
-				: null;
+				: false;
 		$aufnahmegruppe_kurzbz =
 			(isset($formData['aufnahmegruppe_kurzbz']) && !empty($formData['aufnahmegruppe_kurzbz']))
 				? $formData['aufnahmegruppe_kurzbz']
@@ -33,6 +33,9 @@ class Config extends FHCAPI_Controller
 	{
 		// TODO(chris): permissions
 		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'set' => ['admin:r', 'assistenz:r'],
+			'filter' => ['admin:r', 'assistenz:r'],
 			'student' => ['admin:r', 'assistenz:r'],
 			'students' => ['admin:r', 'assistenz:r']
 		]);
@@ -45,13 +48,255 @@ class Config extends FHCAPI_Controller
 			'lehre',
 			'stv',
 			'konto',
-			'abschlusspruefung'
+			'abschlusspruefung',
+			'projektarbeit'
 		]);

 		// Load Config
 		$this->load->config('stv');
 	}

+	/**
+	 * get App config
+	 */
+	public function get()
+	{
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$this->load->config('stv');
+
+		$config = [];
+
+		#number_displayed_past_studiensemester
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$number_displayed_past_studiensemester_default = $this->config->item('number_displayed_past_studiensemester_default');
+
+		$config['number_displayed_past_studiensemester'] = [
+			"type" => "number",
+			"label" => $this->p->t('stv', 'settings_no_displayed_past_sem'),
+			"value" => $data['number_displayed_past_studiensemester']
+				?? $number_displayed_past_studiensemester_default
+		];
+
+		#font_size
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_font_size']);
+		$data = $this->getDataOrTerminateWithError($result);
+		$config['font_size'] = [
+			"type" => "select",
+			"label" => $this->p->t('stv', 'settings_fontsize'),
+			"value" => $data['stv_font_size'] ?? "fs_normal",
+			"options" => [
+				"fs_xx-small" => $this->p->t('stv', 'settings_fontsize_xx-small'),
+				"fs_x-small" => $this->p->t('stv', 'settings_fontsize_x-small'),
+				"fs_small" => $this->p->t('stv', 'settings_fontsize_small'),
+				"fs_normal" => $this->p->t('stv', 'settings_fontsize_normal'),
+				"fs_big" => $this->p->t('stv', 'settings_fontsize_big'),
+				"fs_huge" => $this->p->t('stv', 'settings_fontsize_huge')
+			]
+		];
+
+		#others
+		Events::trigger('stv_config_get', function & () use (&$config) {
+			return $config;
+		});
+
+		$this->terminateWithSuccess($config);
+	}
+
+	/**
+	 * set App config
+	 */
+	public function set()
+	{
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'number_displayed_past_studiensemester',
+			$this->p->t('stv', 'settings_no_displayed_past_sem'),
+			'required|integer'
+		);
+		$this->form_validation->set_rules(
+			'font_size',
+			$this->p->t('stv', 'settings_fontsize'),
+			'required|in_list[fs_xx-small,fs_x-small,fs_small,fs_normal,fs_big,fs_huge]'
+		);
+
+		Events::trigger('stv_config_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$this->VariableModel->setVariable(
+			getAuthUID(),
+			'number_displayed_past_studiensemester',
+			$this->input->post('number_displayed_past_studiensemester')
+		);
+		$this->VariableModel->setVariable(
+			getAuthUID(),
+			'stv_font_size',
+			$this->input->post('font_size')
+		);
+
+		Events::trigger('stv_config_set', $this->input);
+
+		$this->terminateWithSuccess();
+	}
+	
+	/*
+	 * Get the config for the student filters
+	 *
+	 * @return void
+	 */
+	public function filter()
+	{
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
+
+		$this->BuchungstypModel->addOrder('beschreibung');
+		
+		$result = $this->BuchungstypModel->load();
+
+		$buchungstyp_kurzbz = $this->getDataOrTerminateWithError($result);
+		$buchungstyp_kurzbz_plus_all = array_merge([[
+			'buchungstyp_kurzbz' => 'all',
+			'beschreibung' => $this->p->t('stv', 'konto_all_types')
+		]], $buchungstyp_kurzbz);
+
+		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
+
+		$result = $this->StatusgrundModel->getAktiveGruende();
+		
+		$statusgruende = $this->getDataOrTerminateWithError($result);
+
+		$result = [];
+
+		$result[] = [
+			'id' => 'filter_konto_count_0',
+			'label' => $this->p->t('stv', 'filter_konto_count_0'),
+			'type' => 'konto',
+			'fixed' => [
+				'missing' => true,
+				'usestdsem' => true
+			],
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_konto_missing_counter',
+			'label' => $this->p->t('stv', 'filter_konto_missing_counter'),
+			'type' => 'konto_counter',
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz_plus_all,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				],
+				'samestg' => [
+					'type' => 'bool',
+					'label' => $this->p->t('stv', 'filter_konto_samestg'),
+					'default' => $this->variablelib->getVar('kontofilterstg') == 'true'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_documents',
+			'label' => $this->p->t('stv', 'filter_documents'),
+			'type' => 'documents'
+		];
+		$result[] = [
+			'id' => 'filter_konto_missing_counter_past',
+			'label' => $this->p->t('stv', 'filter_konto_missing_counter_past'),
+			'type' => 'konto_counter',
+			'fixed' => [
+				'past' => true
+			],
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz_plus_all,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				],
+				'samestg' => [
+					'type' => 'bool',
+					'label' => $this->p->t('stv', 'filter_konto_samestg'),
+					'default' => $this->variablelib->getVar('kontofilterstg') == 'true'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_konto_missing_studiengebuehr',
+			'label' => $this->p->t('stv', 'filter_konto_missing_studiengebuehr'),
+			'type' => 'konto',
+			'fixed' => [
+				'missing' => true,
+				'usestdsem' => true
+			],
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_konto_studiengebuehrerhoeht',
+			'label' => $this->p->t('stv', 'filter_konto_studiengebuehrerhoeht'),
+			'type' => 'konto',
+			'fixed' => [
+				'usestdsem' => true
+			],
+			'dynamic' => [
+				'buchungstyp_kurzbz' => [
+					'type' => 'select',
+					'values' => $buchungstyp_kurzbz,
+					'value_key' => 'buchungstyp_kurzbz',
+					'label_key' => 'beschreibung'
+				]
+			]
+		];
+		$result[] = [
+			'id' => 'filter_zgv_without_date',
+			'label' => $this->p->t('stv', 'filter_zgv_without_date'),
+			'type' => 'zgv'
+		];
+		$result[] = [
+			'id' => 'filter_statusgrund',
+			'label' => $this->p->t('stv', 'filter_statusgrund'),
+			'type' => 'statusgrund',
+			'fixed' => [
+				'usestdsem' => true
+			],
+			'dynamic' => [
+				'statusgrund_id' => [
+					'type' => 'select',
+					'values' => $statusgruende,
+					'value_key' => 'statusgrund_id',
+					'label_key' => 'bezeichnung'
+				]
+			]
+		];
+
+		Events::trigger('stv_conf_filter', function & () use (&$result) {
+			return $result;
+		});
+
+		$this->terminateWithSuccess($result);
+	}
+
 	public function student()
 	{
 		$result = [];
@@ -59,21 +304,21 @@ class Config extends FHCAPI_Controller

 		$result['details'] = [
 			'title' => $this->p->t('stv', 'tab_details'),
-			'component' => './Stv/Studentenverwaltung/Details/Details.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Details.js'),
 			'config' => $config['details']
 		];

 		$result['notes'] = [
 			'title' => $this->p->t('stv', 'tab_notes'),
-			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Notizen.js'),
 			'config'	=> $config['notes'],
 			'showSuffix' => ($config['notes']['showCountNotes'] ?? false),
-			'suffixhelper' => APP_ROOT . 'public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
+			'suffixhelper' => absoluteJsImportUrl('public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js')
 		];

 		$result['contact'] = [
 			'title' => $this->p->t('stv', 'tab_contact'),
-			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js'),
 			'config' => [
 				'showBankaccount' => $this->permissionlib->isBerechtigt('mitarbeiter/bankdaten')
 					|| $this->permissionlib->isBerechtigt('student/bankdaten')
@@ -81,20 +326,23 @@ class Config extends FHCAPI_Controller
 		];
 		$result['prestudent'] = [
 			'title' => $this->p->t('stv', 'tab_prestudent'),
-			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js'),
 			'config' => $config['prestudent']
 		];
 		$result['status'] = [
 			'title' => 'Status',
-			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js'),
+			'config' => [
+				'showStatusVorruecken' => defined('STATUS_VORRUECKEN_ANZEIGEN') ? STATUS_VORRUECKEN_ANZEIGEN : true,
+			]
 		];
 		$result['documents'] = [
 			'title' => $this->p->t('stv', 'tab_documents'),
-			'component' => './Stv/Studentenverwaltung/Details/Dokumente.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js')
 		];
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
-			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Konto.js'),
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
@@ -106,20 +354,22 @@ class Config extends FHCAPI_Controller
 		];
 		$result['resources'] = [
 			'title' => $this->p->t('stv', 'tab_resources'),
-			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js'),
+			'showOnlyWithUid' => true
 		];
 		$result['groups'] = [
 			'title' => $this->p->t('stv', 'tab_groups'),
-			'component' => './Stv/Studentenverwaltung/Details/Gruppen.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Groups.js'),
+			'showOnlyWithUid' => true
 		];
 		$result['messages'] = [
 			'title' => $this->p->t('stv', 'tab_messages'),
-			'component' => './Stv/Studentenverwaltung/Details/Messages.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Messages.js'),
 		];

 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
-			'component' => './Stv/Studentenverwaltung/Details/Noten.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Noten.js'),
 			'showOnlyWithUid' => true,
 			'config' => [
 				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
@@ -132,29 +382,42 @@ class Config extends FHCAPI_Controller

 		$result['exam'] = [
 			'title' => $this->p->t('stv', 'tab_exam'),
-			'component' => './Stv/Studentenverwaltung/Details/Pruefung.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Pruefung.js'),
+			'showOnlyWithUid' => true
 		];

 		$result['exemptions'] = [
 			'title' => $this->p->t('lehre', 'anrechnungen'),
-			'component' => './Stv/Studentenverwaltung/Details/Anrechnungen.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js'),
 			'config' => $config['exemptions']
 		];

 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
-			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung.js'),
+			'showOnlyWithUid' => true,
 			'config' => $config['finalexam']
 		];

+		$result['projektarbeit'] = [
+			'title' => $this->p->t('stv', 'tab_projektarbeit'),
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit.js'),
+			'config' => array_merge(
+				$config['projektarbeit'],
+				['showVertragsdetails' =>
+					defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN') && FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN]
+			)
+		];
+
 		$result['mobility'] = [
 			'title' => $this->p->t('stv', 'tab_mobility'),
-			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Mobility.js'),
+			'showOnlyWithUid' => true
 		];

 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Archiv.js'),
 			'config' => [
 				'showEdit' => $this->permissionlib->isBerechtigt('admin')
 			]
@@ -162,22 +425,24 @@ class Config extends FHCAPI_Controller

 		$result['jointstudies'] = [
 			'title' => $this->p->t('stv', 'tab_jointstudies'),
-			'component' => './Stv/Studentenverwaltung/Details/JointStudies.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js'),
+			'showOnlyWithUid' => true
 		];

 		$result['coursedates'] = [
 			'title' => $this->p->t('stv', 'tab_courseDates'),
-			'component' => './Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js')
 		];

 		$result['admissionDates'] = [
 			'title' => $this->p->t('stv', 'tab_admissionDates'),
-			'component' => './Stv/Studentenverwaltung/Details/Aufnahmetermine.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js')
 		];

 		$result['functions'] = [
 			'title' => $this->p->t('stv', 'tab_functions'),
-			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js'),
+			'showOnlyWithUid' => true
 		];

 		Events::trigger('stv_conf_student', function & () use (&$result) {
@@ -195,7 +460,7 @@ class Config extends FHCAPI_Controller
 		$config = $this->config->item('tabs');
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
-			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Konto.js'),
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
@@ -205,9 +470,14 @@ class Config extends FHCAPI_Controller
 				'additionalCols' => []
 			]
 		];
+		$result['groups'] = [
+			'title' => $this->p->t('stv', 'tab_groups'),
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Groups.js'),
+			'showOnlyWithUid' => true
+		];
 		$result['status'] = [
 			'title' => 'Status',
-			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js'),
 			'config' => [
 				'changeStatusToAbbrecherStgl' => $this->permissionlib->isBerechtigt('admin'),
 				'changeStatusToAbbrecherStud' => $this->permissionlib->isBerechtigt('admin'),
@@ -218,17 +488,37 @@ class Config extends FHCAPI_Controller
 		];
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
-			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung.js'),
+			'showOnlyWithUid' => true,
 			'config' => $config['finalexam']
 		];
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Archiv.js'),
 			'config' => [
 				'showEdit' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];

+		if($this->permissionlib->isBerechtigt('basis/person'))
+		{
+			$result['combinePeople'] = [
+				'title' => $this->p->t('stv', 'tab_combine_people'),
+				'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js'),
+				'config' => $config['combinePeople']
+			];
+		}
+
+		$result['kontaktieren'] = [
+			'title' => $this->p->t('stv', 'tab_kontaktieren'),
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js'),
+		];
+
+		$result['messages'] = [
+			'title' => $this->p->t('stv', 'tab_messages'),
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Messages.js'),
+		];
+
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
 		});
@@ -2,6 +2,7 @@

 if (! defined('BASEPATH')) exit('No direct script access allowed');

+use \CI3_Events as Events;
 use \DateTime as DateTime;

 class Dokumente extends FHCAPI_Controller
@@ -19,6 +20,8 @@ class Dokumente extends FHCAPI_Controller
 			'getDoktypen' => ['admin:r', 'assistenz:r'],
 			'uploadDokument' => ['admin:rw', 'assistenz:rw'],
 			'download' => ['admin:rw', 'assistenz:rw'],
+			'getDocumentDropDown' => ['admin:rw', 'assistenz:rw'],
+			'getDocumentDropDownMulti' => ['admin:rw', 'assistenz:rw'],
 		]);

 		// Load Libraries
@@ -566,4 +569,422 @@ class Dokumente extends FHCAPI_Controller
 			return false;
 		}
 	}
+
+	public function getDocumentDropDown($prestudent_id, $studiensemester_kurzbz, $studiengang_kz)
+	{
+		$this->load->helper('hlp_common');
+		//permission to create also odt, and doc outputs of certain documents(menu abschlusspruefung)
+		$hasPermissionOutputformat = $this->permissionlib->isBerechtigt('system/change_outputformat', 's');
+
+		if (!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Prestudent_id']), self::ERROR_TYPE_GENERAL);
+		if (!$studiensemester_kurzbz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiensemester']), self::ERROR_TYPE_GENERAL);
+		if(!$studiengang_kz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+
+
+		$uid = $this->_loadUIDFromPrestudent($prestudent_id);
+		$semArray = $this->_getEntriesStudiensemester();
+		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
+
+		$documents = [
+			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf&prestudent_id=$prestudent_id", null,20, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Zweisprachig", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&prestudent_id=$prestudent_id", null,21, null),
+
+			buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 25, null),
+			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 26, null),
+
+			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uid, 50, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uid, 51, null),
+			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uid", $uid,200, "zutrittskarte.php"),
+			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uid, 60, null),
+			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uid, 61, null),
+
+			$this->buildStudienerfolgSubmenu("de", $uid, $semArray, $studiensemester_kurzbz),
+			$this->buildStudienerfolgSubmenu("en", $uid, $semArray, $studiensemester_kurzbz),
+			$this->buildStudienerfolgSubmenu("de", $uid, $semArray, $studiensemester_kurzbz, true),
+			$this->buildStudienerfolgSubmenu("en", $uid, $semArray, $studiensemester_kurzbz, true),
+
+			[
+				"id" => "submenu_studstatus",
+				"type" => "submenu",
+				"name" => "Verwaltung des StudierendenStatus",
+				"order" => 110,
+				"data" => [
+					buildDropdownEntryPrintArray("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					buildDropdownEntryPrintArray("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					buildDropdownEntryPrintArray("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+					buildDropdownEntryPrintArray("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
+				]
+			],
+
+			//Bakkzeugnis bzw. Diplomzeugnis is just shown in tab final_exam
+			buildDropdownEntryPrintArray("zeugnis", "Zeugnis", "xml=zeugnis.rdf.php&xsl=Zeugnis&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uid, 121, null),
+			buildDropdownEntryPrintArray("zeugnis_en", "Zeugnis Englisch", "xml=zeugnis.rdf.php&xsl=ZeugnisEng&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uid, 122, null),
+
+
+		];
+
+		Events::trigger('DocumentGenerationDropDown',
+			// passing $menu per reference
+			function & () use (&$documents) {
+				return $documents;
+			},
+			$prestudent_id,
+			$studiensemester_kurzbz,
+			$studiengang_kz
+		);
+
+		$extraEntries = $this->loadDropDownEntriesBakkOrDipl($stgTyp, $uid);
+
+		$documents = array_merge($documents, $extraEntries);
+
+		usort($documents, function ($a, $b) {
+			$orderA = isset($a['order']) ? (int)$a['order'] : PHP_INT_MAX;
+			$orderB = isset($b['order']) ? (int)$b['order'] : PHP_INT_MAX;
+			return $orderA <=> $orderB;
+		});
+
+		$this->terminateWithSuccess($documents);
+		//return $documents || null;
+	}
+
+	public function getDocumentDropDownMulti($studiensemester_kurzbz,$studiengang_kz)
+	{
+		//permission to create also odt, and doc outputs of certain documents (menu abschlusspruefung)
+		$hasPermissionOutputformat = $this->permissionlib->isBerechtigt('system/change_outputformat', 's');
+
+		$studentUids = $this->input->get('studentUids');
+		$prestudentIds = [];
+
+		if (is_array($studentUids) && !empty($studentUids)) {
+			foreach ($studentUids as $uid) {
+				$prestudent_id = $this-> _loadPrestudentFromUid($uid);
+				$prestudentIds[] = $prestudent_id;
+			}
+		}
+		else
+		{
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Array StudentUIDs']), self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!$studiensemester_kurzbz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiensemester']), self::ERROR_TYPE_GENERAL);
+		if(!$studiengang_kz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+
+
+		$uidString = implode(";", $studentUids);
+		$prestudentIdsString = implode(";", $prestudentIds);
+
+		$semArray = $this->_getEntriesStudiensemester();
+		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
+
+		$documents = [
+			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uidString, 10, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uidString, 20, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uidString, 21, null),
+			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uidString, 50, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uidString, 51, null),
+			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uidString", $uidString,200, "zutrittskarte.php"),
+			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uidString, 60, null),
+			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uidString, 61, null),
+
+			// Studienerfolg Menüs automatisch
+			$this->buildStudienerfolgSubmenu("de", $uidString, $semArray, $studiensemester_kurzbz),
+			$this->buildStudienerfolgSubmenu("en", $uidString, $semArray, $studiensemester_kurzbz),
+			$this->buildStudienerfolgSubmenu("de", $uidString, $semArray, $studiensemester_kurzbz, true),
+			$this->buildStudienerfolgSubmenu("en", $uidString, $semArray, $studiensemester_kurzbz, true),
+
+			[
+				"id" => "submenu_studstatus",
+				"type" => "submenu",
+				"name" => "Verwaltung des StudierendenStatus",
+				"order" => 110,
+				"data" => [
+					buildDropdownEntryPrintArray("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					buildDropdownEntryPrintArray("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					buildDropdownEntryPrintArray("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+					buildDropdownEntryPrintArray("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
+				]
+			],
+
+			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uidString, 35, null),
+			buildDropdownEntryPrintArray("zeugnis", "Zeugnis", "xml=zeugnis.rdf.php&xsl=Zeugnis&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uidString, 121, null),
+			buildDropdownEntryPrintArray("zeugnis_en", "Zeugnis Englisch", "xml=zeugnis.rdf.php&xsl=ZeugnisEng&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uidString, 122, null),
+		];
+
+		Events::trigger('DocumentGenerationDropDownMulti',
+			// passing $menu per reference
+			function & () use (&$documents) {
+				return $documents;
+			},
+			$studentUids,
+			$studiensemester_kurzbz,
+			$studiengang_kz
+		);
+
+		$extraEntries = $this->loadDropDownEntriesBakkOrDipl($stgTyp, $uidString);
+
+		$documents = array_merge($documents, $extraEntries);
+
+		usort($documents, function ($a, $b) {
+			$orderA = isset($a['order']) ? (int)$a['order'] : PHP_INT_MAX;
+			$orderB = isset($b['order']) ? (int)$b['order'] : PHP_INT_MAX;
+			return $orderA <=> $orderB;
+		});
+
+
+		$this->terminateWithSuccess($documents);
+
+		return $documents || null;
+	}
+
+	private function _loadUIDFromPrestudent($prestudent_id)
+	{
+		if(!$prestudent_id){
+			return $this->terminateWithError("no prestudent ID received.");
+		}
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->loadWhere(
+			['prestudent_id' => $prestudent_id]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$student = current($data);
+
+		return $student->student_uid;
+	}
+
+	private function _loadPrestudentFromUid($studentUid)
+	{
+
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->loadWhere(
+			['student_uid' => $studentUid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$student = current($data);
+
+
+		return $student->prestudent_id;
+	}
+
+	/**
+	 * is building an array with studiensemesterkurzb
+	 * actual studiensemester plus the 5 studiensemester in the past
+
+	 * @return Array Studiensemester_kurzbz
+	 */
+	private function _getEntriesStudiensemester(){
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addPlusMinus(1, 5);
+		$this->StudiensemesterModel->addOrder('ende', 'DESC');
+		$result = $this->StudiensemesterModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+
+		foreach($data as $sem)
+		{
+			$semArray[] = $sem->studiensemester_kurzbz;
+		}
+
+		array_shift($semArray);
+
+		return $semArray;
+	}
+	/**
+	 * is returning the typ of Studiengang (Bakk oder Master)
+
+	 * @return character  eg. 'b' or 'm'
+	 */
+	private function _getStudiengangstyp($studiengang_kz)
+	{
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$result = $this->StudiengangModel->loadWhere(
+			array('studiengang_kz' => $studiengang_kz)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$typStudiengang = current($data)->typ;
+
+		return $typStudiengang;
+	}
+
+	/**
+	 * helper function to create ArrayStructure
+	 * actual studiensemester plus the 5 studiensemester in the past
+
+	 * @return Array Studiensemester_kurzbz
+	 */
+	private function buildStudienerfolgSubmenu($lang, $uid, $semArray, $studiensemester_kurzbz, $fa = false)
+	{
+		$entries = [];
+
+		$xsl = $lang === "de" ? "Studienerfolg" : "StudienerfolgEng";
+		$idPrefix = "submenu_studienerfolg_" . $lang . ($fa ? "_fa" : "");
+
+		$entries[] = buildDropdownEntryPrintArray(
+			$idPrefix . "_aktuell",
+			"ausgewähltes Semester",
+			"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$studiensemester_kurzbz" . ($fa ? "&typ=finanzamt" : ""),
+			$uid
+		);
+
+		//all semester
+		$entries[] = buildDropdownEntryPrintArray(
+			$idPrefix . "_all",
+			"alle Semester",
+			"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$studiensemester_kurzbz&all=true" . ($fa ? "&typ=finanzamt" : ""),
+			$uid
+		);
+
+		//sem from array
+		foreach ($semArray as $i => $sem) {
+			$entries[] = buildDropdownEntryPrintArray(
+				$idPrefix . ($i === 0 ? "_akt" : "_minus" . $i),
+				$sem,
+				"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$sem" . ($fa ? "&typ=finanzamt" : ""),
+				$uid
+			);
+
+		}
+		$order = 0;
+		if ($lang === "de" && !$fa) $order = 75; // Studienerfolg
+		if ($lang === "en" && !$fa) $order = 76; // Studienerfolg Englisch
+		if ($lang === "de" &&  $fa) $order = 77; // Studienerfolg Finanzamt
+		if ($lang === "en" &&  $fa) $order = 78; // Studienerfolg Finanzamt Englisch
+
+		return [
+			"id"   => $idPrefix,
+			"type" => "submenu",
+			"name" => "Studienerfolg " . ($fa ? " Finanzamt" : "") . ($lang === "de" ? "" : "Englisch") ,
+			"order" => $order,
+			"data" => $entries,
+		];
+	}
+
+	private function loadDropDownEntriesFinalExam($hasPermissionOutputformat, $stgTyp, $uid)
+	{
+		if ($stgTyp == 'b')
+			$postfix = 'Bakk';
+		else if ($stgTyp == 'm' || $stgTyp == 'd')
+			$postfix = 'Master';
+		else
+			return [];
+
+		$arrayFinalExam = [
+			'pruefungsprotokoll' => [
+				'de' => [
+					'Bakk' => 'PrProtBA',
+					'Master' => 'PrProtMA',
+				],
+				'en' => [
+					'Bakk' => 'PrProtBAEng',
+					'Master' => 'PrProtMAEng',
+				],
+			],
+			'pruefungszeugnis' => [
+				'de' => [
+					'Bakk' => 'Bakkzeugnis',
+					'Master' => 'Diplomzeugnis',
+				],
+				'en' => [
+					'Bakk' => 'BakkzeugnisEng',
+					'Master' => 'DiplomzeugnisEng',
+				],
+			],
+			'urkunde' => [
+				'de' => [
+					'Bakk' => 'Bakkurkunde',
+					'Master' => 'Diplomurkunde',
+				],
+				'en' => [
+					'Bakk' => 'BakkurkundeEng',
+					'Master' => 'DiplomurkundeEng',
+				],
+			],
+		];
+
+		$langLabels = [
+			"de" => "Deutsch",
+			"en" => "Englisch"
+		];
+
+		$docLabels = [
+			"pruefungsprotokoll" => "Prüfungsprotokoll",
+			"pruefungszeugnis" => "Zeugnis",
+			"urkunde" => "Urkunde"
+		];
+
+		$submenuData = [];
+		if ($hasPermissionOutputformat) {
+			foreach ($arrayFinalExam as $docType => $langs) {
+				foreach ($langs as $lang => $types) {
+					$xsl = $types[$postfix];
+					$idPrefix = $docType . "_" . $lang;
+
+					$baseName = $docLabels[$docType] . " " . $langLabels[$lang];
+					$baseUrl = "xml=abschlusspruefung.rdf.php&xsl={$xsl}";
+
+					//3 outputformates
+					foreach (["pdf", "odt", "docx"] as $format) {
+						$submenuData[] = buildDropdownEntryPrintArray(
+							$idPrefix . "_" . $format,
+							$baseName . " (" . strtoupper($format) . ")",
+							$baseUrl . "&output=" . $format,
+							$uid
+						);
+					}
+				}
+			}
+		}
+		else
+		{
+			foreach ($arrayFinalExam as $docType => $langs) {
+				foreach ($langs as $lang => $types) {
+					$xsl = $types[$postfix]; // Auswahl Bakk/Master für jeweilige Sprache
+					$id = $docType . "_" . $lang;
+
+					$name = $docLabels[$docType] . " " . $langLabels[$lang];
+
+					$url = "xml=abschlusspruefung.rdf.php&xsl=" . $xsl . "&output=pdf";
+
+					$submenuData[] = buildDropdownEntryPrintArray($id, $name, $url, $uid);
+				}
+			}
+		}
+		return [
+			"id" => "submenu_finalexam",
+			"type" => "submenu",
+			"name" => "Abschlussprüfung",
+			"data" => $submenuData,
+			"order" => null,
+			"order" => 80,
+		];
+	}
+
+	private function loadDropDownEntriesBakkOrDipl($stgTyp, $uid)
+	{
+		$entries = [];
+
+		if ($stgTyp == 'b')
+		{
+			$entries[] = buildDropdownEntryPrintArray("bakkurkunde", "Bakkurkunde", "xml=abschlusspruefung.rdf.php&xsl=Bakkurkunde&output=pdf", $uid, 22, null);
+			$entries[] = buildDropdownEntryPrintArray("bakkurkundeEng", "Bakkurkunde Englisch", "xml=abschlusspruefung.rdf.php&xsl=BakkurkundeEng&output=pdf", $uid, 23, null);
+		}
+
+		if ($stgTyp == 'm' || $stgTyp == 'd')
+		{
+			$entries[] = buildDropdownEntryPrintArray("diplomurkunde", "Diplomurkunde", "xml=abschlusspruefung.rdf.php&xsl=Diplomurkunde&output=pdf", $uid, 27, null);
+			$entries[] = buildDropdownEntryPrintArray("diplomurkundeEng", "Diplomurkunde Englisch", "xml=abschlusspruefung.rdf.php&xsl=DiplomurkundeEng&output=pdf", $uid, 28, null);
+		}
+
+		return $entries;
+	}
+
 }
@@ -83,7 +83,7 @@ class GemeinsameStudien extends FHCAPI_Controller
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');

-		$this->StudiensemesterModel->addOrder('studienjahr_kurzbz', 'DESC');
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
 		$result = $this->StudiensemesterModel->load();
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($data);
@@ -60,7 +60,8 @@ class Grades extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Note_model', 'NoteModel');

-		$this->NoteModel->addOrder('note');
+		$this->NoteModel->addOrder('notenwert', 'ASC');
+		$this->NoteModel->addOrder('bezeichnung', 'ASC');
 		
 		$result = $this->NoteModel->load();

@@ -9,6 +9,8 @@ class Gruppen extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
+			'add' => ['admin:rw', 'assistenz:rw'],
+			'search' => ['admin:r', 'assistenz:r'],
 			'getGruppen' => ['admin:r', 'assistenz:r'],
 			'deleteGruppe' => ['admin:rw', 'assistenz:rw'],
 		]);
@@ -18,7 +20,9 @@ class Gruppen extends FHCAPI_Controller

 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'gruppenmanagement'
+			'ui',
+			'gruppenmanagement',
+			'lehre'
 		]);

 		// Load models
@@ -26,15 +30,141 @@ class Gruppen extends FHCAPI_Controller
 		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
 	}

+	public function add()
+	{
+		$this->load->library("form_validation");
+
+		$this->form_validation->set_rules(
+			'gruppe_kurzbz',
+			$this->p->t('gruppenmanagement', 'gruppe'),
+			'required|is_in_db[organisation/Gruppe_model]',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired'),
+				'is_in_db' => $this->p->t('ui', 'error_fieldNotFound')
+			]
+		);
+		$this->form_validation->set_rules(
+			'uid',
+			$this->p->t('ui', 'student_uid'),
+			'required|is_in_db[crm/Student_model:student_uid]',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired'),
+				'is_in_db' => $this->p->t('ui', 'error_fieldNotFound')
+			]
+		);
+		$this->form_validation->set_rules(
+			'studiensemester_kurzbz',
+			$this->p->t('lehre', 'studiensemester'),
+			'required|is_in_db[organisation/Studiensemester_model]',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired'),
+				'is_in_db' => $this->p->t('ui', 'error_fieldNotFound')
+			]
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$gruppe_kurzbz = $this->input->post('gruppe_kurzbz');
+		$uid = $this->input->post('uid');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+		$result = $this->BenutzergruppeModel->load([
+			$gruppe_kurzbz,
+			$uid
+		]);
+		$benutzergruppe = $this->getDataOrTerminateWithError($result);
+
+		if ($benutzergruppe) {
+			$this->terminateWithError(
+				$this->p->t('gruppenmanagement', 'error_alreadyInGroup', [
+					'uid' => $uid,
+					'studiensemester_kurzbz' => current($benutzergruppe)->studiensemester_kurzbz
+				]),
+				self::ERROR_TYPE_GENERAL
+			);
+		}
+
+		$result = $this->BenutzergruppeModel->insert([
+			'uid' => $uid,
+			'gruppe_kurzbz' => $gruppe_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		]);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess();
+	}
+
+	public function search()
+	{
+		$query = $this->input->post('query');
+		if (!$query)
+			$this->terminateWithSuccess([]);
+
+		// add query to where clause
+		$query = strtoupper($query);
+		$query = $this->GruppeModel->db->escape_like_str($query);
+		$query = '%' . str_replace(' ', '%', $query) . '%';
+
+		$this->GruppeModel->db->group_start();
+		$this->GruppeModel->db->or_like('UPPER(gruppe_kurzbz)', $query, 'none', false);
+		$this->GruppeModel->db->or_like('UPPER(bezeichnung)', $query, 'none', false);
+		$this->GruppeModel->db->or_like('UPPER(beschreibung)', $query, 'none', false);
+		$this->GruppeModel->db->group_end();
+		
+		// add stg sorting 1
+		$studiengang_kz = $this->input->post('studiengang_kz');
+		$sort_stg = $studiengang_kz ? "WHEN studiengang_kz = " . $this->GruppeModel->escape($studiengang_kz) . " THEN 0" : "";
+
+		// add stg sorting 2
+		$studiengang_kzs = [];
+		$result = $this->permissionlib->getSTG_isEntitledFor('admin');
+		if ($result)
+			$studiengang_kzs = array_merge($studiengang_kzs, $result);
+		$result = $this->permissionlib->getSTG_isEntitledFor('assistenz');
+		if ($result)
+			$studiengang_kzs = array_merge($studiengang_kzs, $result);
+
+		// selects
+		$this->GruppeModel->addSelect("*");
+		$this->GruppeModel->addSelect("CASE
+			" . $sort_stg . "
+			WHEN studiengang_kz IN (" . implode(",", $this->GruppeModel->db->escape($studiengang_kzs)) . ")
+			THEN 1
+			ELSE 2
+		END AS sort_stg");
+
+		// ordering
+		$this->GruppeModel->addOrder("sort_stg");
+		$this->GruppeModel->addOrder("sort");
+		$this->GruppeModel->addOrder("gruppe_kurzbz");
+
+		// default where clause & execute
+		$result = $this->GruppeModel->loadWhere([
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false,
+			'generiert' => false
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
 	public function getGruppen($student_uid)
 	{
-		$this->BenutzergruppeModel ->addSelect('gruppe_kurzbz');
-		$this->BenutzergruppeModel ->addSelect('bezeichnung');
-		$this->BenutzergruppeModel ->addSelect('generiert');
-		$this->BenutzergruppeModel ->addSelect('uid');
-		$this->BenutzergruppeModel ->addSelect('studiensemester_kurzbz');
-		$this->BenutzergruppeModel ->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
-		$this->BenutzergruppeModel-> addOrder('bezeichnung', 'ASC');
+		$this->BenutzergruppeModel->addSelect('gruppe_kurzbz');
+		$this->BenutzergruppeModel->addSelect('bezeichnung');
+		$this->BenutzergruppeModel->addSelect('generiert');
+		$this->BenutzergruppeModel->addSelect('uid');
+		$this->BenutzergruppeModel->addSelect('studiensemester_kurzbz');
+		$this->BenutzergruppeModel->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
+		$this->BenutzergruppeModel->addOrder('bezeichnung', 'ASC');

 		$result = $this->BenutzergruppeModel->loadWhere(
 			array(
@@ -49,29 +179,48 @@ class Gruppen extends FHCAPI_Controller

 	public function deleteGruppe()
 	{
-		$student_uid = $this->input->post('id');
+		$this->load->library("form_validation");
+
+		$this->form_validation->set_rules(
+			'uid',
+			$this->p->t('person', 'UID'),
+			'required',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired')
+			]
+		);
+
+		$this->form_validation->set_rules(
+			'gruppe_kurzbz',
+			$this->p->t('gruppenmanagement', 'gruppe'),
+			'required',
+			[
+				'required' => $this->p->t('ui', 'error_fieldRequired')
+			]
+		);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$uid = $this->input->post('uid');
 		$gruppe_kurzbz = $this->input->post('gruppe_kurzbz');

-		//Validate if automatic group generation
-		$result = $this->GruppeModel-> loadWhere(
-			array(
-				'gruppe_kurzbz' => $gruppe_kurzbz
-			)
-		);
+		// Validate if automatic group generation
+		$result = $this->GruppeModel->loadWhere([
+			'gruppe_kurzbz' => $gruppe_kurzbz
+		]);
 		$data = $this->getDataOrTerminateWithError($result);
 		$generation = current($data);

-		if($generation->generiert)
+		if ($generation->generiert)
 		{
 			$this->terminateWithError($this->p->t('gruppenmanagement', 'error_deleteGeneratedGroups'), self::ERROR_TYPE_GENERAL);
 		}

-		$result = $this->BenutzergruppeModel->delete(
-			array(
-				'gruppe_kurzbz' => $gruppe_kurzbz,
-				'uid' => $student_uid
-				)
-		);
+		$result = $this->BenutzergruppeModel->delete([
+			'gruppe_kurzbz' => $gruppe_kurzbz,
+			'uid' => $uid
+		]);

 		$data = $this->getDataOrTerminateWithError($result);

@@ -52,6 +52,7 @@ class Kontakt extends FHCAPI_Controller
 		// Extra Permissionchecks
 		$permsMa = [];
 		$permsStud = [];
+		$permsDefault = null;
 		switch ($this->router->method) {
 			case 'getBankverbindung':
 			case 'loadBankverbindung':
@@ -68,7 +69,7 @@ class Kontakt extends FHCAPI_Controller
 			case 'getKontakte':
 			case 'loadAddress':
 			case 'loadContact':
-				$permsMa = $permsStud = ['admin:r', 'assistenz:r'];
+				$permsMa = $permsStud = $permsDefault = ['admin:r', 'assistenz:r'];
 				break;
 			case 'addNewAddress':
 			case 'addNewContact':
@@ -76,7 +77,7 @@ class Kontakt extends FHCAPI_Controller
 			case 'updateContact':
 			case 'deleteAddress':
 			case 'deleteContact':
-				$permsMa = $permsStud = ['admin:rw', 'assistenz:rw'];
+				$permsMa = $permsStud = $permsDefault = ['admin:rw', 'assistenz:rw'];
 				break;
 		}
 		if ($this->router->method == 'getAdressen'
@@ -91,7 +92,7 @@ class Kontakt extends FHCAPI_Controller
 			if (is_null($person_id) || !ctype_digit((string)$person_id))
 				$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);

-			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud, $permsDefault);
 		} elseif ($this->router->method == 'loadAddress'
 			|| $this->router->method == 'loadContact'
 			|| $this->router->method == 'loadBankverbindung'
@@ -135,7 +136,7 @@ class Kontakt extends FHCAPI_Controller

 			$person_id = current($data)->person_id;
 			
-			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud, $permsDefault);
 		}
 	}
 	public function getAdressen($person_id)
@@ -239,7 +239,7 @@ class Konto extends FHCAPI_Controller
 				$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']];
+			$data['studiengang_kz'] = unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']];
 		}

 		$result = [];
@@ -352,7 +352,7 @@ class Konto extends FHCAPI_Controller
 				continue;
 			}

-
+			
 			$result = $this->KontoModel->insert([
 				'person_id' => $buchung['person_id'],
 				'studiengang_kz' => $buchung['studiengang_kz'],
@@ -361,7 +361,7 @@ class Konto extends FHCAPI_Controller
 				'buchungstyp_kurzbz' => $buchung['buchungstyp_kurzbz'],
 				'credit_points' => $buchung['credit_points'],
 				'zahlungsreferenz' => $buchung['zahlungsreferenz'],
-				'betrag' => $betrag,
+				'betrag' => number_format($betrag, 2, '.', ''),
 				'buchungsdatum' => $buchungsdatum,
 				'mahnspanne' => '0',
 				'buchungsnr_verweis' => $buchung['buchungsnr'],
@@ -0,0 +1,63 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+class Lehrverband extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'hasOrgforms' => ['admin:r', 'assistenz:r'],
+			'getTree' => ['admin:r', 'assistenz:r'],
+			'getSpecialgroups' => ['admin:r', 'assistenz:r']
+		]);
+	}
+
+	public function hasOrgforms($studiengang_kz)
+	{
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		
+		$result = $this->StudiengangModel->load($studiengang_kz);
+		
+		$data = $this->getDataOrTerminateWithError($result);
+		if ($data) {
+			$data = current($data)->mischform;
+		}
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getTree($studiengang_kz)
+	{
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+
+		$result = $this->LehrverbandModel->loadWhere([
+			'studiengang_kz' => $studiengang_kz,
+			'aktiv' => true
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getSpecialgroups($studiengang_kz)
+	{
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+
+		$where = [
+			'studiengang_kz' => $studiengang_kz,
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false
+		];
+
+		$result = $this->GruppeModel->loadWhere($where);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}
@@ -43,7 +43,7 @@ class Prestudent extends FHCAPI_Controller

 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'studierendenantrag', 'lehre'
+			'ui', 'studierendenantrag', 'lehre', 'global'
 		]);
 	}

@@ -98,11 +98,9 @@ class Prestudent extends FHCAPI_Controller
 			'person_id',
 			'berufstaetigkeit_code',
 			'ausbildungcode',
-			'zgv_code',
 			'zgvort',
 			'zgvdatum',
 			'zgvnation',
-			'zgvmas_code',
 			'zgvmaort',
 			'zgvmadatum',
 			'zgvmanation',
@@ -110,7 +108,6 @@ class Prestudent extends FHCAPI_Controller
 			'bismelden',
 			'anmerkung',
 			'dual',
-			'zgvdoktor_code',
 			'zgvdoktorort',
 			'zgvdoktordatum',
 			'zgvdoktornation',
@@ -125,6 +122,57 @@ class Prestudent extends FHCAPI_Controller
 			'standort_code'
 		];

+		// add zgv code fields only if user has permission
+		$this->load->library('PermissionLib');
+		$prestudentres = $this->PrestudentModel->load($prestudent_id);
+		if(!hasData($prestudentres))
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_fieldNotFound', ['field' => 'Prestudent ' . $prestudent_id]));
+		}
+		$prestudent = (getData($prestudentres))[0];
+		$bakkZgvStg = $this->permissionlib->getSTG_isEntitledFor('student/editBakkZgv') ?: array();
+		$makkZgvStg = $this->permissionlib->getSTG_isEntitledFor('student/editMakkZgv') ?: array();
+		$dokZgvStg = $this->permissionlib->getSTG_isEntitledFor('student/editDokZgv') ?: array();
+
+		if(in_array($prestudent->studiengang_kz, $bakkZgvStg)) 
+		{
+			$array_allowed_props_prestudent[] = 'zgv_code';
+		}
+		else if(!is_null($this->input->post('zgv_code')))
+		{
+			$this->terminateWithError(
+				$this->p->t('global', 'zgv')
+				. ' - ' .
+				$this->p->t('ui', 'error_keineBerechtigungStg')
+			);
+		}
+
+		if(in_array($prestudent->studiengang_kz, $makkZgvStg))
+		{
+			$array_allowed_props_prestudent[] = 'zgvmas_code';
+		}
+		else if(!is_null($this->input->post('zgvmas_code')))
+		{
+			$this->terminateWithError(
+				$this->p->t('lehre', 'zgvMaster')
+				. ' - ' .
+				$this->p->t('ui', 'error_keineBerechtigungStg')
+			);
+		}
+
+		if(in_array($prestudent->studiengang_kz, $dokZgvStg))
+		{
+			$array_allowed_props_prestudent[] = 'zgvdoktor_code';
+		}
+		else if(!is_null($this->input->post('zgvdoktor_code')))
+		{
+			$this->terminateWithError(
+				$this->p->t('lehre', 'zgvDoktor')
+				. ' - ' .
+				$this->p->t('ui', 'error_keineBerechtigungStg')
+			);
+		}
+
 		// add UDFs
 		$result = $this->udflib->getDefinitionForModel($this->PrestudentModel);

@@ -0,0 +1,413 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Projektarbeit extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getProjektarbeit' => ['admin:r', 'assistenz:r'],
+			'loadProjektarbeit' => ['admin:r', 'assistenz:r'],
+			'insertProjektarbeit' => ['admin:rw', 'assistenz:rw'],
+			'updateProjektarbeit' => ['admin:rw', 'assistenz:rw'],
+			'deleteProjektarbeit' => ['admin:rw', 'assistenz:rw'],
+			'getTypenProjektarbeit' => ['admin:r', 'assistenz:r'],
+			'getFirmen' => ['admin:r', 'assistenz:r'],
+			'getLehrveranstaltungen' => ['admin:r', 'assistenz:r'],
+			'getNoten' => ['admin:r', 'assistenz:r'],
+			'getStudiensemester' => ['admin:r', 'assistenz:r']
+		]);
+
+		// Load Libraries
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'person',
+			'projektarbeit'
+		]);
+
+		// Load models
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$this->load->model('education/Projekttyp_model', 'ProjekttypModel');
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$this->load->model('ressource/Firma_model', 'FirmaModel');
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('education/Note_model', 'NoteModel');
+		$this->load->model('education/Projektbetreuer_model', 'BetreuerModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		// load libraries
+		$this->load->library('PermissionLib');
+	}
+
+	/**
+	 * Get projekt works for a uid.
+	 */
+	public function getProjektarbeit()
+	{
+		$student_uid = $this->input->get('uid');
+
+		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->ProjektarbeitModel->getProjektarbeit($student_uid);
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$projektarbeiten = getData($result);
+
+		foreach ($projektarbeiten as $projektarbeit)
+		{
+			$projektarbeit_id = $projektarbeit->projektarbeit_id;
+			$abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
+
+			if (isError($abgabeRes)) $this->terminateWithError(getError($abgabeRes), self::ERROR_TYPE_GENERAL);
+
+			if (hasData($abgabeRes))
+			{
+				$paabgabe = getData($abgabeRes)[0];
+				$projektarbeit->abgabedatum = $paabgabe->abgabedatum;
+			}
+		}
+
+		$this->terminateWithSuccess($projektarbeiten);
+	}
+
+	/**
+	 * Load a single Projektarbeit by id.
+	 */
+	public function loadProjektarbeit()
+	{
+		$projektarbeit_id = $this->input->get('projektarbeit_id');
+
+		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
+
+		$this->ProjektarbeitModel->addSelect(
+			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
+			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
+		);
+		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
+		$result = $this->ProjektarbeitModel->loadWhere(
+			array('projektarbeit_id' => $projektarbeit_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	/**
+	 * Inwert a Projektarbeit.
+	 */
+	public function insertProjektarbeit()
+	{
+		$student_uid = $this->input->post('uid');
+
+		if (!$student_uid) return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+
+		if (!$this->_hasBerechtigungForStudent($student_uid))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$formData = $this->input->post('formData');
+
+		if ($this->_validate($formData) == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$projektarbeit = $this->_getProjektarbeitArr($formData);
+
+		$result = $this->ProjektarbeitModel->insert(
+			array_merge($projektarbeit, ['insertamum' => date('c'), 'insertvon' => getAuthUID(), 'student_uid' => $student_uid])
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Update a Projektarbeit by ID.
+	 */
+	public function updateProjektarbeit()
+	{
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+
+		if (!$projektarbeit_id || !is_numeric($projektarbeit_id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$formData = $this->input->post('formData');
+
+		if ($this->_validate($formData) == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$projektarbeit = $this->_getProjektarbeitArr($formData);
+
+		$result = $this->ProjektarbeitModel->update(
+			$projektarbeit_id,
+			array_merge($projektarbeit, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Delete Projektarbeit by ID after validation.
+	 */
+	public function deleteProjektarbeit()
+	{
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+
+		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID'], self::ERROR_TYPE_GENERAL));
+
+		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$validate = $this->_validateDelete($projektarbeit_id);
+
+		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->ProjektarbeitModel->delete(
+			['projektarbeit_id' => $projektarbeit_id]
+		);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result))
+		{
+			$this->outputJson($result);
+		}
+
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+	}
+
+	/**
+	 * Get all active projekt work types.
+	 */
+	public function getTypenProjektarbeit()
+	{
+		$result = $this->ProjekttypModel->loadWhere(['aktiv' => true]);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	/**
+	 * Gets companies by search string.
+	 */
+	public function getFirmen()
+	{
+		$searchString = $this->input->get('searchString');
+
+		if (!isset($searchString))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Search term']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->FirmaModel->searchFirmen($searchString, $aktiv = true);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	/**
+	 * Get Lehrveranstaltungen by params, incling lehreinheiten for a specific Studiensemester..
+	 */
+	public function getLehrveranstaltungen()
+	{
+		$student_uid = $this->input->get('student_uid');
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+		$additional_lehrveranstaltung_id = $this->input->get('additional_lehrveranstaltung_id');
+
+		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemster missing', self::ERROR_TYPE_GENERAL);
+
+		// get Lvs
+		$lvsResult = $this->LehrveranstaltungModel->getLvsForProjektarbeit($student_uid, $studiengang_kz, $additional_lehrveranstaltung_id);
+
+		if (isError($lvsResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
+
+		$lvs = hasData($lvsResult) ? getData($lvsResult) : [];
+
+		foreach ($lvs as $lv)
+		{
+			// add Lehreinheiten for each Lv for the semester
+			$lehreinheiten = $this->LehreinheitModel->getLesForLv(
+				$lv->lehrveranstaltung_id, $studiensemester_kurzbz
+			);
+
+			foreach ($lehreinheiten as $lehreinheit)
+			{
+				if (!isEmptyArray($lehreinheit->lektoren))
+				{
+					$this->MitarbeiterModel->addSelect('kurzbz');
+					$this->MitarbeiterModel->db->where_in('tbl_mitarbeiter.mitarbeiter_uid', $lehreinheit->lektoren);
+					$maResult = $this->MitarbeiterModel->load();
+
+					if (isError($maResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
+
+					$lehreinheit->lektoren = array_column(getData($maResult), 'kurzbz');
+				}
+			}
+
+			$lv->lehreinheiten = $lehreinheiten;
+		}
+
+		return $this->terminateWithSuccess($lvs);
+	}
+
+	/**
+	 * Get all noten.
+	 */
+	public function getNoten()
+	{
+		$this->NoteModel->addOrder('notenwert', 'ASC');
+		$this->NoteModel->addOrder('bezeichnung', 'ASC');
+
+		$result = $this->NoteModel->load();
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	/**
+	 * Get all Studiensemester, sorted.
+	 */
+	public function getStudiensemester()
+	{
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$result = $this->StudiensemesterModel->load();
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	/**
+	 * Validate Projektarbeit data.
+	 * @param formData
+	 * @return bool true if data valid
+	 */
+	private function _validate($formData)
+	{
+		$this->form_validation->set_data($formData);
+
+		$this->form_validation->set_rules('projekttyp_kurzbz', 'Projekttyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
+		]);
+
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|is_natural', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
+			'is_natural' =>  $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
+		]);
+
+		$this->form_validation->set_rules('beginn', 'Beginn', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Beginn'])
+		]);
+
+		$this->form_validation->set_rules('ende', 'Ende', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Ende'])
+		]);
+
+		$this->form_validation->set_rules('gesperrtbis', 'Ende', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Gesperrt bis'])
+		]);
+
+		return $this->form_validation->run();
+	}
+
+	/**
+	 * Extract Projektarbeit data from passed form data.
+	 * @param formData
+	 * @return array
+	 */
+	private function _getProjektarbeitArr($formData)
+	{
+		return [
+			'titel' => $formData['titel'],
+			'titel_english' => $formData['titel_english'] ?? null,
+			'themenbereich' => $formData['themenbereich'] ?? null,
+			'projekttyp_kurzbz' => $formData['projekttyp_kurzbz'],
+			'firma_id' => $formData['firma_id'] ?? null,
+			'lehreinheit_id' => $formData['lehreinheit_id'],
+			'beginn' => isset($formData['beginn']) && !isEmptyString($formData['beginn']) ? $formData['beginn'] : null,
+			'ende' => isset($formData['ende']) && !isEmptyString($formData['ende']) ? $formData['ende'] : null,
+			'note' => $formData['note'] ?? null,
+			'final' => $formData['final'] ?? null,
+			'freigegeben' => $formData['freigegeben'] ?? null,
+			'anmerkung' => $formData['anmerkung'] ?? null,
+			'gesperrtbis' => isset($formData['gesperrtbis']) && !isEmptyString($formData['gesperrtbis']) ? $formData['gesperrtbis'] : null
+		];
+	}
+
+	/**
+	 * Check if deletion of a Projektarbeit is possible.
+	 * @param $projektarbeit_id
+	 * @return object success if deletion possible, error otherwise.
+	 */
+	private function _validateDelete($projektarbeit_id)
+	{
+		$this->BetreuerModel->addSelect('1');
+		$result = $this->BetreuerModel->loadWhere(['projektarbeit_id' => $projektarbeit_id]);
+
+		if (isError($result)) return $result;
+
+		if (hasData($result)) return error($this->p->t('projektarbeit', 'error_betreuerNichtGeloescht'));
+
+		$this->PaabgabeModel->addSelect('1');
+		$result = $this->PaabgabeModel->loadWhere(['projektarbeit_id' => $projektarbeit_id]);
+
+		if (isError($result)) return $result;
+
+		if (hasData($result)) return error($this->p->t('projektarbeit', 'error_paabgabeNichtGeloescht'));
+
+		return success();
+	}
+
+	/**
+	 * Checks permissions for a student.
+	 * @param $student_uid
+	 * @return bool true if authorized
+	 */
+	private function _hasBerechtigungForStudent($student_uid)
+	{
+		if (!$student_uid)
+			return false;
+
+		$this->load->model('crm/Student_model', 'StudentModel');
+
+		$this->StudentModel->addSelect('studiengang_kz');
+		$result = $this->StudentModel->load([$student_uid]);
+		if (isError($result) || !hasData($result))
+			return false;
+
+		$studiengang_kz = getData($result)[0]->studiengang_kz;
+
+		if ($this->permissionlib->isBerechtigt('admin', 'suid', $studiengang_kz))
+			return true;
+		if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $studiengang_kz))
+			return true;
+
+		return false;
+	}
+}
@@ -0,0 +1,435 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+use \CI3_Events as Events;
+
+class Projektbetreuer extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getProjektbetreuer' => ['admin:r', 'assistenz:r'],
+			'saveProjektbetreuer' => ['admin:rw', 'assistenz:rw'],
+			'deleteProjektbetreuer' => ['admin:rw', 'assistenz:rw'],
+			'getBetreuerarten' => ['admin:r', 'assistenz:r'],
+			'getNoten' => ['admin:r', 'assistenz:r'],
+			'getDefaultStundensaetze' => ['admin:r', 'assistenz:r'],
+			'getProjektbetreuerBySearchQuery' => ['admin:r', 'assistenz:r'],
+			'getPerson' => ['admin:r', 'assistenz:r'],
+			'validateProjektbetreuer' => ['admin:r', 'assistenz:r']
+		]);
+
+		// Load Libraries
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'person',
+			'projektarbeit'
+		]);
+
+		// Load models
+		$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
+		$this->load->model('education/Betreuerart_model', 'BetreuerartModel');
+		$this->load->model('ressource/Stundensatz_model', 'StundensatzModel');
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$this->load->model('education/Note_model', 'NoteModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		// load libraries
+		$this->load->library('PermissionLib');
+	}
+
+	/**
+	 * Gets Projektbetreuer data for a Projektarbeit.
+	 */
+	public function getProjektbetreuer()
+	{
+		$projektarbeit_id = $this->input->get('projektarbeit_id');
+
+		if (!isset($projektarbeit_id))
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
+
+		$qry = "
+			SELECT * FROM (
+				SELECT
+					projektarbeit_id, person_id, nachname, vorname, note, punkte, round(stunden, 1) AS stunden,
+					stundensatz, betreuerart_kurzbz, vertrag_id, titelpre, titelpost,
+					CASE
+						WHEN EXISTS
+							(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=pers.person_id)
+						THEN 'Mitarbeiter'
+						WHEN EXISTS
+							(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=pers.person_id)
+						THEN 'Student'
+						ELSE 'Person'
+					END AS status
+				FROM
+					lehre.tbl_projektbetreuer
+					JOIN public.tbl_person pers USING (person_id)
+				WHERE
+					projektarbeit_id = ?
+			) betreuer
+			ORDER BY
+				CASE WHEN status = 'Mitarbeiter' THEN 0 WHEN status = 'Person' THEN 1 ELSE 2 END";
+
+		$result = $this->ProjektbetreuerModel->execReadOnlyQuery($qry, [$projektarbeit_id]);
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$projektbetreuer = getData($result);
+
+		//~ foreach ($projektbetreuer as $projektarbeit)
+		//~ {
+			//~ $projektarbeit_id = $projektarbeit->projektarbeit_id;
+			//~ $abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
+
+			//~ if (isError($abgabeRes)) $this->terminateWithError(getError($abgabeRes), self::ERROR_TYPE_GENERAL);
+
+			//~ if (hasData($abgabeRes))
+			//~ {
+				//~ $paabgabe = getData($abgabeRes)[0];
+				//~ $projektarbeit->abgabedatum = $paabgabe->abgabedatum;
+			//~ }
+		//~ }
+
+		// add thesis download link (from external extension)
+		foreach ($projektbetreuer as $pb)
+		{
+			$downloadLink = null;
+			Events::trigger(
+				'projektbeurteilung_download_link',
+				$pb->projektarbeit_id,
+				$pb->betreuerart_kurzbz,
+				$pb->person_id,
+				function ($value) use (&$downloadLink) {
+					$downloadLink = $value;
+				}
+			);
+			$pb->beurteilungDownloadLink = $downloadLink;
+		}
+
+		$this->terminateWithSuccess($this->_addFullNameToBetreuer($projektbetreuer));
+	}
+
+	/**
+	 * Saves (adds or updates) a single Projektbetreuer for a Projektarbeit.
+	 */
+	public function saveProjektbetreuer()
+	{
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+
+		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$projektbetreuer = $this->input->post('projektbetreuer');
+
+		if ($this->_validate($projektbetreuer) == false) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// check if assessor has already been assigned
+		if (isset($projektbetreuer['person_id']))
+		{
+			$this->ProjektbetreuerModel->addSelect('1');
+			$betreuerRes = $this->ProjektbetreuerModel->loadWhere(
+				[
+					'person_id' => $projektbetreuer['person_id'],
+					'projektarbeit_id' => $projektbetreuer['projektarbeit_id'],
+					'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz']
+				]
+			);
+
+			if (hasData($betreuerRes)
+				&& (!isset($projektbetreuer['person_id_old']) || $projektbetreuer['person_id'] != $projektbetreuer['person_id_old'])) {
+				return $this->terminateWithError($this->p->t('projektarbeit', 'betreuerZugewiesen'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		$result = null;
+
+		$stunden = isset($projektbetreuer['stunden']) && !isEmptyString($projektbetreuer['stunden']) ? $projektbetreuer['stunden'] : null;
+		$stundensatz =
+			isset($projektbetreuer['stundensatz']) && !isEmptyString($projektbetreuer['stundensatz']) ? $projektbetreuer['stundensatz'] : null;
+
+		$betreuer = [
+			'projektarbeit_id' => $projektarbeit_id,
+			'person_id' => $projektbetreuer['person_id'],
+			'note' => $projektbetreuer['note'],
+			'stunden' => $stunden,
+			'stundensatz' => $stundensatz,
+			'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz']
+		];
+
+		if (isset($projektbetreuer['person_id_old']) && isset($projektbetreuer['betreuerart_kurzbz_old']))
+		{
+			$result = $this->ProjektbetreuerModel->update(
+				[
+					'projektarbeit_id' => $projektarbeit_id,
+					'person_id' => $projektbetreuer['person_id_old'],
+					'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz_old']
+				],
+				array_merge($betreuer, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
+			);
+		}
+		else
+		{
+			$result = $this->ProjektbetreuerModel->insert(
+				array_merge($betreuer, ['insertamum' => date('c'), 'insertvon' => getAuthUID()])
+			);
+		}
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	/**
+	 * Delete a Projektbetreuer assignment to a Projektarbeit.
+	 */
+	public function deleteProjektbetreuer()
+	{
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$person_id = $this->input->post('person_id');
+		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
+
+		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
+		{
+			return $this->terminateWithError(
+				$this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'projektarbeit').' ID'], self::ERROR_TYPE_GENERAL)
+			);
+		}
+
+		if (!isset($person_id) || !is_numeric($person_id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID'], self::ERROR_TYPE_GENERAL));
+
+		if (!isset($betreuerart_kurzbz))
+		{
+			return $this->terminateWithError(
+				$this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'betreuerart')], self::ERROR_TYPE_GENERAL)
+			);
+		}
+
+		// check permission
+		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
+
+		$validate = $this->_validateDelete($projektarbeit_id, $person_id, $betreuerart_kurzbz);
+
+		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
+
+		// check if there is a Projektarbeitsbeurteilung - if yes, it is handled (possibly deleted) by external extension.
+		$beurteilungDeleteSuccess = true;
+
+		Events::trigger(
+			'projektarbeitsbeurteilung_delete',
+			$projektarbeit_id,
+			function ($value) use (&$beurteilungDeleteSuccess) {
+				$beurteilungDeleteSuccess = $value;
+			}
+		);
+
+		// if there is still a Beurteilung, Projektarbeit cannot be deleted - return with error
+		if (!$beurteilungDeleteSuccess) return $this->terminateWithError($this->p->t('projektarbeit', 'error_paarbeitHatBeurteilung'));
+
+		$result = $this->ProjektbetreuerModel->delete(
+			['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id, 'betreuerart_kurzbz' => $betreuerart_kurzbz]
+		);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result))
+		{
+			$this->outputJson($result);
+		}
+
+		return $this->terminateWithSuccess(getData($result));
+	}
+
+	/**
+	 * Get all active Betreuerarten.
+	 */
+	public function getBetreuerarten()
+	{
+		$result = $this->BetreuerartModel->loadWhere(['aktiv' => true]);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	/**
+	 * Get all Noten.
+	 */
+	public function getNoten()
+	{
+		$result = $this->NoteModel->load();
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	/**
+	 * Get default Stundensätze for an employee in a semester.
+	 */
+	public function getDefaultStundensaetze()
+	{
+		$person_id = $this->input->get('person_id');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+
+		$result = $this->StundensatzModel->getStundensatzForMitarbeiter($person_id, $studiensemester_kurzbz);
+
+		return $this->terminateWithSuccess($result);
+	}
+
+	/**
+	 * Get all Projektbetreuer by search string.
+	 */
+	public function getProjektbetreuerBySearchQuery()
+	{
+		$searchString = $this->input->get('searchString');
+
+		if (!isset($searchString))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Search term']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->PersonModel->searchPerson($searchString);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$persons = $this->_addFullNameToBetreuer(getData($result));
+
+		// sort persons by type (employees first)
+		usort($persons, function ($a, $b) {
+			$statusRanks = ['Mitarbeiter' => 0, 'Person' => 1, 'Student' => 2];
+			return (isset($statusRanks[$a->status]) ? $statusRanks[$a->status] : count($statusRanks) + 1)
+				- (isset($statusRanks[$b->status]) ? $statusRanks[$b->status] : count($statusRanks) + 1);
+		});
+
+		return $this->terminateWithSuccess($persons);
+	}
+
+	/**
+	 * Get person info by Id.
+	 */
+	public function getPerson()
+	{
+		$person_id = $this->input->get('person_id');
+
+		if (!isset($person_id))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Person']), self::ERROR_TYPE_GENERAL);
+
+		$this->PersonModel->addSelect("CASE
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=tbl_person.person_id)
+				THEN 'Mitarbeiter'
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=tbl_person.person_id)
+				THEN 'Student'
+				ELSE 'Person'
+			END AS status");
+		$result = $this->PersonModel->addSelect('titelpre, titelpost, vorname, nachname, person_id');
+		$result = $this->PersonModel->load($person_id);
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? $this->_addFullNameToBetreuer(getData($result))[0] : []);
+	}
+
+	/**
+	 * Validate list of Projektbetreuer.
+	 */
+	public function validateProjektbetreuer()
+	{
+		$projektbetreuerArr = $this->input->post('projektbetreuer');
+
+		if (!is_array($projektbetreuerArr)) $projektbetreuerArr = [$projektbetreuerArr];
+
+		foreach ($projektbetreuerArr as $pb)
+		{
+			if ($this->_validate($pb) == false)
+			{
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+			}
+		}
+
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
+	 * Validation funciton for checking Projektbetreuer input.
+	 * @param $formData Betreuer data
+	 * @return bool true when data is valid
+	 */
+	private function _validate($formData)
+	{
+		$this->form_validation->set_data($formData);
+
+		$this->form_validation->set_rules('betreuerart_kurzbz', 'Betreuerart', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('projektarbeit', 'betreuerart')])
+		]);
+
+		$this->form_validation->set_rules('person_id', 'Person', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('projektarbeit', 'betreuer')])
+		]);
+
+		$this->form_validation->set_rules('stunden', 'Stunden', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => $this->p->t('projektarbeit', 'stunden')])
+		]);
+
+		$this->form_validation->set_rules('stundensatz', 'Stundensatz', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' =>  $this->p->t('projektarbeit', 'stundensatz')])
+		]);
+
+
+		return $this->form_validation->run();
+	}
+
+	/**
+	 * Check possibility of deletion of a Projektbetreuer.
+	 * @param projektarbeit_id
+	 * @param person_id
+	 * @param betreuerart_kurzbz
+	 * @return object success when delete possible, error otherwise
+	 */
+	private function _validateDelete($projektarbeit_id, $person_id, $betreuerart_kurzbz)
+	{
+		// check if contract exists
+		$this->ProjektbetreuerModel->addSelect('vertrag_id');
+		$result = $this->ProjektbetreuerModel->loadWhere(
+			['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id, 'betreuerart_kurzbz' => $betreuerart_kurzbz]
+		);
+
+		if (isError($result)) return $result;
+
+		// if contract exists, no deletion is possible
+		if (hasData($result) && getData($result)[0]->vertrag_id != null) return error($this->p->t('projektarbeit', 'error_betreuerHatVertrag'));
+
+		return success();
+	}
+
+	/**
+	 * Add full name to array with Betreuer.
+	 * @param $betreuerArr
+	 * @return array including Betreuer with their full names
+	 */
+	private function _addFullNameToBetreuer($betreuerArr)
+	{
+		foreach ($betreuerArr as $betreuer)
+		{
+			$betreuer->name = ($betreuer->titelpre ? $betreuer->titelpre . ' ' : '') .
+				$betreuer->nachname . ' ' . $betreuer->vorname . ($betreuer->titelpost ? ' ' . $betreuer->titelpre : '').
+				' (' . $betreuer->status . ')';
+		}
+
+		return $betreuerArr;
+	}
+}
@@ -18,6 +18,8 @@

 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 addresses
@@ -111,7 +113,7 @@ class Pruefung extends FHCAPI_Controller

 		// Load language phrases
 		$this->loadPhrases([
-			'global', 'ui','lehre'
+			'global', 'ui', 'lehre', 'exam'
 		]);
 	}

@@ -172,174 +174,11 @@ class Pruefung extends FHCAPI_Controller
 	 *
 	 * @param lehrveranstaltung_id, student_uid, lehreinheit_id
 	 *
-	 * @return values on success
-	 * 			retval 0: pruefung inserted
-	 * 			reval 1: pruefung and zeugnisnote inserted
-	 * 			retval 2: pruefung inserted, no insert Zeugnisnote
-	 * 					(change after date of examination)
-	 * 			retval 3: pruefung of type Termin2 inserted
-	 * 						and pruefung of type Termin1 as well
-	 *			retval 5: prueufungen Termin 2 and 1 inserted
-	 * 						and no insert Zeugnisnote (change after date of examination)
+	 * @return void
 	 */
 	public function insertPruefung()
 	{
-		$authUID = getAuthUID();
-
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehrveranstaltung')]),
-		]);
-		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
-		]);
-		$this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
-		]);
-		$this->form_validation->set_rules(
-			'datum',
-			$this->p->t('global', 'datum'),
-			['is_valid_date']
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		//calculate studiensemester_kurzbz this from lehreinheit (case newPruefung)
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		if (!$studiensemester_kurzbz)
-		{
-			$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-			$result = $this->LehreinheitModel->load($this->input->post('lehreinheit_id'));
-
-			$lehreinheit = $this->getDataOrTerminateWithError($result);
-			$studiensemester_kurzbz = current($lehreinheit)->studiensemester_kurzbz;
-
-			if (isError($result))
-			{
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$result = $this->PruefungModel->insert([
-			'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-			'student_uid' => $this->input->post('student_uid'),
-			'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-			'datum' => $this->input->post('datum'),
-			'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-			'note' => $this->input->post('note'),
-			'anmerkung' => $this->input->post('anmerkung'),
-			'insertamum' => date('c'),
-			'insertvon' => $authUID,
-		]);
-
-		$this->getDataOrTerminateWithError($result);
-
-		//check if existing zeugnisnote
-		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-
-		$result = $this->ZeugnisnoteModel->loadWhere(array(
-			'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
-			'student_uid' => $this->input->post('student_uid'),
-			'studiensemester_kurzbz' => $studiensemester_kurzbz));
-
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		if (!hasData($result))
-		{
-			//insert zeugnisnote, if not existing
-			$result = $this->ZeugnisnoteModel->insert(array(
-				'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
-				'student_uid' => $this->input->post('student_uid'),
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'note' => $this->input->post('note'),
-				'uebernahmedatum' => date('c'),
-				'benotungsdatum' => $this->input->post('datum'),
-				'insertamum' => date('c'),
-				'insertvon' =>  $authUID
-			));
-
-			if (isError($result))
-			{
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$this->terminateWithSuccess(1);
-		}
-
-		$return_code = 0;
-
-		//handling Termin1 if not existing
-		if($this->input->post('pruefungstyp_kurzbz') == "Termin2")
-		{
-			$resultP = $this->PruefungModel->loadWhere(array(
-				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-				'student_uid' => $this->input->post('student_uid'),
-				'pruefungstyp_kurzbz' => 'Termin1'));
-
-			if (isError($resultP))
-			{
-				$this->terminateWithError(getError($resultP), self::ERROR_TYPE_GENERAL);
-			}
-			if(!hasData($resultP))
-			{
-				//check if existing Zeugnisnote
-				$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-				$this->ZeugnisnoteModel->addJoin('lehre.tbl_lehreinheit', 'lehrveranstaltung_id');
-
-				$resultP = $this->ZeugnisnoteModel->loadWhere(array(
-					'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
-					'student_uid' => $this->input->input->post('student_uid'),
-					'lehre.tbl_zeugnisnote.studiensemester_kurzbz' => $studiensemester_kurzbz));
-				if (isError($resultP))
-				{
-					$this->terminateWithError(getError($resultP), self::ERROR_TYPE_GENERAL);
-				}
-				if (!hasData($resultP))
-				{
-					$this->terminateWithError("Zeugnisnote existiert nicht", self::ERROR_TYPE_GENERAL);
-				}
-				$dataNote = current(getData($resultP));
-
-				$resultN = $this->PruefungModel->insert([
-					'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-					'student_uid' => $this->input->post('student_uid'),
-					'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-					'datum' => $dataNote->benotungsdatum,
-					'pruefungstyp_kurzbz' => 'Termin1',
-					'note' => $dataNote->note,
-					'punkte' => $dataNote->punkte,
-					'anmerkung' => 'automatisiert aus Zeugnisnote erstellt',
-					'insertamum' => date('c'),
-					'insertvon' => $authUID,
-				]);
-
-				if (isError($resultN)) {
-					$this->terminateWithError(getError($resultN), self::ERROR_TYPE_GENERAL);
-				}
-				$return_code = 3;
-			}
-		}
-
-		$note = current(getData($result));
-		$uebernahmedatum = new DateTime($note->uebernahmedatum);
-		$benotungsdatum = new DateTime($note->benotungsdatum);
-
-		$checkDate = $uebernahmedatum  === '' || $benotungsdatum  > $uebernahmedatum
-			? $benotungsdatum
-			: $uebernahmedatum;
-
-		if ($checkDate >= $this->input->post('datum') && $note !== $note->note)
-		{
-			$this->terminateWithSuccess($return_code + 2);
-		}
-		$this->terminateWithSuccess($return_code + 2);
+		$this->insertOrUpdatePruefung();
 	}

 	/**
@@ -348,8 +187,6 @@ class Pruefung extends FHCAPI_Controller
 	 * @param pruefung_id
 	 *
 	 * @return success or error
-	 *
-	 * no impact on lehre.tbl_zeugnisnote
 	 */
 	public function updatePruefung($pruefung_id)
 	{
@@ -359,48 +196,7 @@ class Pruefung extends FHCAPI_Controller
 		if (!$oldpruefung)
 			show_404(); // Pruefung that should be updated does not exist

-		$authUID = getAuthUID();
-
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehrveranstaltung')]),
-		]);
-		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
-		]);
-		$this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
-		]);
-		$this->form_validation->set_rules(
-			'datum',
-			$this->p->t('global', 'datum'),
-			['is_valid_date']
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$result = $this->PruefungModel->update(
-			[
-				'pruefung_id' => $pruefung_id
-			],
-			[	'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-				'student_uid' =>  $this->input->post('student_uid'),
-				'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
-				'note' => $this->input->post('note'),
-				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-				'datum' => $this->input->post('datum'),
-				'anmerkung' => $this->input->post('anmerkung'),
-				'updatevon' => $authUID,
-				'updateamum' => date('c'),
-			]
-		);
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->outputJsonSuccess(true);
+		$this->insertOrUpdatePruefung($pruefung_id);
 	}

 	/**
@@ -574,4 +370,198 @@ class Pruefung extends FHCAPI_Controller

 		return $this->terminateWithSuccess($data);
 	}
+
+	protected function insertOrUpdatePruefung($pruefung_id=null)
+	{
+		$authUID = getAuthUID();
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
+		]);
+		$this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
+		]);
+		$this->form_validation->set_rules(
+			'datum',
+			$this->p->t('global', 'datum'),
+			['is_valid_date']
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$this->PruefungModel->db->trans_start();
+
+		if ($this->input->post('pruefungstyp_kurzbz') == "Termin2")
+		{
+			//Wenn ein 2. Termin angelegt wird, und kein 1. Termin vorhanden ist,
+			//dann wird auch ein 1. Termin angelegt mit der derzeitigen Zeugnisnote
+			$resultP = $this->PruefungModel->loadWhere(array(
+				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+				'student_uid' => $this->input->post('student_uid'),
+				'pruefungstyp_kurzbz' => 'Termin1'));
+
+			$termin1 = $this->getDataOrTerminateWithError($resultP);
+			if (!$termin1)
+			{
+				//check if existing Zeugnisnote
+				$this->ZeugnisnoteModel->addJoin('lehre.tbl_lehreinheit', 'lehrveranstaltung_id');
+
+				$this->ZeugnisnoteModel->db->where(
+					'lehre.tbl_zeugnisnote.studiensemester_kurzbz',
+					'lehre.tbl_lehreinheit.studiensemester_kurzbz',
+					false
+				);
+				$resultP = $this->ZeugnisnoteModel->loadWhere(array(
+					'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+					'student_uid' => $this->input->post('student_uid')
+				));
+
+				$zeugnisnoten = $this->getDataOrTerminateWithError($resultP);
+				if ($zeugnisnoten)
+				{
+					$zeugnisnote = current($zeugnisnoten);
+
+					$resultN = $this->PruefungModel->insert([
+						'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+						'student_uid' => $this->input->post('student_uid'),
+						'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+						'datum' => $zeugnisnote->benotungsdatum,
+						'pruefungstyp_kurzbz' => 'Termin1',
+						'note' => $zeugnisnote->note,
+						'punkte' => $zeugnisnote->punkte,
+						'anmerkung' => 'automatisiert aus Zeugnisnote erstellt',
+						'insertamum' => date('c'),
+						'insertvon' => $authUID,
+					]);
+
+					$this->getDataOrTerminateWithError($resultN);
+				}
+				//Wenn keine Zeugnisnote vorhanden ist, dann wird kein
+				//1.Termin angelegt
+			}
+		}
+
+		if(intval($pruefung_id) > 0)
+		{
+			$result = $this->PruefungModel->update(
+				[
+					'pruefung_id' => $pruefung_id
+				],
+				[	'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+					'student_uid' =>  $this->input->post('student_uid'),
+					'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
+					'note' => $this->input->post('note'),
+					'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+					'datum' => $this->input->post('datum'),
+					'anmerkung' => $this->input->post('anmerkung'),
+					'updatevon' => $authUID,
+					'updateamum' => date('c'),
+				]
+			);
+		}
+		else
+		{
+			$result = $this->PruefungModel->insert([
+				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+				'student_uid' => $this->input->post('student_uid'),
+				'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+				'datum' => $this->input->post('datum'),
+				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+				'note' => $this->input->post('note'),
+				'anmerkung' => $this->input->post('anmerkung'),
+				'insertamum' => date('c'),
+				'insertvon' => $authUID,
+				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
+			]);
+		}
+
+		$this->getDataOrTerminateWithError($result);
+
+		//get studiensemester_kurzbz and lehreveranstaltung_id from lehreinheit
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+		$result = $this->LehreinheitModel->load($this->input->post('lehreinheit_id'));
+
+		$lehreinheiten = $this->getDataOrTerminateWithError($result);
+
+		if (!$lehreinheiten) {
+			$this->terminateWithValidationErrors([
+				'lehreinheit_id' => $this->p->t('ui', 'error_fieldNotFound', [
+					'field' => $this->p->t('lehre', 'lehreinheit')
+				])
+			]);
+		}
+		$lehreinheit = current($lehreinheiten);
+		$studiensemester_kurzbz = $lehreinheit->studiensemester_kurzbz;
+		$lehrveranstaltung_id = $lehreinheit->lehrveranstaltung_id;
+
+		//check if existing zeugnisnote
+		$result = $this->ZeugnisnoteModel->loadWhere(array(
+			'lehrveranstaltung_id' => $lehrveranstaltung_id,
+			'student_uid' => $this->input->post('student_uid'),
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+
+		$zeugnisnoten = $this->getDataOrTerminateWithError($result);
+
+		if (!$zeugnisnoten)
+		{
+			//insert zeugnisnote, if not existing
+			$result = $this->ZeugnisnoteModel->insert(array(
+				'lehrveranstaltung_id' => $lehrveranstaltung_id,
+				'student_uid' => $this->input->post('student_uid'),
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'note' => $this->input->post('note'),
+				'uebernahmedatum' => date('c'),
+				'benotungsdatum' => $this->input->post('datum'),
+				'insertamum' => date('c'),
+				'insertvon' =>  $authUID,
+				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
+			));
+
+			$this->getDataOrTerminateWithError($result);
+
+			$this->PruefungModel->db->trans_complete();
+			$this->terminateWithSuccess();
+		}
+
+		$note = current($zeugnisnoten);
+		$uebernahmedatum = new DateTime($note->uebernahmedatum);
+		$benotungsdatum = new DateTime($note->benotungsdatum);
+		$pruefungsdatum = new DateTime($this->input->post('datum'));
+
+		$checkDate = $note->uebernahmedatum === '' || $benotungsdatum > $uebernahmedatum
+			? $benotungsdatum
+			: $uebernahmedatum;
+
+		if ($checkDate > $pruefungsdatum && $this->input->post('note') !== $note->note)
+		{
+			$this->PruefungModel->db->trans_complete();
+			$this->terminateWithSuccess($this->p->t('exam', 'hinweis_changeAfterExamDate'));
+		}
+
+		//update zeugnisnote, if existing and valid datum
+		$result = $this->ZeugnisnoteModel->update([
+			'lehrveranstaltung_id' => $lehrveranstaltung_id,
+			'student_uid' => $this->input->post('student_uid'),
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		], [
+			'note' => $this->input->post('note'),
+			'uebernahmedatum' => date('c'),
+			'benotungsdatum' => $this->input->post('datum'),
+			'updateamum' => date('c'),
+			'updatevon' =>  $authUID,
+			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
+		]);
+
+		$this->PruefungModel->db->trans_complete();
+		$this->terminateWithSuccess();
+	}
 }
@@ -114,9 +114,8 @@ class Status extends FHCAPI_Controller
 		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');

 		$result = $this->BismeldestichtagModel->getLastReachedMeldestichtag();
-		$data = $this->getDataOrTerminateWithError($result);

-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
 	}

 	public function isLastStatus($prestudent_id)
@@ -296,7 +295,7 @@ class Status extends FHCAPI_Controller
 			}],
 			//Check if Rolle already exists
 			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
-				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above

 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
@@ -637,7 +636,7 @@ class Status extends FHCAPI_Controller

 		$this->load->library('PrestudentLib');

-		$this->prestudentlib->setFirstStudent(
+		$resFirstStudent = $this->prestudentlib->setFirstStudent(
 			$prestudent_id,
 			$lastAufgenommener->studiensemester_kurzbz,
 			$lastAufgenommener->ausbildungssemester,
@@ -646,9 +645,8 @@ class Status extends FHCAPI_Controller
 			$this->input->post('statusgrund_id')
 		);

-		$this->getDataOrTerminateWithError($result);
-
-		$this->db->trans_commit();
+		$this->db->trans_complete();
+		$this->getDataOrTerminateWithError($resFirstStudent);

 		return $this->outputJsonSuccess(true);
 	}
@@ -903,7 +901,7 @@ class Status extends FHCAPI_Controller

 		$this->form_validation->set_rules('_default', '', [
 			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
-				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above

 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
@@ -920,7 +918,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above

 				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
@@ -945,7 +943,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above

 				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
@@ -970,7 +968,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above

 				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
@@ -995,7 +993,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above

 				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
@@ -1020,7 +1018,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
 					return true; // Error will be handled by the required statements above

 				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
@@ -1079,6 +1077,24 @@ class Status extends FHCAPI_Controller
 		$this->terminateWithSuccess(true);
 	}

+	protected function checkForCriticalChangesBis($oldstatus)
+	{
+		$changedFields = array();
+		$allowedFields = array('anmerkung', 'statusgrund_id');
+		$oldstatus_array = get_object_vars($oldstatus);
+		foreach($oldstatus_array as $key => $oldValue)
+		{
+			$newValue = $this->input->post($key);
+			if( $newValue !== $oldValue )
+			{
+				$changedFields[] = $key;
+			}
+		}
+		$criticalFieldsChanged = array_diff($changedFields, $allowedFields);
+		$hasCriticalChangesBis = count($criticalFieldsChanged) > 0 ? true : false;
+		return $hasCriticalChangesBis;
+	}
+
 	/**
 	 * Updates a status entry
 	 *
@@ -1103,6 +1119,7 @@ class Status extends FHCAPI_Controller

 		$oldstatus = current($oldstatus);

+		$hasCriticalChangesBis = $this->checkForCriticalChangesBis($oldstatus);

 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
 		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
@@ -1113,7 +1130,6 @@ class Status extends FHCAPI_Controller
 		$ausbildungssemester = $this->input->post('ausbildungssemester') ?: $oldstatus->ausbildungssemester;
 		$datum = $this->input->post('datum') ?: $oldstatus->datum;

-
 		//Form Validation
 		$this->load->library('form_validation');

@@ -1136,9 +1152,15 @@ class Status extends FHCAPI_Controller
 			$this->p->t('global', 'datum'),
 			[
 				'is_valid_date',
-				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
+				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck, $hasCriticalChangesBis){
 					if ($isBerechtigtNoStudstatusCheck)
-						return true; // Skip if access right says so
+					{
+						return true; // Skip if access right says so*/
+					}
+					if (!$hasCriticalChangesBis) {
+						return true; // Skip if no critical changes were made
+					}
+
 					if (!$value)
 						return true; // Error will be handled by the required statement above

@@ -1342,6 +1364,7 @@ class Status extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => $authUID
 		];
+		$nullableFields = ['statusgrund_id', 'anmerkung', 'rt_stufe'];
 		foreach ([
 					'orgform_kurzbz',
 					'anmerkung',
@@ -1350,8 +1373,17 @@ class Status extends FHCAPI_Controller
 					'rt_stufe',
 					'statusgrund_id'
 				] as $key)
-			if ($this->input->post($key))
+		{
+			if (in_array($key, $nullableFields))
+			{
+				$updateData[$key] = ($this->input->post($key) === '') ? null : $this->input->post($key);
+			}
+			else if ($this->input->post($key))
+			{
 				$updateData[$key] = $this->input->post($key);
+			}
+		}
+

 		if ($this->input->post('bestaetigtam')) {
 			$updateData['bestaetigtam'] = $this->input->post('bestaetigtam');
@@ -36,7 +36,8 @@ class Student extends FHCAPI_Controller
 		parent::__construct([
 			'get' => ['admin:r', 'assistenz:r'],
 			'save' => ['admin:rw', 'assistenz:rw'],
-			'check' => ['admin:rw', 'assistenz:rw'],
+			'saveStudent' => ['admin:rw', 'assistenz:rw'],
+			'getPerson' => ['admin:rw', 'assistenz:rw'],
 			'add' => ['admin:rw', 'assistenz:rw'] // TODO(chris): extra permissions
 		]);

@@ -55,7 +56,7 @@ class Student extends FHCAPI_Controller

 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'lehre'
+			'ui', 'lehre', 'person'
 		]);
 	}

@@ -111,26 +112,33 @@ class Student extends FHCAPI_Controller
 		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 
+					SELECT kontakt
+					FROM public.tbl_kontakt
+					WHERE kontakttyp='email'
+					AND person_id=p.person_id
+					AND zustellung
+					ORDER BY kontakt_id DESC
 					LIMIT 1
 				) AS email_privat",
 				false
 			);
+			$this->PrestudentModel->addSelect(
+				"(
+					SELECT kontakt
+					FROM public.tbl_kontakt
+					WHERE kontakttyp='email_unverifiziert'
+					AND person_id=p.person_id
+					AND zustellung
+					ORDER BY kontakt_id DESC
+					LIMIT 1
+				) AS email_privat_unverified",
+				false
+			);
 		}
 		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
 		);

 		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
@@ -146,9 +154,9 @@ class Student extends FHCAPI_Controller
 										'LEFT');*/

 		$result = $this->PrestudentModel->loadWhere(['tbl_prestudent.prestudent_id' => $prestudent_id]);
-		
+
 		$student = $this->getDataOrTerminateWithError($result);
-		
+
 		if (!$student)
 			return show_404();

@@ -208,7 +216,7 @@ class Student extends FHCAPI_Controller
 		]);

 		$this->load->library('UDFLib');
-		
+
 		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());

 		$udf_field_validations = $this->getDataOrTerminateWithError($result);
@@ -219,7 +227,7 @@ class Student extends FHCAPI_Controller
 			$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;
@@ -232,7 +240,6 @@ class Student extends FHCAPI_Controller

 		$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) {
@@ -292,7 +299,7 @@ class Student extends FHCAPI_Controller
 		}

 		$array_allowed_props_student = ['matrikelnr'];
-		if($this->isLaufendesSemester($studiensemester_kurzbz)) 
+		if($this->isLaufendesSemester($studiensemester_kurzbz))
 		{
 			$array_allowed_props_student = ['matrikelnr', 'verband', 'semester', 'gruppe'];
 		}
@@ -309,6 +316,10 @@ class Student extends FHCAPI_Controller
 		foreach ($array_allowed_props_benutzer as $prop) {
 			$val = $this->input->post($prop);
 			if ($val !== null) {
+				if($prop === 'alias' && $val === '')
+				{
+					$val = null;
+				}
 				$update_benutzer[$prop] = $val;
 			}
 		}
@@ -424,7 +435,32 @@ class Student extends FHCAPI_Controller
 		), ''));
 	}

-	public function check()
+	/**
+	 * Saves data to a prestudent using their student_uid
+	 *
+	 * @param string			$student_uid
+	 * @param string			$studiensemester_kurzbz
+	 * @return void
+	 */
+	public function saveStudent($student_uid, $studiensemester_kurzbz)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+
+		$result = $this->StudentModel->load([$student_uid]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if (!$data)
+			show_404(); // No Student with that ID
+
+		$student = current($data);
+
+		$this->checkPermissionsForPrestudent($student->prestudent_id, ['admin:rw', 'assistenz:rw']);
+
+		return $this->save($student->prestudent_id, $studiensemester_kurzbz);
+	}
+
+	public function getPerson()
 	{
 		$this->load->library('form_validation');

@@ -442,21 +478,55 @@ class Student extends FHCAPI_Controller

 		$this->load->model('person/Person_model', 'PersonModel');

+		$this->PersonModel->addSelect(
+			'person_id, vorname, nachname, vornamen, wahlname, gebdatum, staatsbuergerschaft, geburtsnation, sprache, anrede,
+			titelpost, titelpre, gebort, gebzeit, homepage, geschlecht, matr_nr,
+			aktiv, unruly, tbl_geschlecht.bezeichnung_mehrsprachig AS geschlecht_bezeichnung'
+		);
+		$this->PersonModel->addJoin('public.tbl_geschlecht', 'geschlecht');
+
 		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->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape(trim($nachname)) . ')', false);
+			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape(trim($vorname)) . ')', false);
 			$this->PersonModel->db->group_end();
 		} elseif ($nachname) {
-			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($nachname) . ')', false);
+			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape(trim($nachname)) . ')', false);
 		}

 		$result = $this->PersonModel->load();

 		$data = $this->getDataOrTerminateWithError($result);

+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		foreach ($data as $person)
+		{
+			// get adresses
+			$langIdx = $this->_getLanguageIndex() - 1;
+			$person->geschlecht_bezeichnung = isset($person->geschlecht_bezeichnung[$langIdx]) ? $person->geschlecht_bezeichnung[$langIdx] : '';
+
+			// get Adresse
+			$this->AdresseModel->addOrder('heimatadresse', 'DESC');
+			$this->AdresseModel->addOrder('zustelladresse', 'DESC');
+			$this->AdresseModel->addOrder('adresse_id', 'DESC');
+			$result = $this->AdresseModel->loadWhere(['person_id' => $person->person_id]);
+
+			$adressen = $this->getDataOrTerminateWithError($result);
+
+			$person->adressen = $adressen;
+
+			// get status
+			$result = $this->PrestudentstatusModel->getLastStatusPerson($person->person_id);
+
+			$status = $this->getDataOrTerminateWithError($result);
+
+			$person->status = $status;
+		}
+
 		$this->terminateWithSuccess($data);
 	}

@@ -465,69 +535,57 @@ class Student extends FHCAPI_Controller
 		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->_validate();

-		$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/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');

-		$this->db->trans_start();
+		$this->load->library('PrestudentLib');

-		$result = $this->addInteressent();
+		$errors = [];
+		$person_id = null;

-		$this->db->trans_complete();
+		$this->db->trans_begin();

-		if ($this->db->trans_status() === FALSE)
-			$this->terminateWithError('TODO(chris): TEXT', self::ERROR_TYPE_GENERAL);
+		$result = $this->_addPerson();
+		if (isError($result)) $errors[] = getError($result);

-		$this->terminateWithSuccess($result);
+		if (hasData($result))
+		{
+			$person_id = getData($result);
+			$result = $this->_addAdresse($person_id);
+			if (isError($result)) $errors[] = getError($result);
+			$result = $this->_addKontakt($person_id);
+			if (isError($result)) $errors[] = getError($result);
+			if (!$this->input->post('personOnly')) $result = $this->_addFirstPrestudentstatus($person_id);
+			if (isError($result)) $errors[] = getError($result);
+		}
+
+		if ($this->db->trans_status() === FALSE || !isEmptyArray($errors))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(isEmptyArray($errors) ? $this->p->t('stv', 'error_add_student') : $errors);
+		}
+		$this->db->trans_commit();
+
+		$this->terminateWithSuccess($person_id);
 	}

-	protected function addInteressent()
+	private function _addPerson()
 	{
 		// 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'),
@@ -550,19 +608,25 @@ class Student extends FHCAPI_Controller
 			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');
+				$data['gebdatum'] = (new DateTime($this->input->post('gebdatum')))->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);
+			return $this->PersonModel->insert($data);
 		}

-		// Addresse anlegen
-		$anlegen = $this->input->post('address[func]');
-		if ($anlegen) {
+		return success($person_id);
+	}
+
+	private function _addAdresse($person_id)
+	{
+		// Addresse anlegen?
+		$anlegen = $this->input->post('address[checked]');
+		if ($anlegen === true)
+		{
+			// Adresse laden
 			$this->load->model('person/Adresse_model', 'AdresseModel');

 			$data = [
@@ -574,50 +638,45 @@ class Student extends FHCAPI_Controller
 				'typ' => 'h',
 				'zustelladresse' => true,
 			];
-			if ($anlegen < 0) { // Überschreiben
-				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
-				$this->AdresseModel->addOrder('sort');
+
+				$this->AdresseModel->addSelect('adresse_id');
 				$result = $this->AdresseModel->loadWhere([
 					'person_id' => $person_id
 				]);
-				$address = $this->getDataOrTerminateWithError($result);
-				if ($address) {
-					$address = current($address);

-					$data['updateamum'] = date('c');
-					$data['updatevon'] = getAuthUID();
+				if (isError($result)) return $result;
+
+				// wenn neue Adresse, heimatadresse setzen
+				if (!hasData($result)) $data['heimatadresse'] = true;

-					$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);
-			}
+
+				return $this->AdresseModel->insert($data);
 		}
-		
+
+		return success(null);
+	}
+
+	private function _addKontakt($person_id)
+	{
 		// Kontaktdaten
 		$kontaktdaten = [];
-		foreach (['email', 'telefon', 'mobil'] as $k) {
+
+		foreach (['email', 'telefon', 'mobil'] as $k)
+		{
 			$v = $this->input->post($k);
 			if ($v)
 				$kontaktdaten[$k] = $v;
 		}
-		if (count($kontaktdaten)) {
+
+		if (count($kontaktdaten))
+		{
 			$this->load->model('person/Kontakt_model', 'KontaktModel');

-			foreach ($kontaktdaten as $typ => $kontakt) {
+			foreach ($kontaktdaten as $typ => $kontakt)
+			{
 				$data = [
 					'person_id' => $person_id,
 					'kontakttyp' => $typ,
@@ -627,83 +686,70 @@ class Student extends FHCAPI_Controller
 					'insertvon' => getAuthUID()
 				];
 				$result = $this->KontaktModel->insert($data);
-				$this->getDataOrTerminateWithError($result);
+				if (isError($result)) return $result;
 			}
 		}
+		return success(null);
+	}

+	private function _addFirstPrestudentstatus($person_id)
+	{
 		// 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
-		];
+
+		// Anmerkung with Ausbildungsart
+		$studiengang_kz = $this->input->post('studiengang_kz');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
 		$ausbildungsart = $this->input->post('ausbildungsart');
+		$anmerkung = $this->input->post('anmerkungen');
+		$foerderrelevant = null;
 		if ($ausbildungsart)
-			$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
+			$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;
+		if ($incoming || substr($studiengang_kz, 0, 1) == '9')
+			$foerderrelevant = false;

-				$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);
+		$result = $this->prestudentlib->setPrestudent(
+			$person_id,
+			$studiengang_kz,
+			$this->input->post('letzteausbildung'),
+			$anmerkung,
+			$foerderrelevant
+		);
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('Error when adding prestudent');

-		// 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);
+		$prestudent_id = getData($result);

-		if ($incoming) {
-			// TODO(chris): IMPLEMENT!
-			//Matrikelnummer und UID generieren
-			//Benutzerdatensatz anlegen
-			//Studentendatensatz anlegen
-			//StudentLehrverband anlegen
+		// wenn Incoming, Incoming Daten hinzufügen
+		if ($incoming)
+		{
+			$statusResult = $this->prestudentlib->setFirstIncoming(
+				$prestudent_id,
+				$studiengang_kz,
+				$studiensemester_kurzbz,
+				$this->input->post('orgform_kurzbz'),
+				$this->input->post('studienplan_id')
+			);
 		}
+		else
+		{
+			// Prestudent Rolle Anlegen
+			$statusResult = $this->prestudentlib->setFirstStatus(
+				$prestudent_id,
+				$this->PrestudentstatusModel::STATUS_INTERESSENT,
+				$studiensemester_kurzbz,
+				$this->input->post('ausbildungssemester'),
+				$this->input->post('orgform_kurzbz'),
+				$this->input->post('studienplan_id')
+			);
+		}
+		if (!hasData($statusResult)) return error('error when adding status');
+		if (isError($statusResult)) return $statusResult;

-		// TODO(chris): DEBUG
-		/*$result = $this->PrestudentModel->loadWhere([
-			'pestudent_id' => 1
-		]);
-		if (isError($result)) {
-			return $result;
-		}*/
-
-		return success(true);
+		return success($prestudent_id);
 	}

 	public function requiredIfNotPersonId($value)
@@ -715,13 +761,84 @@ class Student extends FHCAPI_Controller
 	
 	public function requiredIfAddressFunc($value)
 	{
-		if (!$_POST['address']['func'])
+		if (!isset($_POST['address']['checked']) || !$_POST['address']['checked'])
 			return true;
 		return !!$value;
 	}

-	public function isValidDate($value)
+	public function requiredIfStudentFunc($value)
 	{
-		return isValidDate($value);
+		if (isset($_POST['personOnly']) && $_POST['personOnly'])
+			return true;
+		return !!$value;
+	}
+
+	public function requiredIfStudentAndNotIncomingFunc($value)
+	{
+		if ((isset($_POST['incoming']) && $_POST['incoming']) || $this->requiredIfStudentFunc($value))
+			return true;
+		return !!$value;
+	}
+
+	/**
+	 * Validates input data. Terminates with validation errors, if invalid.
+	 */
+	private function _validate()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'nachname')])
+		]);
+		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'geschlecht')])
+		]);
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', ['isValidDate', function($value) { return isValidDate($value); }], [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+		//$this->form_validation->set_rules('address[checked]', 'Address', 'required');
+		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'plz')])
+		]);
+		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'gemeinde')])
+		]);
+		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'ort')])
+		]);
+		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'adresse')])
+		]);
+		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'callback_requiredIfStudentFunc', [
+			'requiredIfStudentFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'studiengang')])
+		]);
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'callback_requiredIfStudentFunc', [
+			'requiredIfStudentFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'studiensemester')])
+		]);
+		$this->form_validation->set_rules(
+			'ausbildungssemester',
+			'Ausbildungssemester',
+			'callback_requiredIfStudentAndNotIncomingFunc|integer|less_than[9]|greater_than[-1]',
+			[
+				'requiredIfStudentAndNotIncomingFunc' =>
+					$this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'ausbildungssemester')]),
+			]
+		);
+		// 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());
+	}
+
+	private function _getLanguageIndex()
+	{
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->SpracheModel->addSelect('index');
+		$result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
+		$this->addMeta('lang', getUserLanguage());
+
+		return hasData($result) ? getData($result)[0]->index : 1;
 	}
 }
@@ -44,14 +44,12 @@ class Students extends FHCAPI_Controller
 		}

 		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('PhrasesLib');
 		$this->loadPhrases(
 			array(
 				'lehre'
 			)
 		);
-
 	}

 	/**
@@ -75,7 +73,7 @@ class Students extends FHCAPI_Controller
 	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)					=> getPrestudentsOrgform
 	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)/(otherfilter)	=> getPrestudentsOrgform
 	 *
-	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)	=> getStudentsSpezialguppe
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)	=> getStudentsSpezialgruppe
 	 *
 	 * /(studiensemester_kurzbz)/(studiengang_kz)								=> getStudents
 	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)					=> getStudents
@@ -101,39 +99,183 @@ class Students extends FHCAPI_Controller
 	}

 	/**
+	 * @param string		$studiensemester_kurzbz
+	 *
 	 * @return void
 	 */
-	public function getIncoming()
+	public function getIncoming($studiensemester_kurzbz)
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
+		$this->addMeta('ci_params', [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		]);
+		
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
+			"(
+				SELECT prestudent_id 
+				FROM public.tbl_prestudentstatus
+				WHERE status_kurzbz = 'Incoming'
+				AND studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+			) test",
+			"prestudent_id"
+		);
+
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN pls.ausbildungssemester::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+
+		$result = $this->PrestudentModel->load();
+		
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}

 	/**
+	 * @param string		$studiensemester_kurzbz
+	 *
 	 * @return void
 	 */
-	public function getOutgoing()
+	public function getOutgoing($studiensemester_kurzbz)
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
+		$this->addMeta('ci_params', [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		]);
+		
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
+			"(
+				SELECT prestudent_id 
+				FROM bis.tbl_bisio bis 
+				JOIN public.tbl_student USING (student_uid)
+				JOIN public.tbl_studiensemester stdsem ON (
+					(bis.von >= stdsem.start AND bis.von <= stdsem.ende) 
+					OR 
+					(bis.bis >= stdsem.start AND bis.bis <= stdsem.ende) 
+					OR 
+					(bis.von <= stdsem.start AND bis.bis >= stdsem.ende)
+				)
+				WHERE NOT EXISTS (
+					SELECT 1 
+					FROM public.tbl_prestudentstatus 
+					WHERE status_kurzbz = 'Incoming'
+					AND prestudent_id = tbl_student.prestudent_id
+				) AND stdsem.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				GROUP BY prestudent_id
+			) test",
+			"prestudent_id"
+		);
+
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN pls.ausbildungssemester::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+
+		$result = $this->PrestudentModel->load();
+		
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}

 	/**
+	 * @param string		$studiensemester_kurzbz
+	 *
 	 * @return void
 	 */
-	public function getGemeinsamestudien()
+	public function getGemeinsamestudien($studiensemester_kurzbz)
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
+		$this->addMeta('ci_params', [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		]);
+		
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
+			"(
+				SELECT prestudent_id
+				FROM bis.tbl_mobilitaet 
+				WHERE studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+			) bis",
+			"prestudent_id"
+		);
+
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN pls.ausbildungssemester::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+
+		$result = $this->PrestudentModel->load();
+		
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}

-	public function getPrestudents($studiengang_kz,
-		$studiensemester_kurzbz = null, $filter = null
-	)
-	{
+	public function getPrestudents(
+		$studiengang_kz,
+		$studiensemester_kurzbz = null,
+		$filter = null
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiengang_kz' => $studiengang_kz,
@@ -144,10 +286,12 @@ class Students extends FHCAPI_Controller
 		$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter);
 	}

-	public function getPrestudentsOrgform($studiengang_kz, $orgform_kurzbz,
-		$studiensemester_kurzbz = null, $filter = null
-	)
-	{
+	public function getPrestudentsOrgform(
+		$studiengang_kz,
+		$orgform_kurzbz,
+		$studiensemester_kurzbz = null,
+		$filter = null
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiengang_kz' => $studiengang_kz,
@@ -227,7 +371,7 @@ class Students extends FHCAPI_Controller

 				$stg = $this->getDataOrTerminateWithError($result);
 				if (!$stg)
-					$this->terminateWithValidationErrors(['' => 'Studiengang does not exist']); // TODO(chris): phrase
+					$this->terminateWithSuccess([]);
 				$stg = current($stg);

 				$where['ps.status_kurzbz'] = 'Interessent';
@@ -296,7 +440,10 @@ class Students extends FHCAPI_Controller
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
-					// TODO(chris): this does not work with $orgform_kurzbz != null
+					/** NOTE(chris):
+					 * show all prestudents in this stg who don't have a status
+					 * $orgform_kurzbz does not change the results since orgform is stored in the status table
+					 */
 					$where['ps.status_kurzbz'] = null;
 				} else {
 					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
@@ -310,42 +457,18 @@ class Students extends FHCAPI_Controller
 				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);
+			CASE 
+				WHEN pls.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();

-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-
 		$this->addFilter($studiensemester_kurzbz);

 		$result = $this->PrestudentModel->loadWhere($where);
@@ -355,10 +478,13 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}

-	public function getStudents($studiensemester_kurzbz,
-		$studiengang_kz, $semester = null, $verband = null, $gruppe = null
-	)
-	{
+	public function getStudents(
+		$studiensemester_kurzbz,
+		$studiengang_kz,
+		$semester = null,
+		$verband = null,
+		$gruppe = null
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -371,10 +497,14 @@ class Students extends FHCAPI_Controller
 		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, null);
 	}

-	public function getStudentsOrgform($studiensemester_kurzbz,
-		$studiengang_kz, $orgform_kurzbz, $semester = null, $verband = null, $gruppe = null
-	)
-	{
+	public function getStudentsOrgform(
+		$studiensemester_kurzbz,
+		$studiengang_kz,
+		$orgform_kurzbz,
+		$semester = null,
+		$verband = null,
+		$gruppe = null
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -388,10 +518,12 @@ class Students extends FHCAPI_Controller
 		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, $orgform_kurzbz);
 	}

-	public function getStudentsSpezialgruppe($studiensemester_kurzbz,
-		$studiengang_kz, $semester, $gruppe_kurzbz,
-		$orgform_kurzbz = null)
-	{
+	public function getStudentsSpezialgruppe(
+		$studiensemester_kurzbz,
+		$studiengang_kz,
+		$semester,
+		$gruppe_kurzbz
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -403,10 +535,13 @@ class Students extends FHCAPI_Controller
 		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, null);
 	}

-	public function getStudentsOrgformSpezialgruppe($studiensemester_kurzbz,
-		$orgform_kurzbz, $studiengang_kz, $semester, $gruppe_kurzbz
-	)
-	{
+	public function getStudentsOrgformSpezialgruppe(
+		$studiensemester_kurzbz,
+		$orgform_kurzbz,
+		$studiengang_kz,
+		$semester,
+		$gruppe_kurzbz
+	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -430,8 +565,15 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
-	{
+	protected function fetchStudents(
+		$studiensemester_kurzbz,
+		$studiengang_kz,
+		$semester = null,
+		$verband = null,
+		$gruppe = null,
+		$gruppe_kurzbz = null,
+		$orgform_kurzbz = null
+	) {
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');

@@ -440,21 +582,6 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}

-		/*
-			$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');
@@ -462,18 +589,6 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.gruppe');
 		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");

-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-

 		$where = [];

@@ -506,7 +621,6 @@ class Students extends FHCAPI_Controller
 					false
 				);
 			}
-
 		}

 		$this->addFilter($studiensemester_kurzbz);
@@ -540,39 +654,18 @@ class Students extends FHCAPI_Controller

 		$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');
-
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
+		$this->PrestudentModel->addSelect("COALESCE(
+			v.semester::text, 
+			CASE 
+				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+				THEN pls.ausbildungssemester::text 
+				ELSE ''::text 
+			END
+		) AS semester", false);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");

 		$this->addSelectPrioRel();

@@ -609,40 +702,12 @@ class Students extends FHCAPI_Controller

 		$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');

-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-
 		$this->addSelectPrioRel();


@@ -681,33 +746,12 @@ class Students extends FHCAPI_Controller

 		$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');

-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-
 		$this->addSelectPrioRel();

 		$this->addFilter($studiensemester_kurzbz);
@@ -721,6 +765,81 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}

+	/**
+	 * @param string		$studiensemester_kurzbz
+	 *
+	 * @return void
+	 */
+	public function search($studiensemester_kurzbz)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+
+		$this->load->library('SearchLib', [ 'config' => 'searchstv' ]);
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('searchstr', 'searchstr', 'required');
+		$this->form_validation->set_rules('types[]', 'types', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->searchlib->search($this->input->post('searchstr'), $this->input->post('types'));
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$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');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
+		);
+
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$prestudent_ids = [];
+		$student_uids = [];
+			$this->addMeta('data', $data);
+		foreach ($data as $row) {
+			$dataset = json_decode($row->data);
+			if ($row->type == 'prestudent') {
+				$prestudent_ids[] = $dataset->prestudent_id;
+			} elseif ($row->type == 'student') {
+				$student_uids[] = $dataset->uid;
+			}
+		}
+
+		if ($prestudent_ids && $student_uids) {
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->PrestudentModel->db->or_where_in('s.student_uid', $student_uids);
+		} elseif ($prestudent_ids) {
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+		} elseif ($student_uids) {
+			$this->PrestudentModel->db->where_in('s.student_uid', $student_uids);
+		} else {
+			$this->terminateWithSuccess([]);
+		}
+
+		$result = $this->PrestudentModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
 	/**
 	 * @param string|null	$studiensemester_kurzbz
 	 * @param string		$type
@@ -771,6 +890,13 @@ class Students extends FHCAPI_Controller
 		// verband
 		// gruppe

+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
+		);
+
 		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
 		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
@@ -806,13 +932,6 @@ class Students extends FHCAPI_Controller
 		$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');
@@ -827,13 +946,13 @@ class Students extends FHCAPI_Controller
 		$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)
+				SELECT *, public.get_rolle_prestudent(pss.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
+					FROM public.tbl_prestudentstatus
 					WHERE prestudent_id = tbl_prestudent.prestudent_id
 					AND status_kurzbz = 'Interessent'
 					LIMIT 1
@@ -842,7 +961,7 @@ class Students extends FHCAPI_Controller
 			) prest
 			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
 			AND priorisierung <= tbl_prestudent.priorisierung
-		) || ' (' || tbl_prestudent.priorisierung || ')' AS priorisierung_relativ", false);
+		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
 	}

 	/**
@@ -854,40 +973,20 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function addFilter($studiensemester_kurzbz)
 	{
-		$filter = json_decode($this->input->get('filter'), true);
+		$filter = $this->input->post('filter');
+		
 		if (!is_array($filter))
 		{
-			$this->addMeta('addfilter', 'invalid filter: ' . $this->input->get('filter'));
+			$this->addMeta('addfilter', 'invalid filter: ' . json_encode($this->input->post('filter')));
 			return;
 		}
-		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);
+		foreach ($filter as $item) {
+			if (isset($item['usestdsem']) && $item['usestdsem'])
+				$item['studiensemester_kurzbz'] = $studiensemester_kurzbz;
+			if (!$this->PrestudentModel->addFilter($item)) {
+				$this->addMeta('addfilter', 'invalid filter: ' . json_encode($item));
+				return;
+			}
 		}
 	}
 }
@@ -165,7 +165,17 @@ class Verband extends FHCAPI_Controller
 		
 		$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("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);
@@ -173,6 +183,7 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addOrder('semester');

 		if ($org_form !== null) {
+			$this->StudiengangModel->addSelect("v.orgform_kurzbz");
 			$this->StudiengangModel->db->group_start();
 			$this->StudiengangModel->db->where('v.semester', 0);
 			$this->StudiengangModel->db->or_where('v.orgform_kurzbz', $org_form);
@@ -188,6 +199,7 @@ class Verband extends FHCAPI_Controller
 		array_unshift($list, [
 			'name' => 'PreStudent',
 			'link' => $link . 'prestudent',
+			'no_sem_reload' => true,
 			'stg_kz' => (int)$studiengang_kz,
 			'children' => $this->getStdSem($link . 'prestudent/', $studiengang_kz)
 		]);
@@ -203,6 +215,7 @@ class Verband extends FHCAPI_Controller
 					$this->StudienordnungModel->addDistinct();
 					$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
 					$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+					$this->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");

 					$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');

@@ -216,7 +229,6 @@ class Verband extends FHCAPI_Controller
 					$list = array_merge($list, $result);
 				}
 			}
-
 		}
 		$this->terminateWithSuccess($list);
 	}
@@ -272,6 +284,7 @@ class Verband extends FHCAPI_Controller
 		$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($this->StudiengangModel->escape($semester) . ' AS semester');
 		$this->StudiengangModel->addSelect('verband');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 		
@@ -320,6 +333,8 @@ class Verband extends FHCAPI_Controller
 		$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('v.semester');
+		$this->StudiengangModel->addSelect('v.verband');
 		$this->StudiengangModel->addSelect('gruppe');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 		
@@ -0,0 +1,102 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Vertrag extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getVertrag' => ['admin:r', 'assistenz:r'],
+			'cancelVertrag' => ['admin:r', 'assistenz:r']
+		]);
+
+		// Load Libraries
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'person',
+			'projektarbeit'
+		]);
+
+		// Load models
+		$this->load->model('accounting/Vertrag_model', 'VertragModel');
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+
+		// load libraries
+		$this->load->library('PermissionLib');
+	}
+
+	public function getVertrag()
+	{
+		$vertrag_id = $this->input->get('vertrag_id');
+
+		if (!isset($vertrag_id) || !is_numeric($vertrag_id))
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Vertrag ID']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->VertragModel->getVertragById($vertrag_id);
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$vertrag = getData($result)[0];
+
+		$this->terminateWithSuccess($vertrag);
+	}
+
+	public function cancelVertrag()
+	{
+		$vertrag_id = $this->input->post('vertrag_id');
+		$person_id = $this->input->post('person_id');
+
+		if (!isset($vertrag_id) || !is_numeric($vertrag_id))
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Vertrag ID']), self::ERROR_TYPE_GENERAL);
+		if (!isset($person_id) || !is_numeric($person_id))
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
+
+		// * first find lehrveranstaltung_id of the contracts lehrveranstaltung
+		$this->VertragModel->addSelect('lehrveranstaltung_id');
+		$this->VertragModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id', 'LEFT');
+		$result = $this->VertragModel->loadWhere(['vertrag_id' => $vertrag_id]);
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$lehrveranstaltung_id = getData($result)[0]->lehrveranstaltung_id;
+
+		$allOe = $this->LehrveranstaltungModel->getAllOe($lehrveranstaltung_id);
+
+		if (isError($allOe)) $this->terminateWithError(getError($allOe), self::ERROR_TYPE_GENERAL);
+
+		$allOe = hasData($allOe) ? array_column(getData($allOe), 'oe_kurzbz') : [];
+
+		// * then check if the user has permissions to cancel the corresponding lv-organisational units
+		if (!$this->permissionlib->isBerechtigtMultipleOe('admin', $allOe, 'suid') &&
+			!$this->permissionlib->isBerechtigtMultipleOe('lehre/lehrauftrag_bestellen', $allOe, 'suid'))
+		{
+			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'lehrauftrag_bestellen:rw']]);
+		}
+
+		$uidResult = $this->BenutzerModel->getFromPersonId($person_id);
+
+		if (isError($uidResult)) $this->terminateWithError(getError($uidResult), self::ERROR_TYPE_GENERAL);
+
+		if (!hasData($uidResult)) $this->terminateWithError("no user found", self::ERROR_TYPE_GENERAL);
+
+		$mitarbeiter_uid = getData($uidResult)[0]->uid;
+
+		$result = $this->VertragModel->cancelVertrag($vertrag_id, $mitarbeiter_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}
@@ -51,13 +51,17 @@ class Vorlagen extends FHCAPI_Controller
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');

-		$data = $this->getDataOrTerminateWithError($result);
-		$oe_kurzbz = current($data);
+		if (hasData($result))
+		{
+			$data = getData($result);

-		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
-		$data = $this->getDataOrTerminateWithError($result);
+			$oe_kurzbz = array_column($data, 'oe_kurzbz');
+			$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz);
+
+			$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+		}
+		$this->terminateWithSuccess(array());

-		$this->terminateWithSuccess($data);
 	}

 }
@@ -233,10 +233,10 @@ class Person extends API_Controller
 				//Quersumme bilden
 				for ($i = 0; $i < 10; $i++)
 				{
-					$erg += $gewichtung[$i] * $tmpSvnr{$i};
+					$erg += $gewichtung[$i] * $tmpSvnr[$i];
 				}

-				if ($tmpSvnr{3} != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11
+				if ($tmpSvnr[3] != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11
 				{
 					return error('SVNR ist ungueltig');
 				}
@@ -244,7 +244,7 @@ class Person extends API_Controller
 				if (mb_strlen($person['svnr']) == 12)
 				{
 					$last = substr($person['svnr'], 10, 12);
-					if ($last{0} != 'v' || !is_numeric($last{1}))
+					if ($last[0] != 'v' || !is_numeric($last[1]))
 					{
 						return error('SVNR ist ungueltig');
 					}
@@ -33,19 +33,26 @@ class Widget extends Auth_Controller
 			return $this->outputJsonSuccess([
 				"widget_id" => 0,
 				"widget_kurzbz" => "notfound",
-				"arguments" => json_encode([
+				"arguments" => [
 					"className" => 'alert-danger',
 					"title" => 'Widget Not Found',
 					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
-				]),
-				"setup" => json_encode([
+				],
+				"setup" => [
 					"name" => 'Widget Not Found',
-					"file" => 'DashboardWidget/Default.js',
+					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
 					"width" => 1,
 					"height" => 1
-				])
+				]
 			]);
-		return $this->outputJsonSuccess(current(getData($widget)));
+
+		$widget = current(getData($widget));
+		$widget->arguments = json_decode($widget->arguments);
+		$tmpsetup = json_decode($widget->setup);
+		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+		$widget->setup = $tmpsetup;
+
+		return $this->outputJsonSuccess($widget);
 	}
 	
 	public function getAll()
@@ -56,7 +63,16 @@ class Widget extends Auth_Controller
 		if (isError($result))
 			return $this->outputJsonError(getError($result));

-		$this->outputJsonSuccess(getData($result) ?: []);
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
 	}
 	
 	public function getWidgetsForDashboard()
@@ -71,7 +87,16 @@ class Widget extends Auth_Controller
 			]);
 		}

-		$this->outputJsonSuccess(getData($result) ?: []);
+		$tmpwidgets = getData($result) ?: [];
+		$widgets = array_map(function($widget) {
+			$widget->arguments = json_decode($widget->arguments);
+			$tmpsetup = json_decode($widget->setup);
+			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+			$widget->setup = $tmpsetup;
+			return $widget;
+		}, $tmpwidgets);
+
+		$this->outputJsonSuccess($widgets);
 	}
 	
 	public function setAllowed()
@@ -0,0 +1,621 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class AbgabetoolJob extends JOB_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->helper('hlp_sancho_helper');
+
+		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$this->_ci->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
+		$this->_ci->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+
+		$this->_ci->load->config('abgabe');
+		$this->loadPhrases([
+			'abgabetool'
+		]);
+	}
+
+	public function notifyAssistenzAboutChangedAbgaben() {
+
+		$this->_ci->logInfo('Start job FHC-Core->notifyAssistenzAboutChangedAbgaben');
+
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_ASSISTENZ');
+		// get all new or changed termine in interval
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
+		
+		$retval = getData($result);
+
+		if(count($retval) == 0) {
+			$this->_ci->logInfo("Keine Emails an Assistenzen über neue oder veränderte Termine versandt");
+			return;
+		}
+
+		// group changed/new abgaben for projektarbeiten
+		$projektarbeiten = [];
+		foreach($retval as $newOrChangedAbgabe) {
+			// Check if the current item has a 'projektarbeit_id' field.
+			// Replace 'projektarbeit_id' with the actual key name if it's different.
+			if (isset($newOrChangedAbgabe->projektarbeit_id)) {
+				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
+
+				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
+				// initialize it as an empty array.
+				if (!isset($projektarbeiten[$projektarbeitId])) {
+					$projektarbeiten[$projektarbeitId] = [];
+				}
+
+				// Add the current row to the array associated with its 'projektarbeit_id'.
+				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
+			}
+		}
+
+		// for each projektarbeit fetch their assistenz and same them in their own dictionary to avoid too many mails
+		$assistenzMap = [];
+		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
+		$projektarbeitBetreuerMap = [];
+		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
+			
+			$assistenzResult = $this->_ci->OrganisationseinheitModel->getAssistenzForOE($abgaben[0]->stg_oe_kurzbz);
+
+			forEach($assistenzResult->retval as $assistenzRow) {
+				if (!isset($assistenzMap[$assistenzRow->person_id])) {
+					$assistenzMap[$assistenzRow->person_id] = [];
+				}
+
+				// Add the current $assistenzRow to the $assistenzMap as an array associated with its projektarbeit_id.
+				$assistenzMap[$assistenzRow->person_id][] = [$projektarbeit_id, $assistenzRow];
+			}
+
+			$betreuerResult = $this->_ci->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
+
+			forEach($betreuerResult->retval as $betreuerRow) {
+				if (!isset($projektarbeitBetreuerMap[$projektarbeit_id])) {
+					$projektarbeitBetreuerMap[$projektarbeit_id] = [];
+				}
+
+				// Add the current betreuerRow to the betreuerMap as an array associated with its projektarbeit_id.
+				$projektarbeitBetreuerMap[$projektarbeit_id][] = $betreuerRow;
+			}
+		}
+
+		$count = 0;
+		foreach($assistenzMap as $assistenz_person_id => $tupelArr) {
+
+			$abgabenString = '<div style="font-family: Arial, sans-serif; color: #333;">';
+
+			foreach($tupelArr as $tupel) {
+				$projektarbeit_id = $tupel[0];
+				$assistenzRow = $tupel[1];
+
+				$betreuerArray = $projektarbeitBetreuerMap[$projektarbeit_id] ?? [];
+				$changedAbgaben = $projektarbeiten[$projektarbeit_id];
+
+				$relevantAbgaben = array_values(array_filter($changedAbgaben, function($abgabetermin) use ($assistenzRow) {
+					if($abgabetermin->updatevon == null && $abgabetermin->insertvon != $assistenzRow->uid) {
+						return $abgabetermin;
+					} else if($abgabetermin->updatevon != null && $abgabetermin->updatevon != $assistenzRow->uid) {
+						return $abgabetermin;
+					}
+				}));
+
+				if(count($relevantAbgaben) == 0) {
+					continue;
+				}
+
+				// Format the Student Name
+				$s = $relevantAbgaben[0];
+				$nameParts = [];
+				if (!empty($s->titelpre)) $nameParts[] = $s->titelpre;
+				$nameParts[] = $s->vorname;
+				$nameParts[] = $s->nachname;
+				if (!empty($s->titelpost)) $nameParts[] = $s->titelpost;
+				$studentFullName = implode(' ', $nameParts);
+
+				// Format the Supervisors string
+				$betreuerStrings = [];
+				foreach($betreuerArray as $b) {
+					$bNameParts = [];
+					if (!empty($b->titelpre)) $bNameParts[] = $b->titelpre;
+					$bNameParts[] = $b->vorname;
+					$bNameParts[] = $b->nachname;
+					if (!empty($b->titelpost)) $bNameParts[] = $b->titelpost;
+
+					$bFullName = implode(' ', $bNameParts);
+					$betreuerStrings[] = "{$bFullName} ({$b->betreuerart_kurzbz})";
+				}
+				$allBetreuerFormatted = implode(', ', $betreuerStrings);
+
+				$projektarbeit_titel = $s->titel ?? 'Kein Titel vergeben';
+
+				// Project Header Section
+				$abgabenString .= "
+				<div style='margin-top: 25px; padding: 12px; background-color: #f8f9fa; border-left: 4px solid #007bff; border-bottom: 1px solid #eee;'>
+					<strong style='font-size: 16px; color: #0056b3;'>Projekt: {$projektarbeit_titel}</strong><br/>
+					<div style='margin-top: 5px; font-size: 14px;'>
+						<strong>Studierende/r:</strong> {$studentFullName}
+					</div>
+					<div style='margin-top: 3px; font-size: 14px;'>
+						<strong>Betreuer:</strong> {$allBetreuerFormatted}
+					</div>
+					<span style='color: #666; font-size: 12px;'>
+						ID: {$projektarbeit_id} | Stg: {$s->stgtyp}{$s->stgkz} ({$s->studiensemester_kurzbz})
+					</span>
+				</div>";
+
+				// Start Table
+				$abgabenString .= '
+				<table style="width: 100%; border-collapse: collapse; margin-bottom: 25px;">
+					<thead>
+						<tr style="background-color: #eee; text-align: left;">
+							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Zieldatum</th>
+							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
+						</tr>
+					</thead>
+					<tbody>';
+
+				foreach ($relevantAbgaben as $abgabe) {
+					$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
+					$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
+					$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #777; font-style: italic;'>{$abgabe->kurzbz}</small>" : "";
+
+					$abgabenString .= "
+					<tr>
+						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$dateEmailFormatted}</td>
+						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+							<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
+						</td>
+					</tr>";
+				}
+
+				$abgabenString .= '</tbody></table>';
+			}
+
+			$abgabenString .= '</div>';
+
+			// done with building the change list, now send it
+			$assistenzRow = $tupelArr[0][1];
+			$anrede = $assistenzRow->anrede;
+			$anredeFillString = $assistenzRow->anrede == "Herr" ? "r" : "";
+			$fullFormattedNameString = $assistenzRow->first;
+			
+			
+
+			$path = $this->_ci->config->item('URL_ASSISTENZ');
+			$url = CIS_ROOT.$path;
+
+			$body_fields = array(
+				'anrede' => $anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+
+			$email = $assistenzRow->uid."@".DOMAIN;
+			
+			// send email with bundled info
+			sendSanchoMail(
+				'PAAChangesAssSM',
+				$body_fields,
+				$email,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+
+			$count++;
+		}
+
+		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
+		$this->_ci->logInfo('End job FHC-Core->notifyAssistenzAboutChangedAbgaben');
+	}
+
+	public function notifyBetreuerAboutChangedAbgaben() {
+		
+		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
+
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+
+		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_BETREUER');
+
+		// get all new or changed termine in interval
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
+		$retval = getData($result);
+
+		if(count($retval) == 0) {
+			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
+			return;
+		}
+		
+		// group changed/new abgaben for projektarbeiten
+		$projektarbeiten = [];
+		foreach($retval as $newOrChangedAbgabe) {
+			// Check if the current item has a 'projektarbeit_id' field.
+			// Replace 'projektarbeit_id' with the actual key name if it's different.
+			if (isset($newOrChangedAbgabe->projektarbeit_id)) {
+				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
+
+				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
+				// initialize it as an empty array.
+				if (!isset($projektarbeiten[$projektarbeitId])) {
+					$projektarbeiten[$projektarbeitId] = [];
+				}
+
+				// Add the current row to the array associated with its 'projektarbeit_id'.
+				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
+			}
+		}
+
+		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
+		$betreuerMap = [];
+		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
+			$betreuerResult = $this->_ci->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
+			
+			forEach($betreuerResult->retval as $betreuerRow) {
+				if (!isset($betreuerMap[$betreuerRow->person_id])) {
+					$betreuerMap[$betreuerRow->person_id] = [];
+				}
+				
+				// Add the current betreuerRow to the betreuerMap as an array associated with its projektarbeit_id.
+				$betreuerMap[$betreuerRow->person_id][] = [$projektarbeit_id, $betreuerRow];
+			}
+		}
+
+		$count = 0;
+		// now iterate over the betreuerMap and build 1 email about all projektarbeiten and their new/changed termine
+		// $tupel = [$projektarbeit_id, $betreuerRow], each betreuer has 0..n [projektarbeit_id, changedAbgaben] tupel
+		forEach($betreuerMap as $betreuer_person_id => $tupelArr) {
+
+			// start the container
+			$abgabenString = '<div style="font-family: Arial, sans-serif; color: #333;">';
+
+			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($betreuer_person_id);
+			$data = getData($result)[0];
+
+			$anrede = $data->anrede;
+			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
+			$fullFormattedNameString = $data->first;
+
+			forEach($tupelArr as $tupel) {
+				$projektarbeit_id = $tupel[0];
+				$betreuerRow = $tupel[1];
+
+				$changedAbgaben = $projektarbeiten[$projektarbeit_id];
+
+				$relevantAbgaben = array_values(array_filter($changedAbgaben, function($abgabetermin) use ($betreuerRow) {
+					if($abgabetermin->updatevon == null && $abgabetermin->insertvon != $betreuerRow->uid) {
+						return $abgabetermin;
+					} else if($abgabetermin->updatevon != null && $abgabetermin->updatevon != $betreuerRow->uid) {
+						return $abgabetermin;
+					}
+				}));
+
+				if(count($relevantAbgaben) == 0) {
+					continue;
+				}
+
+				// format the Student Name
+				$s = $relevantAbgaben[0];
+				$nameParts = [];
+				if (!empty($s->titelpre)) $nameParts[] = $s->titelpre;
+				$nameParts[] = $s->vorname;
+				$nameParts[] = $s->nachname;
+				if (!empty($s->titelpost)) $nameParts[] = $s->titelpost;
+				$studentFullName = implode(' ', $nameParts);
+
+				$projektarbeit_titel = $s->titel ?? 'Kein Titel vergeben';
+
+				// project header section
+				$abgabenString .= "
+					<div style='margin-top: 25px; padding: 12px; background-color: #f8f9fa; border-left: 4px solid #007bff; border-bottom: 1px solid #eee;'>
+						<strong style='font-size: 16px; color: #0056b3;'>Projekt: {$projektarbeit_titel}</strong><br/>
+						<div style='margin-top: 5px; font-size: 14px;'>
+							<strong>Studierende/r:</strong> {$studentFullName}
+						</div>
+						<span style='color: #666; font-size: 12px;'>
+							ID: {$projektarbeit_id} | Rolle: {$betreuerRow->betreuerart_kurzbz} | 
+							Stg: {$s->stgtyp}{$s->stgkz} ({$s->studiensemester_kurzbz})
+						</span>
+					</div>";
+
+				// start table
+				$abgabenString .= '
+					<table style="width: 100%; border-collapse: collapse; margin-bottom: 25px;">
+						<thead>
+							<tr style="background-color: #eee; text-align: left;">
+								<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Zieldatum</th>
+								<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
+							</tr>
+						</thead>
+						<tbody>';
+
+				foreach ($relevantAbgaben as $abgabe) {
+					$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
+					$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
+					$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #777; font-style: italic;'>{$abgabe->kurzbz}</small>" : "";
+
+					$abgabenString .= "
+						<tr>
+							<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$dateEmailFormatted}</td>
+							<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+								<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
+							</td>
+						</tr>";
+				}
+
+				$abgabenString .= '</tbody></table>';
+			}
+			
+			// close container
+			$abgabenString .= '</div>'; 
+
+			// done with building the change list, now send it
+			$betreuerRow = $tupelArr[0][1];
+			
+			$path = $this->_ci->config->item('URL_MITARBEITER');
+			$url = CIS_ROOT.$path;
+
+			$body_fields = array(
+				'anrede' => $anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+			
+			$email = $betreuerRow->uid ? $betreuerRow->uid."@".DOMAIN : $betreuerRow->private_email;
+			
+			// send email with bundled info
+			sendSanchoMail(
+				'PAAChangesBetSM',
+				$body_fields,
+				$email,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+			
+			$count++;
+		}
+
+		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
+		$this->_ci->logInfo('End job FHC-Core->notifyBetreuerAboutChangedAbgaben');
+	}
+
+	public function notifyBetreuerMail() {
+		// send all new projektarbeit abgabe UPLOADS since the last job run to the related betreuer
+		// this job gathers all new or changed file uploads via field 'abgabedatum', enduploads still
+		// send an email directly after happening since they are kind of important
+
+		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerMail');
+
+		// dont filter for relevant types since this mail should gather all UPLOAD info
+		
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval);
+		$retval = getData($result);
+
+		// retval are paabgaben joined with projektarbeit and betreuer
+		if(count($retval) == 0) {
+			$this->logInfo("Keine Emails über neue Paabgaben an Betreuer versandt");
+			return;
+		}
+
+		// group contents per betreuer person_id
+		$betreuer_uids = [];
+		forEach($retval as $paabgabe) {
+			if(!isset($betreuer_uids[$paabgabe->person_id])) {
+				$betreuer_uids[$paabgabe->person_id] = [];
+			}
+
+			$betreuer_uids[$paabgabe->person_id][] = $paabgabe;
+		}
+
+		$count = 0;
+		forEach ($betreuer_uids as $person_id => $abgaben) {
+			// $person_id is from betreuer
+
+			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($person_id);
+			$data = getData($result)[0];
+
+			$anrede = $data->anrede;
+			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
+			$fullFormattedNameString = $data->first;
+
+			// sorting $abgaben array by datum
+			usort($abgaben, function ($a, $b) {
+				return strtotime($a->datum) <=> strtotime($b->datum);
+			});
+
+			$projektarbeit_titel = $abgaben[0]->titel;
+
+			// initialize the table and headers
+			$abgabenString = '
+			<table style="width: 100%; border-collapse: collapse; font-family: Arial, sans-serif; color: #333; margin-top: 15px; margin-bottom: 15px;">
+				<thead>
+					<tr style="background-color: #f2f2f2; text-align: left;">
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 15%;">Zieldatum</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 25%;">Studierende/r</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 15%;">Abgabedatum</th>
+					</tr>
+				</thead>
+				<tbody>';
+			
+			foreach ($abgaben as $abgabe) {
+				// format the student name
+				$nameParts = [];
+				if (!empty($abgabe->titelpre)) $nameParts[] = $abgabe->titelpre;
+				$nameParts[] = $abgabe->vorname;
+				$nameParts[] = $abgabe->nachname;
+				if (!empty($abgabe->titelpost)) $nameParts[] = $abgabe->titelpost;
+				$studentFullName = implode(' ', $nameParts);
+
+				// format dates inline
+				$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
+				$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
+
+				// handle the optional Kurzbezeichnung
+				$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #666; font-style: italic;'>{$abgabe->kurzbz}</small>" : "";
+
+				$abgabenString .= "
+				<tr>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$dateEmailFormatted}</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$studentFullName}</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+						<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
+					</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$abgabedatumFormatted}</td>
+				</tr>";
+			}
+
+			$abgabenString .= '</tbody></table>';
+
+			$path = $this->_ci->config->item('URL_MITARBEITER');
+			$url = CIS_ROOT.$path;
+
+			$body_fields = array(
+				'anrede' => $anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'paTitel' => $projektarbeit_titel,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+
+			$result = $this->_ci->ProjektbetreuerModel->getBetreuerOfProjektarbeit($abgaben[0]->projektarbeit_id, $abgaben[0]->betreuerart_kurzbz);
+			$data = getData($result)[0];
+
+			$email = $data->uid ? $data->uid."@".DOMAIN : $data->private_email;
+
+			// send email with bundled info
+			sendSanchoMail(
+				'PaabgabeUpdatesBetSM',
+				$body_fields,
+				$email,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+
+			$count++;
+		}
+
+		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
+		$this->_ci->logInfo('End job FHC-Core->notifyBetreuerMail');
+	}
+
+	public function notifyStudentMail()
+	{
+		// send all new projektarbeit abgabe since the last job run to the related student
+
+		$this->_ci->logInfo('Start job FHC-Core->notifyStudentMail');
+
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+
+		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_STUDENT');
+
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
+		$retval = getData($result);
+
+		if(count($retval) == 0) {
+			$this->_ci->logInfo("Keine Emails an Studenten versandt");
+			return;
+		}
+		
+		// group results per projektarbeit/student_uid
+		$student_uids = [];
+		forEach($retval as $paabgabe) {
+			if(!isset($student_uids[$paabgabe->student_uid])) {
+				$student_uids[$paabgabe->student_uid] = [];
+			}
+
+			$student_uids[$paabgabe->student_uid][] = $paabgabe;
+		}
+
+		$count = 0;
+		foreach ($student_uids as $uid => $abgaben) {
+			// $uid is the student's UID
+			$result = $this->_ci->StudentModel->getEmailAnredeForStudentUID($uid);
+			$data = getData($result)[0];
+
+			// $abgabe is the array of paabgabe objects
+			$anredeFillString = $data->anrede=="Herr"?"r":"";
+			$fullFormattedNameString = trim($data->titelpre." ".$data->vorname." ".$data->vornamen." ".$data->nachname." ".$data->titelpost);
+
+			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
+			// php has spaceships 🚀🚀🚀🚀🚀
+			usort($abgaben, function($a, $b) {
+				return strtotime($a->datum) <=> strtotime($b->datum);
+			});
+
+			$projektarbeit_titel = $abgaben[0]->titel;
+			
+			// initialize the table and headers
+			$abgabenString = '
+			<table style="width: 100%; border-collapse: collapse; font-family: Arial, sans-serif; color: #333; margin-top: 15px; margin-bottom: 15px;">
+				<thead>
+					<tr style="background-color: #f2f2f2; text-align: left;">
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 25%;">Zieldatum</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung / Hinweis</th>
+					</tr>
+				</thead>
+				<tbody>';
+
+			foreach ($abgaben as $abgabe) {
+				$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
+
+				// handle the optional Kurzbezeichnung
+				$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #666; font-style: italic;'>{$abgabe->kurzbz}</small>" : "";
+
+				$abgabenString .= "
+				<tr>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>
+						{$dateEmailFormatted}
+					</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+						<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
+					</td>
+				</tr>";
+			}
+
+			$abgabenString .= '</tbody></table>';
+			
+			$route =  $this->_ci->config->item('URL_STUDENTS');
+			$url = CIS_ROOT.$route;
+
+			$body_fields = array(
+				'anrede' => $data->anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'paTitel' => $projektarbeit_titel,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+
+			// send email with bundled info
+			sendSanchoMail(
+				'PaabgabeUpdatesSammelmail',
+				$body_fields,
+				$uid.'@'.DOMAIN,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+
+			$count++;
+			
+		}
+
+		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
+		$this->_ci->logInfo('End job FHC-Core->notifyStudentMail');
+	}
+}
@@ -200,13 +200,14 @@ class AntragJob extends JOB_Controller
 	}

 	/**
-	 * Send reminder to Assistant for Wiedereinstieg Unterbrecher
+	 * Send reminder to Assistant and to Student 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');

@@ -230,6 +231,7 @@ class AntragJob extends JOB_Controller

 		$antraege = getData($result) ?: [];
 		$count = 0;
+		$countReminderStudent = 0;
 		foreach ($antraege as $antrag)
 		{
 			$res = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
@@ -257,10 +259,92 @@ class AntragJob extends JOB_Controller
 				$data['UID'] = $student->student_uid;
 			}

-			// NOTE(chris): Sancho mail
-			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
+			//Data für Email Student
+			$result = $this->PrestudentModel->load($antrag->prestudent_id);
+			$dataPrestudent = current(getData($result));
+			$person_id = $dataPrestudent->person_id;
+
+			$this->KontaktModel->addSelect('kontakt');
+
+			$result = $this->KontaktModel->loadWhere([
+				'person_id'=> $person_id,
+				'zustellung' => true,
+				'kontakttyp' => 'email'
+			]);
+
+			$email_student_privat = null;
+			$dataKontakt = getData($result);
+			if ($dataKontakt) {
+				$stud_private_zustell_emails = array_map(function($kontakt) {
+					return $kontakt->kontakt;
+				}, $dataKontakt);
+				$email_student_privat = implode(', ', $stud_private_zustell_emails);
+			}
+
+			$email_student_FH = $this->StudentModel->getEmailFH($this->StudentModel->getUID($antrag->prestudent_id));
+
+			//studiensemester
+			$result = $this->StudiensemesterModel->getByDate($datum->format('Y-m-d'));
+			if (hasData($result)) {
+				$dataSem = current(getData($result));
+			}
+
+			$studiensemester = $dataSem->studiensemester_kurzbz;
+			$studsemShort = substr($studiensemester, 0, 2);
+
+			if($studsemShort == "SS")
+			{
+				$data['studSemShort_Eng'] = "summer semester";
+				$data['meldenBis'] = "15.1.";
+				$data['meldenBis_Eng'] = "January 15";
+			}
+			elseif ($studsemShort == "WS") {
+				$data['studSemShort_Eng'] = "winter semester";
+				$data['meldenBis'] = "1.8.";
+				$data['meldenBis_Eng'] = "August 1";
+			}
+			else
+			{
+				$studsemShort = "SS/WS";
+				$data['studSemShort_Eng'] = "summer/winter semester";
+				$data['meldenBis'] = "15.1. (bei Einstieg ins SS) / 1.8. (bei Einstieg ins WS)";
+				$data['meldenBis_Eng'] = "January 15 (for sommer semester enrollment) / August 1 (for winter semester enrollment)";
+			}
+
+			$data['studSemShort'] = $studsemShort;
+
+			// NOTE(chris): Sancho mail Assistant
+			$sancho_assistant_sent = sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg');
+			if($sancho_assistant_sent)
 			{
 				$count++;
+			}
+			else
+			{
+				$this->logError('Error: failed to send Assistant Reminder studierendenantrag_id: ' . $antrag->studierendenantrag_id);
+			}
+			//Mail to Student
+			$sancho_student_sent = sendSanchoMail(
+				'Sancho_Mail_Antrag_U_Remind_Stud',
+				$data,
+				$email_student_FH,
+				'Reminder: Unterbrechung Wiedereinstieg',
+				'',
+				'',
+				'',
+				$email_student_privat);
+
+			if($sancho_student_sent)
+			{
+				$countReminderStudent++;
+			}
+			else
+			{
+				$this->logError('Error: failed to send Student Reminder studierendenantrag_id: ' . $antrag->studierendenantrag_id);
+			}
+
+			if($sancho_assistant_sent && $sancho_student_sent)
+			{
 				$this->StudierendenantragstatusModel->insert([
 					'studierendenantrag_id' => $antrag->studierendenantrag_id,
 					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_REMINDERSENT,
@@ -268,7 +352,7 @@ class AntragJob extends JOB_Controller
 				]);
 			}
 		}
-		$this->logInfo($count . ' Reminder gesendet - Ende Job sendReminderWiedereinstieg');
+		$this->logInfo($count . ' Reminder an Assistenz und ' . $countReminderStudent . ' Reminder an Student gesendet  - Ende Job sendReminderWiedereinstieg');
 	}

 	/**
@@ -22,6 +22,7 @@ class InfoCenter extends Auth_Controller
 	const REIHUNGSTESTABSOLVIERT_PAGE = 'reihungstestAbsolviert';
 	const ABGEWIESEN_PAGE = 'abgewiesen';
 	const AUFGENOMMEN_PAGE = 'aufgenommen';
+	const ONBOARDING_PAGE = 'onboarding';
 	const SHOW_DETAILS_PAGE = 'showDetails';
 	const SHOW_ZGV_DETAILS_PAGE = 'showZGVDetails';
 	const ZGV_UBERPRUEFUNG_PAGE = 'ZGVUeberpruefung';
@@ -116,6 +117,7 @@ class InfoCenter extends Auth_Controller
 				'index' => 'infocenter:r',
 				'freigegeben' => 'infocenter:r',
 				'abgewiesen' => 'infocenter:r',
+				'onboarding' => 'infocenter:r',
 				'aufgenommen' => 'infocenter:r',
 				'reihungstestAbsolviert' => 'infocenter:r',
 				'showDetails' => 'infocenter:r',
@@ -230,6 +232,13 @@ class InfoCenter extends Auth_Controller

 		$this->load->view('system/infocenter/infocenterAbgewiesen.php');
 	}
+
+	public function onboarding()
+	{
+		$this->_setNavigationMenu(self::ONBOARDING_PAGE); // define the navigation menu for this page
+
+		$this->load->view('system/infocenter/onboarding.php');
+	}
 	
 	/**
 	 * Aufgenommene page of the InfoCenter tool
@@ -1553,6 +1562,7 @@ class InfoCenter extends Auth_Controller
 		$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);
+		$onboardingLink = site_url(self::INFOCENTER_URI.'/'.self::ONBOARDING_PAGE);

 		$currentFilterId = $this->input->get(self::FILTER_ID);
 		if (isset($currentFilterId))
@@ -1561,6 +1571,7 @@ class InfoCenter extends Auth_Controller
 			$reihungstestAbsolviertLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$abgewiesenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$aufgenommenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
+			$onboardingLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 		}

 		$this->navigationlib->setSessionMenu(
@@ -1624,6 +1635,18 @@ class InfoCenter extends Auth_Controller
 					'', 				// target
 					40   				// sort
 				),
+				'ohnePrestudent' => $this->navigationlib->oneLevel(
+					'Electronic Onboarding',		// description
+					$onboardingLink,	// link
+					null,				// children
+					'users',		// icon
+					null,				// subscriptDescription
+					false,				// expand
+					null,				// subscriptLinkClass
+					null, 				// subscriptLinkValue
+					'', 				// target
+					50   				// sort
+				),
 			)
 		);
 	}
@@ -1650,6 +1673,8 @@ class InfoCenter extends Auth_Controller
 			$link = site_url(self::ZGV_UEBERPRUEFUNG_URI);
 		if ($origin_page === self::ABGEWIESEN_PAGE)
 			$link = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
+		if ($origin_page === self::ONBOARDING_PAGE)
+			$link = site_url(self::INFOCENTER_URI.'/'.self::ONBOARDING_PAGE);

 		if ($origin_page === self::AUFGENOMMEN_PAGE)
 			$link = site_url(self::INFOCENTER_URI.'/'.self::AUFGENOMMEN_PAGE);
@@ -1691,6 +1716,7 @@ class InfoCenter extends Auth_Controller
 		$freigegebenLink = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
 		$absolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
 		$abgewiesenLink = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
+		$onboardingLink = site_url(self::INFOCENTER_URI.'/'.self::ONBOARDING_PAGE);
 		$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
 		if (isset($prevFilterId))
 		{
@@ -1767,6 +1793,24 @@ class InfoCenter extends Auth_Controller
 				)
 			);
 		}
+		if($page == self::ONBOARDING_PAGE)
+		{
+			$this->navigationlib->setSessionElementMenu(
+				'onboarding',
+				$this->navigationlib->oneLevel(
+					'Electronic Onboarding',		// description
+					$onboardingLink,	// link
+					null,				// children
+					'users',			// icon
+					null,				// subscriptDescription
+					false,				// expand
+					null,				// subscriptLinkClass
+					null, 				// subscriptLinkValue
+					'', 				// target
+					50   				// sort
+				)
+			);
+		}
 	}

 	/**
@@ -70,20 +70,22 @@ abstract class Auth_Controller extends FHC_Controller
 	/**
 	 * Checks for Permissions depending if the given person is a
 	 * Mitarbeiter and/or Student
+	 * If neither Student nor Mitarbeiter, default permissions are checked
 	 * 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
+	 * @param array 				$permDefault	Perms if the person is neither a Student nor a Mitarbeiter
 	 *
 	 * @return void
 	 */
-	protected function checkPermissionsForPerson($person_id, $permMa, $permStud)
+	protected function checkPermissionsForPerson($person_id, $permMa, $permStud, $permDefault = null)
 	{
-		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud);
-		
+		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud, $permDefault);
+
 		if ($res) {
-			$perm = array_keys(array_flip(array_merge($res|1 ? $permMa : [], $res|2 ? $permStud : [])));
+			$perm = array_keys(array_flip(array_merge($res&1 ? $permMa : [], $res&2 ? $permStud : [], $res&4 ? $permDefault : [])));
 			$this->_outputAuthError([$this->router->method => $perm]);
 		}
 	}
@@ -108,16 +110,19 @@ abstract class Auth_Controller extends FHC_Controller
 	 * Checks for Permissions depending if the given person is a
 	 * Mitarbeiter and/or Student
 	 * and returns the result.
-	 *
+	 * If neither Student nor Mitarbeiter, default permissions are checked
+	 * 
 	 * @param integer 				$person_id
 	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
 	 * @param array 				$permStud	Perms if the person is a Student
-	 *
+	 * @param array 				$permDefault	Perms if the person is neither a Student nor a Mitarbeiter
 	 * @return integer				0 if permission is granted
 	 */
-	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
+	protected function hasPermissionsForPerson($person_id, $permMa, $permStud, $permDefault)
 	{
-		$res = 3;
+		$res = 8;
+		$isMitarbeiter = false;
+		$isStudent = false;
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
 		$this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
@@ -125,7 +130,8 @@ abstract class Auth_Controller extends FHC_Controller
 		if (hasData($result)) {
 			if ($this->permissionlib->isEntitled(['a' => $permMa], 'a'))
 				return 0;
-			$res = 1;
+			$isMitarbeiter = true;
+			$res += 1;
 		}
 		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
 		$result = $this->PersonModel->load($person_id);
@@ -140,8 +146,15 @@ abstract class Auth_Controller extends FHC_Controller
 						return 0;
 				}
 			}
+			$isStudent = true;
 			$res += 2;
 		}
+		if (isset($permDefault) && !$isMitarbeiter && !$isStudent)
+		{
+			if ($this->permissionlib->isEntitled(['a' => $permDefault], 'a'))
+				return 0;
+			$res += 4;
+		}
 		return $res;
 	}

@@ -266,7 +266,7 @@ class FHCAPI_Controller extends Auth_Controller
 	}

 	// ---------------------------------------------------------------
-	// Security
+	// Security Begin
 	// ---------------------------------------------------------------

 	/**
@@ -287,4 +287,31 @@ class FHCAPI_Controller extends Auth_Controller
 			'required_permissions' => $this->_rpsToString($requiredPermissions, $this->router->method)
 		], self::ERROR_TYPE_AUTH);
 	}
+
+	// ---------------------------------------------------------------
+	// Security End
+	// ---------------------------------------------------------------
+
+	/**
+	 * Checks the client's total request size (Content-Length) against the minimum
+	 * effective PHP limit (min of upload_max_filesize, post_max_size, memory_limit).
+	 * This preempts failures that result in vague "missing parameters" errors on large files.
+	 *
+	 * @return void
+	 */
+	protected function checkUploadSize() {
+		// this number represents bytes
+		$content_length_bytes = (int)$this->input->server('CONTENT_LENGTH');
+		$content_length = $content_length_bytes / 1000000;
+		
+		//get max serverside size upload -> this comes in megabytes
+		$max_upload = (int)(ini_get('upload_max_filesize'));
+		$max_post = (int)(ini_get('post_max_size'));
+		$memory_limit = (int)(ini_get('memory_limit'));
+		$max_upload_mb = min($max_upload, $max_post, $memory_limit);    // smallest of 3 config values
+		
+		if($content_length >= $max_upload_mb) {
+			$this->terminateWithError($this->p->t('global', 'filesizeExceeded'), 'general');
+		}
+	}
 }
@@ -515,3 +515,73 @@ function has_permissions_for_stg($studiengang_kz, $permissions = '')

 	return false;
 }
+
+/**
+ * check if an entry exists in the database
+ */
+function is_in_db($key, $model = '')
+{
+	if (!$model)
+		return false;
+
+	$field = strstr($model, ":");
+	if ($field) {
+		$model = strstr($model, ":", true);
+		$field = substr($field, 1);
+	}
+
+	$CI =& get_instance();
+	$CI->load->model($model, $model);
+
+	if ($field) {
+		$result = $CI->$model->loadWhere([
+			$field => $key
+		]);
+	} else {
+		$result = $CI->$model->load($key);
+	}
+
+	return (isSuccess($result) && hasData($result));
+}
+
+/**
+ * is building an array for Dropdown Entry in Print Dropdown
+ * @param $id id for the Document to add to the Document Array
+ * @param $name title of the dropdownEntry
+ * @param $parameterUrl url of parameters xml, xsl, format etc as needed
+ * 	WITHOUT BASEURL eg. "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf"
+ * @param $uid default parameter, if null only parameterurl will be added
+ * 	additional needed parameter: put in the parameterUrl
+ * @param $alternativeBaseUrl: if baseUrl not pdfExport.php, put here alternative without ? char, eg. "zutrittskarte.php"
+ *
+ * @return Array
+ */
+function buildDropdownEntryPrintArray($id, $name, $parameterurl, $uid=null, $order=null, $alternativeBaseUrl=null)
+{
+	//DEFAULT BASEURL
+	$baseurl = "pdfExport.php?";
+
+	$uidString = $uid ? "&uid=" . $uid : "";
+
+
+
+	if($alternativeBaseUrl)
+	{
+		return [
+			"id"    => $id,
+			"type"  => "documenturl",
+			"name"  => $name,
+			"url"   => $alternativeBaseUrl . "?" . $parameterurl . $uidString,
+			"order" => $order
+		];
+	}
+	else
+		return [
+			"id"    => $id,
+			"type"  => "documenturl",
+			"name"  => $name,
+			"url"   => $baseurl . $parameterurl . "&uid=" . $uid,
+			"order" => $order
+		];
+
+}
@@ -185,7 +185,15 @@ function generateJSModulesInclude($JSModules)

 		for ($tmpJSsCounter = 0; $tmpJSsCounter < count($tmpJSs); $tmpJSsCounter++)
 		{
-			$toPrint = sprintf($jsInclude, base_url($tmpJSs[$tmpJSsCounter].$cachetoken)).PHP_EOL;
+			if($ci->config->item('use_fhcomplete_build_version_in_path'))
+			{
+				$relurl = preg_replace('#public/#', 'public/' . $ci->config->item('fhcomplete_build_version') . '/', $tmpJSs[$tmpJSsCounter]);
+				$toPrint = sprintf($jsInclude, base_url($relurl)).PHP_EOL;
+			}
+			else
+			{
+				$toPrint = sprintf($jsInclude, base_url($tmpJSs[$tmpJSsCounter].$cachetoken)).PHP_EOL;
+			}

 			if ($tmpJSsCounter > 0) $toPrint = "\t\t".$toPrint;

@@ -246,3 +254,18 @@ function generateSkipLink($skipID)
 	$toPrint.='" class="fhcSkipLink" aria-label="Skip to main content"></a>';
 	echo $toPrint;
 }
+
+function absoluteJsImportUrl($relurl)
+{
+	$ci =& get_instance();
+	$ci->load->config('javascript');
+	if($ci->config->item('use_fhcomplete_build_version_in_path'))
+	{
+		$url = base_url(preg_replace('#^public/#', 'public/' . $ci->config->item('fhcomplete_build_version') . '/', $relurl));
+	}
+	else
+	{
+		$url = base_url($relurl) . '?'. $ci->config->item('fhcomplete_build_version');
+	}
+	return $url;
+}
@@ -41,3 +41,4 @@ 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}.';
+$lang['form_validation_is_in_db']	= '{field} does not exist.';
@@ -17,6 +17,7 @@ class LektorLib
 		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 		$this->_ci->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->_ci->load->library('PhrasesLib', array('lehre'));
 	}

 	public function addLektorToLehreinheit($lehreinheit_id, $mitarbeiter_uid)
@@ -35,7 +36,7 @@ class LektorLib

 		if (isError($already_assigned)) return $already_assigned;

-		if (hasData($already_assigned)) return error('Lektor already assigned');
+		if (hasData($already_assigned)) return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));

 		$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz' => $lehreinheit->studiensemester_kurzbz));
 		if (isError($studiensemester_result)) return $studiensemester_result;
@@ -88,6 +89,7 @@ class LektorLib

 		$lehreinheit = getData($lehreinheit_result)[0];

+
 		//TODO kollision check, wird vorerst nicht implementiert -> nur über das FAS möglich
 		if (isset($new_data['mitarbeiter_uid']) && $new_data['mitarbeiter_uid'] !== $mitarbeiter_uid)
 		{
@@ -98,7 +100,13 @@ class LektorLib
 			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));

 			if (hasData($verplant))
-				return error('Wechsel vom Mitarbeiter nicht möglich da er bereits verplant ist!');
+				return error($this->_ci->phraseslib->t("lehre", "lektorbereitsverplant"));
+
+			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_data['mitarbeiter_uid'], 'lehreinheit_id' => $lehreinheit_id));
+
+			if (hasData($lehreinheit_data))
+				return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));
+
 		}
 		$warning = '';
 		if (isset($new_data['semesterstunden']))
@@ -35,6 +35,90 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}

+	/**
+	 * Sets initial prestudent entry, no status yet.
+	 * @return object success or error
+	 */
+	public function setPrestudent(
+		$person_id,
+		$studiengang_kz,
+		$ausbildungscode,
+		$anmerkung,
+		$foerderrelevant
+	)
+	{
+		// Prestudent anlegen
+		$data = [
+			'aufmerksamdurch_kurzbz' => 'k.A.',
+			'person_id' => $person_id,
+			'studiengang_kz' => $studiengang_kz,
+			'ausbildungcode' => $ausbildungscode,
+			'anmerkung' => $anmerkung,
+			'reihungstestangetreten' => false,
+			'bismelden' => true,
+			'foerderrelevant' => $foerderrelevant,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+
+		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
+		$this->_ci->PrestudentModel->addSelect('public.tbl_prestudent.*, public.tbl_person.vorname, public.tbl_person.nachname');
+		$this->_ci->PrestudentModel->addJoin('public.tbl_person', 'person_id');
+		$this->_ci->PrestudentModel->addOrder('zgvmas_code');
+		$this->_ci->PrestudentModel->addOrder('zgv_code', 'DESC');
+		$this->_ci->PrestudentModel->addLimit(1);
+		$result = $this->_ci->PrestudentModel->loadWhere([
+			'person_id' => $person_id,
+			'zgv_code IS NOT NULL' => null
+		]);
+
+		if (isError($result)) return $result;
+
+		if (hasData($result)) {
+			$prestudent = getData($result)[0];
+			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
+		return $this->_ci->PrestudentModel->insert($data);
+	}
+
+	/**
+	 * Sets first status of a prestudent.!
+	 * @return object success or error
+	 */
+	public function setFirstStatus(
+		$prestudent_id,
+		$status_kurzbz,
+		$studiensemester_kurzbz,
+		$ausbildungssemester = null,
+		$orgform_kurzbz = null,
+		$studienplan_id = null
+	)
+	{
+		// Prestudent Rolle Anlegen
+		$data = [
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester ?: 0,
+			'orgform_kurzbz' => $orgform_kurzbz ?: null,
+			'studienplan_id' => $studienplan_id ?: null,
+			'datum' => date('Y-m-d'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+
+		return  $this->_ci->PrestudentstatusModel->insert($data);
+	}
+
 	public function setAbbrecher(
 		$prestudent_id,
 		$studiensemester_kurzbz,
@@ -603,9 +687,6 @@ class PrestudentLib
 		$now = date('c');
 		$today = date('Y-m-d');

-		$jahr = mb_substr($studiensemester_kurzbz, 4, 2);
-
-
 		// Genererate Personenkennzeichen
 		$personenkennzeichen = $this->_ci->StudentModel->generateMatrikelnummer2(
 			$student_data->studiengang_kz,
@@ -615,8 +696,9 @@ class PrestudentLib
 		if (isError($personenkennzeichen))
 			return $personenkennzeichen;
 		$personenkennzeichen = getData($personenkennzeichen);
-		
-		
+
+		$jahr = mb_substr($personenkennzeichen, 0, 2);
+
 		// Generate UID
 		$uid = $this->_ci->StudentModel->generateUID(
 			$student_data->kurzbz,
@@ -641,7 +723,7 @@ class PrestudentLib


 		// Generate Alias
-		$alias = '';
+		$alias = null;
 		if (!defined('GENERATE_ALIAS_STUDENT')
 			|| GENERATE_ALIAS_STUDENT === true
 		) {
@@ -889,6 +971,155 @@ class PrestudentLib
 		);
 	}

+	/**
+	 * Creates an incoming, saves necessary data for an incoming. 
+	 * @param $prestudent_id existing prestudent, for which incoming entry is created
+	 * @param $studiengang_kz Studiengang assigned to incoming
+	 * @param $studiensemester_kurzbz start semester for incoming
+	 * @return object success if incoming successfully saved, or error
+	 */
+	public function setFirstIncoming($prestudent_id, $studiengang_kz, $studiensemester_kurzbz, $orgform_kurzbz, $studienplan_id)
+	{
+		// Verband and Ausbildungssemester for incoming
+		$authUID = getAuthUID();
+		$incomingVerband = 'I';
+		$incomingAusbildungssemester = '0';
+
+		// get prestudent
+		$this->_ci->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->_ci->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+		$result = $this->_ci->PrestudentModel->load($prestudent_id);
+
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('No prestudent');
+
+		$student_data = getData($result)[0];
+
+		$result = $this->setFirstStatus(
+			$prestudent_id,
+			$this->_ci->PrestudentstatusModel::STATUS_INCOMING,
+			$studiensemester_kurzbz,
+			$incomingAusbildungssemester,
+			$orgform_kurzbz,
+			$studienplan_id
+		);
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('Error when adding prestudentstatus');
+
+		// generate Personenkennzeichen
+		$result = $this->_ci->StudentModel->generateMatrikelnummer2($studiengang_kz, $studiensemester_kurzbz);
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('No personenkennzeichen could be generated');
+
+		$personenkennzeichen = getData($result);
+
+		$jahr = mb_substr($personenkennzeichen, 0, 2);
+		$stg = mb_substr($personenkennzeichen, 3, 4);
+
+		$nachname_clean = mb_strtolower(sanitizeProblemChars($student_data->nachname));
+		$vorname_clean = mb_strtolower(sanitizeProblemChars($student_data->vorname));
+		$nachname_clean = str_replace(' ','_', $nachname_clean);
+		$vorname_clean = str_replace(' ','_', $vorname_clean);
+
+		// get Studiengang data
+		$result = $this->_ci->StudiengangModel->load(ltrim($stg, '0'));
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('No Studiengang');
+
+		$stgObj = getData($result)[0];
+
+		// gernerate uid
+		$result = $this->_ci->StudentModel->generateUID($stgObj->kurzbz, $jahr, $stgObj->typ, $personenkennzeichen, $vorname_clean, $nachname_clean);
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error("UID could not be generated");
+		$uid = getData($result);
+
+		//Benutzerdatensatz anlegen
+		$benutzer = [
+			'uid' => $uid,
+			'person_id' => $student_data->person_id,
+			'aktiv' => true,
+			'aktivierungscode' => $this->_ci->BenutzerModel->generateActivationkey()
+		];
+
+		// Generate Alias
+		$alias = '';
+		if (!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT === true)
+		{
+			$result = $this->_ci->BenutzerModel->generateAliasFromName($student_data->vorname, $student_data->nachname);
+			if (isError($result))
+				return $result;
+			$alias = getData($result);
+		}
+
+		$benutzer['alias'] = $alias;
+		$benutzer['insertamum'] = date('Y-m-d H:i:s');
+		$benutzer['insertvon'] = $authUID;
+
+		$result = $this->_ci->BenutzerModel->insert($benutzer);
+
+		if (isError($result)) return $result;
+
+		// Studentendatensatz anlegen
+		$student = [
+			'student_uid' => $uid,
+			'matrikelnr' => $personenkennzeichen,
+			'prestudent_id' => $prestudent_id,
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $incomingAusbildungssemester,
+			'verband' => $incomingVerband,
+			'gruppe' => ' '
+		];
+
+		$result = $this->_ci->LehrverbandModel->loadWhere([
+				'studiengang_kz' => $student['studiengang_kz'],
+				'semester' => $student['semester'],
+				'verband' => $student['verband'],
+				'gruppe' => $student['gruppe']
+			]);
+
+		if (isError($result)) return $result;
+
+		if (!hasData($result))
+		{
+			// Add Lehrverband if it does not exist
+			$result = $this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student_data->studiengang_kz,
+				'semester' => $student['semester'],
+				'verband' => $student['verband'],
+				'gruppe' => $student['gruppe'],
+				'bezeichnung' => 'Incoming',
+				'aktiv' => true
+			]);
+
+			if (isError($result)) return $result;
+		}
+
+		// add student
+		$student['insertamum'] = date('Y-m-d H:i:s');
+		$student['insertvon'] = $authUID;
+
+		$result = $this->_ci->StudentModel->insert($student);
+		if (isError($result)) return $result;
+
+		// Add Studentlehrverband
+		$result = $this->_ci->StudentlehrverbandModel->insert([
+			'student_uid' => $uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $student_data->studiengang_kz,
+			'semester' => $incomingAusbildungssemester,
+			'verband' => $incomingVerband,
+			'gruppe' => ' ',
+			'insertamum' => date('Y-m-d H:i:s'),
+			'insertvon' => $authUID
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success($prestudent_id);
+	}
+
 	protected function setBasic($authUID, $now, $status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id = null)
 	{
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
@@ -402,6 +402,26 @@ class Vertrag_model extends DB_Model
 		return $this->loadWhere(array('mitarbeiter_uid' => $mitarbeiter_uid, 'lehreinheit_id' => $lehreinheit_id));
 	}

+	public function getVertragById($vertrag_id)
+	{
+		$this->addSelect(
+			'tbl_vertrag.vertrag_id, vertragstyp_kurzbz, vertragsstunden, vertragsstunden_studiensemester_kurzbz, status.vertragsstatus_kurzbz,
+			status.bezeichnung AS vertragsstatus, tbl_vertrag.betrag, lema.semesterstunden, lema.stundensatz'
+		);
+		$this->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_vertrag.vertrag_id = lema.vertrag_id', 'LEFT');
+		$this->addJoin('
+			(
+				SELECT DISTINCT ON(vst.vertrag_id) vst.vertrag_id,
+					bezeichnung,
+					tbl_vertragsstatus.vertragsstatus_kurzbz
+				FROM lehre.tbl_vertrag_vertragsstatus vst
+					JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
+				ORDER BY vst.vertrag_id, datum DESC
+			) as status', 'status.vertrag_id = lehre.tbl_vertrag.vertrag_id', 'LEFT');
+
+		return $this->loadWhere(['tbl_vertrag.vertrag_id' => $vertrag_id]);
+	}
+
 	public function cancelVertrag($vertrag_id, $mitarbeiter_uid)
 	{
 		$vertrag = $this->load($vertrag_id);
@@ -1,5 +1,7 @@
 <?php

+use CI3_Events as Events;
+
 class Prestudent_model extends DB_Model
 {
 	/**
@@ -782,4 +784,118 @@ class Prestudent_model extends DB_Model

 		return $this->execQuery($query, array($person_id));
 	}
+
+	/**
+	 * Adds a filter to the query builder
+	 *
+	 * @param array			$filter
+	 * @return boolean
+	 */
+	public function addFilter($filter)
+	{
+		if (!isset($filter['type']))
+			return false;
+
+		switch ($filter['type']) {
+			case 'konto':
+				$bt = '';
+				$stdsem = '';
+				$comp = '!=';
+
+				if (isset($filter['buchungstyp_kurzbz']) && $filter['buchungstyp_kurzbz'] != 'all')
+					$bt = ' AND buchungstyp_kurzbz=' . $this->escape($filter['buchungstyp_kurzbz']);
+				
+				if (isset($filter['studiensemester_kurzbz']))
+					$stdsem = ' AND studiensemester_kurzbz=' . $this->escape($filter['studiensemester_kurzbz']);
+
+				if (isset($filter['missing']) && $filter['missing']) {
+					$comp = '=';
+					$this->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
+				}
+
+				$this->db->where('(
+					SELECT count(*) 
+					FROM public.tbl_konto 
+					WHERE person_id=tbl_prestudent.person_id 
+					' . $bt . ' 
+					' . $stdsem . '
+				) ' . $comp, 0);
+				break;
+			
+			case 'konto_counter':
+				$bt = '';
+				$samestg = '';
+				$past = '';
+
+				if (isset($filter['buchungstyp_kurzbz']) && $filter['buchungstyp_kurzbz'] != 'all')
+					$bt = ' AND buchungstyp_kurzbz = ' . $this->escape($filter['buchungstyp_kurzbz']);
+				
+				if (isset($filter['samestg']) && $filter['samestg'])
+					$samestg = ' AND studiengang_kz = tbl_prestudent.studiengang_kz';
+
+				if (isset($filter['past']) && $filter['past'])
+					$past = ' AND buchungsdatum < NOW()';
+
+				$this->db->where('(
+					SELECT sum(betrag) 
+					FROM public.tbl_konto 
+					WHERE person_id = tbl_prestudent.person_id 
+					' . $bt . ' 
+					' . $samestg . '
+					' . $past . '
+				) !=', 0);
+				break;
+			
+			case 'zgv':
+				$this->db
+					->group_start()
+						->group_start()
+							->where('zgv_code IS NOT NULL')
+							->where('zgvdatum IS NULL')
+						->group_end()
+						->or_group_start()
+							->where('zgvmas_code IS NOT NULL')
+							->where('zgvmadatum IS NULL')
+						->group_end()
+						->or_group_start()
+							->where('zgvdoktor_code IS NOT NULL')
+							->where('zgvdoktordatum IS NULL')
+						->group_end()
+					->group_end();
+				break;
+			
+			case 'documents':
+				$this->db->where('(
+					SELECT count(*) 
+					FROM public.tbl_dokumentstudiengang 
+					WHERE dokument_kurzbz NOT IN (
+						SELECT dokument_kurzbz 
+						FROM tbl_dokumentprestudent 
+						WHERE prestudent_id=tbl_prestudent.prestudent_id
+					)
+					AND studiengang_kz=tbl_prestudent.studiengang_kz
+				) !=', 0);
+				break;
+
+			case 'statusgrund':
+				if (!isset($filter['statusgrund_id']))
+					return false;
+
+				if (isset($filter['studiensemester_kurzbz']))
+					$stdsem = ' AND studiensemester_kurzbz=' . $this->escape($filter['studiensemester_kurzbz']);
+
+				$this->db->where('(
+					SELECT count(*) 
+					FROM public.tbl_prestudentstatus 
+					WHERE prestudent_id = tbl_prestudent.prestudent_id 
+					AND statusgrund_id = ' . $this->escape($filter['statusgrund_id']) . '
+					' . $stdsem . '
+				) !=', 0);
+				break;
+		}
+
+		Events::trigger('prestudent_add_filter', $filter);
+
+		return true;
+	}
 }
@@ -290,7 +290,11 @@ class Prestudentstatus_model extends DB_Model
 	 */
 	public function getLastStatusPerson($person_id, $studiensemester_kurzbz = null)
 	{
-		$query = 'SELECT *
+		$query = 'SELECT p.*, ps.*, s.*,
+					stg.kurzbz AS studiengang_kurzbz, stg.kurzbzlang AS studiengang_kurzbzlang,
+					UPPER(typ::varchar(1) || kurzbz) AS studiengang_kuerzel,
+					stg.typ AS studiengang_typ, stg.bezeichnung AS studiengang_bezeichnung, stg.english AS studiengang_bezeichnung_english,
+					stg.orgform_kurzbz AS studiengang_orgform
 					FROM public.tbl_prestudent p
 					JOIN (
 							SELECT DISTINCT ON(prestudent_id) *
@@ -298,7 +302,8 @@ class Prestudentstatus_model extends DB_Model
 							 WHERE prestudent_id IN (SELECT prestudent_id FROM public.tbl_prestudent WHERE person_id = ?)
 						  ORDER BY prestudent_id, datum desc, insertamum desc
 						) ps USING(prestudent_id)
-					JOIN public.tbl_status USING(status_kurzbz)';
+					JOIN public.tbl_status s USING(status_kurzbz)
+					JOIN public.tbl_studiengang stg USING (studiengang_kz)';

 		$parametersArray = array($person_id);

@@ -27,7 +27,7 @@ class Student_model extends DB_Model
        $this->addSelect('1');

        $result = $this->loadWhere(array('student_uid' => $uid));
-        
+

        if(hasData($result))
        {
@@ -169,7 +169,7 @@ class Student_model extends DB_Model

 		$max = 0;
 		if ($matrikelnrres && hasData($matrikelnrres)) {
-			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
+			$max = mb_substr(trim(getData($matrikelnrres)[0]->matrikelnr), -3);
 			if (!is_numeric($max)) {
 				$max = (int)$max;
 			}
@@ -279,4 +279,12 @@ class Student_model extends DB_Model
 	{
 		return $student_uid . '@' . DOMAIN;
 	}
+	
+	public function getEmailAnredeForStudentUID($student_uid) {
+		$qry = "SELECT anrede, titelpre, vorname, vornamen, nachname, titelpost
+				FROM campus.vw_student 
+				WHERE uid = ?";
+
+		return $this->execReadOnlyQuery($qry, array($student_uid));
+	}
 }
@@ -651,7 +651,13 @@ EOSQL;
 											 ELSE NULL
 											 END
 									 END,
-								 ' '
+								 ' ' 
+									ORDER BY
+										UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz),
+										COALESCE(TRIM(tbl_lehreinheitgruppe.semester::text), ''),
+										COALESCE(TRIM(tbl_lehreinheitgruppe.verband), ''),
+										COALESCE(TRIM(tbl_lehreinheitgruppe.gruppe), ''),
+										COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, '')
 						 ) AS gruppen
 					 FROM lehre.tbl_lehreinheitgruppe
 						LEFT JOIN public.tbl_studiengang USING (studiengang_kz)
@@ -374,7 +374,7 @@ class Lehreinheitgruppe_model extends DB_Model
 			return success('Group assigned successfully to Lehreinheit');
 		}
 		else
-			return error('Group already assigned');
+			return error($this->p->t('lehre', 'grpbereitszugeteilt'));
 	}

 	public function deleteGroup($lehreinheit_id, $lehreinheitgruppe_id)
@@ -401,7 +401,7 @@ class Lehreinheitgruppe_model extends DB_Model
 		$stundenplan_result = $this->loadWhere(array('tbl_lehreinheitgruppe.lehreinheitgruppe_id' => $lehreinheitgruppe_id));

 		if (hasData($stundenplan_result))
-			return error('Gruppe already verplant');
+			return error($this->p->t('lehre', 'grpbereitsverplant'));

 		$delete_result = $this->delete($lehreinheitgruppe_id);

@@ -316,8 +316,8 @@ class Lehrveranstaltung_model extends DB_Model
 			(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
 			tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
 			tbl_zeugnisnote.note, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_benutzer.uid,
-			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung
-
+			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung,
+			tbl_student.prestudent_id
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN public.tbl_benutzer USING(uid)
@@ -386,6 +386,37 @@ class Lehrveranstaltung_model extends DB_Model

 		return $this->execQuery($query, array($lehrveranstaltung_id, $studiensemester_kurzbz));
 	}
+
+	/**
+	 * Get LV-Leitung of given Lehrveranstaltung ID and Studiensemester.
+	 *
+	 * @param $lehrveranstaltung_id
+	 * @param $studiensemester
+	 * @return array|stdClass|null
+	 */
+	public function getLvLeitung($lehrveranstaltung_id, $studiensemester)
+	{
+		$params = [$lehrveranstaltung_id, $studiensemester];
+
+		$qry = "
+			SELECT
+				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
+			FROM
+				lehre.tbl_lehreinheit
+				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
+				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
+				JOIN public.tbl_person p using (person_id) 
+			WHERE
+				tbl_lehreinheit.lehrveranstaltung_id= ?
+				AND tbl_lehreinheit.studiensemester_kurzbz = ?
+				AND lehrfunktion_kurzbz = 'LV-Leitung'
+            ORDER BY 
+                lema.insertamum DESC
+			LIMIT 1
+		";
+
+		return $this->execQuery($qry, $params);
+	}
 	/**
 	 * Gets all Leiter of Lehrveranstaltungsorganisationseinheit
 	 * @param $lehrveranstaltung_id
@@ -1255,4 +1286,61 @@ class Lehrveranstaltung_model extends DB_Model

 		return $this->execReadOnlyQuery($qry, $params);
 	}
+
+	/**
+	 * Gets Lehrveranstaltungen for a student, as needed for a Projektarbeit.
+	 * @param student_uid
+	 * @param studiengang_kz optional, all Lvs of this Studiengang will be included 
+	 * @param additional_lehrveranstaltung_id optional, this lv will be added to result
+	 * @return object success or error
+	 */
+	public function getLvsForProjektarbeit($student_uid, $studiengang_kz = null, $additional_lehrveranstaltung_id = null)
+	{
+		$params = array($student_uid, $student_uid);
+
+		$qry = "
+			SELECT *
+			FROM
+				lehre.tbl_lehrveranstaltung
+			WHERE
+				(
+					lehrveranstaltung_id IN (
+
+						SELECT
+							lehrveranstaltung_id
+						FROM
+							campus.vw_student_lehrveranstaltung
+						WHERE
+							uid=?
+
+						UNION
+
+						SELECT
+							lehrveranstaltung_id
+						FROM
+							lehre.tbl_zeugnisnote
+						WHERE
+							student_uid=?
+					)";
+
+		if (isset($studiengang_kz))
+		{
+			$params[] = $studiengang_kz;
+			$qry .= " OR (studiengang_kz = ? AND semester IS NOT NULL)";
+		}
+
+		if (isset($additional_lehrveranstaltung_id))
+		{
+			$params[] = $additional_lehrveranstaltung_id;
+			$qry .= " OR lehrveranstaltung_id = ?";
+		}
+
+		$qry .= "
+				)
+				AND projektarbeit = TRUE
+			ORDER BY
+				semester, bezeichnung";
+
+		return $this->execQuery($qry, $params);
+	}
 }
@@ -11,4 +11,12 @@ class Note_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_note';
 		$this->pk = 'note';
 	}
+
+	public function getAllActive() {
+		$qry ="SELECT *
+			FROM lehre.tbl_note
+			WHERE aktiv = true";
+
+		return $this->execReadOnlyQuery($qry);
+	}
 }
@@ -60,5 +60,58 @@ class Paabgabe_model extends DB_Model

 		return $this->execReadOnlyQuery($qry, array($person_id));
 	}
+
+	public function findAbgabenNewOrUpdatedSince($interval, $relevantTypes)
+	{
+
+		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, campus.tbl_paabgabe.kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
+			   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
+			   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
+			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, public.tbl_studiengang.studiengang_kz,
+			   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.studiensemester_kurzbz,
+			   public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
+		FROM campus.tbl_paabgabe
+				 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
+				 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
+				 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
+				 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+				 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
+				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
+				 JOIN public.tbl_person USING (person_id)
+		
+		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
+		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
+		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+
+		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
+	}
+
+	public function findAbgabenNewOrUpdatedSinceByAbgabedatum($interval) {
+
+		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
+						campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
+						campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
+						lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id,
+						public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
+				
+				FROM campus.tbl_paabgabe 
+					JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
+					JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
+					JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+					JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
+				 	JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+				
+				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
+				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?
+				ORDER BY abgabedatum DESC
+	";
+
+		return $this->execQuery($query, [$interval]);
+	}
 	
+	public function loadByIDs($paabgabe_ids) {
+		$qry = "SELECT * FROM campus.tbl_paabgabe WHERE paabgabe_id IN ?";
+		
+		return $this->execReadOnlyQuery($qry, [$paabgabe_ids]);
+	}
 }
@@ -11,4 +11,10 @@ class Paabgabetyp_model extends DB_Model
 		$this->dbTable = 'campus.tbl_paabgabetyp';
 		$this->pk = 'paabgabetyp_kurzbz';
 	}
+	
+	public function getAll() {
+		$qry = "SELECT * FROM campus.tbl_paabgabetyp ORDER BY bezeichnung";
+
+		return $this->execReadOnlyQuery($qry);
+	}
 }
@@ -24,16 +24,28 @@ class Projektarbeit_model extends DB_Model
 	public function getProjektarbeit($student_uid, $studiengang_kz = null, $studiensemester_kurzbz = null, $projekttyp = null, $final = null)
 	{
 		$qry = "SELECT
-					tbl_projektarbeit.* , tbl_projekttyp.bezeichnung
+					pa.*, tbl_projekttyp.bezeichnung,
+					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
+					tbl_firma.name AS firma_name,
+					(
+						SELECT
+							STRING_AGG(trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')), ', ')
+						FROM
+							lehre.tbl_projektbetreuer
+							JOIN public.tbl_person USING (person_id)
+						WHERE
+							projektarbeit_id = pa.projektarbeit_id
+							AND student_uid = pa.student_uid
+						GROUP BY projektarbeit_id
+					) AS projektbetreuer
 				FROM
-					lehre.tbl_projektarbeit
-				JOIN
-					lehre.tbl_projekttyp USING (projekttyp_kurzbz), lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung
-
+					lehre.tbl_projektarbeit pa
+					JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
+					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+					LEFT JOIN public.tbl_firma USING (firma_id)
 				WHERE
-					tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
-					tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
-					tbl_projektarbeit.student_uid = ?";
+					pa.student_uid = ?";

 		$params = array($student_uid);

@@ -52,16 +64,16 @@ class Projektarbeit_model extends DB_Model
 		if (isset($projekttyp))
 		{
 			if (is_array($projekttyp))
-				$qry .= ' AND tbl_projektarbeit.projekttyp_kurzbz IN ?';
+				$qry .= ' AND pa.projekttyp_kurzbz IN ?';
 			else
-				$qry .= ' AND tbl_projektarbeit.projekttyp_kurzbz=?';
+				$qry .= ' AND pa.projekttyp_kurzbz=?';

 			$params[] = $projekttyp;
 		}

 		if (isset($final))
 		{
-			$qry .= ' AND tbl_projektarbeit.final=?';
+			$qry .= ' AND pa.final=?';
 			$params[] = $final;
 		}

@@ -97,36 +109,36 @@ class Projektarbeit_model extends DB_Model
 	 */
 	public function getStudentProjektarbeitenWithBetreuer($studentUID)
 	{
-		$betreuerQuery = "
-		SELECT 
+		$betreuerQuery = "SELECT * FROM (SELECT DISTINCT ON(projektarbeit_id)
 			vorname as bvorname,
 			nachname as bnachname,
 			titelpre as btitelpre,
 			titelpost AS btitelpost,
-			titelpost AS btitelpost,
 			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
 		
-			(SELECT person_id 
-			 FROM lehre.tbl_projektbetreuer 
+			(SELECT person_id
+			 FROM lehre.tbl_projektbetreuer
 			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
-			(SELECT betreuerart_kurzbz 
-			 FROM lehre.tbl_projektbetreuer 
+			   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
+			(SELECT betreuerart_kurzbz
+			 FROM lehre.tbl_projektbetreuer
 			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
-			(SELECT tbl_betreuerart.beschreibung 
-			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
+			   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
+			(SELECT tbl_betreuerart.beschreibung
+			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
 			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
-			
+			   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
+		
 			tbl_betreuerart.betreuerart_kurzbz,
 			person_id as bperson_id,
 			projektarbeit_id,
 			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
+			lehre.tbl_projekttyp.projekttyp_kurzbz as projekttypkurzbz,
 			lehre.tbl_lehreinheit.studiensemester_kurzbz,
 			lehre.tbl_lehrveranstaltung.studiengang_kz,
 			public.tbl_studiengang.kurzbzlang,
-			lehre.tbl_projektbetreuer.note as note,
+			lehre.tbl_projektarbeit.note as note,
+			lehre.tbl_note.bezeichnung as note_bezeichnung,
 			public.tbl_mitarbeiter.mitarbeiter_uid,
 			lehre.tbl_projektarbeit.titel as titel,
 			lehre.tbl_projektarbeit.sprache as sprache,
@@ -135,9 +147,8 @@ class Projektarbeit_model extends DB_Model
 			lehre.tbl_projektarbeit.schlagwoerter as schlagwoerter,
 			lehre.tbl_projektarbeit.schlagwoerter_en as schlagwoerter_en,
 			lehre.tbl_projektarbeit.abstract as abstract,
-			lehre.tbl_projektarbeit.abstract_en as abstract_en, 
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
+			lehre.tbl_projektarbeit.abstract_en as abstract_en,
+			lehre.tbl_projektarbeit.insertamum as insertamum,
 			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
 		
 		FROM lehre.tbl_projektarbeit
@@ -146,15 +157,17 @@ class Projektarbeit_model extends DB_Model
 				 LEFT JOIN public.tbl_benutzer USING(person_id)
 				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
 				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-		LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
-		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-		WHERE 
-			tbl_projektarbeit.student_uid = ? AND
+				 LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+				 LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
+				 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+				 LEFT JOIN lehre.tbl_note ON(lehre.tbl_projektarbeit.note = lehre.tbl_note.note)
+		WHERE
+			tbl_projektarbeit.student_uid = ? AND mitarbeiter_uid IS NOT NULL AND
 			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-  		AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
-		
+		  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')) as base
+		ORDER BY insertamum DESC";
+				
 		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
 	}

@@ -167,8 +180,12 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabe.fixtermin,
 					campus.tbl_paabgabe.kurzbz,
 					campus.tbl_paabgabe.datum,
+					campus.tbl_paabgabe.note,
+					campus.tbl_paabgabe.upload_allowed,
+					campus.tbl_paabgabe.beurteilungsnotiz,
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
+					campus.tbl_paabgabetyp.benotbar, 
 					campus.tbl_paabgabe.abgabedatum,
 					campus.tbl_paabgabe.insertvon
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
@@ -178,16 +195,76 @@ class Projektarbeit_model extends DB_Model
 		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
 	}

+	public function getProjektarbeitenAbgabetermine($projektarbeiten_ids) {
+		$qry ="SELECT campus.tbl_paabgabe.paabgabe_id, 
+					campus.tbl_paabgabe.projektarbeit_id,
+					campus.tbl_paabgabe.fixtermin,
+					campus.tbl_paabgabe.kurzbz,
+					campus.tbl_paabgabe.datum,
+					campus.tbl_paabgabe.note,
+					campus.tbl_paabgabe.upload_allowed,
+					campus.tbl_paabgabe.beurteilungsnotiz,
+					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
+					campus.tbl_paabgabetyp.bezeichnung, 
+					campus.tbl_paabgabe.abgabedatum,
+					campus.tbl_paabgabe.insertvon
+				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
+				WHERE campus.tbl_paabgabe.projektarbeit_id IN ?
+				ORDER BY campus.tbl_paabgabe.datum";
+
+		return $this->execReadOnlyQuery($qry, array($projektarbeiten_ids));
+	}
+
 	public function getProjektbetreuerAnrede($bperson_id) {
-		$qry_betr="SELECT distinct trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first,
-						public.tbl_mitarbeiter.mitarbeiter_uid, anrede
-						FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
-						JOIN public.tbl_benutzer ON(public.tbl_benutzer.person_id=public.tbl_person.person_id)
-						JOIN public.tbl_mitarbeiter ON(public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid)
-						WHERE public.tbl_person.person_id= ?";
+		$qry_betr="SELECT DISTINCT ON(public.tbl_person.person_id) trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first, anrede
+			FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
+			WHERE public.tbl_person.person_id= ?";

 		return $this->execReadOnlyQuery($qry_betr, [$bperson_id]);
+	}
+	
+	public function getProjektbetreuerEmail($projektarbeit_id) {
+		$qry = "SELECT (
+				   SELECT kontakt
+				   FROM public.tbl_kontakt
+				   WHERE kontakttyp = 'email'
+					 AND person_id = pers.person_id
+				   ORDER BY
+					   CASE WHEN zustellung THEN 0 ELSE 1 END,
+					   insertamum DESC NULLS LAST
+				   LIMIT 1
+			   ) AS private_email, mitarbeiter_uid as uid
+		FROM lehre.tbl_projektarbeit pa
+				 JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+				 JOIN public.tbl_person pers USING (person_id)
+				 LEFT JOIN public.tbl_benutzer ben USING (person_id)
+				 LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid = ma.mitarbeiter_uid
+		WHERE (ben.aktiv OR ben.aktiv IS NULL)
+		  AND projektarbeit_id = ?";

+		return $this->execReadOnlyQuery($qry, [$projektarbeit_id]);
+	}
+	
+	public function getProjektbetreuerEmailByPersonID($person_id) {
+		$qry = "SELECT (
+				   SELECT kontakt
+				   FROM public.tbl_kontakt
+				   WHERE kontakttyp = 'email'
+					 AND person_id = pers.person_id
+				   ORDER BY
+					   CASE WHEN zustellung THEN 0 ELSE 1 END,
+					   insertamum DESC NULLS LAST
+				   LIMIT 1
+			   ) AS private_email, mitarbeiter_uid as uid
+		FROM lehre.tbl_projektarbeit pa
+				 JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+				 JOIN public.tbl_person pers USING (person_id)
+				 LEFT JOIN public.tbl_benutzer ben USING (person_id)
+				 LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid = ma.mitarbeiter_uid
+		WHERE (ben.aktiv OR ben.aktiv IS NULL)
+		  AND person_id = ?";
+
+		return $this->execReadOnlyQuery($qry, [$person_id]);
 	}

 	public function getProjektarbeitBenutzer($uid) {
@@ -222,9 +299,9 @@ class Projektarbeit_model extends DB_Model
 					*
 				FROM
 					(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
-							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id,
-							tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
-							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz
+							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
+							tbl_projektbetreuer.person_id as betreuer_person_id, tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid
 					 FROM lehre.tbl_projektarbeit
 							  LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
 							  LEFT JOIN lehre.tbl_betreuerart using(betreuerart_kurzbz)
@@ -261,4 +338,170 @@ class Projektarbeit_model extends DB_Model
 		
 		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
 	}
+	
+	
+	public function getProjektarbeitenForStudiengang($studiengang_kz, $benotet) {
+		$new_qry = "SELECT DISTINCT ON(tmp.projektarbeit_id) *, campus.get_betreuer_details(tmp.zweitbetreuer_person_id) as zweitbetreuer_full_name, campus.get_betreuer_details(tmp.betreuer_person_id) as erstbetreuer_full_name
+       		FROM(
+			   SELECT
+				   DISTINCT ON(tbl_projektarbeit.projektarbeit_id)
+				   tbl_projektarbeit.projekttyp_kurzbz,
+				   tbl_projektarbeit.titel,
+				   tbl_projektarbeit.projektarbeit_id,
+				   tbl_studiengang.typ, tbl_studiengang.kurzbz,
+				   student_benutzer.uid as student_uid,
+				   student_person.vorname as student_vorname,
+				   student_person.nachname as student_nachname,
+				   tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
+				   betreuer_benutzer.uid as betreuer_benutzer_uid,
+				   betreuer_person.vorname as betreuer_vorname,
+				   betreuer_person.nachname as betreuer_nachname,
+				   lehre.tbl_projektbetreuer.betreuerart_kurzbz as betreuerart,
+				   lehre.tbl_projektbetreuer.person_id as betreuer_person_id,
+				   lehre.tbl_projektarbeit.sprache               as sprache,
+				   lehre.tbl_projektarbeit.seitenanzahl          as seitenanzahl,
+				   lehre.tbl_projektarbeit.kontrollschlagwoerter as kontrollschlagwoerter,
+				   lehre.tbl_projektarbeit.schlagwoerter         as schlagwoerter,
+				   lehre.tbl_projektarbeit.schlagwoerter_en      as schlagwoerter_en,
+				   lehre.tbl_projektarbeit.abstract              as abstract,
+				   lehre.tbl_projektarbeit.abstract_en           as abstract_en,
+				   lehre.tbl_projektarbeit.insertamum            as insertamum,
+				   lehre.tbl_projektarbeit.note					 as note,
+				   (
+					   SELECT orgform_kurzbz
+					   FROM tbl_prestudentstatus
+					   WHERE prestudent_id = (SELECT prestudent_id
+											  FROM tbl_student
+											  WHERE student_uid = student_benutzer.uid
+											  LIMIT 1)
+					   ORDER BY datum DESC, insertamum DESC, ext_id DESC
+					   LIMIT 1
+				   )
+					   as organisationsform,
+				   (
+					   SELECT person_id
+					   FROM lehre.tbl_projektbetreuer
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_person_id,
+				   (
+					   SELECT betreuerart_kurzbz
+					   FROM lehre.tbl_projektbetreuer
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_betreuerart_kurzbz,
+				   (
+					   SELECT tbl_betreuerart.beschreibung
+					   FROM lehre.tbl_projektbetreuer
+								JOIN lehre.tbl_betreuerart USING (betreuerart_kurzbz)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_betreuerart_beschreibung,
+				   (
+					   SELECT trim(COALESCE(titelpre, '') || ' ' || COALESCE(vorname, '') || ' ' || COALESCE(nachname, '') || ' ' ||
+								   COALESCE(titelpost, ''))
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_full_name,
+			       (
+					   SELECT
+						   COALESCE(tbl_studienplan.orgform_kurzbz,
+									tbl_prestudentstatus.orgform_kurzbz, tbl_studiengang.orgform_kurzbz) as
+							   orgform
+					   FROM
+						   public.tbl_prestudent
+							   JOIN public.tbl_prestudentstatus USING(prestudent_id)
+							   JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+							   JOIN public.tbl_studiengang USING(studiengang_kz)
+							   LEFT JOIN lehre.tbl_studienplan USING(studienplan_id)
+					   WHERE
+						   prestudent_id=tbl_student.prestudent_id
+					   ORDER BY tbl_prestudentstatus.datum DESC LIMIT 1
+				   ) as orgform,
+				   (SELECT status_kurzbz FROM public.tbl_prestudentstatus
+					WHERE prestudent_id=tbl_student.prestudent_id
+					ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as studienstatus
+			   FROM lehre.tbl_projektarbeit
+						LEFT JOIN public.tbl_benutzer student_benutzer ON (student_benutzer.uid = lehre.tbl_projektarbeit.student_uid)
+						LEFT JOIN public.tbl_person student_person ON (student_benutzer.person_id = student_person.person_id)
+						LEFT JOIN public.tbl_student on(student_benutzer.uid = public.tbl_student.student_uid)
+						LEFT JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
+						LEFT JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+						LEFT JOIN public.tbl_studiengang ON (public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz)
+						LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+						LEFT JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+						LEFT JOIN public.tbl_person betreuer_person ON (betreuer_person.person_id = lehre.tbl_projektbetreuer.person_id)
+						LEFT JOIN public.tbl_benutzer betreuer_benutzer ON (betreuer_person.person_id = betreuer_benutzer.person_id)
+			   WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
+				 AND student_benutzer.aktiv AND (
+				     lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' 
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Betreuer'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbetreuer'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Senatsvorsitz'
+				     )
+				 AND public.tbl_studiengang.studiengang_kz = ?";
+		
+			     if($benotet == 0) {
+					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NULL ";
+				 } else if ($benotet == 1) {
+					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NOT NULL ";
+				 }
+				 
+			   $new_qry .= " ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
+		   ) as tmp";
+		
+		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
+	}
+	
+	/**
+	 *
+	 * @param
+	 * @return object success or error
+	 */
+	public function hasBerechtigungForProjektarbeit($projektarbeit_id)
+	{
+		if (!$projektarbeit_id || !is_numeric($projektarbeit_id))
+			return false;
+
+		$this->ProjektarbeitModel->addSelect('studiengang_kz');
+		$this->ProjektarbeitModel->addJoin('public.tbl_student', 'student_uid');
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		if (isError($result) || !hasData($result))
+			return false;
+
+		$studiengang_kz = getData($result)[0]->studiengang_kz;
+
+		if ($this->permissionlib->isBerechtigt('admin', 'suid', $studiengang_kz))
+			return true;
+		if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $studiengang_kz))
+			return true;
+
+		return false;
+	}
+
+	public function getProjektarbeitByPaabgabeID($paabgabe_id) {
+		$qry = "SELECT
+					projektarbeit_id
+				FROM
+					campus.tbl_paabgabe
+					JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+				WHERE
+					campus.tbl_paabgabe.paabgabe_id = ?;
+		";
+
+		return $this->execReadOnlyQuery($qry, [$paabgabe_id]);
+	}
 }
@@ -10,6 +10,7 @@ class Projektbetreuer_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'lehre.tbl_projektbetreuer';
 		$this->pk = array('betreuerart_kurzbz', 'projektarbeit_id', 'person_id');
+		$this->hasSequence = false;
 	}

    /**
@@ -231,4 +232,41 @@ class Projektbetreuer_model extends DB_Model

 		return $this->execQuery($qry, array($projektarbeit_id, $betreuer_person_id));
 	}
+
+	/**
+	 * Gets all Betreuer of a Projektarbeit.
+	 * Returns one row for each person.
+	 * @param int $projektarbeit_id
+	 * @return array success with number of Betreuer or error
+	 */
+	public function getAllBetreuerOfProjektarbeit($projektarbeit_id)
+	{
+		$qry = "SELECT DISTINCT ON (pers.person_id) pers.person_id, betreuerart_kurzbz, vorname, nachname,
+				trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as voller_name,
+				anrede, titelpre, titelpost, gebdatum, geschlecht, pa.projekttyp_kurzbz,
+				ben.uid, ben.alias, ma.personalnummer, mitarbeiter_uid, student_uid,
+				(
+					SELECT kontakt
+					FROM public.tbl_kontakt
+					WHERE kontakttyp = 'email'
+					AND person_id = pers.person_id
+					ORDER BY
+						CASE WHEN zustellung THEN 0 ELSE 1 END,
+						insertamum DESC NULLS LAST
+					LIMIT 1
+				) AS private_email
+				FROM lehre.tbl_projektarbeit pa
+				JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+				JOIN public.tbl_person pers USING (person_id)
+				LEFT JOIN public.tbl_benutzer ben USING (person_id)
+				LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid = ma.mitarbeiter_uid
+				WHERE (ben.aktiv OR ben.aktiv IS NULL)
+				AND projektarbeit_id = ?
+				ORDER BY pers.person_id, CASE WHEN ma.mitarbeiter_uid IS NULL THEN 1 ELSE 0 END, /*Mitarbeiter account first*/
+						CASE WHEN ben.uid IS NULL THEN 1 ELSE 0 END, /*user with account first*/
+						ben.insertamum";
+
+		return $this->execQuery($qry, array($projektarbeit_id));
+	}
+
 }
@@ -243,4 +243,20 @@ class Organisationseinheit_model extends DB_Model

 		return $this->execReadOnlyQuery($qry, array($oe_kurzbz));
 	}
+	
+	public function getAssistenzForOE($oe_kurzbz) {
+		$qry = "
+			SELECT person_id, uid, benutzerfunktion_id, funktion_kurzbz, oe_kurzbz, alias, 
+       			anrede, trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first
+			FROM tbl_benutzerfunktion
+					 JOIN public.tbl_benutzer USING(uid)
+					 JOIN public.tbl_person USING(person_id)
+			WHERE funktion_kurzbz = 'ass'
+				AND oe_kurzbz = ?
+				AND (datum_bis IS NULL OR NOW() <= datum_bis)
+				AND public.tbl_benutzer.aktiv = true
+		";
+
+		return $this->execReadOnlyQuery($qry, array($oe_kurzbz));
+	}
 }
@@ -657,37 +657,7 @@ class Studiengang_model extends DB_Model
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
-
-		$addEmailProperty= function(&$benutzerfunktionen){
-			if(count($benutzerfunktionen) && defined('DOMAIN'))
-			{
-				$benutzerfunktionen = array_map(function($benutzer)
-				{
-					$benutzer->email = $benutzer->alias."@".DOMAIN;
-					return $benutzer;
-				},$benutzerfunktionen) ;
-			}
-
-		};
-		$addFotoProperty= function(&$collection){
-			$collection = array_map(function($item){
-				$person_id = $this->PersonModel->getByUid($item->uid);
-				if(isError($person_id))
-					return error($person_id);
-				$person_id = current(getData($person_id))->person_id;
-				$this->PersonModel->addSelect('foto');
-				$foto = $this->PersonModel->loadWhere(array('person_id'=>$person_id));
-				if(isError($foto))
-					return error($foto);	
-				$foto = current(getData($foto))->foto;
-				$item->foto = $foto;
-				return $item;
-			},$collection);
-		};
 		
-
-		$this->load->model('crm/Student_model', 'StudentModel');
-
 		$student = $this->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
 		if (isError($student))
 			return error($student);
@@ -712,7 +682,7 @@ class Studiengang_model extends DB_Model
 		$stg_ltg = array_values(array_filter($stg_ltg, function($stg_leitung){
 			return $stg_leitung->aktiv;
 		}));
-		$addFotoProperty($stg_ltg);
+		$this->addFotoProperty($stg_ltg);

 		$gf_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('gLtg', $stg_obj->oe_kurzbz);
 		if (isError($gf_ltg))
@@ -721,8 +691,8 @@ class Studiengang_model extends DB_Model
 		$gf_ltg = array_values(array_filter($gf_ltg, function($gf_leitung){
 			return $gf_leitung->aktiv;
 		}));
-		$addEmailProperty($gf_ltg);
-		$addFotoProperty($gf_ltg);
+		$this->addEmailProperty($gf_ltg);
+		$this->addFotoProperty($gf_ltg);

 		$stv_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
 		if (isError($stv_ltg))
@@ -731,8 +701,8 @@ class Studiengang_model extends DB_Model
 		$stv_ltg = array_values(array_filter($stv_ltg, function($stv_leitung){
 			return $stv_leitung->aktiv;
 		}));
-		$addEmailProperty($stv_ltg);
-		$addFotoProperty($stv_ltg);
+		$this->addEmailProperty($stv_ltg);
+		$this->addFotoProperty($stv_ltg);

 		$ass = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
 		if (isError($ass))
@@ -741,8 +711,8 @@ class Studiengang_model extends DB_Model
 		$ass = array_values(array_filter($ass, function($assistenz){
 			return $assistenz->aktiv;
 		}));
-		$addEmailProperty($ass);
-		$addFotoProperty($ass);
+		$this->addEmailProperty($ass);
+		$this->addFotoProperty($ass);

 		$hochschulvertr = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('hsv');
 		if (isError($hochschulvertr))
@@ -751,7 +721,7 @@ class Studiengang_model extends DB_Model
 		$hochschulvertr = array_values(array_filter($hochschulvertr, function($hochschul_vertreter){
 			return $hochschul_vertreter->aktiv;
 		}));
-		$addEmailProperty($hochschulvertr);
+		$this->addEmailProperty($hochschulvertr);


 		$stdv = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stdv', $stg_obj->oe_kurzbz);
@@ -761,7 +731,7 @@ class Studiengang_model extends DB_Model
 		$stdv = array_values(array_filter($stdv, function($std_vertreter){
 			return $std_vertreter->aktiv;
 		}));
-		$addEmailProperty($stdv);
+		$this->addEmailProperty($stdv);


 		$jahrgangsvertr = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('jgv', $stg_obj->oe_kurzbz, $semester);
@@ -771,7 +741,7 @@ class Studiengang_model extends DB_Model
 		$jahrgangsvertr = array_values(array_filter($jahrgangsvertr, function($jahrgang_vertreter){
 			return $jahrgang_vertreter->aktiv;
 		}));
-		$addEmailProperty($jahrgangsvertr);
+		$this->addEmailProperty($jahrgangsvertr);


 		$result_object = new stdClass();
@@ -801,4 +771,141 @@ class Studiengang_model extends DB_Model

 		return $this->execReadOnlyQuery($qry, array($studiengang_kz, $orgform_kurzbz, $studiensemester_kurzbz));
 	}
+
+	/**
+	 * Get active Studiengänge with Kuerzel by given Studiengang-Kennzahlen.
+	 * Helpful to easily get Studiengänge the user is entitled for.
+	 *
+	 * @param $studiengang_kz_arr
+	 * @param $studiensemester_kurzbz
+	 * @return array|stdClass|null	Returns one row per Studiengang. Not considering the Orgforms.
+	 */
+	public function getByStgs($studiengang_kz_arr, $studiensemester_kurzbz)
+	{
+		if (is_numeric($studiengang_kz_arr))
+		{
+			$studiengang_kz_arr = [$studiengang_kz_arr];
+		}
+
+		$qry = '
+			SELECT
+				DISTINCT stg.*, UPPER(typ::varchar(1) || kurzbz) AS kuerzel
+			FROM
+				public.tbl_studiengang stg
+				JOIN lehre.tbl_studienordnung sto USING(studiengang_kz)
+				JOIN lehre.tbl_studienplan stpl USING(studienordnung_id)
+				JOIN lehre.tbl_studienplan_semester stplsem USING(studienplan_id)
+			WHERE
+				stg.studiengang_kz IN ?
+				AND stplsem.studiensemester_kurzbz = ?
+			ORDER BY
+				stg.kurzbzlang
+		';
+
+		return $this->execQuery($qry, [$studiengang_kz_arr, $studiensemester_kurzbz]);
+	}
+
+	/**
+	 * Get OrgForms of given Studiengang and Studiensemester.
+	 *
+	 * @param $studiengang_kz
+	 * @param $studiensemester_kurzbz
+	 * @return array|stdClass|null
+	 */
+	public function getOrgformsByStg($studiengang_kz, $studiensemester_kurzbz)
+	{
+		$qry = '
+			SELECT
+				stpl.orgform_kurzbz
+			FROM
+				public.tbl_studiengang stg
+				JOIN lehre.tbl_studienordnung sto USING(studiengang_kz)
+				JOIN lehre.tbl_studienplan stpl USING(studienordnung_id)
+				JOIN lehre.tbl_studienplan_semester stplsem USING(studienplan_id)
+			WHERE
+				stg.studiengang_kz = ?
+				AND stg.aktiv = TRUE
+				AND stplsem.studiensemester_kurzbz = ?
+			GROUP BY
+				stpl.orgform_kurzbz
+			ORDER BY
+				CASE stpl.orgform_kurzbz
+					WHEN \'VZ\' THEN 1
+					WHEN \'BB\' THEN 2
+					WHEN \'DUA\' THEN 3
+					ELSE 4
+				END,
+				stpl.orgform_kurzbz; 
+		';
+
+		return $this->execQuery($qry, [$studiengang_kz, $studiensemester_kurzbz]);
+	}
+	
+	public function getStudiengaengeFiltered($allowed_stg) {
+		$query ="SELECT DISTINCT
+					public.tbl_studiengang.studiengang_kz,
+					public.tbl_studiengang.bezeichnung,
+					public.tbl_studiengang.kurzbzlang,
+					public.tbl_studiengang.orgform_kurzbz
+				FROM public.tbl_studiengang JOIN lehre.tbl_studienordnung USING(studiengang_kz)
+					JOIN lehre.tbl_studienplan USING(studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester USING(studienplan_id)
+				WHERE public.tbl_studiengang.aktiv = true
+				
+				AND public.tbl_studiengang.studiengang_kz IN ?
+				ORDER BY public.tbl_studiengang.kurzbzlang";
+
+		return $this->execReadOnlyQuery($query, [$allowed_stg]);
+	}
+	
+	public function getAssistenzForStudiengangKZ($stg_kz) {
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		
+		$stg_obj = $this->load($stg_kz);
+		if(isError($stg_obj))
+			return error($stg_obj);
+		if(getData($stg_obj))
+		{
+			$stg_obj = current(getData($stg_obj));
+		}
+
+		$ass = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
+		if (isError($ass))
+			return $ass;
+		$ass = getData($ass) ?: [];
+		$ass = array_values(array_filter($ass, function($assistenz){
+			return $assistenz->aktiv;
+		}));
+		
+		$this->addEmailProperty($ass);
+		
+		return success($ass);
+	}
+	
+	private function addEmailProperty(&$benutzerfunktionen) {
+		if(count($benutzerfunktionen) && defined('DOMAIN'))
+		{
+			$benutzerfunktionen = array_map(function($benutzer)
+			{
+				$benutzer->email = $benutzer->alias."@".DOMAIN;
+				return $benutzer;
+			},$benutzerfunktionen) ;
+		}
+	}
+	
+	private function addFotoProperty (&$collection) {
+		$collection = array_map(function($item){
+			$person_id = $this->PersonModel->getByUid($item->uid);
+			if(isError($person_id))
+				return error($person_id);
+			$person_id = current(getData($person_id))->person_id;
+			$this->PersonModel->addSelect('foto');
+			$foto = $this->PersonModel->loadWhere(array('person_id'=>$person_id));
+			if(isError($foto))
+				return error($foto);
+			$foto = current(getData($foto))->foto;
+			$item->foto = $foto;
+			return $item;
+		},$collection);
+	}
 }
@@ -157,7 +157,6 @@ class Studienplan_model extends DB_Model
 		return $this->execReadOnlyQuery($qry, array($lv_id));
 	}

-
 	public function getStudienplaeneForPerson($person_id)
 	{
 		$this->addDistinct();
@@ -207,7 +207,6 @@ class Notiz_model extends DB_Model
 			";

 		return $this->execQuery($qry, array($type, $id));
-
 	}


@@ -151,12 +151,21 @@ class Person_model extends DB_Model
 	 */
 	public function searchPerson($filter)
 	{
-		$this->addSelect('vorname, nachname, gebdatum, person_id');
+		$this->addSelect('vorname, nachname, gebdatum, person_id, titelpre, titelpost');
+		$this->addSelect("CASE
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=tbl_person.person_id)
+				THEN 'Mitarbeiter'
+				WHEN EXISTS
+					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=tbl_person.person_id)
+				THEN 'Student'
+				ELSE 'Person'
+			END AS status");
 		$result = $this->loadWhere(
-			'lower(nachname) like '.$this->db->escape('%'.$filter.'%')."
+			'lower(nachname) like '.$this->db->escape('%'.mb_strtolower($filter).'%')."
 			OR lower(vorname) like ".$this->db->escape('%'.$filter.'%')."
-			OR lower(nachname || ' ' || vorname) like ".$this->db->escape('%'.$filter.'%')."
-			OR lower(vorname || ' ' || nachname) like ".$this->db->escape('%'.$filter.'%')
+			OR lower(nachname || ' ' || vorname) like ".$this->db->escape('%'.mb_strtolower($filter).'%')."
+			OR lower(vorname || ' ' || nachname) like ".$this->db->escape('%'.mb_strtolower($filter).'%')
 		);

 		return $result;
@@ -411,4 +420,17 @@ class Person_model extends DB_Model
 			return success($result);
 		}
 	}
-}
+
+	public function loadAllStudentUIDSForPersonID($person_id) {
+		$qry = "SELECT
+			CONCAT(tp.vorname, ' ', tp.nachname) AS name,
+			ARRAY_AGG(DISTINCT b.uid ORDER BY b.uid) AS uids
+		FROM public.tbl_student s
+				 JOIN public.tbl_benutzer b ON s.student_uid = b.uid
+				 JOIN public.tbl_person tp ON b.person_id = tp.person_id
+		GROUP BY tp.vorname, tp.nachname, b.aktiv, b.person_id
+		HAVING b.person_id = ? AND b.aktiv IS TRUE;";
+		
+		return $this->execReadOnlyQuery($qry, [$person_id]);
+	}
+}
@@ -135,7 +135,8 @@ class Profil_update_model extends DB_Model
 				attachment_id,
 				UPPER(public.tbl_studiengang.typ || public.tbl_studiengang.kurzbz) AS studiengang,
 				COALESCE(of.orgform_kurzbz, public.tbl_studiengang.orgform_kurzbz) AS orgform,
-				NULL as oezuordnung
+				NULL as oezuordnung,
+				tbl_student.semester
 			FROM public.tbl_profil_update
 			JOIN public.tbl_profil_update_status ON public.tbl_profil_update_status.status_kurzbz = public.tbl_profil_update.status 
 			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
@@ -12,17 +12,24 @@ class Firma_model extends DB_Model
 		$this->pk = 'firma_id';
 	}

-	public function searchFirmen($filter)
+	public function searchFirmen($filter, $aktiv = null)
 	{
+		$params = [];
 		$filter = strtoLower($filter);
 		$qry = "
-			SELECT 
+			SELECT
 				f.name, f.firma_id
-			FROM 
-			    public.tbl_firma f
-			WHERE 
-			    lower (f.name) LIKE '%". $this->db->escape_like_str($filter)."%'";
+			FROM
+				public.tbl_firma f
+			WHERE
+				lower (f.name) LIKE '%". $this->db->escape_like_str($filter)."%'";

-		return $this->execQuery($qry);
+			if (isset($aktiv) && is_bool($aktiv))
+			{
+				$params[] = $aktiv;
+				$qry .= " AND aktiv = ?";
+			}
+
+		return $this->execQuery($qry, $params);
 	}
 }
@@ -353,12 +353,14 @@ class Mitarbeiter_model extends DB_Model
 	{
 		$filter = strtoLower($filter);

+		$returnwert = "p.person_id, p.nachname, p.vorname, p.titelpost,  p.titelpre";
+
 		if ($mode == "mitAkadGrad")
-			$returnwert = "ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
+			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
 		elseif ($mode == "ohneMaUid")
-			$returnwert = "p.person_id, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre) as mitarbeiter";
+			$returnwert .= ", CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre) as mitarbeiter";
 		else
-			$returnwert = "ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
+			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";

 		$qry = "
 			SELECT " . $returnwert . "  
@@ -373,7 +375,11 @@ class Mitarbeiter_model extends DB_Model
 			OR
 				lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%'
 			OR
-				(ma.mitarbeiter_uid) LIKE '%". $this->db->escape_like_str($filter)."%'";
+				(ma.mitarbeiter_uid) LIKE '%". $this->db->escape_like_str($filter)."%'
+			OR
+				lower(vorname || ' ' || nachname || ' ' || vorname) like ".$this->db->escape('%'.mb_strtolower($filter).'%')."
+			ORDER BY
+				p.nachname, p.vorname, b.uid, p.person_id";

 		return $this->execQuery($qry);
 	}
@@ -535,4 +535,53 @@ class Stundenplan_model extends DB_Model

 		return $this->execQuery($query, [$uid, $uid]);
 	}
+
+	/**
+	 * Get Stundenplantermine for given Lehreinheit.
+	 *
+	 * @param $lehreinheit_id
+	 * @return array|stdClass|null
+	 */
+	public function getTermineByLe($lehreinheit_id)
+	{
+		$qry = '
+			SELECT DISTINCT
+			    datum
+			FROM 
+		       	lehre.vw_stundenplan
+			WHERE 
+				lehreinheit_id = ?
+			ORDER BY 
+			    datum ASC
+		';
+
+		return $this->execQuery($qry, [$lehreinheit_id]);
+	}
+
+	/**
+	 * Get Stundenplantermine for given Lehrveranstaltung of given Studiensemester.
+	 *
+	 * @param $lehrveranstaltung_id
+	 * @param $studiensemester_kurzbz
+	 * @return array|stdClass|null
+	 */
+	public function getTermineByLv($lehrveranstaltung_id, $studiensemester_kurzbz)
+	{
+		$qry = '
+		  	SELECT DISTINCT
+				datum
+	   		FROM
+	   		    lehre.vw_stundenplan
+	  		WHERE 
+	  		    lehreinheit_id IN (
+					SELECT lehreinheit_id
+					FROM lehre.tbl_lehreinheit 
+					WHERE lehrveranstaltung_id = ?
+					AND studiensemester_kurzbz = ?
+				)    
+	   		ORDER BY datum ASC
+		';
+
+		return $this->execQuery($qry, [$lehrveranstaltung_id, $studiensemester_kurzbz]);
+	}
 }
@@ -2,7 +2,7 @@

 class Stundensatz_model extends DB_Model
 {
-	
+
 	/**
 	 * Constructor
 	 */
@@ -43,6 +43,107 @@ class Stundensatz_model extends DB_Model
 		return $this->execQuery($qry, $params);
 	}

+	public function getStundensatzForMitarbeiter($person_id, $studiensemester_kurzbz)
+	{
+		$this->load->config('stv');
+
+		$defaultStundensatz = $this->config->item('tabs')['projektarbeit']['defaultProjektbetreuerStundensatz'];
+
+		$stundensatz = '';
+
+		if(isset($person_id) && isset($studiensemester_kurzbz))
+		{
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+			$this->StudiensemesterModel->addSelect('start, ende');
+			$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
+
+			if (hasData($result))
+			{
+				$studiensemester = getData($result)[0];
+
+				if (defined('FAS_LV_LEKTORINNENZUTEILUNG_FIXANGESTELLT_STUNDENSATZ') && !FAS_LV_LEKTORINNENZUTEILUNG_FIXANGESTELLT_STUNDENSATZ)
+				{
+					// load Mitarbeiter
+					$params = [$person_id];
+					$qry = "
+						SELECT
+							mitarbeiter_uid, fixangestellt
+						FROM
+							public.tbl_mitarbeiter
+							JOIN public.tbl_benutzer ON(tbl_benutzer.uid=tbl_mitarbeiter.mitarbeiter_uid)
+						WHERE
+							person_id=?
+						ORDER BY
+							tbl_mitarbeiter.insertamum DESC NULLS LAST
+						LIMIT 1";
+
+					$result = $this->execQuery($qry, $params);
+
+					if (hasData($result))
+					{
+						$ma = getData($result)[0];
+
+						$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model','DienstverhaeltnisModel');
+						$echterdv_result = $this->DienstverhaeltnisModel->existsDienstverhaeltnis(
+							$ma->mitarbeiter_uid,
+							$studiensemester->start,
+							$studiensemester->ende,
+							'echterdv'
+						);
+
+						if (hasData($echterdv_result))
+						{
+							$stundensatz = null;
+						}
+						else
+						{
+							$stundensatzRes = $this->getStundensatzByDatum(
+								$ma->mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'lehre'
+							);
+
+							if (hasData($stundensatzRes))
+								$stundensatz = getData($stundensatzRes)[0]->stundensatz;
+							else
+								$stundensatz = '0.00';
+						}
+					}
+					else
+					{
+						$stundensatz = '0.00';
+					}
+
+				}
+				else
+				{
+					$params = [$person_id, $studiensemester->ende, $studiensemester->start];
+					$qry = "SELECT ss.stundensatz
+							FROM hr.tbl_stundensatz ss
+								JOIN public.tbl_mitarbeiter ON ss.uid = tbl_mitarbeiter.mitarbeiter_uid
+								JOIN public.tbl_benutzer ON(tbl_benutzer.uid=tbl_mitarbeiter.mitarbeiter_uid)
+							WHERE person_id=?
+								AND stundensatztyp = 'lehre'
+								AND gueltig_von <= ?
+								AND (gueltig_bis >= ? OR gueltig_bis IS NULL)
+							ORDER BY gueltig_bis DESC NULLS FIRST, gueltig_von DESC NULLS LAST LIMIT 1";
+
+					$result = $this->execQuery($qry, $params);
+
+					if (hasData($result))
+					{
+						$stundensatz = getData($result)[0]->stundensatz;
+					}
+					else
+					{
+						$stundensatz = $defaultStundensatz;
+					}
+				}
+			}
+		}
+
+		return $stundensatz;
+	}
+
 	public function getDefaultStundensatz($mitarbeiter_uid, $beginn, $ende = null, $typ = null)
 	{
 		$stundensatz_result = $this->getStundensatzByDatum($mitarbeiter_uid, $beginn, $ende, $typ);
@@ -58,4 +159,4 @@ class Stundensatz_model extends DB_Model
 		}
 		return $default_stundensatz;
 	}
-}
+}
@@ -242,74 +242,89 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
-		$sql_base = "
-			SELECT
+		$sql = <<<EOSQL
+			with filtered_messages as (
+				select
+					m.message_id, m.person_id as sender_id, mr.person_id as recipient_id
+				from
+					public.tbl_msg_message m
+				join
+					public.tbl_msg_recipient mr on mr.message_id = m.message_id
+				where
+					m.person_id = ?
+				group by
+					m.message_id, m.person_id, mr.person_id
+
+				union all
+
+				select
+					m.message_id, m.person_id as sender_id, mr.person_id as recipient_id
+				from
+					public.tbl_msg_message m
+				join
+					public.tbl_msg_recipient mr on mr.message_id = m.message_id
+				where
+					mr.person_id = ?
+				group by
+					m.message_id, m.person_id, mr.person_id
+
+			), lastmsgstatus as (
+				select
+					ms.*
+				from (
+						select
+							s.message_id, s.person_id, MAX(s.insertamum) as lastinserted
+						from
+							public.tbl_msg_status s
+						group by
+							s.message_id, s.person_id
+					) ls
+				join
+					public.tbl_msg_status ms on ms.message_id = ls.message_id and ms.person_id = ls.person_id and ms.insertamum = ls.lastinserted
+			)
+
+			select
+				(select count(*) from filtered_messages) as total_msgs,
 				m.message_id AS message_id,
 				m.subject AS subject,
 				m.body AS body,
 				m.insertamum AS insertamum,
 				m.relationmessage_id AS relationmessage_id,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
-				m.person_id as sender_id,
-				r.person_id as recipient_id,
-				MAX(ss.status) as status,
-				MAX(ss.insertamum) as statusdatum
-			FROM public.tbl_msg_message m
-				 JOIN public.tbl_msg_recipient r USING(message_id)
-				 JOIN public.tbl_msg_status ss ON(r.message_id = ss.message_id AND ss.person_id = r.person_id)
-			WHERE m.person_id = ?
-			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-			UNION ALL
-			SELECT
-				m.message_id AS message_id,
-				m.subject AS subject,
-				m.body AS body,
-				m.insertamum AS insertamum,
-				m.relationmessage_id AS relationmessage_id,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
-				m.person_id as sender_id,
-				r.person_id as recipient_id,
-				MAX(ss.status) as status,
-				MAX(ss.insertamum) as statusdatum
-			FROM public.tbl_msg_recipient r
-				 JOIN public.tbl_msg_status ss USING(message_id, person_id)
-				 JOIN public.tbl_msg_message m USING(message_id)
-			WHERE r.person_id = ?
-			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-				 ";
-		$sql = "
-			SELECT COUNT(*) AS count FROM (
-				" . $sql_base . "
-			) a
-				 ";
-
-		$parametersArray = array($person_id, $person_id);
-
-		$count = $this->execQuery($sql, $parametersArray);
-
-		if (isError($count))
-			return $count;
-
-		$count = ceil(current(getData($count))->count/$limit);
-		$sql = "
-			SELECT * FROM (
-				" . $sql_base . "
-			) a
-			ORDER BY insertamum DESC
-			LIMIT ?
-			OFFSET ?
-				 ";
+				(COALESCE(ps.titelpre,'') || ' ' || COALESCE(ps.vorname,'') || ' ' || COALESCE(ps.nachname,'') || ' ' || COALESCE(ps.titelpost,'')) as sender,
+				(COALESCE(pr.titelpre,'') || ' ' || COALESCE(pr.vorname,'') || ' ' || COALESCE(pr.nachname,'') || ' ' || COALESCE(pr.titelpost,'')) as recipient,
+				fm.sender_id,
+				fm.recipient_id,
+				ms.status,
+				ms.insertamum as statusdatum
+			from
+				filtered_messages fm
+			join
+				public.tbl_msg_message m on fm.message_id = m.message_id
+			join
+				lastmsgstatus ms on fm.message_id = ms.message_id and fm.recipient_id = ms.person_id
+			left join
+				public.tbl_person ps on ps.person_id = fm.sender_id
+			left join
+				public.tbl_person pr on pr.person_id = fm.recipient_id
+			order by
+				m.insertamum DESC
+			limit ?
+			offset ?;
+EOSQL;

 		$parametersArray = array($person_id, $person_id, $limit, $offset);

+		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);

 		if (isError($data))
 			return $data;

 		$data = getData($data);
+		if($data)
+		{
+			$count = ceil($data[0]->total_msgs / $limit);
+		}

 		return success(['data' => $data, 'count' => $count]);
 	}
@@ -254,22 +254,16 @@ EOSQL;
 	return $dvs;
    }

-	public function existsDienstverhaeltnis($mitarbeiter_uid, $start, $ende = null, $vertragsart_kurzbz = null)
+	public function existsDienstverhaeltnis($mitarbeiter_uid, $start, $ende, $vertragsart_kurzbz)
 	{
 		$this->addOrder('von', 'DESC');
 		$this->db->where('mitarbeiter_uid', $mitarbeiter_uid);
-		if (!is_null($vertragsart_kurzbz))
-			$this->db->where('vertragsart_kurzbz', $this->escape($vertragsart_kurzbz));
-
+		$this->db->where('vertragsart_kurzbz', $vertragsart_kurzbz);
 		$this->db->where('von <=', $ende);
-
-		if (!is_null($ende))
-		{
-			$this->db->group_start();
-			$this->db->where('bis >=', $start);
-			$this->db->or_where('bis IS NULL', null, false);
-			$this->db->group_end();
-		}
+		$this->db->group_start();
+		$this->db->where('bis >=', $start);
+		$this->db->or_where('bis IS NULL', null, false);
+		$this->db->group_end();

 		$this->addLimit(1);
 		return $this->load();
@@ -286,7 +286,13 @@ EOSQL;
 			foreach( $rows as $row ) {
 				$tmpgb = new Gehaltsbestandteil();
 				$tmpgb->hydrateByStdClass($row, true);
-				
+
+				if ($row->betrag_valorisiert != null && $row->valorisierungsdatum != null 
+					&& $row->valorisierungsdatum == $row->von) {
+					// neuer Gehaltsbestandteil mit Valorisierungsdatum aber auch valorisiert
+					$tmpgb->setGrundbetrag($row->betrag_valorisiert);
+				}
+
 				// prevent duplication (caused by the join with historic values)
 				if (!isset($lastRecords[(string)$row->gehaltsbestandteil_id])) {
 					$gehaltsbestandteile[] = $tmpgb;
@@ -0,0 +1,47 @@
+<?php
+
+$includesArray = array(
+	'title' => 'Cis4',
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'tabulator5' => true, // TODO: upgrade to 6 when available
+	'vue3' => true,
+	'primevue3' => true,
+	'skipID' => '#fhccontent',
+	'vuedatepicker11' => true,
+	'customCSSs' => array(
+		'public/css/components/verticalsplit.css',
+		'public/css/components/FilterComponent.css',
+		'public/css/components/FormUnderline.css',
+		'public/css/theme/default.css',
+		'public/css/components/abgabetool/abgabe.css'
+	),
+	'customJSs' => array(
+		'vendor/npm-asset/primevue/accordion/accordion.min.js',
+		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
+		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
+		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
+		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
+		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+		'vendor/npm-asset/primevue/timeline/timeline.min.js',
+		'vendor/npm-asset/primevue/inplace/inplace.min.js',
+		'vendor/npm-asset/primevue/message/message.min.js',
+		'vendor/npm-asset/primevue/tieredmenu/tieredmenu.js',
+		'vendor/moment/luxonjs/luxon.min.js'
+	),
+	'customJSModules' => array(
+		'public/js/apps/Abgabetool/Abgabetool.js',
+	),
+
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+<div id="abgabetoolroot" class="h-100" style="max-width: 95%;" route=<?php echo json_encode($route) ?> 
+	uid=<?php echo $uid ?> 
+	 student_uid_prop="<?php echo $student_uid_prop ?? '' ?>"
+	stg_kz_prop="<?php echo $stg_kz_prop ?? '' ?>"
+	>
+</div>
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
@@ -21,19 +21,25 @@ $includesArray = array(
 		'public/css/components/FilterComponent.css',
 		'public/css/components/Profil.css',
 		'public/css/components/FormUnderline.css',
+		'public/css/components/abgabetool/abgabe.css',
 		'public/css/Cis4/Cms.css',
 		'public/css/Cis4/Studium.css',
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.min.js',
 		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
-		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
-		'vendor/npm-asset/primevue/textarea/textarea.min.js',
 		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
+		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
+		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
+		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+		'vendor/npm-asset/primevue/timeline/timeline.min.js',
+		'vendor/npm-asset/primevue/inplace/inplace.min.js',
+		'vendor/npm-asset/primevue/message/message.min.js',
+		'vendor/npm-asset/primevue/tieredmenu/tieredmenu.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
-		'public/js/apps/Dashboard/Fhc.js'
+		'public/js/apps/Dashboard/Fhc.js',
 	),

 );
@@ -40,6 +40,10 @@ $configArray = [
 		cis-root="<?= CIS_ROOT; ?>"
 		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
+<?php if($ids !== null && $typeid !== null) { ?>
+		:id ="<?= htmlspecialchars(json_encode($ids)); ?>"
+		type-id ="<?= htmlspecialchars($typeid); ?>"
+<?php } ?>
 	>
 	</router-view>
 </div>
@@ -22,7 +22,8 @@
 			'public/css/components/function.css'
 		],
 		'customJSs' => [
-			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'
+			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js',
+			'vendor/moment/luxonjs/luxon.min.js'
 			#'vendor/npm-asset/primevue/tree/tree.min.js',
 			#'vendor/npm-asset/primevue/toast/toast.min.js'
 		],
@@ -53,6 +54,8 @@ $configArray = [
 			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
 			stv-root="<?= site_url('Studentenverwaltung'); ?>"
 			cis-root="<?= CIS_ROOT; ?>"
+			avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
+			logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 			:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
 			>
@@ -0,0 +1,47 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Info Center',
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'jquerycheckboxes1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
+			'ajaxlib' => true,
+			'filterwidget' => true,
+			'navigationwidget' => true,
+			'dialoglib' => true,
+			'phrases' => array(
+				'person' => array('vorname', 'nachname'),
+				'ui' => array('bitteEintragWaehlen')
+			),
+			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/rueckstellung.js', 'public/js/infocenter/infocenterPersonDataset.js')
+		)
+	);
+?>
+
+	<div id="wrapper">
+
+		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">
+							Electronic Onboarding
+						</h3>
+					</div>
+				</div>
+				<div>
+					<?php $this->load->view('system/infocenter/onboardingData.php'); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
@@ -0,0 +1,116 @@
+<?php
+
+	$APP = '\'infocenter\'';
+	$KENNZEICHEN = '\'eobRegistrierungsId\'';
+
+$query = '
+		SELECT
+			p.person_id AS "PersonId",
+			p.vorname AS "Vorname",
+			p.nachname AS "Nachname",
+			pl.zeitpunkt AS "LockDate",
+			pl.lockuser AS "LockUser",
+			rueck.datum_bis AS "HoldDate",
+			rueck.bezeichnung AS "Rueckstellgrund"
+		FROM public.tbl_person p
+			JOIN tbl_kennzeichen ON p.person_id = tbl_kennzeichen.person_id AND kennzeichentyp_kurzbz = '. $KENNZEICHEN .'
+			LEFT JOIN (
+					SELECT tpl.person_id,
+						   tpl.zeitpunkt,
+						   sp.nachname AS lockuser
+					  FROM system.tbl_person_lock tpl
+					  JOIN public.tbl_benutzer sb USING (uid)
+					  JOIN public.tbl_person sp ON sb.person_id = sp.person_id
+					 WHERE tpl.app = '.$APP.'
+				 ) pl ON p.person_id = pl.person_id
+			LEFT JOIN (
+				SELECT
+					tbl_rueckstellung.person_id,
+					tbl_rueckstellung.datum_bis,
+					tbl_rueckstellung.status_kurzbz,
+					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
+				FROM public.tbl_rueckstellung
+					JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
+					JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
+				WHERE tbl_rueckstellung.rueckstellung_id =
+				(
+					SELECT srueck.rueckstellung_id
+					FROM public.tbl_rueckstellung srueck
+					WHERE srueck.person_id = tbl_rueckstellung.person_id
+						AND datum_bis >= NOW()
+					ORDER BY srueck.datum_bis DESC LIMIT 1
+				)
+			) rueck ON rueck.person_id = p.person_id
+		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
+
+	$filterWidgetArray = array(
+		'query' => $query,
+		'app' => InfoCenter::APP,
+		'datasetName' => 'onboarding',
+		'filter_id' => $this->input->get('filter_id'),
+		'requiredPermissions' => 'infocenter',
+		'datasetRepresentation' => 'tablesorter',
+		'checkboxes' => 'PersonId',
+		'additionalColumns' => array('Details'),
+		'columnsAliases' => array(
+			'PersonId',
+			ucfirst($this->p->t('person', 'vorname')) ,
+			ucfirst($this->p->t('person', 'nachname')),
+			ucfirst($this->p->t('global', 'sperrdatum')),
+			ucfirst($this->p->t('global', 'gesperrtVon')),
+			ucfirst($this->p->t('infocenter', 'rueckstelldatum')),
+			ucfirst($this->p->t('infocenter', 'rueckstellgrund')),
+		),
+
+		'formatRow' => function($datasetRaw) {
+			/* NOTE: Dont use $this here for PHP Version compatibility */
+			$datasetRaw->{'Details'} = sprintf(
+				'<a href="%s?person_id=%s&origin_page=%s&fhc_controller_id=%s&prev_filter_id=%s">Details</a>',
+				site_url('system/infocenter/InfoCenter/showDetails'),
+				$datasetRaw->{'PersonId'},
+				'onboarding',
+				(isset($_GET['fhc_controller_id']) ? $_GET['fhc_controller_id'] : ''),
+				(isset($_GET['filter_id']) ? $_GET['filter_id'] : '')
+			);
+
+			if ($datasetRaw->{'LockDate'} == null)
+			{
+				$datasetRaw->{'LockDate'} = '-';
+			}
+
+			if ($datasetRaw->{'LockUser'} == null)
+			{
+				$datasetRaw->{'LockUser'} = '-';
+			}
+
+			if ($datasetRaw->{'HoldDate'} == null)
+			{
+				$datasetRaw->{'HoldDate'} = '-';
+			}
+			else
+			{
+				$datasetRaw->{'HoldDate'} = date_format(date_create($datasetRaw->{'HoldDate'}), 'Y-m-d H:i');
+			}
+
+			if ($datasetRaw->{'Rueckstellgrund'} === null)
+			{
+				$datasetRaw->{'Rueckstellgrund'} = '-';
+			}
+
+			return $datasetRaw;
+		},
+
+		'markRow' => function($datasetRaw) {
+
+			if ($datasetRaw->LockDate != null)
+			{
+				return FilterWidget::DEFAULT_MARK_ROW_CLASS;
+			}
+		}
+
+
+
+	);
+
+	echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
+?>
@@ -106,6 +106,7 @@
 			<tbody>
 			<?php
 			$lastMailAdress = '';
+			$lastUnverifiedMailAdress = '';
 			foreach ($stammdaten->kontakte as $kontakt): ?>
 				<tr>
 				<?php if ($kontakt->kontakttyp === 'email'): ?>
@@ -119,14 +120,16 @@
 						<?php echo '<span class="kontakt '.$kontakt->kontakttyp.'" data-id="'. $kontakt->kontakt_id .'" data-value="' . $kontakt->kontakt .'">';?>
 						<?php if ($kontakt->kontakttyp === 'email'): ?>
 							<a href="mailto:<?php echo $kontakt->kontakt; ?>" target="_top">
-							<?php $lastMailAdress = $kontakt->kontakt;
+							<?php $lastMailAdress = $kontakt->kontakt; ?>
+						<?php elseif ($kontakt->kontakttyp === 'email_unverifiziert'): ?>
+							<?php $lastUnverifiedMailAdress = $kontakt->kontakt;
 							endif;
 							echo $kontakt->kontakt;
-							if ($kontakt->kontakttyp === 'email'):
+						if ($kontakt->kontakttyp === 'email'):
 							?>
 							</a>
-							<?php endif; ?>
-					<?php echo '</span>'?>
+						<?php endif; ?>
+						<?php echo '</span>'?>
 					</td>
 					<td><?php echo $kontakt->anmerkung; ?></td>
 				</tr>
@@ -140,9 +143,9 @@
 						<?php if (isset($adresse)): ?>
 							<div class="row adresse col-sm-12" data-id="<?php echo $adresse->adresse_id ?>">
 								<div class="float-left" data-value="<?php echo $adresse->strasse ?>" data-type="strasse"><?php echo $adresse->strasse ?></div>
-								
+
 								<div class="float-left" data-value="<?php echo $adresse->plz ?>" data-type="plz"><?php echo $adresse->plz ?></div>
-								
+
 								<div class="float-left" data-value="<?php echo $adresse->ort ?>" data-type="ort"><?php echo $adresse->ort ?></div>

 							<?php if (isset($adresse->nationkurztext)): ?>
@@ -182,7 +185,8 @@
 			</div>
 			<?php if (isset($stammdaten->zugangscode)): ?>
 				<div class="col-xs-6 text-right">
-					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode).'&emailAdresse='.$lastMailAdress.'&keepEmailUnverified=true' ?>"
+					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode)
+					.'&emailAdresse='.(isEmptyString($lastMailAdress)?$lastUnverifiedMailAdress:$lastMailAdress).'&keepEmailUnverified=true' ?>"
 					   target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;<?php echo  $this->p->t('infocenter','zugangBewerbung') ?></a>
 				</div>
 			<?php endif; ?>
@@ -36,4 +36,4 @@ $this->load->view('templates/FHC-Header', $includesArray);
 		></cis-menu>
 </header>

-<main id="cis-main" class="flex-grow-1 p-4 pt-2">
+<main id="cis-main" class="flex-grow-1 p-4 pt-2" style="min-width: 0;">
@@ -107,16 +107,10 @@ if(isset($_GET['getAnmeldung']))
 				$abgeschlossen = false;
 				$semesterlock = false;
 				$regelerfuellt = true;
+
 				if ($kompatible_lv)
 				{
 					$lvregelExists = $lvregel->exists($kompatible_lv);
-					if($lvregelExists)
-					{
-						if($lvregel->isAbgeschlossen($uid, $kompatible_lv))
-							$abgeschlossen=true;
-						else
-							$abgeschlossen=false;
-					}

 					if(!$lvregel->checkSemester($kompatible_lv, $semester))
 					{
@@ -135,7 +129,7 @@ if(isset($_GET['getAnmeldung']))
 					}
 				}

-				if (!(($lvregelExists && !$abgeschlossen) || $semesterlock || !$regelerfuellt))
+				if (!$semesterlock && $regelerfuellt)
 				{
 					$anzahl++;
 					// LV wird angeboten und Anmeldefenster ist offen
@@ -152,7 +146,6 @@ if(isset($_GET['getAnmeldung']))
 						echo '<br><input type="radio" disabled="true" value="'.$lvid.'" name="lv" /><span class="ok">'.$lv->bezeichnung.'</span><img src="../../../skin/images/information.png" title="'.$p->t('studienplan/bereitsAngemeldet').'"/>';
 					}
 				}
-
 			}
 /*			else
 			{
@@ -86,67 +86,88 @@ echo '<?xml version="1.0" encoding="ISO-8859-1" ?>';
 					<h3>Formel / Formula</h3>
 					<div style="font-size: large; padding-top: 15px">
 						<math xmlns="http://www.w3.org/1998/Math/MathML">
-							<mfrac>
-								<mn> 5 </mn>
-								<mn> 3 </mn>
-							</mfrac>
-
-							<mo> + </mo>
-							<mfrac>
-								<mn> 7 </mn>
-								<mn> 6 </mn>
-							</mfrac>
-							<mo> = </mo>
-
-							<mfrac>
-								<mn> 10 </mn>
-								<mn> 6 </mn>
-							</mfrac>
-							<mo> + </mo>
-							<mfrac>
-
-								<mn> 7 </mn>
-								<mn> 6 </mn>
-							</mfrac>
-							<mo> = </mo>
-							<mfrac>
-								<mn> 17 </mn>
-
-								<mn> 6 </mn>
-							</mfrac>
+						  <mrow>
+						    <mfrac>
+						      <mn>5</mn>
+						      <mn>3</mn>
+						    </mfrac>
+						    <mo>+</mo>
+						    <mfrac>
+						      <mn>7</mn>
+						      <mn>6</mn>
+						    </mfrac>
+						    <mo>=</mo>
+						    <mfrac>
+						      <mn>10</mn>
+						      <mn>6</mn>
+						    </mfrac>
+						    <mo>+</mo>
+						    <mfrac>
+						      <mn>7</mn>
+						      <mn>6</mn>
+						    </mfrac>
+						    <mo>=</mo>
+						    <mfrac>
+						      <mn>17</mn>
+						      <mn>6</mn>
+						    </mfrac>
+						  </mrow>
 						</math><br/><br/>
 						<math xmlns="http://www.w3.org/1998/Math/MathML">
-							<mrow>
-								<munderover>
-									<mo movablelimits="false">&sum;</mo>
-									<mn><mi>k</mi>=1</mn>
-									<mn>5</mn>
-								</munderover>
-								<mrow>
-									<msup>
-										<mo>(-1)</mo>
-										<mn><mi>k</mi>+1</mn>
-									</msup>
-								</mrow>
-								<mfrac>
-									<mrow>
-										<msup>
-											<mi>x</mi>
-											<mn>2<mi>k</mi> + 1</mn>
-										</msup>
-									</mrow>
-									<mrow>
-										<mo>(2<mi>k</mi>+1)!</mo>
-									</mrow>
-								</mfrac>
-							</mrow>
-
+						  <mrow>
+						    <munderover>
+						      <mo>&sum;</mo>
+						      <mrow>
+						        <mi>k</mi>
+						        <mo>=</mo>
+						        <mn>1</mn>
+						      </mrow>
+						      <mn>5</mn>
+						    </munderover>
+						    <mrow>
+						      <msup>
+						        <mrow>
+						          <mo>(</mo>
+						          <mo>-</mo>
+						          <mn>1</mn>
+						          <mo>)</mo>
+						        </mrow>
+						        <mrow>
+						          <mi>k</mi>
+						          <mo>+</mo>
+						          <mn>1</mn>
+						        </mrow>
+						      </msup>
+						      <mfrac>
+						        <mrow>
+						          <msup>
+						            <mi>x</mi>
+						            <mrow>
+						              <mn>2</mn>
+						              <mi>k</mi>
+						              <mo>+</mo>
+						              <mn>1</mn>
+						            </mrow>
+						          </msup>
+						        </mrow>
+						        <mrow>
+						          <mo>(</mo>
+						          <mn>2</mn>
+						          <mi>k</mi>
+						          <mo>+</mo>
+						          <mn>1</mn>
+						          <mo>)</mo>
+						          <mo>!</mo>
+						        </mrow>
+						      </mfrac>
+						    </mrow>
+						  </mrow>
 						</math>
 					</div>
 				</div>
 				<div class="col-sm-6">
 					<h3>Bild / Picture</h3>
-					<img alt="Beispielbild" src="MathML_Beispiel.jpg" border="1" height="154" width="233"></img>
+					<img alt="Beispielbild" src="MathML_Beispiel.png" height="140" style="border: 1px solid black">
 				</div>
 			</div>
 		</div>
@@ -1172,8 +1172,8 @@ if ($frage_id != '')
 	echo "</td></tr>";
 	//Vorschau fuer das Text-Feld
 	echo "<tr><td style='width: 50%'>Vorschau:<br />
-			<div id='vorschau_frage' style='border: 1px solid black' align='center'>$frage->text</div></td>
-			<td style='width: 50%'>Derzeit:<br /><div id='aktuell' style='border: 1px solid black' align='center'>$frage->text</div>
+			<div id='vorschau_frage' style='border: 1px solid black; padding: 5px' align='center'>$frage->text</div></td>
+			<td style='width: 50%'>Derzeit:<br /><div id='aktuell' style='border: 1px solid black; padding: 5px' align='center'>$frage->text</div>
 			</td></tr>";
 	echo "</table>";
 	echo '</td><td style="border-left: 1px solid black" valign="top">';
@@ -1280,8 +1280,8 @@ if ($frage_id != '')
 	echo "/></td></tr>";
 	echo "<tr><td colspan='2' align='right'><input type='submit' name='submitvorschlag' value='Speichern' />".($vorschlag_id != ''?"<input type='button' value='Abbrechen' onclick=\"document.location.href='$PHP_SELF?gebiet_id=$gebiet_id&amp;stg_kz=$stg_kz&amp;nummer=$nummer&amp;frage_id=$frage->frage_id'\" />":'')."</td></tr>";
 	//Vorschau fuer das Text-Feld
-	echo "<tr><td colspan='2'>Vorschau:<br /><div id='vorschau_vorschlag' style='border: 1px solid black' align='center'>$vorschlag->text</div>
-			Derzeit:<br /><div id='aktuellvorschlag' style='border: 1px solid black' align='center'>$vorschlag->text</div></td></tr>";
+	echo "<tr><td colspan='2'>Vorschau:<br /><div id='vorschau_vorschlag' style='border: 1px solid black; padding: 5px' align='center'>$vorschlag->text</div>
+			Derzeit:<br /><div id='aktuellvorschlag' style='border: 1px solid black; padding: 5px' align='center'>$vorschlag->text</div></td></tr>";
 	echo "</table>";
 	echo "</form>";
 	echo '</td></tr></table>';
@@ -0,0 +1,15 @@
+(function () {
+	function sendMessage() {
+		let frame = window.frames['content'];
+		if (frame)
+			frame.postMessage({ type: "proctoringReady" });
+	}
+
+	window.addEventListener("message", function (e)
+	{
+		if (e.data.indexOf("proctoringReady_") === 0)
+		{
+			sendMessage();
+		}
+	});
+})();
@@ -0,0 +1,30 @@
+.proctoring-blocker
+{
+	position: fixed;
+	inset: 0;
+	z-index: 99999;
+	backdrop-filter: blur(6px);
+	pointer-events: all;
+	user-select: none;
+}
+
+.proctoring-blocker.hidden
+{
+	display: none !important;
+}
+
+.proctoring-text
+{
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	color: #fff;
+	font-size: 16px;
+	font-family: sans-serif;
+}
+
+.proctoring-blur-fallback
+{
+	filter: blur(6px);
+}
@@ -45,7 +45,7 @@ if (!$db = new basis_db())
 $PHP_SELF=$_SERVER["PHP_SELF"];

 // Start session
-session_start();
+require_once './session_init.php';

 // If language is changed by language select menu, reset language variables
 if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
@@ -182,6 +182,12 @@ echo '
 if(!isset($_SESSION['pruefling_id']))
 	die($p->t('testtool/bitteZuerstAnmelden'));

+if (!empty($_SESSION['externe_ueberwachung']) && isset($_SESSION['externe_ueberwachung_verified'])): ?>
+	<link href="frage.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript" src="frage_externe_ueberwachung.js"></script>
+	<div id="proctoringBlocker" class="proctoring-blocker hidden"></div>
+<?php endif;
+
 $pruefling = new pruefling();
 $pruefling->load($_SESSION['pruefling_id']);

--- a/Show More
+++ b/Show More