Merge branch 'master' into feature-63428/Infomail_Foto

- expand InputComponent for dynamic adding of actionButton to Form Upload Image
- add Phrases for Infomail

application/components/filters/Vertragsverwaltung.php

@@ -1,36 +0,0 @@
-<?php
-$filterCmptArray = array(
-	"app" => 'core',
-	'datasetName' => 'vertragsverwaltung',
-	'query' =>  '
-		SELECT
-			uid,
-			person_id,
-			vorname,
-			nachname,
-			gebdatum,
-			vertragsarten,
-			unternehmen,
-			ids,
-			aktiv
-		FROM
-			(
-			SELECT
-				b.uid , p.person_id,
-				p.vorname, p.nachname,
-				gebdatum,
-				STRING_AGG(DISTINCT va.bezeichnung, \', \') AS Vertragsarten,
-				STRING_AGG(DISTINCT u.bezeichnung, \', \') AS Unternehmen,
-				STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids,
-				b.aktiv
-			FROM
-				hr.tbl_dienstverhaeltnis d
-				JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
-				JOIN public.tbl_person p ON p.person_id = b.person_id
-				JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
-				JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
-			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.aktiv
-			) as vertragsdaten
-		',
-	'requiredPermissions' => 'vertrag/mitarbeiter'
-	);

application/config/Events.php

@@ -6,30 +6,30 @@ use CI3_Events as Events;
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["lehreinheit"] = array(
-		'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'
+		'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'
 	);
 });
 
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["reservierung"] = array(
-		'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'
+		'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'
 	);
 });
 
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["ferien"] = array(
-		'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'
+		'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'
 	);
 });
 

application/config/abgabe.php

@@ -1,45 +0,0 @@
-<?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;
-
-$config['BETREUER_SAMMELMAIL_BUTTON_STUDENT'] = true;

application/config/cis.php

@@ -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'] = 11091;
+$config['cis_menu_root_content_id'] = 11087;
 // send Mails for ProfilUpdate
 $config['cis_send_profil_update_mails'] = true;
 // Vilesci CI BaseUrl

application/config/javascript.php

@@ -7,6 +7,3 @@ $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;

application/config/navigation.php

@@ -163,13 +163,6 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 50,
 					'requiredPermissions' => 'lehre/gruppenmanager:r'
-				),
-				'vertragsverwaltung' => array(
-					'link' => site_url('vertragsverwaltung'),
-					'description' => 'Vertragsverwaltung',
-					'expand' => true,
-					'sort' => 51,
-					'requiredPermissions' => 'vertrag/mitarbeiter:r'
 				)
 			)
 		),
@@ -342,37 +335,4 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
 	),
-
 );
-
-$config['navigation_menu']['vertragsverwaltung/*'] = array(
-	'vertragsverwaltung' => array(
-		'link' => site_url('vertragsverwaltung'),
-		'description' => 'Vertragsverwaltung',
-		'icon' => 'home',
-		'sort' => 100,
-		'target' => '_blank',
-		'requiredPermissions' => array('vertrag/mitarbeiter:r')
-	)
-);
-
-$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')
-	]
-];

application/config/routes.php

@@ -1,6 +1,6 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------------
@@ -51,7 +51,7 @@ if (! defined('BASEPATH')) 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,22 +65,15 @@ $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/$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';
+$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';
 
 // (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
 $route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';

application/config/searchfunctions.php

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

application/config/searchstv.php

@@ -7,43 +7,5 @@ $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"
-	]
-];

application/config/stv.php

@@ -61,13 +61,9 @@ $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'];
 
@@ -88,16 +84,6 @@ 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',
@@ -111,7 +97,6 @@ $config['student_tab_order'] = [
 	'grades',
 	'exam',
 	'exemptions',
-	'projektarbeit',
 	'finalexam',
 	'mobility',
 	'jointstudies',
@@ -124,22 +109,7 @@ $config['student_tab_order'] = [
 $config['students_tab_order'] = [
 	'banking',
 	'status',
-	'messages',
 	'groups',
 	'finalexam',
-	'combinePeople',
 	'archive',
 ];
-
-$config['stv_prestudent_tags'] = [
-	'prioone' => ['readonly' => false],
-	'priotwo' => ['readonly' => true],
-	'hinweis' => ['readonly' => false],
-	'hinweis_assistenz' => ['readonly' => true],
-	'hinweis_kf' => ['readonly' => true],
-	'hinweis_lehrende' => ['readonly' => false],
-	'hinweis_stg_kf' => ['readonly' => true],
-	'finished_stg' => ['readonly' => true],
-	'finished_kf' => ['readonly' => true],
-	'inwork_kf' => ['readonly' => true],
-];

application/controllers/Cis/Abgabetool.php

@@ -14,10 +14,10 @@ class Abgabetool extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => 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')
+			'getStudentProjektarbeitAbgabeFile' => self::PERM_LOGGED,
+			'Mitarbeiter' => self::PERM_LOGGED,
+			'Student' => self::PERM_LOGGED,
+			'Deadlines' => self::PERM_LOGGED
 		]);
 	}
 
@@ -29,69 +29,80 @@ class Abgabetool extends Auth_Controller
 	 */
 	public function index()
 	{
-		// TODO: routing from index based on berechtigung?
 
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
 
-		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']);
-		}
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
 	}
 
-	public function Student($student_uid_prop = '')
+	public function Student()
 	{
+
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
-		
-		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]);
-		}
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
 	}
 
 	public function Mitarbeiter()
 	{
+
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
 
-		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']);
-		}
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, '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(),
 		);
 
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
+		$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');
+			}
 		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'DeadlinesOverview']);
+			$this->terminateWithJsonError('Keine Zuordnung!');
 		}
 	}
 }

application/controllers/Cis/Documents.php

@@ -72,7 +72,7 @@ class Documents extends Auth_Controller
 
 		$stgs = [];
 		$stsemArray = [];
-		$buchungstypen = defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : [];
+		$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
 		$person_ids = [];
 		foreach ($stati as $status) {
 			$person_ids[] = $status->person_id;

application/controllers/Cis/MyLv.php

@@ -33,4 +33,9 @@ class MyLv extends Auth_Controller
 
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLv']);
 	}
+
+	public function Info($studien_semester,$lvid)
+	{
+		$this->load->view('Cis/LvInfo',['lvid'=> $lvid, 'studien_semester' => $studien_semester]);
+	}
 }

application/controllers/Cis/ProfilUpdate.php

@@ -13,7 +13,7 @@ class ProfilUpdate extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
-			'show' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r', 'basis/cis:r'],
+			'show' => ['basis/cis:r'],
 			'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r']
 		]);
 

application/controllers/Cis/Pub.php

@@ -14,7 +14,7 @@ class Pub extends Auth_Controller
 	{
 		parent::__construct(
 		    array(
-			'bild' => ['basis/cis:r', 'assistenz:r']
+			'bild' => ['basis/cis:r']
 		    )
 		);
 	}

application/controllers/NeueNachricht.php

@@ -20,18 +20,11 @@ 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
+			]
 		]);
 	}
 }

application/controllers/Studentenverwaltung.php

@@ -28,14 +28,10 @@ class Studentenverwaltung extends Auth_Controller
 				'basis/prestudentstatus' => $this->permissionlib->isBerechtigt('basis/prestudentstatus'),
 				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
 				'admin' => $this->permissionlib->isBerechtigt('admin'),
-				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz', 'suid'),
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
 				'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')
@@ -43,5 +39,3 @@ class Studentenverwaltung extends Auth_Controller
 		]);
 	}
 }
-
-

application/controllers/Vertragsverwaltung.php

@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Vertragsverwaltung extends Auth_Controller
-{
-	public function __construct()
-	{
-		$permissions = [];
-		$router = load_class('Router');
-		$permissions[$router->method] = ['vertrag/mitarbeiter:r'];
-		#$permissions[$router->method] = ['admin:rw'];
-		parent::__construct($permissions);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * @return void
-	 */
-	public function _remap()
-	{
-		$this->load->view('Vertragsverwaltung', [
-			'permissions' => [
-				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter', 'suid')
-			]
-		]);
-	}
-}

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

@@ -208,6 +208,7 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
+		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -220,7 +221,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: null,
+			'uid' => $this->input->post_get('uid') ?: '',
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -250,9 +251,6 @@ class Documents extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $ss,
 					'student_uid' => $akteData['uid']
 				]);
-
-				if (!hasData($result)) $this->terminateWithError($this->p->t("stv", "error_noLehrverbandAssigned"));
-
 				$res = current($this->getDataOrTerminateWithError($result));
 
 				$studiengang_kz = $res->studiengang_kz;
@@ -334,7 +332,6 @@ class Documents extends FHCAPI_Controller
 			if ($prestudent_id) {
 				$this->load->model('crm/prestudent_model', 'PrestudentModel');
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
-				$this->PrestudentModel->addSelect('tbl_prestudent.*, UPPER(typ || kurzbz) AS kuerzel');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
 
@@ -445,10 +442,6 @@ 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);

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

@@ -38,9 +38,34 @@ class Lehre extends FHCAPI_Controller
 		parent::__construct([
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
-			'Pruefungen' => 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
 		]);
+
+		$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');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -100,5 +125,557 @@ 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);
+	}
 }
 

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

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

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

@@ -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 and public.tbl_student.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
 				$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"]);
@@ -706,13 +706,7 @@ class ProfilUpdate extends FHCAPI_Controller
 
 	private function setStatusOnUpdateRequest($id, $status, $status_message)
 	{
-		return $this->ProfilUpdateModel->update([$id], [
-			"status" => $status,
-			"status_timestamp" => "NOW()",
-			"status_message" => $status_message,
-			"updateamum" => "NOW()",
-			"updatevon" => getAuthUID()
-		]);
+		return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
 	}
 	
 	private function updateRequestedChange($id, $requested_change)
@@ -722,12 +716,13 @@ class ProfilUpdate extends FHCAPI_Controller
 	
 	private function deleteOldVersionFile($dms_id)
 	{
-		if (!isset($dms_id)) {
-			return true;
-		}
-
 		// starting the transaction
 		$this->db->trans_start();
+		
+		
+		if (!isset($dms_id)) {
+			return;
+		}
 
 		//? delete the file from the profilUpdate first
 		$profilUpdateFileDelete = $this->ProfilUpdateModel->removeFileFromProfilUpdate($dms_id);
@@ -782,8 +777,13 @@ class ProfilUpdate extends FHCAPI_Controller
 
 		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
 		$res = $this->getDataOrTerminateWithError($res, $this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));	
-		$oe = ($res[0])->oe_kurzbz;
-		return $oe;
+		$res = array_map(
+			function ($item) {
+				return $item->oe_kurzbz;
+			},
+			$res
+		);
+		return $res;
 	}
 
 	private function handleAdresse($requested_change, $personID)
@@ -813,7 +813,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$insert_adresse_id = $insertID;
 			$insert_adresse_id = $this->getDataOrTerminateWithError($insert_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
 			if ($insert_adresse_id) {
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id, $personID);
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
 			}
 		}
 		//! DELETE
@@ -825,33 +825,12 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 		//! UPDATE
 		else {
-			$curadresse_res = $this->AdresseModel->load($adresse_id);
-			$curadresse = ($this->getDataOrTerminateWithError($curadresse_res))[0];
+			$requested_change['updateamum'] = "NOW()";
+			$requested_change['updatevon'] = getAuthUID();
+			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
+			$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
+			$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
 
-			if($curadresse->heimatadresse)
-			{
-				$tmpadresse = array_merge((array) $curadresse, $requested_change);
-				unset($tmpadresse["adresse_id"]);
-				$tmpadresse['insertamum'] = "NOW()";
-				$tmpadresse['insertvon'] = getAuthUID();
-				$tmpadresse['person_id'] = $personID;
-				unset($tmpadresse["heimatadresse"]);
-				unset($tmpadresse["updateamum"]);
-				unset($tmpadresse["updatevon"]);
-
-				$tmpadresse_res = $this->AdresseModel->insert($tmpadresse);
-				$tmpadresse_id = $this->getDataOrTerminateWithError($tmpadresse_res, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $tmpadresse_id, $personID);
-			}
-			else
-			{
-				$requested_change['updateamum'] = "NOW()";
-				$requested_change['updatevon'] = getAuthUID();
-
-				$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
-				$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id, $personID);
-			}
 		}
 		return $insertID ?? null;
 	}
@@ -873,7 +852,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$insert_kontakt_id = $insertID;
 			$insert_kontakt_id = $this->getDataOrTerminateWithError($insert_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
 			if ($insert_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id, $requested_change['kontakttyp'], $personID);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
 			}
 		}
 		//! DELETE
@@ -890,18 +869,18 @@ class ProfilUpdate extends FHCAPI_Controller
 			$update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
 			$update_kontakt_id = $this->getDataOrTerminateWithError($update_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
 			if ($update_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id, $requested_change['kontakttyp'], $personID);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
 			}
 		}
 		return isset($insertID) ? $insertID : null;
 	}
 
-	private function handleDupplicateZustellAdressen($zustellung, $adresse_id, $person_id)
+	private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
 	{
 		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
 			$this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
-			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $person_id, "zustelladresse" => TRUE]);
+			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
 			if (isError($zustellAdressenArray)) {
 				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
 			}
@@ -914,8 +893,6 @@ class ProfilUpdate extends FHCAPI_Controller
 					return $adresse->adresse_id != $adresse_id;
 				});
 	
-				$this->addMeta('bhzustelladressen', $zustellAdressenArray);
-
 				// remove the zustelladresse from all other zustelladressen
 				foreach ($zustellAdressenArray as $adresse) {
 					$this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
@@ -925,16 +902,12 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 	}
 
-	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id, $kontakttyp, $person_id)
+	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
 	{
 		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
 			$this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
-			$zustellKontakteArray = $this->PersonModel->loadWhere([
-				"public.tbl_person.person_id" => $person_id,
-				"zustellung" => TRUE,
-				"kontakttyp" => $kontakttyp
-			]);
+			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
 			if (!isSuccess($zustellKontakteArray)) {
 				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
 			}

application/controllers/api/frontend/v1/detailheader/Detailheader.php

@@ -1,53 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Detailheader extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
-		]);
-	}
-
-	public function getHeader($person_id)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getHeader($person_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getPersonAbteilung($mitarbeiter_uid)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getLeitungOrg($oekurzbz)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-}
-
-

application/controllers/api/frontend/v1/fotoHandling/Foto.php

@@ -1,237 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Foto extends  FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'uploadFoto' => ['admin:r', 'assistenz:r'],
-			'deleteFoto' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models and Libraries
-		$this->load->model('person/Person_model', 'PersonModel');
-		$this->load->model("crm/Akte_model", "AkteModel");
-		$this->load->model('person/Fotostatusperson_model', 'FotostatusPersonModel');
-
-		$this->loadPhrases([
-			'ui',
-			'header'
-		]);
-	}
-
-	public function uploadFoto($person_id)
-	{
-		if(!$person_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$data = json_decode(file_get_contents("php://input"), true);
-
-		if (!empty($data['image']))
-		{
-			$base64 = $data['image'];
-			$resizedImage1 = $this->_resize($base64, 827, 1063);
-
-			if (is_null($resizedImage1))
-				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
-
-			$akte = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'dokument_kurzbz' => 'Lichtbil'));
-
-			$akteUpdateData = array(
-				'dokument_kurzbz' => 'Lichtbil',
-				'person_id' => $person_id,
-				'inhalt' => $resizedImage1,
-				'mimetype' => 'image/jpg',
-				'erstelltam' => date('c'),
-				'gedruckt' => false,
-				'titel' => 'Lichtbild_' . $person_id . '.jpg',
-				'bezeichnung' => 'Lichtbild gross',
-				'insertamum' => date('c'),
-				'insertvon' => getAuthUID(),
-			);
-
-			if (hasData($akte)) {
-				$akte_id = getData($akte)[0]->akte_id;
-
-				$akteUpdateData['updateamum'] = date('c');
-				$akteUpdateData['updatevon'] = getAuthUID();
-				$akteResult = $this->AkteModel->update(array('akte_id' => $akte_id), $akteUpdateData);
-			} else {
-				$akteResult = $this->AkteModel->insert($akteUpdateData);
-			}
-
-			if (isError($akteResult)) {
-				return $this->terminateWithError(getError($akteResult), self::ERROR_TYPE_GENERAL);
-			}
-
-			$resizedImage2 = $this->_resize($base64, 101, 130);
-
-			if (is_null($resizedImage2))
-				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
-
-			$result = $this->_updateFoto($person_id, $resizedImage2);
-
-			if (!isError($result)) {
-				$this->FotostatusPersonModel->insert(array(
-					'person_id' => $person_id,
-					'fotostatus_kurzbz' => 'hochgeladen',
-					'datum' => date('Y-m-d'),
-					'updateamum' => date('c'),
-					'updatevon' => getAuthUID(),
-					'insertamum' => date('c'),
-					'insertvon' => getAuthUID(),
-				));
-
-				return $this->terminateWithSuccess($base64);
-			}
-		}
-		else
-		{
-			$this->terminateWithError($this->p->t('header', 'error_noPhoto'), self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-	public function deleteFoto($person_id)
-	{
-		if(!$person_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->_deleteFoto($person_id);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess($result);
-	}
-
-	private function _resize($imageData, $maxwidth, $maxheight, $quality = 90)
-	{
-		$meta = getimagesize($imageData);
-		if (!$meta)
-		{
-			return null;
-		}
-
-		$src_width = $meta[0];
-		$src_height = $meta[1];
-		$mime = $meta['mime'];
-
-		switch ($mime) {
-			case 'image/jpeg':
-			case 'image/jpg':
-				$imagecreated = imagecreatefromjpeg($imageData);
-				break;
-			case 'image/png':
-				$imagecreated = imagecreatefrompng($imageData);
-				break;
-			case 'image/gif':
-				$imagecreated = imagecreatefromgif($imageData);
-				break;
-			default:
-				return null;
-		}
-
-
-		if (!$imagecreated)
-		{
-			return null;
-		}
-
-		$src_aspect_ratio = $src_width / $src_height;
-		$thu_aspect_ratio = $maxwidth / $maxheight;
-
-		if ($src_width <= $maxwidth && $src_height <= $maxheight)
-		{
-			$thu_width = $src_width;
-			$thu_height = $src_height;
-		}
-		elseif ($thu_aspect_ratio > $src_aspect_ratio)
-		{
-			$thu_width = (int) ($maxheight * $src_aspect_ratio);
-			$thu_height = $maxheight;
-		}
-		else
-		{
-			$thu_width = $maxwidth;
-			$thu_height = (int) ($maxwidth / $src_aspect_ratio);
-		}
-
-		$imageScaled = imagecreatetruecolor($thu_width, $thu_height);
-
-		if ($mime === 'image/png')
-		{
-			$background = imagecolorallocate($imageScaled , 0, 0, 0);
-			imagecolortransparent($imageScaled, $background);
-			imagealphablending($imageScaled, false);
-			imagesavealpha($imageScaled, true);
-		}
-
-		imagecopyresampled($imageScaled, $imagecreated, 0, 0, 0, 0, $thu_width, $thu_height, $src_width, $src_height);
-
-		if ($mime === "image/gif")
-		{
-			$background = imagecolorallocate($imageScaled, 0, 0, 0);
-			imagecolortransparent($imageScaled, $background);
-		}
-
-		if (!empty($imageScaled))
-		{
-			ob_start();
-
-			if ($mime == 'image/png')
-				imagepng($imageScaled, NULL);
-			else if ($mime === 'image/gif')
-				imagegif($imageScaled, NULL);
-			else
-				imagejpeg($imageScaled, NULL, $quality);
-
-			$resizedImageData = ob_get_contents();
-			ob_end_clean();
-			@imagedestroy($imagecreated);
-			@imagedestroy($imageScaled);
-
-
-			if (!empty($resizedImageData))
-			{
-				return base64_encode($resizedImageData);
-			}
-			return null;
-		}
-		return null;
-	}
-
-	private function _updateFoto($person_id, $foto)
-	{
-		$personJson['foto'] = $foto;
-		$result = $this->PersonModel->update($person_id, $personJson);
-
-		if (isError($result))
-		{
-			return error($result->msg, EXIT_ERROR);
-		}
-
-		return $result;
-	}
-
-	private function _deleteFoto($person_id)
-	{
-		$personJson['foto'] = null;
-		$result = $this->PersonModel->update($person_id, $personJson);
-
-		if (isError($result))
-		{
-			return error($result->msg, EXIT_ERROR);
-		}
-
-		return $result;
-	}
-}

application/controllers/api/frontend/v1/lv/Gruppe.php

@@ -12,8 +12,8 @@ class Gruppe extends FHCAPI_Controller
 			'add' => ['admin:rw', 'assistenz:rw'],
 			'delete' => ['admin:rw', 'assistenz:rw'],
 			'deleteFromLVPlan' => ['admin:rw', 'assistenz:rw'],
-			'getBenutzerSearch' => ['admin:r', 'assistenz:r'],
-			'getAllSearch' => ['admin:r', 'assistenz:r'],
+			'getBenutzer' => ['admin:r', 'assistenz:r'],
+			'getAll' => ['admin:r', 'assistenz:r'],
 			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
 		]);
 
@@ -22,8 +22,7 @@ class Gruppe extends FHCAPI_Controller
 		$this->_ci->load->library('PhrasesLib');
 		$this->loadPhrases(
 			array(
-				'ui',
-				'lehre'
+				'ui'
 			)
 		);
 
@@ -92,11 +91,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);
 
@@ -109,33 +108,15 @@ class Gruppe extends FHCAPI_Controller
 	}
 
 
-	public function getAllSearch()
+	public function getAll()
 	{
-		$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');
-		$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_result = $this->_ci->GruppeModel->loadWhere(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
 
 		$gruppen_array = array();
 
@@ -154,18 +135,7 @@ class Gruppe extends FHCAPI_Controller
 		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
 		$this->_ci->LehrverbandModel->addOrder('verband');
 		$this->_ci->LehrverbandModel->addOrder('gruppe');
-		$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_result = $this->_ci->LehrverbandModel->loadWhere(array('tbl_lehrverband.aktiv' => true));
 
 		$lehrverband_array = array();
 
@@ -180,40 +150,15 @@ class Gruppe extends FHCAPI_Controller
 		$this->terminateWithSuccess($all_gruppen);
 	}
 
-	public function getBenutzerSearch()
+	public function getBenutzer()
 	{
-		$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');
 
-		$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();
+		$personen = $this->_ci->PersonModel->loadWhere(array('tbl_benutzer.aktiv' => true));
 		$this->terminateWithSuccess(hasData($personen) ? getData($personen) : array());
 	}
 

application/controllers/api/frontend/v1/lv/Lehreinheit.php

@@ -169,10 +169,6 @@ class Lehreinheit extends FHCAPI_Controller
 		{
 			$value = $this->input->post($field);
 
-			if ($field === 'lehre')
-			{
-				$value = (bool)$value;
-			}
 			if ($value !== null)
 			{
 				$updateData[$field] = $value;
@@ -285,43 +281,15 @@ 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);
 
-		$errors = array();
-		if (is_array($lehreinheit_id))
-		{
-			foreach ($lehreinheit_id as $le_id)
-			{
-				$lehreinheit = $this->checkLehreinheit($le_id);
-				$this->checkPermission($lehreinheit->lehreinheit_id);
+		$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
 
-				$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
+		if (isError($result))
+			$this->terminateWithValidationErrors(getError($result));
 
-				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');
+		$this->terminateWithSuccess('Erfolgreich geloescht');
 	}
 
 	public function update()

application/controllers/api/frontend/v1/lv/Lektor.php

@@ -15,7 +15,7 @@ class Lektor extends FHCAPI_Controller
 			'deleteLVPlan' => ['admin:rw', 'assistenz:rw'],
 			'deletePerson' => ['admin:rw', 'assistenz:rw'],
 			'getLehrfunktionen' => ['admin:r', 'assistenz:r'],
-			'getLektorenSearch' => ['admin:r', 'assistenz:r'],
+			'getLektoren' => ['admin:r', 'assistenz:r'],
 			'getLektorenByLE' => ['admin:r', 'assistenz:r'],
 			'getLektorDaten' => ['admin:r', 'assistenz:r'],
 			'getLektorVertrag' => ['admin:r', 'assistenz:r'],
@@ -208,35 +208,12 @@ class Lektor extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($this->_ci->LehrfunktionModel->load()));
 	}
 
-	public function getLektorenSearch()
+	public function getLektoren()
 	{
-		$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->_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());
+		$this->terminateWithSuccess(getData($this->_ci->MitarbeiterModel->loadWhere(array('public.tbl_benutzer.aktiv' => true))));
 	}
 
 	private function checkLehreinheit($lehreinheit_id)

application/controllers/api/frontend/v1/lv/Setup.php

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

application/controllers/api/frontend/v1/lv/Tags.php

@@ -5,7 +5,7 @@ if (!defined('BASEPATH'))
 
 class Tags extends Tag_Controller
 {
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:r'];
+	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
 
 	public function __construct()
 	{

application/controllers/api/frontend/v1/messages/Messages.php

@@ -1,5 +1,6 @@
 <?php
 
+
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class Messages extends FHCAPI_Controller
@@ -13,15 +14,13 @@ 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'],
-			'getDataVorlage' => ['admin:r', 'assistenz:r'],
+			'getVorlagentext' => ['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
@@ -38,7 +37,7 @@ class Messages extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'messages'
+			'ui'
 		]);
 	}
 
@@ -53,14 +52,11 @@ class Messages extends FHCAPI_Controller
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 
-		if (hasData($result))
-		{
-			$data = getData($result);
-			$this->addMeta('count', $data['count']);
-			$this->terminateWithSuccess($data['data']);
-		}
+		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess(array());
+		$this->addMeta('count', $data['count']);
+
+		$this->terminateWithSuccess($data['data']);
 	}
 
 	public function getVorlagen()
@@ -70,23 +66,33 @@ class Messages extends FHCAPI_Controller
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
 
-		if (hasData($result))
-		{
-			$this->load->model('system/Vorlage_model', 'VorlageModel');
+		$data = $this->getDataOrTerminateWithError($result);
+		$oe_kurzbz = current($data);
 
-			$data = getData($result);
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
-			$oe_kurzbz = array_column($data, 'oe_kurzbz');
-			$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz);
+		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
 
-			$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-		}
+		$this->terminateWithSuccess($data);
 
-		$this->terminateWithSuccess(array());
+		//If admin
+		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
+		$result = $this->VorlageModel->loadWhere(
+			array(
+				'mimetype' => 'text/html'
+			));
+
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 
-	public function getDataVorlage($vorlage_kurzbz)
+	public function getVorlagentext($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');
@@ -98,53 +104,30 @@ class Messages extends FHCAPI_Controller
 			]);
 
 		$data = $this->getDataOrTerminateWithError($result);
+
+		//not correct with Vorlage
 		$vorlage = current($data);
-		$this->terminateWithSuccess($vorlage);
+
+		//$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($vorlage->text);
 	}
 
-	public function getMessageVarsPerson($typeId)
+	public function getMessageVarsPerson($id, $typeId)
 	{
-		$ids = $this->input->post('ids');
-		$messageVarsPerson = [];
+		$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
+		$result = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		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);
+		$this->terminateWithSuccess($data);
 	}
 
-	public function getMsgVarsPrestudent($typeId)
+	public function getMsgVarsPrestudent($id, $typeId)
 	{
-		$ids = $this->input->post('ids');
-		if(!is_array($ids)) {
-			$ids = array($ids);
-		}
-		$messageVarsPrestudent = [];
+		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
+		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		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);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function getMsgVarsLoggedInUser()
@@ -155,45 +138,27 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getNameOfDefaultRecipients($type_id)
+	public function getNameOfDefaultRecipient($id, $type_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);
-		}
+		$id = ($type_id != 'person_id') ? $this->_getPersonId($id, $type_id) : $id;
 
 		$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;
-			}
-		}
 
-		$this->terminateWithSuccess($recipients);
+		$result = $this->PersonModel->load($id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$name = current($data);
+
+		$this->terminateWithSuccess($name->vorname . " " . $name->nachname );
 	}
 
-	public function sendMessage($typeId)
+	public function sendMessage($recipient_id)
 	{
-		$resultReturn = [];
+		//has to be uid
+	//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
+
+		//default setting
+		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
+
 		$uid = getAuthUID();
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$result = $this->BenutzerModel->loadWhere(
@@ -231,61 +196,49 @@ class Messages extends FHCAPI_Controller
 		$body = $this->input->post('body');
 		$relationmessage_id = $this->input->post('relationmessage_id');
 
-		if (isset($_POST['ids']))
+		$typeId = $this->input->post('type_id');
+		$id = $this->input->post('id');
+
+		if($typeId == 'uid')
 		{
-			$ids = json_decode($_POST['ids']);
-			unset($_POST['ids']);
-			foreach ($data as $k => $v) {
-				$_POST[$k] = $v;
-			}
-		}
+			$prestudent_id = $this-> _getPrestudentIdFromUid($id);
 
-		if (!is_array($ids)) {
-			$ids = [$ids];
+			//parseMessagetext for variables Prestudent
+			$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
 		}
-
-		foreach ($ids as $id)
+		if($typeId == 'mitarbeiter_uid')
 		{
-			$receiversPersonId = $typeId == "person_id" ? $id : $this->_getPersonId($id, $typeId);
+			$person_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);
+			$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+			$this->terminateWithError($bodyParsed, self::ERROR_TYPE_GENERAL);
 
 		}
-		$this->terminateWithSuccess($resultReturn);
+		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);
+		}
+
+		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
+
+		$this->terminateWithSuccess($result);
 	}
 
-	public function getPreviewText($type_id)
+	public function getPreviewText($id, $type_id)
 	{
 		if (isset($_POST['data']))
 		{
@@ -293,60 +246,39 @@ class Messages extends FHCAPI_Controller
 			unset($_POST['data']);
 		}
 		else
-			$this->terminateWithError($this->p->t('messages', 'errorMissingOrInvalidParameters', ['parameter'=> "Textbody"]), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError("Textbody missing ", self::ERROR_TYPE_GENERAL);
 
-		if (isset($_POST['ids']))
+		switch($type_id)
 		{
-			$ids = json_decode($_POST['ids']);
-			if(!is_array($ids))
-			{
-				$ids = array($ids);
-			}
-			unset($_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;
 		}
-		else
-			$this->terminateWithError($this->p->t('ui', 'errorMissingOrInvalidParameters', ['parameter'=> 'Id(s)']), self::ERROR_TYPE_GENERAL);
 
-		$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;
-			}
-		}
+		$bodyParsed = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($bodyParsed);
 	}
 
 	public function getReplyData($messageId)
 	{
-		if (!is_numeric($messageId)) {
-			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value'=> 'Message ID']), self::ERROR_TYPE_GENERAL);
-		}
+		//TODO(Manu) validation of messageId: if number
 
 		$this->MessageModel->addSelect('public.tbl_msg_message.*');
 		$this->MessageModel->addSelect('r.*');
@@ -369,6 +301,7 @@ 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);
@@ -416,11 +349,6 @@ 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);
@@ -428,11 +356,8 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($person->person_id);
 	}
 
-	public function getUids($typeId)
+	public function getUid($id, $typeId)
 	{
-		$ids = $this->input->post('ids');
-		$benutzerIds = [];
-
 		if (!$typeId)
 		{
 			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Type ID']), self::ERROR_TYPE_GENERAL);
@@ -440,50 +365,39 @@ class Messages extends FHCAPI_Controller
 		elseif ($typeId == 'person_id')
 		{
 			$this->load->model('person/Benutzer_model', 'BenutzerModel');
-			foreach ($ids as $id)
-			{
-				$result = $this->BenutzerModel->loadWhere(
-					['person_id' => $id]
-				);
-				$data = $this->getDataOrTerminateWithError($result);
-				$benutzer = current($data);
-
-				$benutzerIds[$id] = $benutzer->uid;
-			}
+			$result = $this->BenutzerModel->loadWhere(
+				['person_id' => $id]
+			);
 		}
 		elseif($typeId == 'prestudent_id')
 		{
 			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			foreach ($ids as $id)
-			{
-				$result = $this->PrestudentModel->loadWhere(
-					['prestudent_id' => $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]
-				);
-				$data = $this->getDataOrTerminateWithError($result);
-				$benutzer = current($data);
-
-				$benutzerIds[$id] = $benutzer->uid;
-			}
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['person_id' => $person_id]
+			);
 		}
 		elseif($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
 		{
-			$this->terminateWithSuccess($ids);
+			$this->terminateWithSuccess($id);
 		}
 		else
 		{
-			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError("MESSAGES::getUID logic for type_id " . $typeId . " not defined yet", self::ERROR_TYPE_GENERAL);
 		}
 
-		$this->terminateWithSuccess($benutzerIds);
+		$data = $this->getDataOrTerminateWithError($result);
+		$benutzer = current($data);
+
+		$this->terminateWithSuccess($benutzer->uid);
 	}
 
 	private function _getPersonId($id, $typeId)
@@ -502,16 +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);
 		if (count($data) < 1)
 		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError('Error: Messages API no person_id found.');
 		}
 		$person = current($data);
 
@@ -520,6 +429,7 @@ 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]
@@ -528,7 +438,7 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		if (count($data) < 1)
 		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError('Error: Messages API no prestudent_id found.');
 		}
 		$student = current($data);
 
@@ -553,4 +463,4 @@ class Messages extends FHCAPI_Controller
 			date_format(date_create($sentDate), 'd.m.Y H:i'), $receiverName, $receiverSurname, $body
 		);
 	}
-}
+}

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

@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizAnrechnung extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "anrechnung_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

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

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizBestellung extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "bestellung_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

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

@@ -17,106 +17,5 @@ class NotizLehreinheit extends Notiz_Controller
 			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
 		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		//Permission checks for allowed Oes
-		$allowedOes = $this->permissionlib->getOE_isEntitledFor('assistenz') ?: [];
-
-		if ($this->router->method == 'addNewNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$lehreinheit_id = $post_data['id'];
-
-			if(!$lehreinheit_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
-		}
-
-		if ($this->router->method == 'updateNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$notiz_id = $post_data['notiz_id'];
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//get lehreinheit_id
-			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$lehreinheit_id = current($data)->lehreinheit_id;
-
-			if(!$lehreinheit_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
-		}
-
-		if ($this->router->method == 'deleteNotiz')
-		{
-			$notiz_id = $this->input->post('notiz_id');
-			$lehreinheit_id = $this->input->post('id');
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!$lehreinheit_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
-		}
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
 	}
-
-	private function _checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes)
-	{
-		//get oe from lehreinheit
-		$result = $this->LehreinheitModel->getOes($lehreinheit_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$oes = current($data);
-
-		if (!in_array($oes, $allowedOes))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg') . " " . $oes, self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-			if($typeId != "lehreinheit_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-
-
-}
+}

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

@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizMitarbeiter extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "mitarbeiter_uid")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

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

@@ -20,100 +20,33 @@ class NotizPerson extends Notiz_Controller
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
 			'getCountNotes' => ['admin:r', 'assistenz:r'],
 		]);
-
-		//Load Models
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		//Permission checks for allowed Oes
-		if ($this->router->method == 'addNewNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$person_id = $post_data['id'];
-
-			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-
-			if(!$person_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
-		}
-
-		if ( $this->router->method == 'updateNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$notiz_id = $post_data['notiz_id'];
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//get person_id
-			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$person_id = current($data)->person_id;
-
-			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
-		}
-
-		if ($this->router->method == 'deleteNotiz' )
-		{
-			$notiz_id = $this->input->post('notiz_id');
-			$person_id = $this->input->post('id');
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!$person_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'person ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
-		}
 	}
 
 	public function isBerechtigt($id, $typeId)
 	{
 		if($typeId != "person_id")
 		{
-			$this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
+		//TODO define permission
 		if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
 		{
 			$result =  $this->p->t('lehre', 'error_keineSchreibrechte');
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		return $this->outputJsonSuccess(true);
 	}
 
-	//stv: if person has permission of one studiengang of person -> permission to add/update/delete Note
-	private function _checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs)
+	public function loadDokumente()
 	{
-		$result = $this->PrestudentModel->loadWhere(['person_id' => $person_id]);
-		$data = $this->getDataOrTerminateWithError($result);
+		$notiz_id = $this->input->post('notiz_id');
 
-		$checkarray = [];
-		foreach ($data as $item)
-		{
-			if(in_array($item->studiengang_kz, $allowedStgs))
-			{
-				return true;
-			}
-		}
-
-		$this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
+		// TODO(chris): make CI variant of endpoint
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || campus.tbl_dms_version.dms_id AS preview');
+		
+		return parent::loadDokumente();
 	}
-}
+}

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

@@ -1,117 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizPrestudent extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-
-		//Permission checks for Studiengangsarray
-		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-
-		if ($this->router->method == 'addNewNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$prestudent_id = $post_data['id'];
-
-			if(!$prestudent_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
-		}
-
-		if ($this->router->method == 'updateNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$notiz_id = $post_data['notiz_id'];
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//get prestudent_id
-			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$prestudent_id = current($data)->prestudent_id;
-
-			if(!$prestudent_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
-		}
-
-		if ($this->router->method == 'deleteNotiz')
-		{
-			$notiz_id = $this->input->post('notiz_id');
-			$prestudent_id = $this->input->post('id');
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!$prestudent_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
-		}
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "prestudent_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-
-	private function _checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs)
-	{
-		$student_uid = $this->StudentModel->getUID($prestudent_id);
-
-		$result = $this->StudentModel->loadWhere(['student_uid' => $student_uid]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$studiengang_kz = current($data)->studiengang_kz;
-
-		if (!in_array($studiengang_kz, $allowedStgs))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-}

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

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizProjekt extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "projekt_kurzbz")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

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

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizProjektphase extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "projektphase_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

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

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizProjekttask extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "projekttask_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

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

@@ -1,69 +0,0 @@
-<?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) : []);
-	}
-}

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

@@ -25,8 +25,7 @@ class Studiensemester extends FHCAPI_Controller
 			array(
 				'getAll' => self::PERM_LOGGED,
 				'getAktNext' => self::PERM_LOGGED,
-				'getStudienjahrByStudiensemester' => self::PERM_LOGGED,
-				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED
+				'getStudienjahrByStudiensemester' => self::PERM_LOGGED
 			)
 		);
 		// Load model StudiensemesterModel
@@ -153,17 +152,4 @@ 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));
-	}
 }

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

@@ -127,9 +127,9 @@ class Unterbrechung extends FHCAPI_Controller
 		$this->form_validation->set_rules(
 			'datum_wiedereinstieg',
 			'Datum Wiedereinstieg',
-			'required|is_valid_date|callback_isDateInFuture',
+			'required|callback_isValidDate|callback_isDateInFuture',
 			[
-				'is_valid_date' => $this->p->t('ui', 'error_invalid_date'),
+				'isValidDate' => $this->p->t('ui', 'error_invalid_date'),
 				'isDateInFuture' => $this->p->t('ui', 'error_invalid_date')
 			]
 		);
@@ -209,9 +209,18 @@ class Unterbrechung extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($result));
 	}
 
+	public function isValidDate($date)
+	{
+		try {
+		    new DateTime($date);
+		} catch (Exception $e) {
+			return false;
+		}
+		return true;
+	}
+
 	public function isDateInFuture($date)
 	{
 		return new DateTime() < new DateTime($date);
 	}
 }
-

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

@@ -20,6 +20,8 @@ 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'],
@@ -100,45 +102,35 @@ class Abschlusspruefung extends FHCAPI_Controller
 	{
 		$abschlusspruefung_id = $this->input->post('id');
 
-		$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->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->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');
@@ -228,10 +220,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->terminateWithSuccess($typStudiengang);
 	}
 
-	public function getMitarbeiter()
+	public function getMitarbeiter($searchString)
 	{
-		$searchString = $this->input->get('searchString') ?? '';
-
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'mitAkadGrad');
@@ -242,10 +232,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->terminateWithSuccess($result ?: []);
 	}
 
-	public function getPruefer()
+	public function getPruefer($searchString)
 	{
-		$searchString = $this->input->get('searchString') ?? '';
-
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'ohneMaUid');
@@ -456,4 +444,58 @@ 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);
+	}
 }

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

@@ -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,9 +107,13 @@ 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 != '')
@@ -129,7 +133,12 @@ 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
 		{
@@ -137,6 +146,12 @@ class Archiv extends FHCAPI_Controller
 
 			$result = $this->aktelib->get($akte_id);
 		}
+
+	/*	$fileObj->filename
+	 * 	$fileObj->file
+	 * 	$fileObj->name
+	 * 	$fileObj->mimetype
+	 * 	$fileObj->disposition*/
 	}
 
 	/**

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

@@ -36,44 +36,15 @@ class Aufnahmetermine extends FHCAPI_Controller
 		// Load models
 		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
 		$this->load->model('crm/RtPerson_model', 'RtPersonModel');
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
 	public function getAufnahmetermine($person_id)
 	{
 		$result = $this->ReihungstestModel->getReihungstestPerson($person_id);
-		$arrayRt = $this->getDataOrTerminateWithError($result);
 
-		foreach ($arrayRt as $item) {
-			//Studienplan
-			$result = $this->StudienplanModel->loadWhere([
-				'studienplan_id' => $item->studienplan_id
-			]);
-			$data = $this->getDataOrTerminateWithError($result);
-			$studienordnung_id_ber = current($data)->studienordnung_id;
+		$data = $this->getDataOrTerminateWithError($result);
 
-			//Studienordnung
-			$result = $this->StudienordnungModel->loadWhere([
-				'studienordnung_id' => $studienordnung_id_ber
-			]);
-			$data = $this->getDataOrTerminateWithError($result);
-			$studiengang_kz_ber = current($data)->studiengang_kz;
-
-			//Studiengang von studiengang_kz_ber
-			$result = $this->StudiengangModel->load($studiengang_kz_ber);
-			$data = $this->getDataOrTerminateWithError($result);
-
-			$studiengangkurzbzlang_ber = current($data)->kurzbzlang;
-			$typ_ber = current($data)->typ;
-
-			//add to Array
-			$item->studiengang_kz_ber = $studiengang_kz_ber;
-			$item->studiengangkurzbzlang_ber = $studiengangkurzbzlang_ber;
-			$item->studiengangtyp_ber = $typ_ber;
-		}
-		$this->terminateWithSuccess($arrayRt);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function insertAufnahmetermin()
@@ -89,6 +60,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 		}
 
+
 		$rt_id = (isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
 		$anmeldedatum =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
 		$teilgenommen =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
@@ -252,11 +224,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 			)
 		);
 
-		//check if existing placementtest
-		if(!hasData($result))
-			$this->terminateWithSuccess([]);
-		else
-			$data = getData($result);
+		$data = $this->getDataOrTerminateWithError($result);
 
 		$studienplan_arr = [];
 		$include_ids = [];
@@ -265,18 +233,12 @@ class Aufnahmetermine extends FHCAPI_Controller
 			if($item->studienplan_id != null)
 				$studienplan_arr[] = $item->studienplan_id;
 		}
-		if(!hasData($studienplan_arr))
-			$this->terminateWithSuccess([]);
 
 		//get Placementtests Person
 		$person_id = $this->_getPersonId($prestudent_id);
 		$resultRt = $this->ReihungstestModel->getReihungstestPerson($person_id);
 
-		//check if existing placementtest
-		if(!hasData($result))
-			$this->terminateWithSuccess([]);
-		else
-			$dataRt = getData($resultRt);
+		$dataRt = $this->getDataOrTerminateWithError($resultRt);
 
 		foreach ($dataRt as $item)
 		{
@@ -336,7 +298,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$reihungstestangetreten =
 			(isset($formData['reihungstestangetreten']) && !empty($formData['reihungstestangetreten']))
 				? $formData['reihungstestangetreten']
-				: false;
+				: null;
 		$aufnahmegruppe_kurzbz =
 			(isset($formData['aufnahmegruppe_kurzbz']) && !empty($formData['aufnahmegruppe_kurzbz']))
 				? $formData['aufnahmegruppe_kurzbz']
@@ -392,7 +354,6 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$person_id = $this->input->get('person_id');
 		$punkte = $this->input->get('punkte');
 		$reihungstest_id = $this->input->get('reihungstest_id');
-		$has_excluded_gebiete = $this->input->get('hasExcludedAreas');
 
 		if(!$reihungstest_id)
 		{
@@ -403,27 +364,22 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$studiengang_kz = $this->input->get('studiengang_kz');
 
 		$this->load->model('testtool/Ablauf_model', 'AblaufModel');
-		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz, 1);
+		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$weightedArray = [];
-		$basis_gebiet_id_arr = [];
-		$basis_gebiet_id_toString = '';
 		foreach ($data as $abl)
 		{
 			$weightedArray[$abl->gebiet_id] = $abl->gewicht;
-			$basis_gebiet_id_arr[]= $abl->gebiet_id;
 		}
-		$basis_gebiet_id_toString = implode(', ', $basis_gebiet_id_arr);
 
-		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson(
-			$person_id,
-			$punkte,
-			$reihungstest_id,
-			$weightedArray,
-			$has_excluded_gebiete,
-			$basis_gebiet_id_toString
-		);
+		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray);
+
+/*		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}*/
+
 		$this->terminateWithSuccess($result);
 	}
 

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

@@ -33,9 +33,6 @@ 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']
 		]);
@@ -48,257 +45,13 @@ class Config extends FHCAPI_Controller
 			'lehre',
 			'stv',
 			'konto',
-			'abschlusspruefung',
-			'projektarbeit'
+			'abschlusspruefung'
 		]);
 
 		// 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',
-					'default' => 'all'
-				],
-				'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',
-					'default' => 'all'
-				],
-				'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 = [];
@@ -306,21 +59,21 @@ class Config extends FHCAPI_Controller
 
 		$result['details'] = [
 			'title' => $this->p->t('stv', 'tab_details'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Details.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Details.js',
 			'config' => $config['details']
 		];
 
 		$result['notes'] = [
 			'title' => $this->p->t('stv', 'tab_notes'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Notizen.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
 			'config'	=> $config['notes'],
 			'showSuffix' => ($config['notes']['showCountNotes'] ?? false),
-			'suffixhelper' => absoluteJsImportUrl('public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js')
+			'suffixhelper' => APP_ROOT . 'public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
 		];
 
 		$result['contact'] = [
 			'title' => $this->p->t('stv', 'tab_contact'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js',
 			'config' => [
 				'showBankaccount' => $this->permissionlib->isBerechtigt('mitarbeiter/bankdaten')
 					|| $this->permissionlib->isBerechtigt('student/bankdaten')
@@ -328,23 +81,20 @@ class Config extends FHCAPI_Controller
 		];
 		$result['prestudent'] = [
 			'title' => $this->p->t('stv', 'tab_prestudent'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js',
 			'config' => $config['prestudent']
 		];
 		$result['status'] = [
 			'title' => 'Status',
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js'),
-			'config' => [
-				'showStatusVorruecken' => defined('STATUS_VORRUECKEN_ANZEIGEN') ? STATUS_VORRUECKEN_ANZEIGEN : true,
-			]
+			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
 		];
 		$result['documents'] = [
 			'title' => $this->p->t('stv', 'tab_documents'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js')
+			'component' => './Stv/Studentenverwaltung/Details/Dokumente.js'
 		];
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Konto.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
@@ -356,22 +106,20 @@ class Config extends FHCAPI_Controller
 		];
 		$result['resources'] = [
 			'title' => $this->p->t('stv', 'tab_resources'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
 		$result['groups'] = [
 			'title' => $this->p->t('stv', 'tab_groups'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Groups.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Gruppen.js'
 		];
 		$result['messages'] = [
 			'title' => $this->p->t('stv', 'tab_messages'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Messages.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Messages.js'
 		];
 
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Noten.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Noten.js',
 			'showOnlyWithUid' => true,
 			'config' => [
 				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
@@ -384,42 +132,29 @@ class Config extends FHCAPI_Controller
 
 		$result['exam'] = [
 			'title' => $this->p->t('stv', 'tab_exam'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Pruefung.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Pruefung.js'
 		];
 
 		$result['exemptions'] = [
 			'title' => $this->p->t('lehre', 'anrechnungen'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Anrechnungen.js',
 			'config' => $config['exemptions']
 		];
 
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung.js'),
-			'showOnlyWithUid' => true,
+			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
 			'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' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Mobility.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Archiv.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
 			'config' => [
 				'showEdit' => $this->permissionlib->isBerechtigt('admin')
 			]
@@ -427,24 +162,22 @@ class Config extends FHCAPI_Controller
 
 		$result['jointstudies'] = [
 			'title' => $this->p->t('stv', 'tab_jointstudies'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/JointStudies.js'
 		];
 
 		$result['coursedates'] = [
 			'title' => $this->p->t('stv', 'tab_courseDates'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js')
+			'component' => './Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js'
 		];
 
 		$result['admissionDates'] = [
 			'title' => $this->p->t('stv', 'tab_admissionDates'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js')
+			'component' => './Stv/Studentenverwaltung/Details/Aufnahmetermine.js'
 		];
 
 		$result['functions'] = [
 			'title' => $this->p->t('stv', 'tab_functions'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
 		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
@@ -462,7 +195,7 @@ class Config extends FHCAPI_Controller
 		$config = $this->config->item('tabs');
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Konto.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
@@ -472,14 +205,9 @@ 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' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js'),
+			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
 			'config' => [
 				'changeStatusToAbbrecherStgl' => $this->permissionlib->isBerechtigt('admin'),
 				'changeStatusToAbbrecherStud' => $this->permissionlib->isBerechtigt('admin'),
@@ -490,37 +218,17 @@ class Config extends FHCAPI_Controller
 		];
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung.js'),
-			'showOnlyWithUid' => true,
+			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
 			'config' => $config['finalexam']
 		];
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Archiv.js'),
+			'component' => './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;
 		});

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

@@ -2,7 +2,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-use \CI3_Events as Events;
 use \DateTime as DateTime;
 
 class Dokumente extends FHCAPI_Controller
@@ -20,8 +19,6 @@ 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
@@ -569,426 +566,4 @@ 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);
-		if(!(is_array($data) && count($data) > 0))
-		{
-			return null;
-		}
-		$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;
-	}
-
 }

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

@@ -60,6 +60,17 @@ class Favorites extends FHCAPI_Controller
 
 		$favorites = $this->input->post('favorites');
 
+		$removed = [];
+		while (strlen($favorites) > 64) {
+			$favObj = json_decode($favorites);
+			if (!$favObj->list)
+				break;
+			$removed[] = array_shift($favObj->list);
+			$favorites = json_encode($favObj);
+		}
+		if ($removed)
+			$this->addMeta('removed', $removed);
+
 		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
 
 		$this->getDataOrTerminateWithError($result);

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

@@ -83,7 +83,7 @@ class GemeinsameStudien extends FHCAPI_Controller
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$this->StudiensemesterModel->addOrder('studienjahr_kurzbz', 'DESC');
 		$result = $this->StudiensemesterModel->load();
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($data);

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

@@ -60,8 +60,7 @@ class Grades extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Note_model', 'NoteModel');
 
-		$this->NoteModel->addOrder('notenwert', 'ASC');
-		$this->NoteModel->addOrder('bezeichnung', 'ASC');
+		$this->NoteModel->addOrder('note');
 		
 		$result = $this->NoteModel->load();
 

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

@@ -9,8 +9,6 @@ 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'],
 		]);
@@ -20,9 +18,7 @@ class Gruppen extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui',
-			'gruppenmanagement',
-			'lehre'
+			'ui', 'gruppenmanagement'
 		]);
 
 		// Load models
@@ -30,141 +26,15 @@ 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(
@@ -179,48 +49,29 @@ class Gruppen extends FHCAPI_Controller
 
 	public function deleteGruppe()
 	{
-		$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');
+		$student_uid = $this->input->post('id');
 		$gruppe_kurzbz = $this->input->post('gruppe_kurzbz');
 
-		// Validate if automatic group generation
-		$result = $this->GruppeModel->loadWhere([
-			'gruppe_kurzbz' => $gruppe_kurzbz
-		]);
+		//Validate if automatic group generation
+		$result = $this->GruppeModel-> loadWhere(
+			array(
+				'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([
-			'gruppe_kurzbz' => $gruppe_kurzbz,
-			'uid' => $uid
-		]);
+		$result = $this->BenutzergruppeModel->delete(
+			array(
+				'gruppe_kurzbz' => $gruppe_kurzbz,
+				'uid' => $student_uid
+				)
+		);
 
 		$data = $this->getDataOrTerminateWithError($result);
 

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

@@ -52,7 +52,6 @@ class Kontakt extends FHCAPI_Controller
 		// Extra Permissionchecks
 		$permsMa = [];
 		$permsStud = [];
-		$permsDefault = null;
 		switch ($this->router->method) {
 			case 'getBankverbindung':
 			case 'loadBankverbindung':
@@ -69,7 +68,7 @@ class Kontakt extends FHCAPI_Controller
 			case 'getKontakte':
 			case 'loadAddress':
 			case 'loadContact':
-				$permsMa = $permsStud = $permsDefault = ['admin:r', 'assistenz:r'];
+				$permsMa = $permsStud = ['admin:r', 'assistenz:r'];
 				break;
 			case 'addNewAddress':
 			case 'addNewContact':
@@ -77,7 +76,7 @@ class Kontakt extends FHCAPI_Controller
 			case 'updateContact':
 			case 'deleteAddress':
 			case 'deleteContact':
-				$permsMa = $permsStud = $permsDefault = ['admin:rw', 'assistenz:rw'];
+				$permsMa = $permsStud = ['admin:rw', 'assistenz:rw'];
 				break;
 		}
 		if ($this->router->method == 'getAdressen'
@@ -92,7 +91,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, $permsDefault);
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
 		} elseif ($this->router->method == 'loadAddress'
 			|| $this->router->method == 'loadContact'
 			|| $this->router->method == 'loadBankverbindung'
@@ -136,7 +135,7 @@ class Kontakt extends FHCAPI_Controller
 
 			$person_id = current($data)->person_id;
 			
-			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud, $permsDefault);
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
 		}
 	}
 	public function getAdressen($person_id)

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

@@ -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['studiengang_kz'] = unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']];
+			$data['kostenstelle'] = 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' => number_format($betrag, 2, '.', ''),
+				'betrag' => $betrag,
 				'buchungsdatum' => $buchungsdatum,
 				'mahnspanne' => '0',
 				'buchungsnr_verweis' => $buchung['buchungsnr'],

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

@@ -1,63 +0,0 @@
-<?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);
-	}
-}

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

@@ -43,7 +43,7 @@ class Prestudent extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'studierendenantrag', 'lehre', 'global'
+			'ui', 'studierendenantrag', 'lehre'
 		]);
 	}
 
@@ -98,9 +98,11 @@ class Prestudent extends FHCAPI_Controller
 			'person_id',
 			'berufstaetigkeit_code',
 			'ausbildungcode',
+			'zgv_code',
 			'zgvort',
 			'zgvdatum',
 			'zgvnation',
+			'zgvmas_code',
 			'zgvmaort',
 			'zgvmadatum',
 			'zgvmanation',
@@ -108,6 +110,7 @@ class Prestudent extends FHCAPI_Controller
 			'bismelden',
 			'anmerkung',
 			'dual',
+			'zgvdoktor_code',
 			'zgvdoktorort',
 			'zgvdoktordatum',
 			'zgvdoktornation',
@@ -122,57 +125,6 @@ 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);
 

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

@@ -1,413 +0,0 @@
-<?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;
-	}
-}

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

@@ -1,435 +0,0 @@
-<?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;
-	}
-}

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

@@ -18,8 +18,6 @@
 
 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
@@ -113,7 +111,7 @@ class Pruefung extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'global', 'ui', 'lehre', 'exam'
+			'global', 'ui','lehre'
 		]);
 	}
 
@@ -174,11 +172,174 @@ class Pruefung extends FHCAPI_Controller
 	 *
 	 * @param lehrveranstaltung_id, student_uid, lehreinheit_id
 	 *
-	 * @return void
+	 * @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)
 	 */
 	public function insertPruefung()
 	{
-		$this->insertOrUpdatePruefung();
+		$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);
 	}
 
 	/**
@@ -187,6 +348,8 @@ class Pruefung extends FHCAPI_Controller
 	 * @param pruefung_id
 	 *
 	 * @return success or error
+	 *
+	 * no impact on lehre.tbl_zeugnisnote
 	 */
 	public function updatePruefung($pruefung_id)
 	{
@@ -196,7 +359,48 @@ class Pruefung extends FHCAPI_Controller
 		if (!$oldpruefung)
 			show_404(); // Pruefung that should be updated does not exist
 
-		$this->insertOrUpdatePruefung($pruefung_id);
+		$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);
 	}
 
 	/**
@@ -370,198 +574,4 @@ 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();
-	}
 }

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

@@ -114,8 +114,9 @@ class Status extends FHCAPI_Controller
 		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
 
 		$result = $this->BismeldestichtagModel->getLastReachedMeldestichtag();
+		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+		$this->terminateWithSuccess($data);
 	}
 
 	public function isLastStatus($prestudent_id)
@@ -295,7 +296,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 || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
@@ -636,7 +637,7 @@ class Status extends FHCAPI_Controller
 
 		$this->load->library('PrestudentLib');
 
-		$resFirstStudent = $this->prestudentlib->setFirstStudent(
+		$this->prestudentlib->setFirstStudent(
 			$prestudent_id,
 			$lastAufgenommener->studiensemester_kurzbz,
 			$lastAufgenommener->ausbildungssemester,
@@ -645,8 +646,9 @@ class Status extends FHCAPI_Controller
 			$this->input->post('statusgrund_id')
 		);
 
-		$this->db->trans_complete();
-		$this->getDataOrTerminateWithError($resFirstStudent);
+		$this->getDataOrTerminateWithError($result);
+
+		$this->db->trans_commit();
 
 		return $this->outputJsonSuccess(true);
 	}
@@ -901,7 +903,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 || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
@@ -918,7 +920,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
@@ -943,7 +945,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
@@ -968,7 +970,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
@@ -993,7 +995,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
@@ -1018,7 +1020,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
@@ -1077,24 +1079,6 @@ 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
 	 *
@@ -1119,7 +1103,6 @@ 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');
@@ -1130,6 +1113,7 @@ 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');
 
@@ -1152,15 +1136,9 @@ class Status extends FHCAPI_Controller
 			$this->p->t('global', 'datum'),
 			[
 				'is_valid_date',
-				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck, $hasCriticalChangesBis){
+				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
 					if ($isBerechtigtNoStudstatusCheck)
-					{
-						return true; // Skip if access right says so*/
-					}
-					if (!$hasCriticalChangesBis) {
-						return true; // Skip if no critical changes were made
-					}
-
+						return true; // Skip if access right says so
 					if (!$value)
 						return true; // Error will be handled by the required statement above
 
@@ -1364,7 +1342,6 @@ class Status extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => $authUID
 		];
-		$nullableFields = ['statusgrund_id', 'anmerkung', 'rt_stufe'];
 		foreach ([
 					'orgform_kurzbz',
 					'anmerkung',
@@ -1373,17 +1350,8 @@ class Status extends FHCAPI_Controller
 					'rt_stufe',
 					'statusgrund_id'
 				] as $key)
-		{
-			if (in_array($key, $nullableFields))
-			{
-				$updateData[$key] = ($this->input->post($key) === '') ? null : $this->input->post($key);
-			}
-			else if ($this->input->post($key))
-			{
+			if ($this->input->post($key))
 				$updateData[$key] = $this->input->post($key);
-			}
-		}
-
 
 		if ($this->input->post('bestaetigtam')) {
 			$updateData['bestaetigtam'] = $this->input->post('bestaetigtam');

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

@@ -36,8 +36,7 @@ class Student extends FHCAPI_Controller
 		parent::__construct([
 			'get' => ['admin:r', 'assistenz:r'],
 			'save' => ['admin:rw', 'assistenz:rw'],
-			'saveStudent' => ['admin:rw', 'assistenz:rw'],
-			'getPerson' => ['admin:rw', 'assistenz:rw'],
+			'check' => ['admin:rw', 'assistenz:rw'],
 			'add' => ['admin:rw', 'assistenz:rw'] // TODO(chris): extra permissions
 		]);
 
@@ -56,7 +55,7 @@ class Student extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'lehre', 'person'
+			'ui', 'lehre'
 		]);
 	}
 
@@ -108,41 +107,30 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('p.matr_nr');
 		$this->PrestudentModel->addSelect('p.anrede');
 		$this->PrestudentModel->addSelect('p.zugangscode');
-		if($this->permissionlib->isBerechtigt('student/bpk'))
-		{
-			$this->PrestudentModel->addSelect('p.bpk');
-		}
 
 		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 DESC
+					SELECT kontakt 
+					FROM public.tbl_kontakt 
+					WHERE kontakttyp='email' 
+					AND person_id=p.person_id 
+					AND zustellung 
+					ORDER BY kontakt_id 
 					LIMIT 1
 				) AS email_privat",
 				false
 			);
-			$this->PrestudentModel->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(
-			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
-				. $this->PrestudentModel->escape($studiensemester_kurzbz)
-				. ")  AS statusofsemester"
+			"(
+				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->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
@@ -158,9 +146,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();
 
@@ -220,7 +208,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);
@@ -231,7 +219,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;
@@ -244,6 +232,7 @@ 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) {
@@ -303,7 +292,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'];
 		}
@@ -320,10 +309,6 @@ 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;
 			}
 		}
@@ -439,32 +424,7 @@ class Student extends FHCAPI_Controller
 		), ''));
 	}
 
-	/**
-	 * 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()
+	public function check()
 	{
 		$this->load->library('form_validation');
 
@@ -482,55 +442,21 @@ 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(trim($nachname)) . ')', false);
-			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape(trim($vorname)) . ')', false);
+			$this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape($nachname) . ')', false);
+			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape($vorname) . ')', false);
 			$this->PersonModel->db->group_end();
 		} elseif ($nachname) {
-			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape(trim($nachname)) . ')', false);
+			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($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);
 	}
 
@@ -539,58 +465,69 @@ 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->_validate();
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
+		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]');
+		// TODO(chris): validate studienplan with studiengang, semester and orgform?
+		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// TODO(chris): This should be in a library
-		$this->load->model('crm/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->load->library('PrestudentLib');
+		$this->db->trans_start();
 
-		$errors = [];
-		$person_id = null;
+		$result = $this->addInteressent();
 
-		$this->db->trans_begin();
+		$this->db->trans_complete();
 
-		$result = $this->_addPerson();
-		if (isError($result)) $errors[] = getError($result);
+		if ($this->db->trans_status() === FALSE)
+			$this->terminateWithError('TODO(chris): TEXT', self::ERROR_TYPE_GENERAL);
 
-		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);
+		$this->terminateWithSuccess($result);
 	}
 
-	private function _addPerson()
+	protected function addInteressent()
 	{
 		// Person anlegen wenn nötig
 		$person_id = $this->input->post('person_id');
 		if (!$person_id) {
 			$this->load->model('person/Person_model', 'PersonModel');
-
+			
 			$data = [
 				'nachname' => $this->input->post('nachname'),
 				'insertamum' => date('c'),
@@ -613,25 +550,19 @@ 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('gebdatum')))->format('Y-m-d');
+				$data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d');
 			if ($this->input->post('geburtsnation'))
 				$data['geburtsnation'] = $this->input->post('geburtsnation');
 			if ($this->input->post('staatsbuergerschaft'))
 				$data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft');
 
-			return $this->PersonModel->insert($data);
+			$result = $this->PersonModel->insert($data);
+			$person_id = $this->getDataOrTerminateWithError($result);
 		}
 
-		return success($person_id);
-	}
-
-	private function _addAdresse($person_id)
-	{
-		// Addresse anlegen?
-		$anlegen = $this->input->post('address[checked]');
-		if ($anlegen === true)
-		{
-			// Adresse laden
+		// Addresse anlegen
+		$anlegen = $this->input->post('address[func]');
+		if ($anlegen) {
 			$this->load->model('person/Adresse_model', 'AdresseModel');
 
 			$data = [
@@ -643,45 +574,50 @@ class Student extends FHCAPI_Controller
 				'typ' => 'h',
 				'zustelladresse' => true,
 			];
-
-				$this->AdresseModel->addSelect('adresse_id');
+			if ($anlegen < 0) { // Überschreiben
+				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
+				$this->AdresseModel->addOrder('sort');
 				$result = $this->AdresseModel->loadWhere([
 					'person_id' => $person_id
 				]);
+				$address = $this->getDataOrTerminateWithError($result);
+				if ($address) {
+					$address = current($address);
 
-				if (isError($result)) return $result;
-
-				// wenn neue Adresse, heimatadresse setzen
-				if (!hasData($result)) $data['heimatadresse'] = true;
+					$data['updateamum'] = date('c');
+					$data['updatevon'] = getAuthUID();
 
+					$result = $this->AdresseModel->update($address->adresse_id, $data);
+					$this->getDataOrTerminateWithError($result);
+				} else {
+					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
+					$anlegen = 1;
+					$data['heimatadresse'] = true;
+				}
+			}
+			if ($anlegen > 0) {
 				$data['person_id'] = $person_id;
 				$data['insertamum'] = date('c');
 				$data['insertvon'] = getAuthUID();
-
-				return $this->AdresseModel->insert($data);
+				if (!isset($data['heimatadresse']))
+					$data['heimatadresse'] = !$this->input->post('person_id');
+				
+				$result = $this->AdresseModel->insert($data);
+				$this->getDataOrTerminateWithError($result);
+			}
 		}
-
-		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,
@@ -691,70 +627,83 @@ class Student extends FHCAPI_Controller
 					'insertvon' => getAuthUID()
 				];
 				$result = $this->KontaktModel->insert($data);
-				if (isError($result)) return $result;
+				$this->getDataOrTerminateWithError($result);
 			}
 		}
-		return success(null);
-	}
 
-	private function _addFirstPrestudentstatus($person_id)
-	{
 		// Prestudent anlegen
-
-		// Anmerkung with Ausbildungsart
-		$studiengang_kz = $this->input->post('studiengang_kz');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$data = [
+			'aufmerksamdurch_kurzbz' => 'k.A.',
+			'person_id' => $person_id,
+			'studiengang_kz' => $this->input->post('studiengang_kz'),
+			'ausbildungcode' => $this->input->post('letzteausbildung'),
+			'anmerkung' => $this->input->post('anmerkungen'),
+			'reihungstestangetreten' => false,
+			'bismelden' => true
+		];
 		$ausbildungsart = $this->input->post('ausbildungsart');
-		$anmerkung = $this->input->post('anmerkungen');
-		$foerderrelevant = null;
 		if ($ausbildungsart)
-			$anmerkung .= ' Ausbildungsart:' . $ausbildungsart;
-
+			$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
 		// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
 		$incoming = $this->input->post('incoming');
-		if ($incoming || substr($studiengang_kz, 0, 1) == '9')
-			$foerderrelevant = false;
+		if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
+			$data['foerderrelevant'] = false;
+		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
+		$this->PrestudentModel->addOrder('zgvmas_code');
+		$this->PrestudentModel->addOrder('zgv_code', 'DESC');
+		$this->PrestudentModel->addLimit(1);
+		$result = $this->PrestudentModel->loadWhere([
+			'person_id' => $person_id
+		]);
+		$prestudent = $this->getDataOrTerminateWithError($result);
+		if ($prestudent) {
+			$prestudent = current($prestudent);
+			if ($prestudent->zgv_code) {
+				$data['zgv_code'] = $prestudent->zgv_code;
+				$data['zgvort'] = $prestudent->zgvort;
+				$data['zgvdatum'] = $prestudent->zgvdatum;
 
+				$data['zgvmas_code'] = $prestudent->zgvmas_code;
+				$data['zgvmaort'] = $prestudent->zgvmaort;
+				$data['zgvmadatum'] = $prestudent->zgvmadatum;
+			}
+		}
 		// Prestudent speichern
-		$result = $this->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');
+		$result = $this->PrestudentModel->insert($data);
+		$prestudent_id = $this->getDataOrTerminateWithError($result);
 
-		$prestudent_id = getData($result);
+		// Prestudent Rolle Anlegen
+		$data = [
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent',
+			'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'),
+			'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0,
+			'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null,
+			'studienplan_id' => $this->input->post('studienplan_id') ?: null,
+			'datum' => date('Y-m-d'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+		$result = $this->PrestudentstatusModel->insert($data);
+		$this->getDataOrTerminateWithError($result);
 
-		// 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')
-			);
+		if ($incoming) {
+			// TODO(chris): IMPLEMENT!
+			//Matrikelnummer und UID generieren
+			//Benutzerdatensatz anlegen
+			//Studentendatensatz anlegen
+			//StudentLehrverband anlegen
 		}
-		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;
 
-		return success($prestudent_id);
+		// TODO(chris): DEBUG
+		/*$result = $this->PrestudentModel->loadWhere([
+			'pestudent_id' => 1
+		]);
+		if (isError($result)) {
+			return $result;
+		}*/
+
+		return success(true);
 	}
 
 	public function requiredIfNotPersonId($value)
@@ -766,84 +715,13 @@ class Student extends FHCAPI_Controller
 	
 	public function requiredIfAddressFunc($value)
 	{
-		if (!isset($_POST['address']['checked']) || !$_POST['address']['checked'])
+		if (!$_POST['address']['func'])
 			return true;
 		return !!$value;
 	}
 
-	public function requiredIfStudentFunc($value)
+	public function 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', 'is_valid_date', [
-			'is_valid_date' => $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;
+		return isValidDate($value);
 	}
 }

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

@@ -44,12 +44,14 @@ class Students extends FHCAPI_Controller
 		}
 
 		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('PhrasesLib');
 		$this->loadPhrases(
 			array(
 				'lehre'
 			)
 		);
+
 	}
 
 	/**
@@ -73,7 +75,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)	=> getStudentsSpezialgruppe
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)	=> getStudentsSpezialguppe
 	 *
 	 * /(studiensemester_kurzbz)/(studiengang_kz)								=> getStudents
 	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)					=> getStudents
@@ -99,183 +101,39 @@ class Students extends FHCAPI_Controller
 	}
 
 	/**
-	 * @param string		$studiensemester_kurzbz
-	 *
 	 * @return void
 	 */
-	public function getIncoming($studiensemester_kurzbz)
+	public function getIncoming()
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
-		$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);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
 	}
 
 	/**
-	 * @param string		$studiensemester_kurzbz
-	 *
 	 * @return void
 	 */
-	public function getOutgoing($studiensemester_kurzbz)
+	public function getOutgoing()
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
-		$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);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
 	}
 
 	/**
-	 * @param string		$studiensemester_kurzbz
-	 *
 	 * @return void
 	 */
-	public function getGemeinsamestudien($studiensemester_kurzbz)
+	public function getGemeinsamestudien()
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
-		$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);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
 	}
 
-	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,
@@ -286,12 +144,10 @@ 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,
@@ -371,7 +227,7 @@ class Students extends FHCAPI_Controller
 
 				$stg = $this->getDataOrTerminateWithError($result);
 				if (!$stg)
-					$this->terminateWithSuccess([]);
+					$this->terminateWithValidationErrors(['' => 'Studiengang does not exist']); // TODO(chris): phrase
 				$stg = current($stg);
 
 				$where['ps.status_kurzbz'] = 'Interessent';
@@ -440,10 +296,7 @@ class Students extends FHCAPI_Controller
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
-					/** 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
-					 */
+					// TODO(chris): this does not work with $orgform_kurzbz != null
 					$where['ps.status_kurzbz'] = null;
 				} else {
 					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
@@ -457,18 +310,42 @@ 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 pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-				THEN ps.ausbildungssemester::text 
-				ELSE ''::text 
-			END AS semester", false);
+			CASE WHEN ps.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+			THEN ps.ausbildungssemester::text 
+			ELSE ''::text END AS semester", false);
 		$this->PrestudentModel->addSelect("'' AS verband");
 		$this->PrestudentModel->addSelect("'' AS gruppe");
 		$this->addSelectPrioRel();
 
+		//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);
@@ -478,13 +355,10 @@ 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,
@@ -497,14 +371,10 @@ 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,
@@ -518,12 +388,10 @@ 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
-	) {
+	public function getStudentsSpezialgruppe($studiensemester_kurzbz,
+		$studiengang_kz, $semester, $gruppe_kurzbz,
+		$orgform_kurzbz = null)
+	{
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -535,13 +403,10 @@ 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,
@@ -565,15 +430,8 @@ 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');
 
@@ -582,6 +440,21 @@ 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');
@@ -589,6 +462,18 @@ 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 = [];
 
@@ -611,7 +496,7 @@ class Students extends FHCAPI_Controller
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
 				$this->PrestudentModel->db->where(
 					"(
-						SELECT orgform_kurzbz
+						SELECT orgform_kurzbz 
 						FROM public.tbl_prestudentstatus 
 						WHERE prestudent_id=tbl_prestudent.prestudent_id 
 						AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . " 
@@ -621,6 +506,7 @@ class Students extends FHCAPI_Controller
 					false
 				);
 			}
+
 		}
 
 		$this->addFilter($studiensemester_kurzbz);
@@ -654,18 +540,39 @@ 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 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->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->addSelectPrioRel();
 
@@ -702,12 +609,40 @@ 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();
 
 
@@ -746,12 +681,33 @@ 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);
@@ -765,81 +721,6 @@ 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
@@ -850,41 +731,6 @@ class Students extends FHCAPI_Controller
 	{
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
-		$this->load->config('stv');
-		$tags = $this->config->item('stv_prestudent_tags');
-
-		$whereTags = '';
-		if (is_array($tags) && !isEmptyArray($tags)) {
-			$tags = array_keys($tags);
-
-			foreach ($tags as $key => $tag) {
-				$tags[$key] = $this->db->escape($tag);
-			}
-			$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
-		}
-		$subQueryTag = "
-		  (
-			SELECT
-			  tag.prestudent_id,
-			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-			FROM (
-			  SELECT DISTINCT ON (n.notiz_id)
-				n.notiz_id AS id,
-				nt.typ_kurzbz,
-				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-				n.text AS notiz,
-				nt.style,
-				n.erledigt AS done,
-				nz.prestudent_id
-			  FROM public.tbl_notizzuordnung AS nz
-				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-			. $whereTags .
-			"
-			) AS tag
-			GROUP BY tag.prestudent_id
-		  ) AS tag_data_agg
-		";
 
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -907,11 +753,8 @@ class Students extends FHCAPI_Controller
 			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
 			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
 
-		$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-
 
 		$this->PrestudentModel->addSelect("b.uid");
-		$this->PrestudentModel->addSelect('tag_data_agg.tags');
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');
@@ -928,13 +771,6 @@ 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');
@@ -969,7 +805,13 @@ class Students extends FHCAPI_Controller
 
 		$this->PrestudentModel->addSelect('mentor');
 		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect('unruly');
+
+		/*$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);
 
@@ -985,13 +827,13 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("(
 			SELECT count(*)
 			FROM (
-				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
-				FROM public.tbl_prestudent pss
-				JOIN public.tbl_prestudentstatus USING (prestudent_id)
+				SELECT *, public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) AS laststatus
+				FROM PUBLIC.tbl_prestudent pss
+				JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
 				WHERE person_id = p.person_id
 				AND studiensemester_kurzbz = (
 					SELECT studiensemester_kurzbz
-					FROM public.tbl_prestudentstatus
+					FROM PUBLIC.tbl_prestudentstatus
 					WHERE prestudent_id = tbl_prestudent.prestudent_id
 					AND status_kurzbz = 'Interessent'
 					LIMIT 1
@@ -1000,7 +842,7 @@ class Students extends FHCAPI_Controller
 			) prest
 			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
 			AND priorisierung <= tbl_prestudent.priorisierung
-		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
+		) || ' (' || tbl_prestudent.priorisierung || ')' AS priorisierung_relativ", false);
 	}
 
 	/**
@@ -1012,20 +854,40 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function addFilter($studiensemester_kurzbz)
 	{
-		$filter = $this->input->post('filter');
-		
+		$filter = json_decode($this->input->get('filter'), true);
 		if (!is_array($filter))
 		{
-			$this->addMeta('addfilter', 'invalid filter: ' . json_encode($this->input->post('filter')));
+			$this->addMeta('addfilter', 'invalid filter: ' . $this->input->get('filter'));
 			return;
 		}
-		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;
-			}
+		if (isset($filter['konto_count_0'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_count_0']);
+			$stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
+
+			$this->PrestudentModel->db->where('(
+				SELECT count(*) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id 
+				AND buchungstyp_kurzbz=' . $bt . ' 
+				AND studiensemester_kurzbz=' . $stdsem . '
+			) =', 0);
+			$this->PrestudentModel->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
+		}
+		if (isset($filter['konto_missing_counter'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_missing_counter']);
+			$stg = '';
+			if ($this->variablelib->getVar('kontofilterstg') == 'true')
+				$stg = ' AND studiengang_kz=tbl_prestudent.studiengang_kz';
+
+			$bt = $bt == 'alle' ? '' : ' AND buchungstyp_kurzbz=' . $bt;
+
+			$this->PrestudentModel->db->where('(
+				SELECT sum(betrag) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id' .
+				$bt .
+				$stg . '
+			) !=', 0);
 		}
 	}
 }

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

@@ -1,48 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Tags extends Tag_Controller
-{
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getTag' => self::BERECHTIGUNG_KURZBZ,
-			'getTags' => self::BERECHTIGUNG_KURZBZ,
-			'addTag' => self::BERECHTIGUNG_KURZBZ,
-			'updateTag' => self::BERECHTIGUNG_KURZBZ,
-			'doneTag' => self::BERECHTIGUNG_KURZBZ,
-			'deleteTag' => self::BERECHTIGUNG_KURZBZ
-		]);
-
-	$this->config->load('stv');
-	}
-
-	public function getTag($readonly_tags = null)
-	{
-		parent::getTag($this->config->item('stv_prestudent_tags'));
-	}
-	public function getTags($tags = null)
-	{
-		parent::getTags($this->config->item('stv_prestudent_tags'));
-	}
-	public function addTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::addTag(true, $this->config->item('stv_prestudent_tags'));
-	}
-	public function updateTag($updatable_tags = null)
-	{
-		parent::updateTag($this->config->item('stv_prestudent_tags'));
-	}
-	public function deleteTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::deleteTag(true, $this->config->item('stv_prestudent_tags'));
-	}
-	public function doneTag($updatable_tags = null)
-	{
-		parent::doneTag($this->config->item('stv_prestudent_tags'));
-	}
-}

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

@@ -165,17 +165,7 @@ 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);
@@ -183,7 +173,6 @@ 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);
@@ -199,7 +188,6 @@ 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)
 		]);
@@ -215,7 +203,6 @@ 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');
 
@@ -229,6 +216,7 @@ class Verband extends FHCAPI_Controller
 					$list = array_merge($list, $result);
 				}
 			}
+
 		}
 		$this->terminateWithSuccess($list);
 	}
@@ -284,7 +272,6 @@ 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);
 		
@@ -333,8 +320,6 @@ 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);
 		

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

@@ -1,102 +0,0 @@
-<?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);
-	}
-}

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

@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the VV Config
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Config extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'printDocument' => ['vertrag/mitarbeiter:r'],
-		]);
-	}
-
-	public function printDocument()
-	{
-		$params = [];
-		$menu = [];
-
-		Events::trigger(
-			'multiActionPrintHonorarvertrag',
-			// passing $menu per reference
-			function & () use (&$menu) {
-				return $menu;
-			},
-			$params
-		);
-
-		if (is_array($menu) && isset($menu[0]))
-		{
-			$this->terminateWithSuccess($menu[0]);
-		}
-		else
-		{
-		//	$this->terminateWithError('Error with Event 'multiActionPrintHonorarvertrag');
-			$this->terminateWithSuccess();
-
-		}
-	}
-}

application/controllers/api/frontend/v1/vertraege/Vertraege.php

@@ -26,6 +26,9 @@ class Vertraege extends FHCAPI_Controller
 			'deleteLehrauftrag' =>['vertrag/mitarbeiter:w'],
 			'deleteBetreuung' =>['vertrag/mitarbeiter:w'],
 			'getMitarbeiter' => ['vertrag/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 
 		//Load Models and Libraries
@@ -238,7 +241,7 @@ class Vertraege extends FHCAPI_Controller
 			}
 		}
 		$this->db->trans_complete();
-		$this->terminateWithSuccess($vertrag_id);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function updateContract()
@@ -355,7 +358,7 @@ class Vertraege extends FHCAPI_Controller
 		}
 		$this->db->trans_complete();
 
-		$this->terminateWithSuccess($vertrag_id);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function loadContract($vertrag_id)
@@ -681,4 +684,37 @@ class Vertraege extends FHCAPI_Controller
 		}
 		return $this->terminateWithSuccess(getData($result));
 	}
+
+	public function getPersonAbteilung($mitarbeiter_uid)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getLeitungOrg($oekurzbz)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getHeader($person_id)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getHeader($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
 }

application/controllers/api/frontend/v1/vorlagen/Vorlagen.php

@@ -51,17 +51,13 @@ class Vorlagen extends FHCAPI_Controller
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
 
-		if (hasData($result))
-		{
-			$data = getData($result);
+		$data = $this->getDataOrTerminateWithError($result);
+		$oe_kurzbz = current($data);
 
-			$oe_kurzbz = array_column($data, 'oe_kurzbz');
-			$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz);
-
-			$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-		}
-		$this->terminateWithSuccess(array());
+		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
 
+		$this->terminateWithSuccess($data);
 	}
 
 }

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

@@ -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');
 					}

application/controllers/dashboard/Widget.php

@@ -33,26 +33,19 @@ class Widget extends Auth_Controller
 			return $this->outputJsonSuccess([
 				"widget_id" => 0,
 				"widget_kurzbz" => "notfound",
-				"arguments" => [
+				"arguments" => json_encode([
 					"className" => 'alert-danger',
 					"title" => 'Widget Not Found',
 					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
-				],
-				"setup" => [
+				]),
+				"setup" => json_encode([
 					"name" => 'Widget Not Found',
-					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
+					"file" => 'DashboardWidget/Default.js',
 					"width" => 1,
 					"height" => 1
-				]
+				])
 			]);
-
-		$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);
+		return $this->outputJsonSuccess(current(getData($widget)));
 	}
 	
 	public function getAll()
@@ -63,16 +56,7 @@ class Widget extends Auth_Controller
 		if (isError($result))
 			return $this->outputJsonError(getError($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);
+		$this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
 	public function getWidgetsForDashboard()
@@ -87,16 +71,7 @@ class Widget extends Auth_Controller
 			]);
 		}
 
-		$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);
+		$this->outputJsonSuccess(getData($result) ?: []);
 	}
 	
 	public function setAllowed()

application/controllers/jobs/AbgabetoolJob.php

@@ -1,913 +0,0 @@
-<?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->library('SignatureLib');
-		
-		$this->_ci->load->config('abgabe');
-		$this->loadPhrases([
-			'abgabetool'
-		]);
-		
-		
-	}
-	
-	// basically the notifyBetreuerMail function but email goes to assistenz
-	// and new abgaben are further evaluated for missing signature status
-	public function notifyAssistenzAboutMissingSignatureUploads() {
-		$this->_ci->logInfo('Start job FHC-Core->notifyAssistenzAboutMissingSignatureUploads');
-		
-		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
-		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_ASSISTENZ');
-
-		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval, $relevantTypes);
-		$retval = getData($result);
-
-		// retval are paabgaben joined with projektarbeit and betreuer
-		if(count($retval) == 0) {
-			$this->logInfo("Keine Emails über neue Paabgaben an Assistenzen versandt");
-			return;
-		}
-
-		// group changed/new abgaben for projektarbeiten
-		$projektarbeiten = [];
-		foreach($retval as $abgabeWithNewUpload) {
-			// Check if the current item has a 'projektarbeit_id' field.
-			// Replace 'projektarbeit_id' with the actual key name if it's different.
-			if (isset($abgabeWithNewUpload->projektarbeit_id)) {
-				$projektarbeitId = $abgabeWithNewUpload->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] = [];
-				}
-				
-				// check signature for that abgabe, main point of this job
-				$this->checkAbgabeSignatur($abgabeWithNewUpload, $abgabeWithNewUpload->student_uid);
-				
-				// Add the current row to the array associated with its 'projektarbeit_id'.
-				$projektarbeiten[$projektarbeitId][] = $abgabeWithNewUpload;
-			}
-		}
-
-		// 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;">';
-			$hasIssues = false; // Track if this assistant actually needs an email
-
-			foreach($tupelArr as $tupel) {
-				$projektarbeit_id = $tupel[0];
-				$assistenzRow = $tupel[1];
-
-				$betreuerArray = $projektarbeitBetreuerMap[$projektarbeit_id] ?? [];
-				$allAbgaben = $projektarbeiten[$projektarbeit_id];
-
-				// only keep abgaben that are not correctly signed
-				$issueAbgaben = array_filter($allAbgaben, function($abgabe) {
-					// We only care about cases where it's explicitly NOT true (false, error, or null)
-					return $abgabe->signatur !== true;
-				});
-
-				// if this specific project has no signature issues, skip to the next project
-				if(empty($issueAbgaben)) {
-					continue;
-				}
-
-				// If we reached here, we have at least one issue to report
-				$hasIssues = true;
-
-				// Format the Student Name (using the first available abgabe object)
-				$s = reset($issueAbgaben);
-				$nameParts = array_filter([$s->titelpre, $s->vorname, $s->nachname, $s->titelpost]);
-				$studentFullName = implode(' ', $nameParts);
-
-				// Format the Supervisors string
-				$betreuerStrings = [];
-				foreach($betreuerArray as $b) {
-					$bNameParts = array_filter([$b->titelpre, $b->vorname, $b->nachname, $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: #fff5f5; border-left: 4px solid #dc3545; border-bottom: 1px solid #fee;'>
-                <strong style='font-size: 16px; color: #b02a37;'>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: #f8f9fa; text-align: left;">
-                      <th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Datum</th>
-                      <th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 45%;">Abgabe/Bezeichnung</th>
-                      <th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 35%;">Status</th>
-                   </tr>
-                </thead>
-                <tbody>';
-
-				$printed = []; // lazy hack to avoid duplicate rows
-				foreach ($issueAbgaben as $abgabe) {
-					// if we had this paabgabe already (erstbetreuer/zweitbetreuer fetch achieves duplicates
-					if(in_array($abgabe->paabgabe_id, $printed)) {
-						continue; // skip this forEach iteration
-					}
-					
-					$printed[] = $abgabe->paabgabe_id;
-					
-					$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
-
-					// label and color
-					if ($abgabe->signatur === false) {
-						$sigLabel = "FEHLENDE SIGNATUR";
-						$sigBg = "#dc3545";
-					} elseif ($abgabe->signatur === 'error') {
-						$sigLabel = "PRÜFUNG FEHLGESCHLAGEN";
-						$sigBg = "#fd7e14";
-					} else {
-						$sigLabel = "DATEI NICHT GEFUNDEN";
-						$sigBg = "#6c757d";
-					}
-
-					$abgabenString .= "
-                <tr>
-                   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$abgabedatumFormatted}</td>
-                   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
-                      <strong>{$abgabe->bezeichnung}</strong>
-                   </td>
-                   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; text-align: center;'>
-                      <span style='color: #fff; background-color: {$sigBg}; padding: 3px 8px; border-radius: 3px; font-weight: bold; font-size: 11px;'>
-                        {$sigLabel}
-                      </span>
-                   </td>
-                </tr>";
-				}
-
-				$abgabenString .= '</tbody></table>';
-			}
-
-			$abgabenString .= '</div>';
-
-			// only send the email if at least one project had an issue
-			if ($hasIssues) {
-				$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;
-
-				sendSanchoMail(
-					'PAANoSigAssSM',
-					$body_fields,
-					$email,
-					$this->p->t('abgabetool', 'c4missingSignatureNotification')
-				);
-
-				$count++;
-			}
-		}
-
-		$this->_ci->logInfo($count . " Emails bezüglich fehlender Signaturen erfolgreich versandt");
-		$this->_ci->logInfo('End job FHC-Core->notifyAssistenzAboutMissingSignatureUploads');
-	}
-
-	/**
-	 * helper function to check the signature status of uploaded files for zwischenabgabe & endupload
-	 */
-	private function checkAbgabeSignatur($abgabe, $student_uid) {
-		$paabgabetypenToCheck = $this->config->item('SIGNATUR_CHECK_PAABGABETYPEN');
-
-		if(!in_array($abgabe->paabgabetyp_kurzbz, $paabgabetypenToCheck)) {
-			return;
-		}
-
-		if (!defined('SIGNATUR_URL')) {
-			$abgabe->signatur = 'error';
-			return;
-		}
-
-		$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$student_uid.'.pdf';
-
-		$signaturVorhanden = null; // if frontend receives null -> indicates no file found at path
-		if(file_exists($path)) {
-
-			// Check if the document is signed
-			$signList = SignatureLib::list($path);
-			if (is_array($signList) && count($signList) > 0)
-			{
-				// The document is signed
-				$signaturVorhanden = true;
-			}
-			elseif ($signList === null)
-			{
-				// frontend knows to handle it this way for signatures
-				$signaturVorhanden = 'error';
-			}
-			else
-			{
-				$signaturVorhanden = false;
-			}
-
-			$abgabe->signatur = $signaturVorhanden;
-		}
-	}
-
-	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(!$retval) {
-			$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;
-
-				// check if the updatevon field is NOT the same as the student the projektarbeit is assigned to
-				// since uploading a file to a paabgabe is also putting updateamum & updatevon
-				// we have our own "student has uploaded a file" emailjob anyways
-				if($newOrChangedAbgabe->student_uid === $newOrChangedAbgabe->updatevon) {
-					continue;
-				}
-				
-				// 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;
-			}
-		}
-
-		if(count($projektarbeiten) == 0) {
-			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
-			return;
-		}
-
-		// 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;
-
-			$relevantCounter = 0; // workaround to check if a betreuer needs to have any notification about relevant
-			// abgaben at all to avoid sending empty emails since we filter on certain conditions
-			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;
-				}
-
-				$relevantCounter++;
-
-				// 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];
-			
-			if($relevantCounter == 0) {
-				$this->_ci->logInfo('No Relevant Abgaben to notify Betreuer PersonID: "'.$betreuerRow->person_id.'".');
-				continue;
-			}
-			
-			$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;
-
-			if(!$email) {
-				$this->_ci->logInfo('Could not send Email for Betreuer PersonID: "'.$data->person_id.'".');
-				continue;
-			}
-			
-			// 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;
-
-			// in rare cases there are betreuer (often zweitbetreuer) without uid and without private email
-			if(!$email) {
-				$this->_ci->logInfo('Could not send Email for Betreuer PersonID: "'.$data->person_id.'".');
-				continue;
-			}
-			
-			// 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');
-	}
-}

application/controllers/jobs/AntragJob.php

@@ -200,14 +200,13 @@ class AntragJob extends JOB_Controller
 	}
 
 	/**
-	 * Send reminder to Assistant and to Student for Wiedereinstieg Unterbrecher
+	 * Send reminder to Assistant for Wiedereinstieg Unterbrecher
 	 *
 	 */
 	public function sendReminderWiedereinstieg()
 	{
 		$now = new DateTime();
 		$modifier = $this->config->item('unterbrechung_job_remind_wiedereinstieg_date_modifier');
-
 		if (!$modifier)
 			return $this->logError('Konnte Job nicht starten: Config "unterbrechung_job_remind_wiedereinstieg_date_modifiers" nicht gesetzt');
 
@@ -231,7 +230,6 @@ class AntragJob extends JOB_Controller
 
 		$antraege = getData($result) ?: [];
 		$count = 0;
-		$countReminderStudent = 0;
 		foreach ($antraege as $antrag)
 		{
 			$res = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
@@ -259,92 +257,10 @@ class AntragJob extends JOB_Controller
 				$data['UID'] = $student->student_uid;
 			}
 
-			//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)
+			// NOTE(chris): Sancho mail
+			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
 			{
 				$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,
@@ -352,7 +268,7 @@ class AntragJob extends JOB_Controller
 				]);
 			}
 		}
-		$this->logInfo($count . ' Reminder an Assistenz und ' . $countReminderStudent . ' Reminder an Student gesendet  - Ende Job sendReminderWiedereinstieg');
+		$this->logInfo($count . ' Reminder gesendet - Ende Job sendReminderWiedereinstieg');
 	}
 
 	/**

application/controllers/jobs/MeldezettelJob.php

@@ -1,86 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-class MeldezettelJob extends JOB_Controller
-{
-	const INSERT_VON = 'meldezetteljob';
-	const DOKUMENT_KURZBZ = 'Meldezet';
-
-	private $_ci; // Code igniter instance
-
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
-	}
-
-	/**
-	 * Sets Meldezettel to "accepted" for all students with Meldeadresse.
-	 */
-	public function acceptMeldezettel()
-	{
-		$this->logInfo('Start Meldezettel Job');
-
-		$params = array(self::DOKUMENT_KURZBZ);
-
-		$qry = "
-			-- get all prestudents with meldeadresse, but no accepted Meldezettel
-			SELECT
-				DISTINCT prestudent_id
-			FROM
-				public.tbl_adresse
-				JOIN public.tbl_person USING (person_id)
-				JOIN public.tbl_prestudent ps USING (person_id)
-			WHERE
-				typ = 'm'
-				AND NOT EXISTS (
-					SELECT
-						1
-					FROM
-						public.tbl_dokumentprestudent
-					WHERE
-						prestudent_id = ps.prestudent_id
-						AND dokument_kurzbz = ?
-				)";
-
-		// get all prestudents with Meldeadresse and no accpeted Meldezettel
-		$result = $this->_ci->DokumentprestudentModel->execReadOnlyQuery($qry, $params);
-
-		if (isError($result))
-		{
-			$this->logError(getError($result));
-		}
-
-		$count = 0;
-
-		if (hasData($result))
-		{
-			$prestudents = getData($result);
-
-			foreach ($prestudents as $prestudent)
-			{
-				// set Meldezettel to accepted
-				$result = $this->_ci->DokumentprestudentModel->insert(
-					array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'dokument_kurzbz' => self::DOKUMENT_KURZBZ,
-						'datum' => date('Y-m-d'),
-						'insertamum' => strftime('%Y-%m-%d %H:%M'),
-						'insertvon' => self::INSERT_VON
-					)
-				);
-
-				if (isError($result))
-					$this->logError(getError($result));
-				else
-					$count++;
-			}
-		}
-
-		$this->logInfo('End Meldezettel Job', array('Number of changes ' => $count));
-	}
-}

application/controllers/system/infocenter/InfoCenter.php

@@ -22,7 +22,6 @@ 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';
@@ -117,7 +116,6 @@ 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',
@@ -232,13 +230,6 @@ 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
@@ -1562,7 +1553,6 @@ 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))
@@ -1571,7 +1561,6 @@ 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(
@@ -1635,18 +1624,6 @@ 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
-				),
 			)
 		);
 	}
@@ -1673,8 +1650,6 @@ 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);
@@ -1716,7 +1691,6 @@ 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))
 		{
@@ -1793,24 +1767,6 @@ 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
-				)
-			);
-		}
 	}
 
 	/**

application/core/Auth_Controller.php

@@ -70,22 +70,20 @@ 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, $permDefault = null)
+	protected function checkPermissionsForPerson($person_id, $permMa, $permStud)
 	{
-		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud, $permDefault);
-
+		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud);
+		
 		if ($res) {
-			$perm = array_keys(array_flip(array_merge($res&1 ? $permMa : [], $res&2 ? $permStud : [], $res&4 ? $permDefault : [])));
+			$perm = array_keys(array_flip(array_merge($res|1 ? $permMa : [], $res|2 ? $permStud : [])));
 			$this->_outputAuthError([$this->router->method => $perm]);
 		}
 	}
@@ -110,19 +108,16 @@ 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, $permDefault)
+	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
 	{
-		$res = 8;
-		$isMitarbeiter = false;
-		$isStudent = false;
+		$res = 3;
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
 		$this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
@@ -130,8 +125,7 @@ abstract class Auth_Controller extends FHC_Controller
 		if (hasData($result)) {
 			if ($this->permissionlib->isEntitled(['a' => $permMa], 'a'))
 				return 0;
-			$isMitarbeiter = true;
-			$res += 1;
+			$res = 1;
 		}
 		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
 		$result = $this->PersonModel->load($person_id);
@@ -146,15 +140,8 @@ 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;
 	}
 

application/core/CI3_Events.php

@@ -35,7 +35,7 @@ class CI3_Events
 			});
 			self::$eventsSorted[$event] = true;
 		}
-
+		
 		foreach (self::$events[$event] as $conf) {
 			$conf[1](...$args);
 		}

application/core/FHCAPI_Controller.php

@@ -266,7 +266,7 @@ class FHCAPI_Controller extends Auth_Controller
 	}
 
 	// ---------------------------------------------------------------
-	// Security Begin
+	// Security
 	// ---------------------------------------------------------------
 
 	/**
@@ -287,31 +287,4 @@ 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');
-		}
-	}
 }

application/core/Notiz_Controller.php

@@ -8,7 +8,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 {
 	const DEFAULT_PERMISSION_R  = 'admin:r';
 	const DEFAULT_PERMISSION_RW = 'admin:rw';
-
+	//public function __construct($zuordnung = 'person/Notizzuordnung_model')
 	public function __construct($permissions)
 	{
 		$default_permissions = [
@@ -97,13 +97,13 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess(getData($result) ?: []);
+		return $this->terminateWithSuccess(getData($result) ?: []);
 	}
 
 
 	//Override function
 	protected function isBerechtigt($id, $typeId){
-		$this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
+		return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
 	}
 
 	public function loadNotiz()
@@ -112,6 +112,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$notiz_id = $this->input->post('notiz_id');
 
+		//$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
 		$this->NotizModel->addSelect('*');
 		$this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum 
@@ -142,9 +143,14 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$uid = getAuthUID();
 
-		$json = $this->input->post('data');
-		$post_data = json_decode($json, true);
-		$this->form_validation->set_data($post_data);
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -160,25 +166,26 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$titel =  $post_data['titel'];
-		$text = $post_data['text'];
-		$erledigt = $post_data['erledigt'];
-		$bearbeiter_uid = isset($post_data['bearbeiter']) ? $post_data['bearbeiter'] : null;
-		$type = $post_data['typeId'];
-		$start = isset($post_data['start']) ? $post_data['start'] : null;
-		$ende = isset($post_data['ende']) ? $post_data['ende'] : null;
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$erledigt = $this->input->post('erledigt');
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
+		$type = $this->input->post('typeId');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
 
 		// Start DB transaction
 		$this->db->trans_start();
 
 		//Save note
-		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $uid,
-			"insertvon" => $uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
+		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
+			"insertvon" => $verfasser_uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
 
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		$notiz_id = $result->retval;
@@ -213,7 +220,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			if (isError($result))
 			{
 				$this->db->trans_rollback();
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			$dms_id_arr[] = $result->retval['dms_id'];
 		}
@@ -228,28 +235,34 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				if (isError($result))
 				{
 					$this->db->trans_rollback();
-					$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 			}
 		}
 		$this->db->trans_commit();
-		$this->terminateWithSuccess($result);
+		return $this->terminateWithSuccess($result);
 	}
 
 	public function updateNotiz()
 	{
-
 		$this->load->library('form_validation');
 		$this->load->library('DmsLib');
 
-		$json = $this->input->post('data');
-		$post_data = json_decode($json, true);
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
 
-		$this->form_validation->set_data($post_data);
+		$notiz_id = $this->input->post('notiz_id');
 
-		$this->form_validation->set_rules('notiz_id', 'Notiz ID', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'notiz_id'])
-		]);
+		if(!$notiz_id)
+		{
+			$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -267,23 +280,25 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		//update Notiz
 		$uid = getAuthUID();
-		$titel = $post_data['titel'];
-		$text = $post_data['text'];
-		$bearbeiter_uid = isset($post_data['bearbeiter']) ? $post_data['bearbeiter'] : $post_data['bearbeiter_uid'];
-		$erledigt = $post_data['erledigt'];
-		$start = $post_data['start'];
-		$ende = $post_data['ende'];
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
+		$erledigt = $this->input->post('erledigt');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
 
 		$result = $this->NotizModel->update(
 			[
-				'notiz_id' => $post_data['notiz_id'],
+				'notiz_id' => $notiz_id
 			],
 			[
 				'titel' =>  $titel,
 				'updatevon' => $uid,
 				'updateamum' => date('c'),
 				'text' => $text,
-				'bearbeiter_uid' => isEmptyString($bearbeiter_uid) ? null : $bearbeiter_uid,
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
 				'start' => $start,
 				'ende' => $ende,
 				'erledigt' => $erledigt
@@ -291,7 +306,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		);
 		if (isError($result))
 		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		//update(1) loading all dms-entries with this notiz_id
@@ -299,7 +314,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
 
-		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $post_data['notiz_id']));
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
 		$result = $this->getDataOrTerminateWithError($result);
 		foreach ($result as $doc) {
 			$dms_id_arr[$doc->dms_id] = array(
@@ -336,7 +351,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				$result = $this->getDataOrTerminateWithError($result);
 				$dms_id = $result['dms_id'];
 
-				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $post_data['notiz_id'], 'dms_id' => $dms_id));
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
 
 				$this->getDataOrTerminateWithError($result);
 			}
@@ -350,7 +365,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->getDataOrTerminateWithError($result);
 		}
 
-		$this->terminateWithSuccess($result);
+		return $this->terminateWithSuccess($result);
 	}
 
 	public function deleteNotiz()
@@ -401,15 +416,15 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		if(!hasData($result))
 		{
-			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->db->trans_complete();
-		$this->terminateWithSuccess(getData($result));
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function loadDokumente()
@@ -425,14 +440,14 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			array('public.tbl_notiz.notiz_id' => $notiz_id)
 		);
 		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		if(!hasData($result))
 		{
-			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess(getData($result));
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function getMitarbeiter($searchString)
@@ -442,7 +457,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess($result);
+		return $this->terminateWithSuccess($result);
 	}
 
 	public function getCountNotes($person_id)
@@ -461,4 +476,4 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		return $this->terminateWithSuccess($anzahl->anzahl ?: 0);
 	}
 
-}
+}

application/helpers/hlp_common_helper.php

@@ -91,7 +91,7 @@ function var_dump_to_error_log($parameter)
 	var_dump($parameter); // KEEP IT!!!
 	$ob_get_contents = ob_get_contents();
 	ob_end_clean();
-	error_log(str_replace("\n", '', $ob_get_contents) . ', referer: ' . "http".(!empty($_SERVER['HTTPS'])?"s":"")."://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']); // KEEP IT!!!
+	error_log(str_replace("\n", '', $ob_get_contents)); // KEEP IT!!!
 }
 
 /**
@@ -408,6 +408,22 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
 	return null;
 }
 
+/**
+ * check if String can be converted to a date
+ */
+function isValidDate($dateString)
+{
+	try
+	{
+		return (new DateTime($dateString)) !== false;
+	}
+	catch(Exception $e)
+	{
+		return false;
+	}
+}
+
+
 // ------------------------------------------------------------------------
 // PHP functions that don't exist in older versions
 // ------------------------------------------------------------------------
@@ -430,8 +446,7 @@ if (!function_exists('array_is_list')) {
 // ------------------------------------------------------------------------
 
 /**
- * Check if the provided parameter is a string containing a valid date
- * NOTE: the name is in the "snake case" format because othewise the CI form validation _cannot_ use it
+ * check if string can be converted to a date
  */
 function is_valid_date($dateString)
 {
@@ -500,73 +515,3 @@ 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
-		];
-
-}

application/helpers/hlp_header_helper.php

@@ -185,15 +185,7 @@ function generateJSModulesInclude($JSModules)
 
 		for ($tmpJSsCounter = 0; $tmpJSsCounter < count($tmpJSs); $tmpJSsCounter++)
 		{
-			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;
-			}
+			$toPrint = sprintf($jsInclude, base_url($tmpJSs[$tmpJSsCounter].$cachetoken)).PHP_EOL;
 
 			if ($tmpJSsCounter > 0) $toPrint = "\t\t".$toPrint;
 
@@ -254,214 +246,3 @@ 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;
-}
-
-/*
- * Manipulate CI views includes Array to load
- *   - public/js/FhcApps.js via customJSs and
- *   - app customisation js and/or css from extensions via customJSModules
- * if customJSModules contains at least one vuejs app and customisation files
- * exist in extensions
- */
-class ExtendableAppsHelper
-{
-	private static $instance = null;
-
-	protected $extensions;
-
-	protected $customCSSs;
-	protected $customJSs;
-	protected $customJSModules;
-
-	protected $initialised;
-	protected $appscount;
-
-	protected $extCustomCSSs;
-	protected $extCustomJSs;
-	protected $extCustomJSModules;
-
-	private function __construct()
-	{
-		$this->extensions = array();
-		$this->customCSSs = null;
-		$this->customJSs = null;
-		$this->customJSModules = null;
-
-		$this->initialised = false;
-		$this->appscount = 0;
-
-		$this->extCustomCSSs = null;
-		$this->extCustomJSs = null;
-		$this->extCustomJSModules = null;
-	}
-
-	public static function getInstance()
-	{
-		if(self::$instance === null)
-		{
-			self::$instance = new ExtendableAppsHelper();
-		}
-		return self::$instance;
-	}
-
-	public function init($customCSSs, $customJSs, $customJSModules)
-	{
-		if($this->initialised)
-		{
-			return;
-		}
-
-		$this->customCSSs = $customCSSs;
-		$this->customJSs = $customJSs;
-		$this->customJSModules = $customJSModules;
-		$this->initialised = true;
-
-		if(!isset($this->customJSModules))
-		{
-			return;
-		}
-
-		if(!is_array($this->customJSModules))
-		{
-			$this->customJSModules = array($this->customJSModules);
-		}
-
-		if(count($this->customJSModules) < 1)
-		{
-			return;
-		}
-
-		$this->buildExtensionsList();
-		$this->prepareExtendedArrays();
-	}
-
-	public function getCustomCSSs()
-	{
-		if(is_null($this->extCustomCSSs))
-		{
-			return $this->customCSSs;
-		}
-		return $this->extCustomCSSs;
-	}
-
-	public function getCustomJSs()
-	{
-		if(is_null($this->extCustomJSs))
-		{
-			return $this->customJSs;
-		}
-		return $this->extCustomJSs;
-	}
-
-	public function getCustomJSModules()
-	{
-		if(is_null($this->extCustomJSModules))
-		{
-			return $this->customJSModules;
-		}
-		return $this->extCustomJSModules;
-	}
-
-	protected function buildExtensionsList()
-	{
-		$this->extensions = array();
-		$fsiterator = new FilesystemIterator(FHCPATH . 'application/extensions');
-		foreach ($fsiterator as $fsitem)
-		{
-			if(preg_match('/^FHC-Core-/', $fsitem->getBasename()))
-			{
-				$this->extensions[] = $fsitem->getBasename();
-			}
-		}
-	}
-
-	protected function prepareExtendedArrays()
-	{
-		$this->appscount = 0;
-		$this->initExtCustomCSSs();
-		$this->extCustomJSModules = array();
-		foreach($this->customJSModules as $item)
-		{
-			$matches = array();
-			if(preg_match('#^public/(extensions/FHC-Core-.+)?js/apps/(.*)\.js$#', $item, $matches))
-			{
-				$this->appscount++;
-
-				$fhcextension = $matches[1];
-				$app = $matches[2];
-
-				$extend_js_suffix = 'js/extend_app/' . $fhcextension . $app . '.js';
-				$extend_css_suffix = 'css/extend_app/' . $fhcextension . $app . '.css';
-
-				foreach($this->extensions as $extension)
-				{
-					$extend_js = 'public/extensions/' . $extension . '/' . $extend_js_suffix;
-					$extend_css = 'public/extensions/' . $extension . '/' . $extend_css_suffix;
-
-					if(is_readable(FHCPATH . $extend_js))
-					{
-						array_push($this->extCustomJSModules, $extend_js);
-					}
-
-					if(is_readable(FHCPATH . $extend_css))
-					{
-						array_push($this->extCustomCSSs, $extend_css);
-					}
-				}
-			}
-			array_push($this->extCustomJSModules, $item);
-		}
-
-		if($this->appscount > 0)
-		{
-			$this->addFhcAppsJs();
-		}
-	}
-
-	protected function initExtCustomCSSs()
-	{
-		if(!isset($this->customCSSs))
-		{
-			$this->extCustomCSSs = array();
-		}
-		elseif(!is_array($this->customCSSs))
-		{
-			$this->extCustomCSSs = array($this->customCSSs);
-		}
-		else
-		{
-			$this->extCustomCSSs = $this->customCSSs;
-		}
-	}
-
-	protected function addFhcAppsJs()
-	{
-		if(!isset($this->customJSs))
-		{
-			$this->extCustomJSs = array();
-		}
-		elseif(!is_array($this->customJSs))
-		{
-			$this->extCustomJSs = array($this->customJSs);
-		}
-		else
-		{
-			$this->extCustomJSs = $this->customJSs;
-		}
-		array_push($this->extCustomJSs, 'public/js/FhcApps.js');
-	}
-}

application/language/english/form_validation_lang.php

@@ -41,4 +41,3 @@ 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.';

application/libraries/DocsboxLib.php

@@ -180,8 +180,7 @@ class DocsboxLib
 					}
 					// Just started or still working on it
 					elseif ($getStatusResponse->body->status == self::STATUS_WORKING
-						|| $getStatusResponse->body->status == self::STATUS_STARTED
-						|| $getStatusResponse->body->status == self::STATUS_QUEUED)
+						|| $getStatusResponse->body->status == self::STATUS_STARTED)
 					{
 						// go on!
 					}

application/libraries/FilterCmptLib.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2025 fhcomplete.org
+ * Copyright (C) 2022 fhcomplete.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -177,7 +177,7 @@ class FilterCmptLib
 		$session = $this->getSession();
 
 		// If session is NOT empty -> a filter was already loaded
-		if (!isError($session) && $session != null)
+		if ($session != null)
 		{
 			// Retrieve the filterId stored in the session
 			$sessionFilterId = $this->_getSessionElement(FilterCmptLib::FILTER_ID);
@@ -219,7 +219,9 @@ class FilterCmptLib
 				}
 			}
 		}
-		else
+
+		// If the session is empty -> first time that this filter is loaded
+		if ($session == null)
 		{
 			// Load filter definition data from DB
 			$definition = $this->_loadDefinition(
@@ -600,7 +602,7 @@ class FilterCmptLib
 	{
 		$session = getSessionElement(self::SESSION_NAME, $this->_filterUniqueId);
 
-		if (!isError($session) && isset($session[$name]))
+		if (isset($session[$name]))
 		{
 			return $session[$name];
 		}
@@ -621,7 +623,7 @@ class FilterCmptLib
 
 		if (!$this->_ci->permissionlib->hasAtLeastOne($this->_requiredPermissions, self::PERMISSION_FILTER_METHOD, self::PERMISSION_TYPE))
 		{
-			$this->_setSession(error('The required permission is not held by the logged user'));
+			$this->_setSession(error('The required permission is not help by the logged user'));
 			return false;
 		}
 
@@ -902,7 +904,7 @@ class FilterCmptLib
 		$filterCmptsSession = getSession(self::SESSION_NAME);
 
 		// If something is present in session
-		if (!isError($filterCmptsSession) && $filterCmptsSession != null)
+		if ($filterCmptsSession != null)
 		{
 			// Loops in the session for all the filter components
 			foreach ($filterCmptsSession as $filterCmpt => $filterCmptData)
@@ -949,11 +951,9 @@ class FilterCmptLib
 	{
 		$session = getSessionElement(self::SESSION_NAME, $this->_filterUniqueId);
 
-		if (!isError($session) && $session != null)
-		{
-			$session[$name] = $value;
-			setSessionElement(self::SESSION_NAME, $this->_filterUniqueId, $session); // stores the single value
-		}
+		$session[$name] = $value;
+
+		setSessionElement(self::SESSION_NAME, $this->_filterUniqueId, $session); // stores the single value
 	}
 
 	/**
@@ -965,7 +965,7 @@ class FilterCmptLib
 		$filterCmptsSession = getSession(self::SESSION_NAME);
 
 		// If something is present in session
-		if (!isError($filterCmptsSession) && $filterCmptsSession != null)
+		if ($filterCmptsSession != null)
 		{
 			// Loops in the session for all the filter components
 			foreach ($filterCmptsSession as $filterCmpt => $filterCmptData)
@@ -1174,4 +1174,3 @@ class FilterCmptLib
 		return $filterName;
 	}
 }
-

application/libraries/LektorLib.php

@@ -17,7 +17,6 @@ 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)
@@ -36,7 +35,7 @@ class LektorLib
 
 		if (isError($already_assigned)) return $already_assigned;
 
-		if (hasData($already_assigned)) return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));
+		if (hasData($already_assigned)) return error('Lektor already assigned');
 
 		$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz' => $lehreinheit->studiensemester_kurzbz));
 		if (isError($studiensemester_result)) return $studiensemester_result;
@@ -89,7 +88,6 @@ 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)
 		{
@@ -100,13 +98,7 @@ class LektorLib
 			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
 
 			if (hasData($verplant))
-				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"));
-
+				return error('Wechsel vom Mitarbeiter nicht möglich da er bereits verplant ist!');
 		}
 		$warning = '';
 		if (isset($new_data['semesterstunden']))

application/libraries/PrestudentLib.php

@@ -35,90 +35,6 @@ 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,
@@ -687,6 +603,9 @@ 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,
@@ -696,9 +615,8 @@ 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,
@@ -723,7 +641,7 @@ class PrestudentLib
 
 
 		// Generate Alias
-		$alias = null;
+		$alias = '';
 		if (!defined('GENERATE_ALIAS_STUDENT')
 			|| GENERATE_ALIAS_STUDENT === true
 		) {
@@ -971,155 +889,6 @@ 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);

application/libraries/ProfilLib.php

@@ -183,10 +183,7 @@ class ProfilLib{
 		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
 		
 		//? formats date from 01-01-2000 to 01.01.2000
-		if ($zutrittskarte_ausgegebenam !== NULL)
-		{
-			$zutrittskarte_ausgegebenam = (new DateTime($zutrittskarte_ausgegebenam))->format('d.m.Y');
-		}
+		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
 
@@ -199,7 +196,7 @@ class ProfilLib{
 	private function getAdressenInfo($pid)
 	{
 		$this->ci->load->model("person/Adresse_model","AdresseModel");
-		$adresse_res = $this->ci->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "heimatadresse", "zustelladresse", "gemeinde", "nation"]);
+		$adresse_res = $this->ci->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
 		$adresse_res = $this->ci->AdresseModel->addOrder("zustelladresse", "DESC");
 		$adresse_res = $this->ci->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
 

application/libraries/StundenplanLib.php

@@ -229,10 +229,9 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
-
-		if ($is_mitarbeiter && empty($ort_kurzbz)) {
-			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
+		
+		if ($is_mitarbeiter) {
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
 		} else {
 			// querying the reservierungen
 			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);

application/models/accounting/Vertrag_model.php

@@ -402,26 +402,6 @@ 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);
@@ -490,175 +470,6 @@ class Vertrag_model extends DB_Model
         return $bezeichnung;
     }
 
-	/**
-	 * Loads all Contracts of a Person
-	 * @param $person_id
-	 * @return array of objects
-	 */
-	public function loadContractsOfPerson($person_id)
-	{
-		$query = "
-			SELECT
-					*,
-					tbl_vertrag.bezeichnung as bezeichnung,
-					tbl_vertragstyp.bezeichnung as vertragstyp_bezeichnung,
-					tbl_vertrag.vertragsdatum,
-					(SELECT bezeichnung FROM lehre.tbl_vertragsstatus 
-					JOIN lehre.tbl_vertrag_vertragsstatus USING(vertragsstatus_kurzbz)
-						WHERE vertrag_id=tbl_vertrag.vertrag_id ORDER BY datum desc limit 1) as status, anmerkung,
-			    CASE
-					WHEN EXISTS (
-						SELECT 1
-						FROM lehre.tbl_vertrag_vertragsstatus
-						WHERE vertrag_id = tbl_vertrag.vertrag_id
-						AND vertragsstatus_kurzbz = 'abgerechnet'
-					) THEN true 
-					ELSE false
-				END AS isAbgerechnet
-				FROM
-					lehre.tbl_vertrag
-					LEFT JOIN lehre.tbl_vertragstyp USING(vertragstyp_kurzbz)
-				WHERE person_id= ?";
-
-
-		return $this->execQuery($query, array($person_id));
-	}
-
-	/**
-	 * Loads all Contracts of a Person that are not assigned yet
-	 * @param $person_id
-	 * @return array of objects
-	 */
-	public function loadContractsOfPersonNotAssigned($person_id)
-	{
-		$query = "
-SELECT
-			'Lehrauftrag' as type,
-			lehreinheit_id,
-			mitarbeiter_uid,
-			null as pruefung_id,
-			null as projektarbeit_id,
-			(tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag1,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			null as betreuerart_kurzbz,
-			(	SELECT
-					upper(tbl_studiengang.typ || tbl_studiengang.kurzbz) || tbl_lehrveranstaltung.semester  || '-' || tbl_lehrveranstaltung.kurzbz || '-' || tbl_lehreinheit.lehrform_kurzbz
-				FROM
-					lehre.tbl_lehrveranstaltung
-					JOIN public.tbl_studiengang USING(studiengang_kz)
-				WHERE
-					lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id)
-			as bezeichnung
-		FROM
-			lehre.tbl_lehreinheitmitarbeiter
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			mitarbeiter_uid IN (SELECT uid FROM public.tbl_benutzer WHERE person_id=?)
-			AND vertrag_id IS NULL
-		UNION
-		SELECT
-			'Betreuung' as type,
-			tbl_projektarbeit.lehreinheit_id as lehreinheit_id,
-			null as mitarbeiter_uid,
-			null::integer as pruefung_id,
-			projektarbeit_id,
-			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag1,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			tbl_projektbetreuer.betreuerart_kurzbz,
-			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
-			as bezeichnung
-		FROM
-			lehre.tbl_projektbetreuer
-			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			tbl_projektbetreuer.person_id=?
-			AND vertrag_id IS NULL
-				";
-
-		return $this->execQuery($query, array($person_id, $person_id));
-	}
-
-	/**
-	 * Loads all Contracts of a Person that are assigned yet
-	 * @param $person_id, $vertrag_id
-	 * @return array of objects
-	 */
-
-	public function loadContractsOfPersonAssigned($person_id, $vertrag_id)
-	{
-		$query = "
-		SELECT
-			'Lehrauftrag' as type,
-			lehreinheit_id,
-			mitarbeiter_uid,
-			null as pruefung_id,
-			null as projektarbeit_id,
-			(tbl_lehreinheitmitarbeiter.semesterstunden * tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			null as betreuerart_kurzbz,
-			(	SELECT
-					upper(tbl_studiengang.typ || tbl_studiengang.kurzbz) || tbl_lehrveranstaltung.semester  || '-' || tbl_lehrveranstaltung.kurzbz || '-' || tbl_lehreinheit.lehrform_kurzbz
-				FROM
-					lehre.tbl_lehrveranstaltung
-					JOIN public.tbl_studiengang USING(studiengang_kz)
-				WHERE
-					lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id)
-			as bezeichnung, vertrag_id
-		FROM
-			lehre.tbl_lehreinheitmitarbeiter
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			mitarbeiter_uid IN (SELECT uid FROM public.tbl_benutzer WHERE person_id=?)
-			AND vertrag_id = ?
-		UNION
-		SELECT
-			'Betreuung' as type,
-			tbl_projektarbeit.lehreinheit_id as lehreinheit_id,
-			null as mitarbeiter_uid,
-			null::integer as pruefung_id,
-			projektarbeit_id,
-			(tbl_projektbetreuer.stunden * tbl_projektbetreuer.stundensatz) as betrag,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			tbl_projektbetreuer.betreuerart_kurzbz,
-			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
-			as bezeichnung, vertrag_id
-		FROM
-			lehre.tbl_projektbetreuer
-			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			tbl_projektbetreuer.person_id=?
-			AND vertrag_id = ?
-				";
-
-		return $this->execQuery($query, array($person_id, $vertrag_id, $person_id, $vertrag_id));
-	}
-
-	/**
-	 * Returns all stati of a contract
-	 *
-	 * @param $vertrag_id
-	 * @return array
-	 */
-	public function getStatiOfContract($vertrag_id)
-	{
-		$query = " 
-			SELECT
-				*,
-                tbl_vertrag_vertragsstatus.datum,
-                tbl_vertrag_vertragsstatus.insertamum,
-                tbl_vertrag_vertragsstatus.updateamum
-			FROM
-				lehre.tbl_vertrag_vertragsstatus
-				JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
-			WHERE
-				tbl_vertrag_vertragsstatus.vertrag_id = ?
-			ORDER BY tbl_vertrag_vertragsstatus.datum DESC";
-
-		return $this->execQuery($query, array($vertrag_id));
-	}
-
 	private function _updateVertragRelevant($vertrag_id)
 	{
 		$this->LehreinheitmitarbeiterModel->update(

application/models/accounting/Vertragstyp_model.php

@@ -11,5 +11,4 @@ class Vertragstyp_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_vertragstyp';
 		$this->pk = 'vertragstyp_kurzbz';
 	}
-
 }

application/models/accounting/Vertragvertragsstatus_model.php

@@ -190,6 +190,4 @@ class Vertragvertragsstatus_model extends DB_Model
 		
 		return $this->loadWhere($condition);
 	}
-
-
 }

application/models/crm/Prestudent_model.php

@@ -1,7 +1,5 @@
 <?php
 
-use CI3_Events as Events;
-
 class Prestudent_model extends DB_Model
 {
 	/**
@@ -784,118 +782,4 @@ 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;
-	}
 }

application/models/crm/Prestudentstatus_model.php

@@ -290,11 +290,7 @@ class Prestudentstatus_model extends DB_Model
 	 */
 	public function getLastStatusPerson($person_id, $studiensemester_kurzbz = null)
 	{
-		$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
+		$query = 'SELECT *
 					FROM public.tbl_prestudent p
 					JOIN (
 							SELECT DISTINCT ON(prestudent_id) *
@@ -302,8 +298,7 @@ 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 s USING(status_kurzbz)
-					JOIN public.tbl_studiengang stg USING (studiengang_kz)';
+					JOIN public.tbl_status USING(status_kurzbz)';
 
 		$parametersArray = array($person_id);
 

application/models/crm/Reihungstest_model.php

@@ -10,7 +10,7 @@ class Reihungstest_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'public.tbl_reihungstest';
 		$this->pk = 'reihungstest_id';
-	}
+	}	
 	
 	/**
 	 * Gets a test from a test id only if it is available
@@ -42,8 +42,8 @@ class Reihungstest_model extends DB_Model
 	/**
 	 * Checks if there are active studyplans which have no public placement tests assigned yet.
 	 * Only check assignment to studyplans that are
-	 *	- Bachelor,
-	 *	- active,
+	 *	- Bachelor, 
+	 *	- active, 
 	 *	- set as online application
 	 *  - valid for 1st terms
 	 * @return array Returns object array with studyplans that have no public placement tests assigned yet.
@@ -97,7 +97,7 @@ class Reihungstest_model extends DB_Model
 					USING (reihungstest_id)
 				WHERE 
 					datum >= now() 
-				AND
+				AND 
 					oeffentlich = \'t\'
 				)
 			';
@@ -105,7 +105,7 @@ class Reihungstest_model extends DB_Model
 		return $this->execQuery($query);
 	}
 	
-	/**
+	/**	
 	 *  Gets amount of free places.
 	 * @return array Returns object array with faculty and amount of free places
 	 * for each public actual placement test date.
@@ -432,10 +432,10 @@ class Reihungstest_model extends DB_Model
 	}
 
 	/**
-	 * Loads all applicants of a placement test
-	 * @param integer $reihungstest_id ID of placement test
-	 * @return array Returns object array with data of applicants.
-	 */
+ * Loads all applicants of a placement test
+ * @param integer $reihungstest_id ID of placement test
+ * @return array Returns object array with data of applicants.
+ */
 	public function getApplicantsOfPlacementTest($reihungstest_id)
 	{
 		$query = '
@@ -556,22 +556,13 @@ class Reihungstest_model extends DB_Model
 	 * Calculates Result of Placement Test for a given Person and given placementtest
 	 * and with taking account of weighting per area
 	 *
-	 * @param Number $person_id ID of Person
-	 * @param Boolean $punkte if true result is points else result is percentage of sum
-	 * @param Number $reihungstest_id ID of Placementtest
-	 * @param Array $weightedArray array of weighting per area (gewicht per gebiet_id)
-	 * @param Boolean $has_excluded_gebiete if true, areas in the configArray will be excluded
-	 * @param Array $basis_gebiet_id_toString areas to exclude
-	 * @return float result points of RT
+	 * @param $person_id ID of Person
+	 * @param $punkte if true result is points else result is percentage of sum
+	 * @param $reihungstest_id ID of Placementtest
+	 * @param $weightedArray array of weighting per area (gewicht per gebiet_id)
+	 * @return float result
 	 */
-	public function getReihungstestErgebnisPerson(
-		$person_id,
-		$punkte,
-		$reihungstest_id,
-		$weightedArray = null,
-		$has_excluded_gebiete = false,
-		$basis_gebiet_id_toString = null
-	)
+	public function getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray = null)
 	{
 		$parametersArray = array($reihungstest_id);
 
@@ -586,35 +577,6 @@ class Reihungstest_model extends DB_Model
 				WHERE
 					reihungstest_id = ? ";
 
-		//areas of Studiengang
-		if (!empty($basis_gebiet_id_toString))
-		{
-			$qry .= "
-				AND
-					gebiet_id IN (". $basis_gebiet_id_toString. ")
-			";
-		}
-
-		//areas to exclude
-		if($has_excluded_gebiete)
-		{
-			if (defined('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE') && !empty(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE))
-			{
-				$excluded_gebiete = unserialize(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE);
-				$exclude_gebiet_id_arr = $excluded_gebiete;
-				if (is_array($exclude_gebiet_id_arr) && count($exclude_gebiet_id_arr) > 0)
-				{
-					$exclude_gebiet_id_toString = implode(', ', $exclude_gebiet_id_arr);
-					$qry .= "
-							AND
-								gebiet_id NOT IN (". $exclude_gebiet_id_toString. ")
-						--	AND
-						--		typ = 'b'
-						";
-				}
-			}
-		}
-
 		//using prestudent Status to avoid to get the sum of more than 1 placement tests
 		$qry .= "
 				AND prestudent_id = (

application/models/crm/Student_model.php

@@ -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(trim(getData($matrikelnrres)[0]->matrikelnr), -3);
+			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
 			if (!is_numeric($max)) {
 				$max = (int)$max;
 			}
@@ -279,12 +279,4 @@ 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));
-	}
 }

application/models/education/Lehreinheit_model.php

@@ -651,13 +651,7 @@ 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)

application/models/education/Lehreinheitgruppe_model.php

@@ -374,7 +374,7 @@ class Lehreinheitgruppe_model extends DB_Model
 			return success('Group assigned successfully to Lehreinheit');
 		}
 		else
-			return error($this->p->t('lehre', 'grpbereitszugeteilt'));
+			return error('Group already assigned');
 	}
 
 	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($this->p->t('lehre', 'grpbereitsverplant'));
+			return error('Gruppe already verplant');
 
 		$delete_result = $this->delete($lehreinheitgruppe_id);
 

application/models/education/Lehrveranstaltung_model.php

@@ -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,
-			tbl_student.prestudent_id
+			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
+
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN public.tbl_benutzer USING(uid)
@@ -386,37 +386,6 @@ 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
@@ -1286,61 +1255,4 @@ 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);
-	}
 }

application/models/education/Note_model.php

@@ -11,12 +11,4 @@ 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);
-	}
 }

application/models/education/Paabgabe_model.php

@@ -60,69 +60,5 @@ 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, $relevantTypes = null) {
-		
-		$queryParams = [$interval];
-		$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,
-					   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 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 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 ?";
-		
-		if($relevantTypes !== null) {
-			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-			$queryParams[]= $relevantTypes;
-		}
-
-		$query .= " ORDER BY abgabedatum DESC";
-
-		return $this->execQuery($query, $queryParams);
-	}
 	
-	public function loadByIDs($paabgabe_ids) {
-		$qry = "SELECT * FROM campus.tbl_paabgabe WHERE paabgabe_id IN ?";
-		
-		return $this->execReadOnlyQuery($qry, [$paabgabe_ids]);
-	}
 }

application/models/education/Paabgabetyp_model.php

@@ -11,10 +11,4 @@ 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);
-	}
 }