Merge branch 'master' into bug-69092/Messages_API_getDataVorlage

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,28 +6,19 @@ 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'
-	);
-});
-
-Events::on('loadRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["slot_room"] = array(
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Slot/roomModalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Slot/roomModalContent.js',
+		'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'
 	);
 });
@@ -35,10 +26,10 @@ Events::on('loadRenderers', function ($renderers) {
 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'
 				)
 			)
 		),
@@ -208,14 +201,7 @@ $config['navigation_header'] = array(
                     'expand' => true,
                     'sort' => 30,
                     'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                ),
-				'dashboardadmin' => array(
-					'link' => site_url('dashboard/Admin'),
-					'description' => 'Dashboard Admin',
-					'expand' => true,
-					'sort' => 40,
-					'requiredPermissions' => 'dashboard/admin:r'
-				)
+                )
 			)
 		)
 	)
@@ -349,18 +335,6 @@ $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'] = [

application/config/noten.php

@@ -1,6 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-// 'entschuldigt' & 'noch nicht eingetragen' -> wirken sich nicht auf Antritte aus
-$config['NOTEN_OHNE_ANTRITT'] = [9, 17]; // tbl_note pk

application/config/routes.php

@@ -64,17 +64,6 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
-$route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
-//Route for LV Plan Stg/Semester/Verband/Gruppe
-$route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
-$route['Cis/Benotungstool/.*'] = 'Cis/Benotungstool/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';

application/config/searchcis.php

@@ -22,9 +22,8 @@ unset($config['student']['searchfields']['email']);
 unset($config['student']['searchfields']['tel']);
 $config['student']['resultfields'] = [
 	"s.student_uid AS uid",
-	"s.matrikelnr AS personenkennzeichen",
+	"s.matrikelnr",
 	"p.person_id",
-	"p.matr_nr AS matrikelnummer",
 	"(p.vorname || ' ' || p.nachname) AS name",
 	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
 	"CASE

application/config/stv.php

@@ -88,14 +88,9 @@ 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']['defaultProjektbetreuerStunden'] = '4.0';
+$config['tabs']['projektarbeit']['defaultProjektbetreuerStundenDiplom'] = '5.0';
+$config['tabs']['projektarbeit']['lvLektroinnenzuteilungFixangestelltStundensatz'] = true;
 $config['tabs']['projektarbeit']['defaultProjektbetreuerStundensatz'] = '80.0';
 
 $config['student_tab_order'] = [
@@ -124,22 +119,8 @@ $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,48 +29,80 @@ class Abgabetool extends Auth_Controller
 	 */
 	public function index()
 	{
-		// TODO: routing from index based on berechtigung?
 
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Abgabetool']);
-		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'Abgabetool']);
-		}
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
 	}
 
-	public function Student($student_uid_prop = '')
+	public function Student()
 	{
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolStudent']);
-		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolStudent', 'student_uid_prop' => $student_uid_prop]);
-		}
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
 	}
 
 	public function Mitarbeiter()
 	{
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolMitarbeiter']);
-		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolMitarbeiter']);
-		}
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
 	}
 
-	public function Assistenz($stg_kz_prop = '')
-	{
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolAssistenz']);
-		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz', 'stg_kz_prop' => $stg_kz_prop]);
-		}
-	}
-	
 	public function Deadlines()
 	{
-		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'DeadlinesOverview']);
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
+	}
+
+
+	public function getStudentProjektarbeitAbgabeFile() 
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->helper('download');
+		
+		$paabgabe_id = $this->_ci->input->get('paabgabe_id');
+		$student_uid = $this->_ci->input->get('student_uid');
+
+		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id) || !isset($student_uid) || isEmptyString($student_uid))
+			$this->terminateWithJsonError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		$isZugeteilterBetreuer = count($this->_ci->ProjektarbeitModel->checkZuordnung($student_uid, getAuthUID())->retval) > 0;
+		
+		if(getAuthUID() == $student_uid || $isZugeteilterBetreuer) {
+			$file_path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
+			if(file_exists($file_path)) {
+				
+				header('Content-Description: File Transfer');
+				header('Content-Type: application/octet-stream');
+				header('Expires: 0');
+				header('Cache-Control: must-revalidate');
+				header('Pragma: public');
+				header('Content-Disposition: attachment; filename="'.basename($file_path).'"');
+				header('Content-Length: ' . filesize($file_path));
+
+				flush(); // send headers first just in case
+				readfile($file_path); // read file content to output buffer
+				
+			} else {
+				$this->terminateWithJsonError('File not found');
+			}
 		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'DeadlinesOverview']);
+			$this->terminateWithJsonError('Keine Zuordnung!');
 		}
 	}
 }

application/controllers/Cis/Auth.php

@@ -40,7 +40,7 @@ class Auth extends FHC_Controller
 
 		if ($this->form_validation->run())
 		{
-			redirect($this->authlib->getLandingPage('/Cis4'));
+			redirect($this->authlib->getLandingPage('/CisVue/Dashboard'));
 		}
 		else
 		{

application/controllers/Cis/LvPlan.php

@@ -28,6 +28,12 @@ class LvPlan extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'LvPlan']);
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'LvPlan']);
 	}
 }

application/controllers/Cis/MyLv.php

@@ -26,6 +26,16 @@ class MyLv extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyLv']);
+		
+		$viewData = array(
+
+		);
+
+		$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/MyLvPlan.php

@@ -27,7 +27,13 @@ class MyLvPlan extends Auth_Controller
 	 * @return void
 	 */
 	public function index()
-	{		
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyLvPlan']);
+	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLvPlan']);
 	}
 }

application/controllers/Cis/OtherLvPlan.php

@@ -1,34 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
-/**
- *
- */
-class OtherLvPlan extends Auth_Controller
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct([
-            'index' => ['basis/other_lv_plan:r']
-        ]);
-
-        // Load Config
-        $this->load->config('calendar');
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-     * @return void
-     */
-    public function index()
-    {
-        $this->load->view('CisRouterView/CisRouterView.php', ['route' => 'OtherLvPlan']);
-    }
-}

application/controllers/Cis/Profil.php

@@ -55,7 +55,15 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilIndex']);
+		
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView(getAuthUID());
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array(
+			'editable'=>true,
+			'profil_data' => $profil_data,
+		);
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilIndex']);
 	}
 
 	/**
@@ -65,13 +73,23 @@ class Profil extends Auth_Controller
 	 */
 	public function View($uid)
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilViewUid']);
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView($uid);
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array (
+			'uid' => $uid,
+			'profil_data'=>$profil_data,
+		);
+		if($uid == getAuthUID()){
+			$viewData['editable'] = true;
+		}
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilViewUid']);
 	}
 
 	/**
-	 * checks whether a specific userID is a student or not (foreword declaration of the function isStudent in Student_model.php)
+	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
-	 * @param  $uid the userID used to check if it is a student
+	 * @param  $uid the userID used to check if it is a mitarbeiter
 	 * @return boolean 
 	 */
 	public function isStudent($uid)
@@ -101,7 +119,7 @@ class Profil extends Auth_Controller
 	}
 
 	/**
-	 * gets the adressen that are marked as zustell from the currently logged in user
+	 * gets the adressen that are marked as zustell from the currenlty logged in user
 	 * @access public
 	 * @return array a list of adresse_id's 
 	 */
@@ -244,23 +262,23 @@ class Profil extends Auth_Controller
 		$this->GemeindeModel->addDistinct();
 		$this->GemeindeModel->addSelect(["name"]);
 		if ($nation == "A") {
-			if (isset($zip) && $zip > 999 && $zip < 32000) {
+				if (isset($zip) && $zip > 999 && $zip < 32000) {
 
-				$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
-				if (isError($gemeinde_res)) {
-					show_error("error while trying to query bis.tbl_gemeinde");
+						$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
+						if (isError($gemeinde_res)) {
+								show_error("error while trying to query bis.tbl_gemeinde");
+						}
+						$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
+						$gemeinde_res = array_map(function ($obj) {
+								return $obj->name;
+						}, $gemeinde_res);
+						echo json_encode($gemeinde_res);
+
+				} else {
+						echo json_encode(error("ortschaftskennziffer code was not valid"));
 				}
-				$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
-				$gemeinde_res = array_map(function ($obj) {
-					return $obj->name;
-				}, $gemeinde_res);
-				echo json_encode($gemeinde_res);
-
-			} else {
-				echo json_encode(error("ortschaftskennziffer code was not valid"));
-			}
 		} else {
-			echo json_encode(error("Nation was not 'A' (Austria)"));
+				echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
 	}
 
@@ -732,4 +750,6 @@ class Profil extends Auth_Controller
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
+
+
 }

application/controllers/Cis/ProjektabgabeUebersicht.php

@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class ProjektabgabeUebersicht extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'ProjektabgabeUebersicht']);
-	}
-}

application/controllers/Cis/Raumsuche.php

@@ -25,6 +25,11 @@ class Raumsuche extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Raumsuche']);
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Raumsuche']);
 	}
 }

application/controllers/Cis/StgOrgLvPlan.php

@@ -1,33 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class StgOrgLvPlan extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'StgOrgLvPlan']);
-	}
-}

application/controllers/Cis/Studium.php

@@ -29,7 +29,10 @@ class Studium extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'studium']);
+		$viewData = array(
+
+		);
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'studium']);
 	}
 
 

application/controllers/Cis/Zeitsperren.php

@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Zeitsperren extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r'],
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * index loads the view Zeitsperren
-	 * @access public
-	 * @return void
-	 */
-	public function index()
-	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'zeitsperren']);
-	}
-}

application/controllers/Cis4.php

@@ -1,7 +1,6 @@
 <?php
 
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  *
@@ -14,9 +13,9 @@ class Cis4 extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct(
-			array(
-				'index' => 'basis/cis:r'
-			)
+		    array(
+			'index' => 'basis/cis:r'
+		    )
 		);
 
 		// Load Config
@@ -31,6 +30,16 @@ class Cis4 extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'FhcDashboard']);
+		$this->load->model('person/Person_model', 'PersonModel');
+		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+		
+		$viewData = array(
+			'uid' => getAuthUID(),
+			'name' => $personData->vorname,
+			'person_id' => $personData->person_id,
+			'timezone' => $this->config->item('timezone')
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'FhcDashboard']);
 	}
 }

application/controllers/CisVue/Dashboard.php

@@ -5,18 +5,18 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  *
  */
-class Benotungstool extends Auth_Controller
+class Dashboard extends Auth_Controller
 {
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-		parent::__construct([
-			'index' => self::PERM_LOGGED
-		]);
-
-		$this->_ci =& get_instance();
+		parent::__construct(
+			array(
+				'index' => 'dashboard/benutzer:r'
+			)
+		);
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -27,11 +27,17 @@ class Benotungstool extends Auth_Controller
 	 */
 	public function index()
 	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
 
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Benotungstool']);
+		$this->load->model('person/Person_model','PersonModel');
+		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+
+		$viewData = array(
+			'uid' => getAuthUID(),
+			'name' => $personData->vorname,
+			'person_id' => $personData->person_id
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData]);
+
 	}
-	
 }

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

@@ -18,8 +18,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-use \DateTime as DateTime;
-
 class Bookmark extends FHCAPI_Controller
 {
 
@@ -30,162 +28,111 @@ class Bookmark extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getBookmarks' => self::PERM_LOGGED,
-			'delete' => self::PERM_LOGGED,
-			'insert' => self::PERM_LOGGED,
+            'delete' => self::PERM_LOGGED,
+            'insert' => self::PERM_LOGGED,
 			'update' => self::PERM_LOGGED,
-			'changeOrder' => self::PERM_LOGGED
-		]);
+        ]);
 
 		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');
 
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
+
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
 	
-	/**
-	 * gets the bookmarks associated to a user
+    /**
+	 * gets the bookmarks associated to a user 
 	 * @access public
 	 * @return void
 	 */
 	public function getBookmarks()
 	{
-		$this->BookmarkModel->addOrder("sort");
+        $this->BookmarkModel->addOrder("bookmark_id");
 		$bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]);
 
-		$bookmarks = $this->getDataOrTerminateWithError($bookmarks);
+        $bookmarks = $this->getDataOrTerminateWithError($bookmarks);
 
-		$this->terminateWithSuccess($bookmarks);
-	}
+        $this->terminateWithSuccess($bookmarks);
+    }
 
-	/**
-	 * deletes bookmark from associated user
+    /**
+	 * deletes bookmark from associated user 
 	 * @access public
 	 * @return void
 	 */
-	public function delete($bookmark_id)
+    public function delete($bookmark_id)
 	{
-		$bookmark = $this->BookmarkModel->load($bookmark_id);
+        $bookmark = $this->BookmarkModel->load($bookmark_id);
 
-		$bookmark = current($this->getDataOrTerminateWithError($bookmark));
+        $bookmark = current($this->getDataOrTerminateWithError($bookmark));
 
-		// only delete bookmark if the user is the owner of the bookmark
-		if ($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')) {
-			$delete_result = $this->BookmarkModel->delete($bookmark_id);
+        // only delete bookmark if the user is the owner of the bookmark
+        if($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')){
 
-			$delete_result = $this->getDataOrTerminateWithError($delete_result);
+            $delete_result = $this->BookmarkModel->delete($bookmark_id);
 
-			$this->terminateWithSuccess($delete_result);
-		} else {
-			$this->_outputAuthError(['delete' => ['admin:rw']]);
-		}
-	}
+            $delete_result = $this->getDataOrTerminateWithError($delete_result);
 
-	/**
-	 * inserts new bookmark into the bookmark table
+            $this->terminateWithSuccess($delete_result);
+        }else{
+            $this->_outputAuthError(['delete' => ['admin:rw']]);
+        }
+    }
+
+    /**
+	 * inserts new bookmark into the bookmark table 
 	 * @access public
 	 * @return void
 	 */
-	public function insert()
+    public function insert()
 	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
-		$this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+        $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		$url = $this->input->post('url', true);
-		$title = $this->input->post('title', true);
-		$tag = $this->input->post('tag', true);
-		if (is_array($tag)) {
-			$tag = json_encode($tag); // convert PHP array to JSON string
-		}
-		$sort = $this->input->post('sort', true);
+        $url = $this->input->post('url',true);
+        $title = $this->input->post('title',true);
+        $tag = $this->input->post('tag', true);
 
-		$insert_into_result = $this->BookmarkModel->insert([
-			'uid' => $this->uid,
-			'url' => $url,
-			'title' => $title,
-			'tag' => $tag,
-			'insertvon' => $this->uid,
-			'updateamum' => null,
-			'updatevon' => null,
-			'sort' => $sort
-		]);
+        $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL]);
 
-		$insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
+        $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
 
-		$this->terminateWithSuccess($insert_into_result);
-	}
+        $this->terminateWithSuccess($insert_into_result);
+
+    }
 
 	/**
-	 * updates bookmark in the bookmark table
+	 * updates bookmark in the bookmark table 
 	 * @access public
 	 * @return void
 	 */
-	public function update($bookmark_id)
+    public function update($bookmark_id)
 	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
-		$this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+        $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		$url = $this->input->post('url', true);
-		$title = $this->input->post('title', true);
-		$tag = $this->input->post('tag', true);
-		if (is_array($tag)) {
-			$tag = json_encode($tag);
-		}
+        $url = $this->input->post('url',true);
+        $title = $this->input->post('title',true);
 
 		$now = new DateTime();
 		$now = $now->format('Y-m-d H:i:s');
 
-		$update_result = $this->BookmarkModel->update($bookmark_id, [
-			'url' => $url,
-			'title' => $title,
-			'tag' => $tag,
-			'updateamum' => $now
-		]);
+        $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title,'updateamum'=>$now]);
 
-		$update_result = $this->getDataOrTerminateWithError($update_result);
+        $update_result = $this->getDataOrTerminateWithError($update_result);
 
-		$this->terminateWithSuccess($update_result);
-	}
+        $this->terminateWithSuccess($update_result);
 
-	/**
-	 * changes sort of two bookmarks in the bookmark table
-	 * @access public
-	 * @return void
-	 */
-	public function changeOrder($bookmark_id1, $bookmark_id2)
-	{
-		$update_result = [];
-
-		$result1 = $this->BookmarkModel->load($bookmark_id1);
-		$data1 = $this->getDataOrTerminateWithError($result1);
-		$sort1 = current($data1)->sort;
-
-		$result2 = $this->BookmarkModel->load(["bookmark_id"=>$bookmark_id2]);
-		$data2 = $this->getDataOrTerminateWithError($result2);
-		$sort2 = current($data2)->sort;
-
-		$update_result1 = $this->BookmarkModel->update($bookmark_id1, [
-			'sort' => $sort2
-		]);
-		$update_result[] = $this->getDataOrTerminateWithError($update_result1);
-
-		$update_result2 = $this->BookmarkModel->update($bookmark_id2, [
-			'sort' => $sort1
-		]);
-		$update_result[] = $this->getDataOrTerminateWithError($update_result2);
-
-		$this->terminateWithSuccess($update_result);
-	}
+    }
 }
 

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

@@ -27,7 +27,7 @@ class Cis4FhcApi extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'dashboardViewData' => self::PERM_LOGGED,
+			'getViewData' => self::PERM_LOGGED,
 		]);
 		
 	}
@@ -36,22 +36,17 @@ class Cis4FhcApi extends FHCAPI_Controller
 	// Public methods
 
 	/**
-     * retrieves view data for dashboard view
-     * @access public
-     * @param  $uid the userID for which profile is being viewed, null or missing value implies one's own profile
-     */
-	public function dashboardViewData()
+	 * fetches ViewData
+	 */
+	public function getViewData()
 	{
 		$this->load->model('person/Person_model','PersonModel');
 		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
 
-		$this->load->config('calendar');
-
 		$viewData = array(
 			'uid' => getAuthUID(),
 			'name' => $personData->vorname,
-			'person_id' => $personData->person_id,
-			'timezone' => $this->config->item('timezone'),
+			'person_id' => $personData->person_id
 		);
 
 		$this->terminateWithSuccess($viewData);

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

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 
 class CisMenu extends FHCAPI_Controller
 {
-
+	
 	/**
 	 * Object initialization
 	 */
@@ -32,95 +31,28 @@ class CisMenu extends FHCAPI_Controller
 			'getMenu' => self::PERM_LOGGED,
 		]);
 
-
+		
 
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	/**
+    /**
 	 * fetches the menu for CIS from the database based on the userLanguage
 	 */
-	public function getMenu()
+    public function getMenu()
 	{
 		$this->load->model('content/Content_model', 'ContentModel');
 		$this->load->config('cis');
-		$cis4_content_id = $this->config->item('cis_menu_root_content_id');
-		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(), getUserLanguage());
+		$cis4_content_id =$this->config->item('cis_menu_root_content_id');
+		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(),getUserLanguage());
 		$result = $this->getDataOrTerminateWithError($result);
 		$menu = $result->childs ?? [];
-
-		$menu = $this->generateUrlsForMenuItems($menu);
 		$this->terminateWithSuccess($menu);
-	}
-
-	private function generateUrlsForMenuItems($menuItems)
-	{
-		return array_map(
-			function ($menuItem) {
-				return $this->generateUrlForMenuItem($menuItem);
-			},
-			$menuItems
-		);
-	}
-
-	private function generateUrlForMenuItem($menuItem)
-	{
-		$menuItem->url = $this->menuItemUrlHelper($menuItem);
-		unset($menuItem->content);
-
-		if ($menuItem->childs && count($menuItem->childs)) {
-			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
-		}
-
-		return $menuItem;
-	}
-
-	private function menuItemUrlHelper($menuItem)
-	{
-		if ($menuItem->template_kurzbz !== 'redirect') {
-			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
-		}
-
-		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
-			return '';
-		}
-
-		$doc = new DOMDocument();
-		$doc->loadXML($menuItem->content);
-		$urlElem = $doc->getElementsByTagName('url')->item(0);
-
-		if (!$urlElem) {
-			return '';
-		}
-
-		$url = $urlElem->textContent;
-
-		if (strpos($url, '../cms/news.php') !== false) {
-			$newsRegex = '/^\.\.\/cms\/news\.php/';
-			$url = preg_replace($newsRegex, site_url("/CisVue/Cms/news"), $url);
-		}
-
-		if (strpos($url, '../cms/content.php?') !== false) {
-			$contentRegex = '/^\.\.\/cms\/content\.php\?content_id=([0-9]+)/';
-			$matches = [];
-			preg_match($contentRegex, $url, $matches);
-			$url = site_url('/CisVue/Cms/content/' . $matches[1]);
-		}
-
-		if (strpos($url, '../index.ci.php') !== false) {
-			$indexRegex = '/^\.\.\/index\.ci\.php/';
-			$url = preg_replace($indexRegex, site_url(), $url);
-		}
-
-		if (strpos($url, '../') !== false) {
-			$relativeRegex = '/^\.\.\//';
-			$url = preg_replace($relativeRegex, base_url(), $url);
-		}
-
-		return $url;
-	}
+    }
 
+	
+	
 }
 

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

@@ -18,9 +18,18 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+//require_once('../../../include/studiengang.class.php');
+//require_once('../../../include/student.class.php');
+//require_once('../../../include/datum.class.php');
+//require_once('../../../include/mail.class.php');
+//require_once('../../../include/benutzerberechtigung.class.php');
+//require_once('../../../include/phrasen.class.php');
+//require_once('../../../include/projektarbeit.class.php');
+//require_once('../../../include/projektbetreuer.class.php');
+
 class Lehre extends FHCAPI_Controller
 {
-
+	
 	/**
 	 * Object initialization
 	 */
@@ -30,9 +39,15 @@ class Lehre extends FHCAPI_Controller
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
 			'Pruefungen' => self::PERM_LOGGED,
-			'semesterAverageGrade' => self::PERM_LOGGED,
-			'getZugewieseneLv' => self::PERM_LOGGED,
-			'getLeForLv' => 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');
@@ -46,7 +61,7 @@ class Lehre extends FHCAPI_Controller
 		);
 
 		$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');
@@ -56,31 +71,31 @@ class Lehre extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	/**
+    /**
 	 * constructs the emails of the groups from a lehrveranstaltung
 	 */
-	public function lvStudentenMail()
+    public function lvStudentenMail()
 	{
-		$lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
+        $lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
+        
+        // return early if the required parameter is missing
+        if(!isset($lehreinheit_id))
+        {
+            $this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
+        }
 
-		// return early if the required parameter is missing
-		if(!isset($lehreinheit_id))
-		{
-			$this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
-		}
+        $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+        
+        $studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
 
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		$studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
-
-		$studentenMails = $this->getDataOrTerminateWithError($studentenMails);
+        $studentenMails = $this->getDataOrTerminateWithError($studentenMails);
 
 		//convert array of objects into array of strings
 		$studentenMails = array_map(function($element){
 			return $element->mail;
 		}, $studentenMails);
 
-		$this->terminateWithSuccess($studentenMails);
+        $this->terminateWithSuccess($studentenMails);
 	}
 
 	public function LV($studiensemester_kurzbz, $lehrveranstaltung_id)
@@ -90,13 +105,13 @@ class Lehre extends FHCAPI_Controller
 		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage(), $lehrveranstaltung_id);
 
 		$result = current($this->getDataOrTerminateWithError($result));
-
+		
 		$this->terminateWithSuccess($result);
 	}
 
 	/**
 	 * fetches all Pruefungen of a student for a specific lehrveranstaltung
-	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database
+	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database 
 	 * @param mixed $lehrveranstaltung_id
 	 * @return void
 	 */
@@ -112,88 +127,555 @@ class Lehre extends FHCAPI_Controller
 	}
 
 	/**
-	 * calculates and returns the grade average and weighted average for a specific semester
-	 * @param string $studiensemester_kurzbz
-	 * @return void
+	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool
 	 */
+	public function getStudentProjektabgaben() {
+		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
 
-	public function semesterAverageGrade($studiensemester_kurzbz)
-	{
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$semesterLvs = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
+		// TODO: error messages
+		
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 
-		if (isError($semesterLvs))
-			return $this->outputJsonError(getError($semesterLvs));
+		$projektarbeit_obj = new projektarbeit();
+		if($projektarbeit_id==-1)
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 
-		$semesterLvsData = getData($semesterLvs);
+		if(!$projektarbeit_obj->load($projektarbeit_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 
-		$doGradesExist = false;
-		$sum = 0;
-		$count = 0;
-		$sumWeighted = 0;
-		$sumEcts = 0;
-
-		foreach ($semesterLvsData as $lv) {
-			if (!$lv->znote || $lv->znote < 1 || $lv->znote > 5)
-				continue;
-
-			$doGradesExist = true;
-
-			$sum += $lv->znote;
-			$count++;
-			$sumWeighted += $lv->znote * floatval($lv->ects);
-			$sumEcts += floatval($lv->ects);
-		}
-
-		$averageGrade = null;
-		$weightedAverageGrade = null;
-		if ($doGradesExist) {
-			$averageGrade = $sum/$count;
-			$weightedAverageGrade = $sumWeighted/$sumEcts;
-		}
-
-		$this->terminateWithSuccess(['average_grade' => $averageGrade, 'weighted_average_grade' => $weightedAverageGrade]);
+		$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 assigned lehrveranstaltungen of a mitarbeiter for a given semester
-	 * @param mixed $uid
-	 * @param mixed $sem_kurzbz
-	 * @return void
+	 * fetches all projektarbeiten and betreuer for a given student_uid used in cis4 student abgabetool
 	 */
-	public function getZugewieseneLv() {
-		$uid = $this->input->get("uid",TRUE);
-		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
-
-		// TODO: error messages
-
-		if(!isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+	public function getStudentProjektarbeiten($uid)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
 		if (!isset($uid) || isEmptyString($uid))
-			$uid = getAuthUID();
+			$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());
+		}
 
-		// querying other ma_uids data requires admin permission
-		if($uid !== 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/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$result = $this->LehrveranstaltungModel->getLvForLektorInSemester($sem_kurzbz, $uid);
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$result = $this->PaabgabeModel->getDeadlines($person_id);
 		$data = $this->getDataOrTerminateWithError($result);
+
 		$this->terminateWithSuccess($data);
 	}
-
-	public function getLeForLv() {
-		$lv_id = $this->input->get("lv_id",TRUE);
-		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
-
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-//		$this->terminateWithSuccess($this->LehreinheitModel->getLesForLv($lv_id, $sem_kurzbz));
-		$this->terminateWithSuccess($this->LehreinheitModel->getAllLehreinheitenForLvaAndMaUid($lv_id, getAuthUID(), $sem_kurzbz));
-	}
-
 }
+

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

@@ -36,8 +36,7 @@ class LvMenu extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getLvMenu' => self::PERM_LOGGED,
-			'getMultipleLvMenu' => self::PERM_LOGGED
+			'getLvMenu' => self::PERM_LOGGED
 		]);
 
 		$this->load->model("ressource/Mitarbeiter_model");
@@ -62,23 +61,24 @@ class LvMenu extends FHCAPI_Controller
 
 	/**
 	 * alternative function to get multiple lvMenus with a single http request
-	 * not yet working as intended as the menu_lv.inc.php scripts called by the
-	 * lvMenuBuild event have logic coupled to require_once import which results in
-	 * a wrong logic after the first invocation -> faulty results for lvinfo, moodle
-	 * and several others
 	 */
-	public function getMultipleLvMenu(){
-		$lvMenuOptionList = $this->input->post('lvMenuOptionList', true);
+	public function getMultipleLvMenu($lvMenuOptionList){
 		$result =[];
 		foreach($lvMenuOptionList as $lvMenuOptions){
-			$lvMenu = $this->getLvMenuInternal($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
-			
+			$lvMenu = $this->getLvMenu($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
+			if(isError($lvMenu)){
+				// TODO: some lvMenu threw an error, handle error here
+			}
 			$result[$lvMenuOptions['lvid']]=$lvMenu;
 		}
 		$this->terminateWithSuccess($result);
 	}
-	
-	private function getLvMenuInternal($lvid, $studiensemester_kurzbz) {
+
+	/**
+	 * 
+	 */
+	public function getLvMenu($lvid, $studiensemester_kurzbz)
+	{
 
 		// return early if parameters are missing
 		if(!isset($lvid) || !isset($studiensemester_kurzbz))
@@ -89,14 +89,14 @@ class LvMenu extends FHCAPI_Controller
 
 		// get the user
 		if (!$user=getAuthUID())
-			$this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));
+		    $this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));
 
 		// check if is_lector
 		$is_lector = false;
 		$mares = $this->Mitarbeiter_model->isMitarbeiter($user);
 		if(hasData($mares))
 		{
-			$is_lector = getData($mares);
+		    $is_lector = getData($mares);
 		}
 
 		// definition of user_is_allowed_to_upload
@@ -105,7 +105,7 @@ class LvMenu extends FHCAPI_Controller
 
 		// load lehrveranstaltung
 		$lvres = $this->Lehrveranstaltung_model->load($lvid);
-		if(!hasData($lvres))
+		if(!hasData($lvres)) 
 		{
 			$this->terminateWithError('LV ' . $lvid . ' not found.');
 		}
@@ -124,7 +124,7 @@ class LvMenu extends FHCAPI_Controller
 		$stgres = $this->Studiengang_model->load(strval($studiengang_kz));
 		if(!hasData($stgres))
 		{
-			$this->terminateWithError('Stg ' . $lv->studiengang_kz . ' not found.');
+		    $this->terminateWithError('Stg ' . $lv->studiengang_kz . ' not found.');
 		}
 		$stg = (getData($stgres))[0];
 		$kurzbz = strtoupper($stg->typ . $stg->kurzbz);
@@ -139,7 +139,7 @@ class LvMenu extends FHCAPI_Controller
 			$angemeldet = false;
 
 			$lesres = $this->Lehreinheit_model->getLehreinheitenForStudentAndStudienSemester(
-				$lvid, $user, $angezeigtes_stsem
+			    $lvid, $user, $angezeigtes_stsem
 			);
 
 			if(hasData($lesres) && count(getData($lesres)) > 0)
@@ -148,7 +148,7 @@ class LvMenu extends FHCAPI_Controller
 
 		// lehrfach
 		$lehrfach_id='';
-
+		
 		if(defined('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN)
 		{
 			// Wenn der eingeloggte User zu einer der Lehreinheiten zugeteilt ist
@@ -211,8 +211,8 @@ class LvMenu extends FHCAPI_Controller
 		foreach($fbs as $row)
 		{
 			$lehrfach_oe_kurzbz_arr[] = $row->oe_kurzbz;
-			if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz)
-				|| $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
+			if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz) 
+			    || $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
 			{
 				$user_is_allowed_to_upload=true;
 			}
@@ -224,21 +224,21 @@ class LvMenu extends FHCAPI_Controller
 		$menu = array();
 
 		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr);
-
+		
 		$this->fhc_menu_feedback($menu, $angemeldet, $lvid);
-
+		
 		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv, $is_lector, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_emailStudierende($menu, $user, $angemeldet, $lvid, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_lehretools($menu, $lvid, $angezeigtes_stsem, $sprache);
-
+		
 		$this->fhc_menu_anrechnungStudent($menu, $lvid, $angezeigtes_stsem);
-
+		
 		$this->fhc_menu_anrechnungLector($menu, $angezeigtes_stsem);
-
+		
 
 		// Addons Menu Logic
 		// ##########################################################################################		
@@ -272,18 +272,18 @@ class LvMenu extends FHCAPI_Controller
 			'permissionLib' => &$this->PermissionLib,
 			'phrasesLib' => &$this->PhrasesLib
 		];
-
-		Events::trigger('lvMenuBuild',
-			// passing $menu per reference
-			function & () use (&$menu) {
-				return $menu;
-			},
-			$params
+		
+		Events::trigger('lvMenuBuild', 
+						// passing $menu per reference
+						function & () use (&$menu) {
+							return $menu;
+						},
+						$params
 		);
 
 		// Menu sortieren
 		// ##########################################################################################
-
+		
 		foreach ($menu as $key => $row){
 
 			// removes menu points that are not needed in the c4 lvUebersicht
@@ -291,7 +291,7 @@ class LvMenu extends FHCAPI_Controller
 				unset($menu[$key]);
 				continue;
 			}
-
+			
 			// fills pos array to sort the menu 
 			$pos[$key] = $row['position'];
 
@@ -299,18 +299,11 @@ class LvMenu extends FHCAPI_Controller
 
 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
 
-
-		return $menu;
-	}
-	
-	/**
-	 * 
-	 */
-	public function getLvMenu($lvid, $studiensemester_kurzbz)
-	{
-		$menu = $this->getLvMenuInternal($lvid, $studiensemester_kurzbz);
+		// HTTP response
+		// ##########################################################################################
 		
 		$this->terminateWithSuccess($menu);
+
 	}
 
 	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr){

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

@@ -16,8 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
 use \DateTime as DateTime;
@@ -34,25 +33,19 @@ class LvPlan extends FHCAPI_Controller
 
 		parent::__construct([
 			'getRoomplan' => self::PERM_LOGGED,
-			'Stunden' => self::PERM_LOGGED,
-			'getReservierungen' => self::PERM_LOGGED,
+            'Stunden' => self::PERM_LOGGED,
+            'getReservierungen' => self::PERM_LOGGED,
 			'LvPlanEvents' => self::PERM_LOGGED,
 			'eventsPersonal' => self::PERM_LOGGED,
 			'eventsLv' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
-			'getLv' => self::PERM_LOGGED,
-			'eventsStgOrg' => self::PERM_LOGGED,
-			'fetchFerienEvents' => self::PERM_LOGGED,
-			'getStudiengaenge' => self::PERM_LOGGED,
-			'getLehrverband' => self::PERM_LOGGED,
-			'permissionOtherLvPlan' => self::PERM_LOGGED,
-			'compactibleEventTypes' => self::PERM_LOGGED,
+			'getLv' => self::PERM_LOGGED
 		]);
 
-		$this->load->library('LogLib');
-		$this->loglib->setConfigs(array(
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
 			'classIndex' => 5,
 			'functionIndex' => 5,
 			'lineIndex' => 4,
@@ -60,17 +53,17 @@ class LvPlan extends FHCAPI_Controller
 			'dbExecuteUser' => 'RESTful API'
 		));
 
-		$this->load->library('form_validation');
+        $this->load->library('form_validation');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
 	/**
-	 * fetches LvPlan and Moodle events together
-	 * @access public
-	 *
-	 */
+     * fetches LvPlan and Moodle events together
+     * @access public
+     *
+     */
 	public function LvPlanEvents()
 	{
 		$hasLv = $this->input->post('lv_id');
@@ -90,30 +83,24 @@ class LvPlan extends FHCAPI_Controller
 		// form validation
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);
-
-		// disallow accessing other user's events if missing permission
-		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
-			$this->terminateWithError("Missing permission to view other users' timetables!");
-		}
 
 		// fetching lvplan events
-		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
+		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date);
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events
-		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date, $uid);
+		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date);
 
 		// fetching ferien events
-		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date, $uid);
-
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -122,45 +109,6 @@ class LvPlan extends FHCAPI_Controller
 		));
 	}
 
-	/**
-	 * fetches LvPlan for studiengang / semester / verband / gruppe
-	 *
-	 * @access public
-	 */
-	public function eventsStgOrg()
-	{
-		$this->load->library('StundenplanLib');
-
-		// form validation
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-		//$this->form_validation->set_rules('stg_kz', "stg_kz", "required"); //no validation show empty calendar
-
-		if (!$this->form_validation->run()) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-			$stgOrgEvents = [];
-			$ferienEvents = [];
-		} else {
-			$start_date = $this->input->post('start_date', true);
-			$end_date = $this->input->post('end_date', true);
-			$stg_kz = $this->input->post('stg_kz', true);
-			$sem = $this->input->post('sem', true);
-			$verband = $this->input->post('verband', true);
-			$gruppe = $this->input->post('gruppe', true);
-
-			$result = $this->stundenplanlib->getEventsStgOrg($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe);
-			$stgOrgEvents = $this->getDataOrTerminateWithError($result);
-
-			$result = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $stg_kz);
-			$ferienEvents = $this->getDataOrTerminateWithError($result);
-		}
-
-		$this->terminateWithSuccess(array_merge(
-			$stgOrgEvents,
-			$ferienEvents
-		));
-	}
-
 	/**
 	 * fetches LvPlan and Ferien events together for the lv
 	 *
@@ -174,7 +122,7 @@ class LvPlan extends FHCAPI_Controller
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
 		$this->form_validation->set_rules('lv_id', "lv_id", "required|integer");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
@@ -189,6 +137,7 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -197,42 +146,40 @@ class LvPlan extends FHCAPI_Controller
 	}
 
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
-	public function studiensemesterDateInterval($date)
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$studiensemester = $this->StudiensemesterModel->getByDate(date_format(date_create($date), 'Y-m-d'));
-		$studiensemester = current($this->getDataOrTerminateWithError($studiensemester));
+	public function studiensemesterDateInterval($date){
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$studiensemester =$this->StudiensemesterModel->getByDate(date_format(date_create($date),'Y-m-d'));
+		$studiensemester =current($this->getDataOrTerminateWithError($studiensemester));
 		$this->terminateWithSuccess($studiensemester);
 	}
 
-	public function getLvPlanForStudiensemester($studiensemester, $lvid)
-	{
+	public function getLvPlanForStudiensemester($studiensemester,$lvid){
 		$this->load->library('StundenplanLib');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $studiensemester]);
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		
+		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
 		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
 		$timespan_start = new DateTime($studiensemester_result->start);
 		$timespan_ende = new DateTime($studiensemester_result->ende);
-		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'), date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
 		$this->terminateWithSuccess($lvplan);
-
+		
 	}
+		
 
-
-	/**
-	 * fetches Stunden layout from database
-	 * @access public
-	 *
-	 */
-	public function Stunden()
+    /**
+     * fetches Stunden layout from database
+     * @access public
+     *
+     */
+    public function Stunden()
 	{
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
 		$this->StundeModel->addOrder('stunde', 'ASC');
 		$stunden = $this->StundeModel->load();
 
-		$stunden = $this->getDataOrTerminateWithError($stunden);
+        $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		$this->terminateWithSuccess($stunden);
 	}
@@ -263,10 +210,10 @@ class LvPlan extends FHCAPI_Controller
 		$roomplan_data = $this->stundenplanlib->getRoomplan($ort_kurzbz, $start_date, $end_date);
 
 		$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-
+		
 		$this->terminateWithSuccess($roomplan_data);
 	}
-
+	
 	/**
 	 * gets the reservierungen of a room if the ort_kurzbz parameter is
 	 * supplied otherwise gets the reservierungen of the lvplan of a student
@@ -279,32 +226,25 @@ class LvPlan extends FHCAPI_Controller
 	{
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);
-
-		// disallow accessing other user's reservierungen if missing permission
-		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
-			$this->terminateWithError("Missing permission to view other users' timetables!");
-		}
 
 		// get data
 		$this->load->library('StundenplanLib');
 
-		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz);
 
 		$result = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getLehreinheitStudiensemester($lehreinheit_id)
-	{
+	public function getLehreinheitStudiensemester($lehreinheit_id){
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
 		$result = $this->LehreinheitModel->load($lehreinheit_id);
@@ -347,68 +287,6 @@ class LvPlan extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current($result));
 	}
 
-	public function getStudiengaenge()
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$result = $this->StudiengangModel->loadWhere([
-			'aktiv' => true
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
-	public function getLehrverband($studiengang_kz, $semester = null, $verband = null)
-	{
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-
-		$where = [
-			'aktiv' => true,
-			'studiengang_kz' => $studiengang_kz,
-		];
-
-		if ($semester !== null && $semester !== 'null' && $semester !== 'undefined') {
-			$where['semester'] = $semester;
-		}
-		if ($verband !== null && $verband !== 'null' && $verband !== 'undefined') {
-			$where['verband'] = $verband;
-		}
-
-		$this->LehrverbandModel->addOrder('studiengang_kz');
-		$this->LehrverbandModel->addOrder('semester');
-		$this->LehrverbandModel->addOrder('verband');
-		$this->LehrverbandModel->addOrder('gruppe');
-		$result = $this->LehrverbandModel->loadWhere($where);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
-	/**
-	 * Checks if the current user has permission to view other users' timetables
-	 *
-	 * @return void
-	 */
-	public function permissionOtherLvPlan()
-	{
-		$this->terminateWithSuccess($this->permissionlib->isBerechtigt('basis/other_lv_plan'));
-	}
-
-	/**
-	 * get event types which can be compacted in lv plan display
-	 *
-	 * @return void
-	 */
-	public function compactibleEventTypes()
-	{
-		$this->terminateWithSuccess(["lehreinheit", "reservierung", "ferien", "moodle"]);
-	}
-
 	/**
 	 * fetch moodle events
 	 *
@@ -416,30 +294,30 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchMoodleEvents($start_date, $end_date, $uid = null)
+	private function fetchMoodleEvents($start_date, $end_date)
 	{
 		$this->load->config('calendar');
 
 		$tz = new DateTimeZone($this->config->item('timezone'));
-
+		
 		$start = new DateTime($start_date);
 		$start->setTimezone($tz);
-
+		
 		$end = new DateTime($end_date);
 		$end->setTimezone($tz);
 		$end->modify('+1 day -1 second');
-
+		
 		$moodle_events = [];
-
+		
 		Events::trigger(
 			'moodleCalendarEvents',
-			function &() use (&$moodle_events) {
+			function & () use (&$moodle_events) {
 				return $moodle_events;
 			},
 			[
 				'start_date' => $start->format('c'),
 				'end_date' => $end->format('c'),
-				'username' => $uid ?? getAuthUID()
+				'username' => getAuthUID()
 			]
 		);
 
@@ -453,23 +331,23 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchFerienEvents($start_date, $end_date, $uid = null)
+	private function fetchFerienEvents($start_date, $end_date)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentLehrverbandModel');
 
 		$currentStudiensemester = $this->StudiensemesterModel->getByDate($start_date);
 		$currentStudiensemester = $this->getDataOrTerminateWithError($currentStudiensemester);
-
+		
 		if ($currentStudiensemester) {
 			$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;
 
 			$studiengang = $this->StudentLehrverbandModel->loadWhere([
-				"student_uid" => $uid ?? getAuthUID(),
+				"student_uid" => getAuthUID(),
 				"studiensemester_kurzbz" => $studentsemester_kurzbz
 			]);
 			$studiengang = $this->getDataOrTerminateWithError($studiengang);
-
+			
 			if ($studiengang)
 				$studiengang_kz = current($studiengang)->studiengang_kz;
 			else
@@ -479,7 +357,7 @@ class LvPlan extends FHCAPI_Controller
 		}
 
 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
-
+		
 		return $this->getDataOrTerminateWithError($ferienEvents);
 	}
 }

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

@@ -1,76 +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');
-
-class OtherLvPlan extends FHCAPI_Controller
-{
-
-    /**
-     * Object initialization
-     */
-    public function __construct()
-    {
-        parent::__construct([
-            'otherLvPlanViewData' => ['basis/other_lv_plan:r'],
-        ]);
-
-        $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
-        $this->load->model('person/Benutzer_model', 'BenutzerModel');
-
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-     * retrieves viewData for other lv plan view
-     * @access public
-     * @param  $uid the userID for which the other lv plan is being viewed
-     */
-    public function otherLvPlanViewData($uid)
-    {
-        $isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid);
-        $isMitarbeiter = getData($isMitarbeiterResult);
-        $isStudent = !$isMitarbeiter;
-
-        $this->BenutzerModel->addSelect(["foto", "vorname", "nachname"]);
-        $this->BenutzerModel->addJoin("tbl_person", "person_id");
-        $personResult = $this->BenutzerModel->load([$uid]);
-        $person = hasData($personResult) ? getData($personResult) : null;
-
-        $viewData = [
-            "user_data" => [
-                "username" => $uid,
-                "is_student" => $isStudent,
-                "is_mitarbeiter" => $isMitarbeiter,
-                "foto" => $person[0]->foto,
-                "vorname" => $person[0]->vorname,
-                "nachname" => $person[0]->nachname,
-            ],
-        ];
-
-        $this->terminateWithSuccess($viewData);
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-}
-

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

@@ -16,8 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Profil extends FHCAPI_Controller
 {
@@ -28,13 +27,13 @@ class Profil extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'fotoSperre' => self::PERM_LOGGED,
+            'fotoSperre' => self::PERM_LOGGED,
 			'getGemeinden' => self::PERM_LOGGED,
 			'getAllNationen' => self::PERM_LOGGED,
 			'isMitarbeiter' => self::PERM_LOGGED,
 			'profilViewData' => self::PERM_LOGGED,
 		]);
-
+		
 		$this->load->library('PermissionLib');
 
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
@@ -49,37 +48,28 @@ class Profil extends FHCAPI_Controller
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
-
-	/**
-     * retrieves view data for profile view
-     * @access public
-     * @param  $uid the userID for which profile is being viewed, null or missing value implies one's own profile
-     */
-	public function profilViewData($uid = null)
-	{
-		$authUid = getAuthUID();
-		$isProfilOfAuthUser = !$uid || $uid === $authUid;
-
+	public function profilViewData($uid=null){
 		$this->load->library('ProfilLib');
-		$profileData = $this->profillib->getView($uid ?? $authUid);
-		$profileData = hasData($profileData) ? getData($profileData) : null;
-
-		$viewData = [
-			'editable' => $isProfilOfAuthUser,
-			'profil_data' => $profileData,
-			'permissions' => [
-				'basis/other_lv_plan' => $this->permissionlib->isBerechtigt(('basis/other_lv_plan'))
-			]
-		];
-
-		if ($isProfilOfAuthUser) {
-			$viewData['calendar_sync_urls'] = $this->getCalendarSyncUrlData();
+		$editable = false;
+		if(isset($uid) && $uid != null){
+			$profil_data = $this->profillib->getView($uid);
+			if($uid == getAuthUID()){
+				$editable = true;
+			}
+		}else{
+			$editable = true;
+			$profil_data = $this->profillib->getView(getAuthUID());
 		}
-
+		
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array(
+			'editable'=>$editable,
+			'profil_data' => $profil_data,
+		);
 		$this->terminateWithSuccess($viewData);
 	}
 
-	/**
+    /**
 	 * update column foto_sperre in public.tbl_person
 	 * @access public
 	 * @param  boolean $value  new value for the column
@@ -87,9 +77,9 @@ class Profil extends FHCAPI_Controller
 	 */
 	public function fotoSperre($value)
 	{
-		if (!isset($value)) {
-			$this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
-		}
+        if(!isset($value)){
+            $this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
+        }
 
 		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
 		if (isError($res)) {
@@ -97,10 +87,10 @@ class Profil extends FHCAPI_Controller
 		}
 		$this->PersonModel->addSelect("foto_sperre");
 		$res = $this->PersonModel->load($this->pid);
-
-		$res = $this->getDataOrTerminateWithError($res);
-
-		$this->terminateWithSuccess(current($res));
+		
+        $res = $this->getDataOrTerminateWithError($res);
+		
+        $this->terminateWithSuccess(current($res));
 	}
 
 	/**
@@ -119,7 +109,7 @@ class Profil extends FHCAPI_Controller
 		if (isError($nation_res)) {
 			$this->terminateWithError("error while trying to query table codex.tbl_nation", self::ERROR_TYPE_GENERAL);
 		}
-
+		
 		$nation_res = $this->getDataOrTerminateWithError($nation_res);
 
 		$this->terminateWithSuccess($nation_res);
@@ -127,30 +117,30 @@ class Profil extends FHCAPI_Controller
 
 	public function getGemeinden($nation, $zip)
 	{
-		if (!isset($nation) || !isset($zip)) {
+		if(!isset($nation) || !isset($zip)){
 			echo json_encode(error("Missing parameters"));
 			return;
 		}
-
+		
 		$this->load->model('codex/Gemeinde_model', "GemeindeModel");
-
+		
 
 		$gemeinde_res = $this->GemeindeModel->getGemeindeByPlz($zip);
-
+		
 		if (isError($gemeinde_res)) {
-			$this->terminateWithError(getError($gemeinde_res), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError(getError($gemeinde_res),self::ERROR_TYPE_GENERAL);
 		}
 		$gemeinde_res = $this->getDataOrTerminateWithError($gemeinde_res);
-
+		
 		/* $gemeinde_res = array_map(function ($obj) {
 			return $obj->ortschaftsname;
 		}, $gemeinde_res); */
 
-		$this->terminateWithSuccess($gemeinde_res);
-
+		$this->terminateWithSuccess($gemeinde_res);	
+		
 	}
 
-
+    
 	/**
 	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
@@ -160,48 +150,23 @@ class Profil extends FHCAPI_Controller
 	public function isMitarbeiter($uid)
 	{
 
-		if (!$uid)
-			$this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
-
-
+		if(!$uid) $this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
+		
+		
 		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
-
+		
 		if (isError($result)) {
 			$this->terminateWithError("error when calling Mitarbeiter_model function isMitarbeiter with uid " . $uid, self::ERROR_TYPE_GENERAL);
 		}
 
 		$result = $this->getDataOrTerminateWithError($result);
-
+		
 		$this->terminateWithSuccess($result);
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
-	/**
-	 * gets the identifier, phrase, and url for each calendar sync option
-	 * @access private
-	 * @return array array of arrays, where each child array is a sync option
-	 */
-	private function getCalendarSyncUrlData()
-	{
-		return [
-			[
-				"identifier" => "cal_dav",
-				"labelPhrase" => "profil/calendar_sync_cal_dav",
-				"url" => APP_ROOT . "webdav/lvplan.php/calendars/" . $this->uid . "/LVPlan-" . $this->uid,
-			],
-			[
-				"identifier" => "cal_dav_principal",
-				"labelPhrase" => "profil/calendar_sync_cal_dav_principal",
-				"url" => APP_ROOT . "webdav/lvplan.php/principals/" . $this->uid,
-			],
-			[
-				"identifier" => "i_cal",
-				"labelPhrase" => "profil/calendar_sync_i_cal",
-				"url" => APP_ROOT . "webdav/google.php?cal=" . encryptData($this->uid, LVPLAN_CYPHER_KEY) . "&" . microtime(true),
-			],
-		];
-	}
+	
 }
 

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

@@ -1,64 +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');
-
-class StgOrgLvPlan extends FHCAPI_Controller
-{
-
-    /**
-     * Object initialization
-     */
-    public function __construct()
-    {
-        parent::__construct([
-			'stgOrgLvPlanViewData' => self::PERM_LOGGED,
-        ]);
-
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-	 * fetches view data for stg org lv plan
-	 * @access public
-	 */
-	public function stgOrgLvPlanViewData()
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$result = $this->StudiengangModel->loadWhere([
-			'aktiv' => true
-		]);
-		$studiengaenge = $this->getDataOrTerminateWithError($result);
-
-		$viewData = array(
-			'studiengaenge' => $studiengaenge,
-		);
-
-        $this->terminateWithSuccess($viewData);
-	}
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-}
-

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

@@ -1,67 +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');
-class Studiensemester extends FHCAPI_Controller
-{
-
-	private $_ci;
-	
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStudiensemester'=> self::PERM_LOGGED,
-
-		]);
-
-		$this->_ci =& get_instance();
-		
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		
-
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * GET METHOD
-	 * returns List of all studiensemester as well as current one
-	 */
-	public function getStudiensemester()
-	{
-		$this->_ci->StudiensemesterModel->addOrder("start", "DESC");
-		$result = $this->_ci->StudiensemesterModel->load();
-
-		$studiensemester = getData($result);
-		$result = $this->_ci->StudiensemesterModel->getAkt();
-		$aktuell = getData($result);
-
-		$this->terminateWithSuccess(array($studiensemester, $aktuell));
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-
-
-}
-

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

@@ -62,36 +62,21 @@ class Studium extends FHCAPI_Controller
 
 		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
-
-			//TODO(Manu) check if use Fallback or just comment out all paramschecks?
-			//add Fallback: if no LehrverbandData of actual semester, get Data of previous one
-			if(!hasData($studentLehrverband))
-			{
-				$result= $this->StudiensemesterModel->getPreviousFrom($aktuelles_studiensemester->studiensemester_kurzbz);
-
-				$data = $this->getDataOrTerminateWithError($result);
-				$vorheriges_studiensemester = current($data)->studiensemester_kurzbz;
-				$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $vorheriges_studiensemester]);
-			}
-			$studentLehrverband = current(getData($studentLehrverband));
-
+			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
+			
+			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
+			$student_studiengang = $studentLehrverband->studiengang_kz;
+			$student_semester = $studentLehrverband->semester;
 			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
 			
-			if(!isset($parameter_studiensemester)) {
-				$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
-				$parameter_studiensemester = $student_studiensemester;
-			}
-			if(!isset($parameter_studiengang)) {
-				$student_studiengang = $studentLehrverband->studiengang_kz;
-				$parameter_studiengang = $student_studiengang;
-			}
-			if(!isset($parameter_semester)) {
-				$student_semester = $studentLehrverband->semester;
-				$parameter_semester = $student_semester;
-			}
+			if(!isset($parameter_studiensemester))
+			$parameter_studiensemester = $student_studiensemester;
+			if(!isset($parameter_studiengang))
+			$parameter_studiengang = $student_studiengang;
+			if(!isset($parameter_semester))
+			$parameter_semester = $student_semester;
 			if(!isset($parameter_studienplan))
-				$parameter_studienplan = $student_studienplan;
-
+			$parameter_studienplan = $student_studienplan;
 		}  
 
 		if(isset($parameter_studiensemester)){
@@ -111,7 +96,8 @@ class Studium extends FHCAPI_Controller
 
 		// fetch studiensemester
 		$allStudienSemester = $this->getDataOrTerminateWithError($this->StudiensemesterModel->load());
-
+		
+		
 		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
 			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
 		}))){
@@ -230,8 +216,6 @@ class Studium extends FHCAPI_Controller
 		$studienplaene = array_map(function($studienplan){
 			$orgform = current($this->getDataOrTerminateWithError($this->OrgformModel->loadWhere(["orgform_kurzbz" => $studienplan->orgform_kurzbz])));
 			$studienplan->orgform_bezeichnung = $orgform->bezeichnung;
-			// bezeichnung_mehrsprachig
-			$studienplan->orgform_bezeichnung_english = $orgform->bezeichnung_mehrsprachig[1];
 			return $studienplan;
 		},$studienplaene);
 		return $studienplaene;

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

@@ -1,367 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Zeitsperren extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getZeitsperrenUser' => self::PERM_LOGGED,
-			'getTypenZeitsperren' => self::PERM_LOGGED,
-			'getTypenErreichbarkeit' => self::PERM_LOGGED,
-			'getStunden' => self::PERM_LOGGED,
-			'loadZeitsperre' => self::PERM_LOGGED,
-			'add' => self::PERM_LOGGED,
-			'update' => self::PERM_LOGGED,
-			'delete' => self::PERM_LOGGED,
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-			'person',
-			'zeitsperren'
-		]);
-
-		// Load models
-		$this->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
-		$this->load->model('ressource/Zeitsperretyp_model', 'ZeitsperretypModel');
-		$this->load->model('ressource/Erreichbarkeit_model', 'ErreichbarkeitModel');
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->load->model('ressource/Zeitaufzeichnung_model', 'ZeitaufzeichnungModel');
-	}
-
-	public function getZeitsperrenUser($uid)
-	{
-		//check if $uid is passedUser
-		$loggedInUser = getAuthUID();
-		if($loggedInUser != $uid) {
-			$this->load->library('PermissionLib');
-			$isAdmin = $this->permissionlib->isBerechtigt('admin');
-			if(!$isAdmin) {
-				$this->terminateWithError($this->p->t('ui', 'noAdmin'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$result = $this->ZeitsperreModel->getZeitsperrenUser($uid);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function getTypenZeitsperren()
-	{
-		$this->ZeitsperretypModel->addOrder('beschreibung', 'ASC');
-		$result = $this->ZeitsperretypModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function getTypenErreichbarkeit()
-	{
-		$result = $this->ErreichbarkeitModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function getStunden()
-	{
-		$this->StundeModel->addOrder('stunde', 'ASC');
-		$result = $this->StundeModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function loadZeitsperre($zeitsperre_id)
-	{
-		$this->ZeitsperreModel->addSelect(
-			'campus.tbl_zeitsperre.*, typ.*,
-			ma.person_id AS ma_person_id, ma.vorname AS ma_vorname, ma.nachname AS ma_nachname,
-			ma.titelpre AS ma_titelpre, ma.titelpost AS ma_titelpost'
-		);
-		$this->ZeitsperreModel->addJoin('campus.tbl_zeitsperretyp typ', 'ON (typ.zeitsperretyp_kurzbz = campus.tbl_zeitsperre.zeitsperretyp_kurzbz)');
-		$this->ZeitsperreModel->addJoin('public.tbl_benutzer ben', 'ON (ben.uid = campus.tbl_zeitsperre.vertretung_uid)', 'LEFT');
-		$this->ZeitsperreModel->addJoin('public.tbl_person ma', 'ON (ma.person_id = ben.person_id)', 'LEFT');
-		$result = $this->ZeitsperreModel->loadWhere(
-			array('zeitsperre_id' => $zeitsperre_id)
-		);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((current(getData($result)) ?: []));
-	}
-
-	public function add($mitarbeiter_uid)
-	{
-		$loggedInUser = getAuthUID();
-
-		if($mitarbeiter_uid != $loggedInUser)
-			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
-
-		$this->form_validation->set_rules('zeitsperretyp_kurzbz', 'Grund Zeitsperre', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Grund Zeitsperre'])
-		]);
-
-		$this->form_validation->set_rules('vondatum', 'VonDatum', 'required|is_valid_date', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
-		]);
-
-		$this->form_validation->set_rules('bisdatum', 'BisDatum', 'required|is_valid_date|callback_check_von_bis_datum|callback_check_diff_intval', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'BisDatum']),
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum']),
-			'check_von_bis_datum' => $this->p->t('zeitsperre', 'error_VonDatumGroesserAlsBisDatum'),
-			'check_diff_intval' => $this->p->t('zeitsperre', 'error_zeitraumAuffallendHoch')
-		]);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$bezeichnung = $this->input->post('bezeichnung');
-		$vondatum = $this->input->post('vondatum');
-		$vonstunde = $this->input->post('vonstunde');
-		$bisdatum = $this->input->post('bisdatum');
-		$bisstunde = $this->input->post('bisstunde');
-		//$vonIso = $this->input->post('vonISO'); //Timestamp für Stunde
-		//$bisIso = $this->input->post('bisISO'); //Timestamp für Stunde
-		$erreichbarkeit_kurzbz = $this->input->post('erreichbarkeit_kurzbz');
-		$vertretung_uid = $this->input->post('vertretung_uid');
-		$zeitsperretyp_kurzbz = $this->input->post('zeitsperretyp_kurzbz');
-
-		//check if existing zeitsperre
-		$result = $this->ZeitsperreModel->getSperreByDate($mitarbeiter_uid, $vondatum, $vonstunde, true);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if(hasData($result))
-		{
-			$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitsperre', ['typ'=> current($data)->zeitsperretyp_kurzbz]), self::ERROR_TYPE_GENERAL);
-		}
-
-		//check if existing zeitaufzeichnung
-		if(in_array($zeitsperretyp_kurzbz, Zeitsperre_model::BLOCKIERENDE_ZEITSPERREN))
-		{
-			$result = $this->ZeitsperreModel->existsZeitaufzeichnung($mitarbeiter_uid, $vondatum, $bisdatum);
-
-			if(hasData($result))
-				$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitaufzeichnung'), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->ZeitsperreModel->insert(
-			[
-				'mitarbeiter_uid' => $mitarbeiter_uid,
-				'bezeichnung' => $bezeichnung,
-				'vondatum' => $vondatum,
-				'vonstunde' => $vonstunde,
-				'bisdatum' => $bisdatum,
-				'bisstunde' => $bisstunde,
-				'erreichbarkeit_kurzbz' => $erreichbarkeit_kurzbz,
-				'zeitsperretyp_kurzbz' => $zeitsperretyp_kurzbz,
-				'vertretung_uid' => $vertretung_uid,
-				'insertvon' =>  $loggedInUser,
-				'insertamum' => date('c'),
-			]
-		);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function update($zeitsperre_id)
-	{
-		//check if loggedin User is owner of the zeitsperre
-		$loggedInUser = getAuthUID();
-		$result = $this->ZeitsperreModel->load($zeitsperre_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$uid = current($data)->mitarbeiter_uid;
-
-		if($uid != $loggedInUser)
-			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
-
-		if(!$zeitsperre_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
-		}
-		//get current params
-		$array_update = [
-			'bezeichnung',
-			'vondatum',
-			'vonstunde',
-			'bisdatum',
-			'bisstunde',
-			//	'vonISO', //Timestamp für Stunde
-			//	'bisISO', //Timestamp für Stunde
-			'erreichbarkeit_kurzbz',
-			'vertretung_uid',
-			'zeitsperretyp_kurzbz',
-			'mitarbeiter_uid',
-		];
-		$post = $this->input->post();
-		$update = [];
-
-		foreach ($array_update as $prop)
-		{
-			if (array_key_exists($prop, $post))
-			{
-				$update[$prop] = $post[$prop];
-			}
-		}
-
-		// Validation
-		$rulesDefined = false;  //necessary, otherwise CI validation will always be triggered, even without rules
-		foreach ($update as $key => $val) {
-			switch ($key) {
-				case 'zeitsperretyp_kurzbz':
-					$this->form_validation->set_rules(
-						$key,
-						'Grund Zeitsperre',
-						'required',
-						['required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'Grund Zeitsperre'])]
-					);
-					$rulesDefined = true;
-					break;
-				case 'vondatum':
-					$this->form_validation->set_rules(
-						$key,
-						'VonDatum',
-						'required|is_valid_date',
-						[
-							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'VonDatum']),
-							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'VonDatum'])
-						]
-					);
-					$rulesDefined = true;
-					break;
-				case 'bisdatum':
-					$rules = 'required|is_valid_date';
-					if (array_key_exists('vondatum', $update)) {
-						$rules .= '|callback_check_von_bis_datum|callback_check_diff_intval';
-					}
-					$this->form_validation->set_rules(
-						$key,
-						'BisDatum',
-						$rules,
-						[
-							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'BisDatum']),
-							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'BisDatum']),
-							'check_von_bis_datum' => $this->p->t('zeitsperre', 'error_VonDatumGroesserAlsBisDatum'),
-							'check_diff_intval' => $this->p->t('zeitsperre', 'error_zeitraumAuffallendHoch')
-						]
-					);
-					$rulesDefined = true;
-					break;
-			}
-		}
-
-		if ($rulesDefined && $this->form_validation->run() == false) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		if(array_key_exists('vondatum', $post) || array_key_exists('bisdatum', $post))
-		{
-			$result = $this->ZeitsperreModel->load($zeitsperre_id);
-			$data = $this->getDataOrTerminateWithError($result);
-			$data = current($data);
-
-			$mitarbeiter_uid = array_key_exists('mitarbeiter_uid', $post) ? $update['mitarbeiter_uid'] : $data->mitarbeiter_uid;
-			$vondatum = array_key_exists('vondatum', $post) ? $update['vondatum'] : $data->vondatum;
-			$bisdatum = array_key_exists('bisdatum', $post) ? $update['bisdatum'] : $data->bisdatum;
-			$vonstunde = array_key_exists('vonstunde', $post) ? $update['vonstunde'] : $data->vonstunde;
-			$zeitsperretyp_kurzbz = array_key_exists('zeitsperretyp_kurzbz', $post) ? $update['zeitsperretyp_kurzbz'] : $data->zeitsperretyp_kurzbz;
-
-			$result = $this->ZeitsperreModel->getSperreByDate($mitarbeiter_uid, $vondatum, $vonstunde, true);
-			$data = $this->getDataOrTerminateWithError($result);
-
-			if(hasData($result))
-			{
-				$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitsperre', ['typ'=> current($data)->zeitsperretyp_kurzbz]), self::ERROR_TYPE_GENERAL);
-			}
-
-			//check if existing zeitaufzeichnung
-			if(in_array($zeitsperretyp_kurzbz, Zeitsperre_model::BLOCKIERENDE_ZEITSPERREN))
-			{
-				$result = $this->ZeitsperreModel->existsZeitaufzeichnung($mitarbeiter_uid, $vondatum, $bisdatum);
-
-				if(hasData($result))
-					$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitaufzeichnung'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		if (!empty($update)) {
-			$update['updatevon'] = $loggedInUser;
-			$update['updateamum'] = date('c');
-			$result = $this->ZeitsperreModel->update($zeitsperre_id, $update);
-
-			$data = $this->getDataOrTerminateWithError($result);
-
-			$this->terminateWithSuccess($data);
-		}
-		else
-			$this->terminateWithSuccess("no update");
-	}
-
-	public function delete($zeitsperre_id)
-	{
-
-		if (!is_numeric($zeitsperre_id) || (int)$zeitsperre_id <= 0)
-		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		//check if loggedin User is owner of the zeitsperre
-		$loggedInUser = getAuthUID();
-		$result = $this->ZeitsperreModel->load($zeitsperre_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$uid = current($data)->mitarbeiter_uid;
-
-		if($uid != $loggedInUser)
-			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
-
-		$result = $this->ZeitsperreModel->delete(
-			array('zeitsperre_id' => $zeitsperre_id)
-		);
-
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function check_von_bis_datum($bisdatum)
-	{
-		$vondatum = $this->input->post('vondatum');
-
-		return $vondatum <= $bisdatum;
-	}
-
-	public function check_diff_intval($bisdatum)
-	{
-		$vondatum = $this->input->post('vondatum');
-
-		// Intervall in days
-		$vonTs = strtotime($vondatum);
-		$bisTs = strtotime($bisdatum);
-
-		$tage = ($bisTs - $vonTs) / 86400;
-
-		// if intervall > 14
-		return $tage <= 14;
-	}
-
-
-}

application/controllers/api/frontend/v1/calendar/RoomPlan.php

@@ -1,232 +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');
-
-class RoomPlan extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'addRoomReservation' => self::PERM_LOGGED,
-			'deleteRoomReservation' => self::PERM_LOGGED,
-			'getRoomCreationInfo' => self::PERM_LOGGED,
-			'getGruppen' => self::PERM_LOGGED,
-			'getLektor' => self::PERM_LOGGED,
-			'getReservableMap' => self::PERM_LOGGED,
-		]);
-
-		$this->load->library('LogLib');
-		$this->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API',
-			'dbExecuteUser' => 'RESTful API'
-		));
-
-		$this->load->library('form_validation');
-		$this->load->library('PermissionLib');
-		$this->load->library('StundenplanLib');
-
-		$this->loadPhrases(['ui']);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-
-	public function addRoomReservation()
-	{
-		$this->form_validation->set_rules('selectedStart', "Start", "required");
-		$this->form_validation->set_rules('selectedEnd', "End", "required");
-		$this->form_validation->set_rules('title', "Title", "required|max_length[10]");
-		$this->form_validation->set_rules('beschreibung', "Beschreibung", "required|max_length[32]");
-		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required|max_length[16]");
-		$this->form_validation->set_rules('studiengang', 'Studiengang', 'numeric');
-		$this->form_validation->set_rules('semester', 'Semester', 'integer|greater_than_equal_to[0]');
-		$this->form_validation->set_rules('verband', 'Verband', 'trim');
-		$this->form_validation->set_rules('gruppe', 'Gruppe', 'trim');
-		$this->form_validation->set_rules('spezialgruppe', 'Spezialgruppe', 'max_length[32]');
-		$this->form_validation->set_rules('lektoren', 'Lektoren');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$start = $this->input->post('selectedStart');
-		$end = $this->input->post('selectedEnd');
-		$title = $this->input->post('title');
-		$beschreibung = $this->input->post('beschreibung');
-		$ort_kurzbz = $this->input->post('ort_kurzbz');
-
-		$studiengang_kz = $this->input->post('studiengang');
-		$semester = $this->input->post('semester');
-		$verband = $this->input->post('verband');
-		$gruppe = $this->input->post('gruppe');
-		$spezialgruppe = $this->input->post('spezialgruppe');
-		$lektoren = $this->input->post('lektoren');
-
-
-		$result = $this->stundenplanlib->addReservation($start, $end, $title, $beschreibung, $ort_kurzbz, $lektoren, $studiengang_kz, $semester, $verband, $gruppe, $spezialgruppe);
-
-		if (isError($result))
-			$this->terminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function deleteRoomReservation()
-	{
-		$reservierung_id = $this->input->post('reservierung_id');
-
-		$result = $this->stundenplanlib->deleteReservation($reservierung_id);
-
-		if (isError($result))
-			$this->terminateWithError($result);
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getRoomCreationInfo()
-	{
-		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
-		if (!$this->permissionlib->isBerechtigt('lehre/reservierung'))
-			$this->terminateWithSuccess($return_array);
-
-		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess($return_array);
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
-		$this->StudiengangModel->addOrder('typ, kurzbz');
-		$this->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
-		$studiengaenge = $this->StudiengangModel->loadWhere(array('aktiv' => true));
-
-		if (isError($studiengaenge))
-			$this->terminateWithError($studiengaenge);
-
-		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
-		$return_array['berechtigt'] = true;
-
-		$this->terminateWithSuccess($return_array);
-	}
-
-	public function getGruppen()
-	{
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess([]);
-
-		$this->load->model('organisation/gruppe_model', 'GruppeModel');
-
-		$query_words = explode(' ', urldecode($query));
-
-		$this->GruppeModel->addOrder('gruppe_kurzbz');
-		$this->GruppeModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->GruppeModel->db->group_start();
-			$this->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->GruppeModel->db->or_where('beschreibung ILIKE', "%" . $word . "%");
-			$this->GruppeModel->db->or_where('orgform_kurzbz ILIKE', "%" . $word . "%");
-
-			if (is_numeric($word))
-			{
-				$this->GruppeModel->db->or_where('studiengang_kz', $word);
-			}
-			$this->GruppeModel->db->group_end();
-		}
-		$this->GruppeModel->db->group_end();
-		$this->GruppeModel->db->where_in('studiengang_kz', $stg_berechtigungen);
-		$gruppen = $this->GruppeModel->loadWhere(array('sichtbar' => true, 'lehre' => true));
-		if (isError($gruppen))
-			$this->terminateWithError($gruppen);
-
-		$this->terminateWithSuccess(hasData($gruppen) ? getData($gruppen) : []);
-	}
-
-	public function getLektor()
-	{
-
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess([]);
-
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
-		$query_words = explode(' ', urldecode($query));
-
-		$this->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
-		$this->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
-		$this->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
-		$this->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
-		$this->MitarbeiterModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->MitarbeiterModel->db->group_start();
-			$this->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
-			$this->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
-			$this->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
-			$this->MitarbeiterModel->db->group_end();
-		}
-		$this->MitarbeiterModel->db->group_end();
-
-		$this->MitarbeiterModel->addOrder('nachname');
-		$this->MitarbeiterModel->addOrder('vorname');
-		$mitarbeiter = $this->MitarbeiterModel->load();
-		if (isError($mitarbeiter))
-			$this->terminateWithError($mitarbeiter);
-
-		$this->terminateWithSuccess(hasData($mitarbeiter) ? getData($mitarbeiter) : []);
-	}
-
-	public function getReservableMap($ort_kurzbz = null)
-	{
-		$this->form_validation->set_rules('start_date', "StartDate", "required");
-		$this->form_validation->set_rules('end_date', "EndDate", "required");
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// storing the post parameter in local variables
-		$start_date = $this->input->post('start_date', true);
-		$end_date = $this->input->post('end_date', true);
-
-		$result = $this->stundenplanlib->getReservableMap($ort_kurzbz, $start_date, $end_date);
-
-		$this->terminateWithSuccess(array('reservierbarMap' => hasData($result) ? getData($result) : []));
-	}
-
-}

application/controllers/api/frontend/v1/dashboard/Board.php

@@ -1,142 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Board extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'create'				=> 'dashboard/admin:rw',
-			'update'				=> 'dashboard/admin:rw',
-			'delete'				=> 'dashboard/admin:rw'
-		]);
-
-		// Models
-		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
-	}
-
-	public function list()
-	{
-		$this->DashboardModel->addSelect('dashboard_id');
-		$this->DashboardModel->addSelect('dashboard_kurzbz');
-		$this->DashboardModel->addSelect('tbl_dashboard.beschreibung');
-		$this->DashboardModel->addSelect("(
-			SELECT json_agg(w.*) 
-			FROM dashboard.tbl_widget w 
-			JOIN dashboard.tbl_dashboard_widget dw 
-			USING(widget_id) 
-			WHERE dw.dashboard_id=tbl_dashboard.dashboard_id
-		) AS \"widgetSetup\"");
-
-		$result = $this->DashboardModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$data = array_map(function ($dashboard) {
-			$tmpSetups = json_decode($dashboard->widgetSetup);
-			$tmpSetups = array_map(function ($widget) {
-				$widget->setup->file = absoluteJsImportUrl($widget->setup->file);
-				return $widget;
-			}, $tmpSetups);
-			$dashboard->widgetSetup = $tmpSetups;
-			return $dashboard;
-		}, $data);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function create()
-	{
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		
-		$result = $this->DashboardModel->insert([
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function update()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		$beschreibung = $this->input->post('beschreibung');
-
-		$result = $this->DashboardModel->update([
-			'dashboard_id' => $dashboard_id
-		], [
-			'dashboard_kurzbz' => $dashboard_kurzbz,
-			'beschreibung' => $beschreibung
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function delete()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_id = $this->input->post('dashboard_id');
-
-		//delete all presets
-		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
-
-		$result = $this->DashboardPresetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		//delete all widgets
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-
-		$result = $this->DashboardWidgetModel->delete([
-			'dashboard_id' => $dashboard_id
-		]);
-		$this->getDataOrTerminateWithError($result);
-
-		$result = $this->DashboardModel->delete($dashboard_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}

application/controllers/api/frontend/v1/dashboard/Preset.php

@@ -1,199 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Preset extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'list'					=> 'dashboard/admin:r',
-			'getBatch'				=> 'dashboard/admin:r',
-			'addWidget'				=> 'dashboard/admin:rw',
-			'removeWidget'			=> 'dashboard/admin:rw'
-		]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function list($dashboard_kurzbz)
-	{
-		$sql = "
-			WITH
-			dashboard_presets AS (
-				SELECT
-					*
-				FROM
-					dashboard.tbl_dashboard_preset dp
-				JOIN
-					dashboard.tbl_dashboard d ON d.dashboard_id = dp.dashboard_id
-				WHERE
-					d.dashboard_kurzbz = {$this->db->escape($dashboard_kurzbz)}
-			),
-			general AS 	(
-				SELECT
-					'general' AS funktion_kurzbz,
-					'Allgemein' AS beschreibung
-			)
-
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					general f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz IS NULL
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-			)
-			UNION ALL
-			(
-				SELECT
-					f.funktion_kurzbz,
-					f.beschreibung,
-					COUNT(p.preset_id) AS has_preset
-				FROM
-					public.tbl_funktion f
-				LEFT JOIN
-					dashboard_presets p ON p.funktion_kurzbz = f.funktion_kurzbz
-				GROUP BY
-					f.funktion_kurzbz, f.beschreibung
-				ORDER BY
-					f.beschreibung ASC
-			)
-		";
-
-		$result = $this->FunktionModel->execReadOnlyQuery($sql);
-
-		$funktionen = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($funktionen);
-	}
-
-	public function getBatch()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$db = $this->input->post('db');
-		$funktionen = $this->input->post('funktionen') ?: [];
-
-		$result = [];
-
-		foreach ($funktionen as $funktion) {
-			$conf = $this->dashboardlib->getPreset($db, $funktion);
-			if ($conf) {
-				$preset = json_decode($conf->preset, true);
-				$result[$funktion] = $preset;
-			} else {
-				$result[$funktion] = [];
-			}
-		}
-
-		return $this->terminateWithSuccess($result);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widget = $this->input->post('widget');
-
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		$preset = $this->dashboardlib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
-
-		$preset_decoded = json_decode($preset->preset, true);
-		
-		$preset_decoded[$widget['widgetid']] = $widget;
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
-		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
-		$this->form_validation->set_rules('widgetid', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$dashboard_kurzbz = $this->input->post('db');
-		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widgetid = $this->input->post('widgetid');
-
-		$preset = $this->dashboardlib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if (!$preset)
-			show_404();
-
-		$preset_decoded = json_decode($preset->preset, true);
-
-		if (!isset($preset_decoded[$widgetid]))
-			show_404();
-		
-		unset($preset_decoded[$widgetid]);
-
-		$preset->preset = json_encode($preset_decoded);
-
-		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(array('msg' => $this->p->t('dashboard', 'success_savePreset')));
-	}
-}

application/controllers/api/frontend/v1/dashboard/User.php

@@ -1,124 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class User extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> 'dashboard/benutzer:r',
-			'addWidget'						=> 'dashboard/benutzer:rw',
-			'removeWidget'					=> 'dashboard/benutzer:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function get($dashboard_kurzbz)
-	{
-		$dashboard = $this->dashboardlib->getDashboardByKurzbz($dashboard_kurzbz);
-		if (!$dashboard)
-			show_404();
-		
-		$uid = $this->authlib->getAuthObj()->username;
-
-		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
-
-		$this->terminateWithSuccess($mergedconfig);
-	}
-
-	public function addWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		if (!isset($widget['widgetid']))
-			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
-
-		if (isset($widget['source']))
-			unset($widget['source']);
-
-		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-
-		$override_decoded = json_decode($override->override, true);
-
-		$override_decoded[$widget['widgetid']] = $widget;
-
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess($widget['widgetid']);
-	}
-
-	public function removeWidget()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget', 'Widget', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$widget_id = $this->input->post('widget');
-		$dashboard_kurzbz = $this->input->post('dashboard');
-		$uid = $this->authlib->getAuthObj()->username;
-		
-		$override = $this->dashboardlib->getOverride($dashboard_kurzbz, $uid);
-		if (!$override)
-			show_404();
-		
-		$override_decoded = json_decode($override->override, true);
-
-		if (!isset($override_decoded[$widget_id]))
-			show_404();
-		
-		unset($override_decoded[$widget_id]);
-
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->dashboardlib->insertOrUpdateOverride($override);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess();
-	}
-}

application/controllers/api/frontend/v1/dashboard/Widget.php

@@ -1,137 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the users dashboard
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Widget extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'get'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
-			'list'							=> 'dashboard/admin:r',
-			'listAllowed'					=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
-			'setAllowed'					=> 'dashboard/admin:rw'
-		]);
-
-		// Libraries
-		$this->load->library('dashboard/DashboardLib');
-
-		// Models
-		$this->load->model('dashboard/Widget_model', 'WidgetModel');
-	}
-
-	public function get($id)
-	{
-		$result = $this->WidgetModel->load($id);
-
-		$widget = $this->getDataOrTerminateWithError($result);
-
-		if (!$widget)
-			return $this->terminateWithSuccess([
-				"widget_id" => 0,
-				"widget_kurzbz" => "notfound",
-				"arguments" => [
-					"className" => 'alert-danger',
-					"title" => 'Widget Not Found',
-					"msg" => 'The widget with the id ' . $id . ' could not be found'
-				],
-				"setup" => [
-					"name" => 'Widget Not Found',
-					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
-					"width" => 1,
-					"height" => 1
-				]
-			]);
-
-		$widget = current($widget);
-		$widget->arguments = json_decode($widget->arguments);
-		$tmpsetup = json_decode($widget->setup);
-		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
-		$widget->setup = $tmpsetup;
-
-		$this->terminateWithSuccess($widget);
-	}
-
-	public function list($dashboard)
-	{
-		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($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;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function listAllowed($dashboard)
-	{
-		$result = $this->WidgetModel->getForDashboard($dashboard);
-
-		$widgets = $this->getDataOrTerminateWithError($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;
-		}, $widgets);
-
-		$this->terminateWithSuccess($widgets);
-	}
-
-	public function setAllowed()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('dashboard_id', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget_id', 'Widget', 'required');
-		$this->form_validation->set_rules('allowed', 'Allowed', 'is_bool');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$data = [
-			'dashboard_id' => $this->input->post('dashboard_id'),
-			'widget_id' => $this->input->post('widget_id')
-		];
-
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-		
-		if ($this->input->post('allowed'))
-			$result = $this->DashboardWidgetModel->insert($data);
-		else
-			$result = $this->DashboardWidgetModel->delete($data);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}

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/education/PaabgabeUebersicht.php

@@ -1,218 +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');
-
-use CI3_Events as Events;
-
-class PaabgabeUebersicht extends FHCAPI_Controller
-{
-	const DOWNLOAD_PERMISSION = 'lehre/abgabetool:download';
-	const ABGABE_TYPES = ['Bachelor', 'Diplom'];
-
-	/**
-	 * PaabgabeUebersicht API constructor.
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'viewData' => self::PERM_LOGGED,
-			'getPaAbgaben' => array('lehre/abgabetool:r'),
-			'getStudiengaenge' => array('lehre/abgabetool:r'),
-			'getTermine' => array('lehre/abgabetool:r'),
-			'getPaAbgabetypen' => array('lehre/abgabetool:r'),
-			'downloadZip' => array('lehre/abgabetool:r'),
-			//'downloadProjektarbeit' => array('lehre/abgabetool:r')
-		]);
-
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-
-		$this->load->library('PermissionLib');
-
-		// Load Phrases
-		$this->loadPhrases([
-			'abgabetool'
-		]);
-	}
-
-	public function viewData()
-	{
-		$viewData = [
-			"uid" => getAuthUID(),
-			// TODO create permission
-			"showEdit" => true,
-		];
-
-        $this->terminateWithSuccess($viewData);
-	}
-
-	/**
-	 * Get Projektabgaben for search criteria.
-	 */
-	public function getPaAbgaben()
-	{
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
-		$abgabedatum = $this->input->get('abgabedatum');
-		$personSearchString = $this->input->get('personSearchString');
-
-		$result = $this->PaabgabeModel->getPaAbgaben(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz, $abgabedatum, $personSearchString);
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		// check wether Abgabe is in visual library
-		if (hasData($result))
-		{
-			Events::trigger('in_visual_library', getData($result));
-		}
-
-		$this->terminateWithSuccess(getData($result) ?: []);
-	}
-
-	/**
-	 * Get all Studiengänge for which user is entitled for
-	 */
-	public function getStudiengaenge()
-	{
-		$studiengang_kz_arr = $this->permissionlib->getSTG_isEntitledFor(self::DOWNLOAD_PERMISSION);
-
-		if (!$studiengang_kz_arr) $this->terminateWithSuccess([]);
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudiengangModel->addSelect('tbl_studiengang.*, UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) AS kuerzel', $studiengang_kz_arr);
-		$this->StudiengangModel->db->where_in('studiengang_kz', $studiengang_kz_arr);
-		$this->StudiengangModel->addOrder('typ, kurzbz');
-		$result = $this->StudiengangModel->load();
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	/**
-	 * Get projekt work due dates, depending on search criteria.
-	 */
-	public function getTermine()
-	{
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
-
-		$result = $this->PaabgabeModel->getTermine(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz);
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	/**
-	 * Get all submission types.
-	 */
-	public function getPaAbgabetypen()
-	{
-		// Load model PaabgabetypModel
-		$this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel');
-
-		$this->PaabgabetypModel->addOrder('bezeichnung');
-		$result = $this->PaabgabetypModel->load();
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	/**
-	 * Download zip files with project works matching submission search criteria.
-	 */
-	public function downloadZip()
-	{
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
-		$abgabedatum = $this->input->get('abgabedatum');
-		$personSearchString = $this->input->get('personSearchString');
-
-		if (!isset($studiengang_kz) && !isset($abgabetyp_kurzbz) && !isset($abgabedatum) && !isset($personSearchString))
-			$this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'nichtsAusgewaehlt'));
-
-		$this->load->library('zip');
-
-		$result = $this->PaabgabeModel->getPaAbgaben(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz, $abgabedatum, $personSearchString);
-
-		if (isError($result)) $this->terminateWithFileOutput('text/plain', getError($result));
-
-		$fileExists = false;
-		$studiengang_kuerzel = null;
-
-		if (!hasData($result)) $this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'keineDateienVorhanden'));
-
-		$abgaben = getData($result);
-
-		foreach ($abgaben as $abgabe)
-		{
-			$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$abgabe->uid.'.pdf';
-			if (file_exists($path))
-			{
-				$fileExists = true;
-				$studiengang_kuerzel = $abgabe->studiengang_kuerzel;
-				$this->zip->read_file($path);
-			}
-		}
-
-		if (!$fileExists) $this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'keineDateienVorhanden'));
-
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$zipFileName = 'Abgabe'.(isset($studiengang_kz) && isset($studiengang_kuerzel) ? '_'.$studiengang_kuerzel : '').'.zip';
-		$this->zip->download($zipFileName);
-	}
-
-	/**
-	 * Download Projektarbeit document.
-	 */
-	//~ public function downloadProjektarbeit()
-	//~ {
-		//~ $paabgabe_id = $this->input->get('paabgabe_id');
-
-		//~ if (!is_numeric($paabgabe_id))
-			//~ $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Abgabe ID']), self::ERROR_TYPE_GENERAL);
-
-		//~ //$abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
-		//~ $this->PaabgabeModel->addSelect("paabgabe_id, student_uid, tbl_paabgabe.datum, tbl_paabgabe.abgabedatum, projekttyp_kurzbz, titel, titel_english,
-					//~ paabgabe_id || '_' || student_uid || '.pdf' AS filename");
-		//~ $this->PaabgabeModel->addJoin('lehre.tbl_projektarbeit', 'projektarbeit_id');
-		//~ $abgabeRes = $this->PaabgabeModel->load($paabgabe_id);
-
-		//~ if (isError($abgabeRes))
-			//~ show_error(getError($abgabeRes));
-
-		//~ if (hasData($abgabeRes))
-		//~ {
-			//~ $endabgabe = getData($abgabeRes)[0];
-			//~ $filepath = PAABGABE_PATH.$endabgabe->filename;
-
-			//~ if (file_exists($filepath))
-			//~ {
-				//~ $this->output
-					//~ ->set_status_header(200)
-					//~ ->set_content_type('application/pdf', 'utf-8')
-					//~ ->set_header('Content-Disposition: attachment; filename="'.$endabgabe->filename.'"')
-					//~ ->set_output(file_get_contents($filepath))
-					//~ ->_display();
-			//~ }
-			//~ else
-			//~ {
-				//~ show_error("File does not exist.");
-			//~ }
-		//~ }
-	//~ }
-}

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/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/messages/Messages.php

@@ -1,5 +1,6 @@
 <?php
 
+
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class Messages extends FHCAPI_Controller
@@ -13,7 +14,6 @@ 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'],
@@ -21,7 +21,8 @@ class Messages extends FHCAPI_Controller
 			'getReplyData' => ['admin:r', 'assistenz:r'],
 			'getPersonId' => ['admin:r', 'assistenz:r'],
 			'getUid' => ['admin:r', 'assistenz:r'],
-			'getUids' => ['admin:r', 'assistenz:r'],
+			'getStudiengang' => ['admin:r', 'assistenz:r'],
+
 		]);
 
 		//Load Models
@@ -38,26 +39,18 @@ class Messages extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'messages'
+			'ui'
 		]);
 	}
 
-	public function getMessages($id, $type_id, $size=null, $page=null)
+	public function getMessages($id, $type_id, $size, $page)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}
 
-		if(!(is_null($size) && is_null($page)))
-		{
-			$offset = $size * ($page - 1);
-			$limit = $size;
-		}
-		else
-		{
-			$offset = null;
-			$limit = null;
-		}
+		$offset = $size * ($page - 1);
+		$limit = $size;
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 
@@ -93,66 +86,35 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess(array());
 	}
 
-	public function getDataVorlage($vorlage_kurzbz)
+	public function getDataVorlage($vorlage_kurzbz, $studiengang_kz)
 	{
-		$studiengang_kz = 0;
-		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
-		$this->VorlagestudiengangModel->addOrder('version', 'DESC');
+		if(!$studiengang_kz)
+			$this->terminateWithSuccess(null);
 
-		$result = $this->VorlagestudiengangModel->loadWhere(
-			[
-				'vorlage_kurzbz' =>$vorlage_kurzbz,
-				'studiengang_kz' => $studiengang_kz
-			]);
+		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+
+		$result = $this->VorlagestudiengangModel->getCurrent($vorlage_kurzbz, $studiengang_kz);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$vorlage = current($data);
-		$this->terminateWithSuccess($vorlage);
+		$this->terminateWithSuccess(current($data));
 	}
 
-	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()
@@ -163,45 +125,25 @@ 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
+		//default setting
+		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
+
 		$uid = getAuthUID();
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$result = $this->BenutzerModel->loadWhere(
@@ -239,61 +181,47 @@ 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')
+		{
+			$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']))
 		{
@@ -301,60 +229,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.*');
@@ -377,6 +284,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);
@@ -424,11 +332,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);
@@ -436,11 +339,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);
@@ -448,50 +348,54 @@ 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);
+	}
+
+	public function getStudiengang($id, $typeId)
+	{
+		if($typeId!= "prestudent_id" && $typeId!="uid" )
+			$this->terminateWithSuccess(null);
+
+		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->load($prestudent_id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$studiengang_kz = current($data)->studiengang_kz;
+
+		return $this->terminateWithSuccess($studiengang_kz);
 	}
 
 	private function _getPersonId($id, $typeId)
@@ -510,16 +414,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);
 
@@ -536,7 +435,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);
 

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/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)
 		{
@@ -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

@@ -200,8 +200,7 @@ class Config extends FHCAPI_Controller
 					'type' => 'select',
 					'values' => $buchungstyp_kurzbz_plus_all,
 					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung',
-					'default' => 'all'
+					'label_key' => 'beschreibung'
 				],
 				'samestg' => [
 					'type' => 'bool',
@@ -227,8 +226,7 @@ class Config extends FHCAPI_Controller
 					'type' => 'select',
 					'values' => $buchungstyp_kurzbz_plus_all,
 					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung',
-					'default' => 'all'
+					'label_key' => 'beschreibung'
 				],
 				'samestg' => [
 					'type' => 'bool',
@@ -333,10 +331,7 @@ class Config extends FHCAPI_Controller
 		];
 		$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' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js')
 		];
 		$result['documents'] = [
 			'title' => $this->p->t('stv', 'tab_documents'),
@@ -367,6 +362,7 @@ class Config extends FHCAPI_Controller
 		$result['messages'] = [
 			'title' => $this->p->t('stv', 'tab_messages'),
 			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Messages.js'),
+			'showOnlyWithUid' => true
 		];
 
 		$result['grades'] = [
@@ -506,7 +502,7 @@ class Config extends FHCAPI_Controller
 		{
 			$result['combinePeople'] = [
 				'title' => $this->p->t('stv', 'tab_combine_people'),
-				'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js'),
+				'component' => './Stv/Studentenverwaltung/Details/CombinePeople.js',
 				'config' => $config['combinePeople']
 			];
 		}
@@ -516,11 +512,6 @@ class Config extends FHCAPI_Controller
 			'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

@@ -78,32 +78,52 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
 
 		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
+
+		$arrayAccepted = [];
 		$person_id = $this->_getPersonId($prestudent_id);
 
-		$mergedArray = [];
+		$docNames = array_map(function ($item) {
+			return $item->dokument_kurzbz;
+		}, $resultPreDoc);
 
-		foreach ($resultPreDoc as $pre)
+		foreach($docNames as $doc)
 		{
-			$result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);
+			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
 
 			if (isError($result))
+			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-
+			}
 			if (hasData($result))
 			{
-				foreach (getData($result) as $doc)
+				$data = getData($result);
+				foreach ($data as $value)
 				{
-					$merged = clone $doc;
-					$merged->docdatum = $pre->docdatum;
-					$merged->insertvonma = $pre->insertvonma;
-					$merged->bezeichnung = $pre->bezeichnung;
-					$mergedArray[] = $merged;
+					array_push($arrayAccepted, $value);
 				}
 			}
-			else
-			{
-				$mergedArray[] = $pre;
+		}
+
+		//Mapping with document_kurzbz
+		$preDocMap = [];
+		foreach ($resultPreDoc as $pre) {
+			$preDocMap[$pre->dokument_kurzbz] = $pre;
+		}
+
+		$mergedArray = [];
+		foreach ($arrayAccepted as $doc) {
+			$merged = clone $doc;
+
+			if (isset($preDocMap[$doc->dokument_kurzbz])) {
+				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
+				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
+				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
+			} else {
+				$merged->akzeptiertdatum = null;
+				$merged->akzeptiertvon = null;
 			}
+
+			$mergedArray[] = $merged;
 		}
 
 		$this->terminateWithSuccess($mergedArray);
@@ -570,14 +590,14 @@ class Dokumente extends FHCAPI_Controller
 
 		$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("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uid, 20, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Zweisprachig", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uid, 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("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uid, 50, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $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),
@@ -666,8 +686,8 @@ class Dokumente extends FHCAPI_Controller
 			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("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uidString, 50, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $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),
@@ -733,10 +753,6 @@ class Dokumente extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		if(!(is_array($data) && count($data) > 0))
-		{
-			return null;
-		}
 		$student = current($data);
 
 		return $student->student_uid;

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

@@ -48,8 +48,7 @@ class Konto extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'konto',
-			'lehre'
+			'konto'
 		]);
 	}
 
@@ -113,7 +112,7 @@ class Konto extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function getBuchungstypen($studiensemester_kurzbz = null)
+	public function getBuchungstypen()
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
 
@@ -123,7 +122,6 @@ class Konto extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->_getOEHBeitrag($data, $studiensemester_kurzbz);
 		$this->terminateWithSuccess($data);
 	}
 
@@ -241,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 = [];
@@ -496,43 +494,4 @@ class Konto extends FHCAPI_Controller
 
 		$this->terminateWithSuccess();
 	}
-
-	private function _getOEHBeitrag(&$data, $studiensemester_kurzbz = null)
-	{
-		if (is_null($studiensemester_kurzbz))
-		{
-			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-			$studiensemester_akt = $this->variablelib->getVar('semester_aktuell');
-		}
-		else
-		{
-			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-			if ($this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
-				$studiensemester_akt = $studiensemester_kurzbz;
-			else
-				$this->terminateWithError($this->p->t('lehre', 'error_noStudiensemester'));
-		}
-
-		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
-		$oehBeitrag = $this->OehbeitragModel->getByStudiensemester($studiensemester_akt);
-
-		$oehStandardbetrag = null;
-		if (hasData($oehBeitrag))
-		{
-			$oeh = getData($oehBeitrag)[0];
-			$summe = ($oeh->studierendenbeitrag + $oeh->versicherung) * -1;
-			$oehStandardbetrag = number_format((float)$summe, 2, '.', '');
-		}
-
-		if ($oehStandardbetrag !== null)
-		{
-			$data = array_map(function ($buchungstyp) use ($oehStandardbetrag) {
-				if (isset($buchungstyp->buchungstyp_kurzbz) && (strtolower($buchungstyp->buchungstyp_kurzbz) === 'oeh'))
-				{
-					$buchungstyp->standardbetrag = $oehStandardbetrag;
-				}
-				return $buchungstyp;
-			}, $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

@@ -17,8 +17,7 @@ class Projektarbeit extends FHCAPI_Controller
 			'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']
+			'getNoten' => ['admin:r', 'assistenz:r']
 		]);
 
 		// Load Libraries
@@ -41,15 +40,11 @@ class Projektarbeit extends FHCAPI_Controller
 		$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');
@@ -58,7 +53,10 @@ class Projektarbeit extends FHCAPI_Controller
 
 		$result = $this->ProjektarbeitModel->getProjektarbeit($student_uid);
 
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
 
 		if (!hasData($result)) $this->terminateWithSuccess([]);
 
@@ -81,9 +79,6 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->terminateWithSuccess($projektarbeiten);
 	}
 
-	/**
-	 * Load a single Projektarbeit by id.
-	 */
 	public function loadProjektarbeit()
 	{
 		$projektarbeit_id = $this->input->get('projektarbeit_id');
@@ -106,9 +101,6 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->terminateWithSuccess(current($data));
 	}
 
-	/**
-	 * Inwert a Projektarbeit.
-	 */
 	public function insertProjektarbeit()
 	{
 		$student_uid = $this->input->post('uid');
@@ -136,9 +128,6 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	/**
-	 * Update a Projektarbeit by ID.
-	 */
 	public function updateProjektarbeit()
 	{
 		$projektarbeit_id = $this->input->post('projektarbeit_id');
@@ -168,9 +157,6 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	/**
-	 * Delete Projektarbeit by ID after validation.
-	 */
 	public function deleteProjektarbeit()
 	{
 		$projektarbeit_id = $this->input->post('projektarbeit_id');
@@ -199,9 +185,6 @@ class Projektarbeit extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)) ? : null);
 	}
 
-	/**
-	 * Get all active projekt work types.
-	 */
 	public function getTypenProjektarbeit()
 	{
 		$result = $this->ProjekttypModel->loadWhere(['aktiv' => true]);
@@ -211,9 +194,6 @@ class Projektarbeit extends FHCAPI_Controller
 		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
-	/**
-	 * Gets companies by search string.
-	 */
 	public function getFirmen()
 	{
 		$searchString = $this->input->get('searchString');
@@ -228,9 +208,6 @@ class Projektarbeit extends FHCAPI_Controller
 		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');
@@ -241,7 +218,6 @@ class Projektarbeit extends FHCAPI_Controller
 		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);
@@ -250,7 +226,6 @@ class Projektarbeit extends FHCAPI_Controller
 
 		foreach ($lvs as $lv)
 		{
-			// add Lehreinheiten for each Lv for the semester
 			$lehreinheiten = $this->LehreinheitModel->getLesForLv(
 				$lv->lehrveranstaltung_id, $studiensemester_kurzbz
 			);
@@ -275,14 +250,8 @@ class Projektarbeit extends FHCAPI_Controller
 		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);
@@ -291,22 +260,9 @@ class Projektarbeit extends FHCAPI_Controller
 	}
 
 	/**
-	 * 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
+	 *
+	 * @param
+	 * @return object success or error
 	 */
 	private function _validate($formData)
 	{
@@ -337,9 +293,9 @@ class Projektarbeit extends FHCAPI_Controller
 	}
 
 	/**
-	 * Extract Projektarbeit data from passed form data.
-	 * @param formData
-	 * @return array
+	 * 
+	 * @param
+	 * @return object success or error
 	 */
 	private function _getProjektarbeitArr($formData)
 	{
@@ -361,9 +317,9 @@ class Projektarbeit extends FHCAPI_Controller
 	}
 
 	/**
-	 * Check if deletion of a Projektarbeit is possible.
-	 * @param $projektarbeit_id
-	 * @return object success if deletion possible, error otherwise.
+	 *
+	 * @param
+	 * @return object success or error
 	 */
 	private function _validateDelete($projektarbeit_id)
 	{
@@ -384,11 +340,6 @@ class Projektarbeit extends FHCAPI_Controller
 		return success();
 	}
 
-	/**
-	 * Checks permissions for a student.
-	 * @param $student_uid
-	 * @return bool true if authorized
-	 */
 	private function _hasBerechtigungForStudent($student_uid)
 	{
 		if (!$student_uid)

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

@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use \DateTime as DateTime;
-use \CI3_Events as Events;
+use CI3_Events as Events;
 
 class Projektbetreuer extends FHCAPI_Controller
 {
@@ -43,9 +43,6 @@ class Projektbetreuer extends FHCAPI_Controller
 		$this->load->library('PermissionLib');
 	}
 
-	/**
-	 * Gets Projektbetreuer data for a Projektarbeit.
-	 */
 	public function getProjektbetreuer()
 	{
 		$projektarbeit_id = $this->input->get('projektarbeit_id');
@@ -53,30 +50,21 @@ class Projektbetreuer extends FHCAPI_Controller
 		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]);
+		$this->ProjektbetreuerModel->addSelect(
+			'projektarbeit_id, person_id, nachname, vorname, note, punkte, round(stunden, 1) AS stunden,
+			stundensatz, betreuerart_kurzbz, vertrag_id, titelpre, titelpost'
+		);
+		$this->ProjektbetreuerModel->addSelect("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");
+		$this->ProjektbetreuerModel->addJoin('public.tbl_person pers', 'person_id');
+		$result = $this->ProjektbetreuerModel->loadWhere(['projektarbeit_id' => $projektarbeit_id]);
 
 		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
@@ -98,7 +86,6 @@ class Projektbetreuer extends FHCAPI_Controller
 			//~ }
 		//~ }
 
-		// add thesis download link (from external extension)
 		foreach ($projektbetreuer as $pb)
 		{
 			$downloadLink = null;
@@ -117,9 +104,6 @@ class Projektbetreuer extends FHCAPI_Controller
 		$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');
@@ -134,36 +118,14 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		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,
+			'stunden' => $projektbetreuer['stunden'],
+			'stundensatz' => $projektbetreuer['stundensatz'],
 			'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz']
 		];
 
@@ -190,9 +152,6 @@ class Projektbetreuer extends FHCAPI_Controller
 		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
-	/**
-	 * Delete a Projektbetreuer assignment to a Projektarbeit.
-	 */
 	public function deleteProjektbetreuer()
 	{
 		$projektarbeit_id = $this->input->post('projektarbeit_id');
@@ -200,44 +159,21 @@ class Projektbetreuer extends FHCAPI_Controller
 		$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)
-			);
-		}
+			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)
-			);
-		}
+			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);
+		$validate = $this->_validateDelete($projektarbeit_id, $person_id);
 
 		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]
 		);
@@ -249,12 +185,9 @@ class Projektbetreuer extends FHCAPI_Controller
 			$this->outputJson($result);
 		}
 
-		return $this->terminateWithSuccess(getData($result));
+		return $this->terminateWithSuccess(current(getData($result)) ? : null);
 	}
 
-	/**
-	 * Get all active Betreuerarten.
-	 */
 	public function getBetreuerarten()
 	{
 		$result = $this->BetreuerartModel->loadWhere(['aktiv' => true]);
@@ -264,9 +197,6 @@ class Projektbetreuer extends FHCAPI_Controller
 		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
-	/**
-	 * Get all Noten.
-	 */
 	public function getNoten()
 	{
 		$result = $this->NoteModel->load();
@@ -276,9 +206,6 @@ class Projektbetreuer extends FHCAPI_Controller
 		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');
@@ -289,9 +216,6 @@ class Projektbetreuer extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
-	/**
-	 * Get all Projektbetreuer by search string.
-	 */
 	public function getProjektbetreuerBySearchQuery()
 	{
 		$searchString = $this->input->get('searchString');
@@ -303,23 +227,9 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		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);
+		return $this->terminateWithSuccess(hasData($result) ? $this->_addFullNameToBetreuer(getData($result)) : []);
 	}
 
-	/**
-	 * Get person info by Id.
-	 */
 	public function getPerson()
 	{
 		$person_id = $this->input->get('person_id');
@@ -345,7 +255,9 @@ class Projektbetreuer extends FHCAPI_Controller
 	}
 
 	/**
-	 * Validate list of Projektbetreuer.
+	 *
+	 * @param
+	 * @return object success or error
 	 */
 	public function validateProjektbetreuer()
 	{
@@ -365,9 +277,9 @@ class Projektbetreuer extends FHCAPI_Controller
 	}
 
 	/**
-	 * Validation funciton for checking Projektbetreuer input.
-	 * @param $formData Betreuer data
-	 * @return bool true when data is valid
+	 *
+	 * @param
+	 * @return object success or error
 	 */
 	private function _validate($formData)
 	{
@@ -394,32 +306,26 @@ class Projektbetreuer extends FHCAPI_Controller
 	}
 
 	/**
-	 * Check possibility of deletion of a Projektbetreuer.
-	 * @param projektarbeit_id
-	 * @param person_id
-	 * @param betreuerart_kurzbz
-	 * @return object success when delete possible, error otherwise
+	 *
+	 * @param
+	 * @return object success or error
 	 */
-	private function _validateDelete($projektarbeit_id, $person_id, $betreuerart_kurzbz)
+	private function _validateDelete($projektarbeit_id, $person_id)
 	{
-		// 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]
-		);
+		$result = $this->ProjektbetreuerModel->loadWhere(['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id]);
 
 		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
+	 *
+	 * @param
+	 * @return object success or error
 	 */
 	private function _addFullNameToBetreuer($betreuerArr)
 	{

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

@@ -636,7 +636,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 +645,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);
 	}
@@ -1077,24 +1078,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 +1102,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 +1112,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 +1135,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 +1341,6 @@ class Status extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => $authUID
 		];
-		$nullableFields = ['statusgrund_id', 'anmerkung', 'rt_stufe'];
 		foreach ([
 					'orgform_kurzbz',
 					'anmerkung',
@@ -1373,17 +1349,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

@@ -37,7 +37,7 @@ class Student extends FHCAPI_Controller
 			'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
 		]);
 
@@ -108,10 +108,6 @@ 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(
@@ -140,9 +136,14 @@ class Student extends FHCAPI_Controller
 			);
 		}
 		$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 +159,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 +221,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 +232,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 +245,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 +305,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 +322,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;
 			}
 		}
@@ -464,7 +462,7 @@ class Student extends FHCAPI_Controller
 		return $this->save($student->prestudent_id, $studiensemester_kurzbz);
 	}
 
-	public function getPerson()
+	public function check()
 	{
 		$this->load->library('form_validation');
 
@@ -482,55 +480,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);
 	}
 
@@ -544,53 +508,71 @@ class Student extends FHCAPI_Controller
 			$_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_fieldRequired', ['field' => $this->p->t('person', 'nachname')])
+		]);
+		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'geschlecht')])
+		]);
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', ['isValidDate', function($value) { return isValidDate($value); }], [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+		$this->form_validation->set_rules('address[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_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_requiredIfStudentFunc|integer|less_than[9]|greater_than[-1]', [
+			'requiredIfStudentFunc' => $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());
 
 		// 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);
-		}
+		$data = $this->getDataOrTerminateWithError($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($data);
 	}
 
-	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 +595,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 +619,52 @@ class Student extends FHCAPI_Controller
 				'typ' => 'h',
 				'zustelladresse' => true,
 			];
-
+			if ($anlegen < 0) { // Überschreiben
 				$this->AdresseModel->addSelect('adresse_id');
+				$this->AdresseModel->addJoin('public.tbl_adressentyp', 'typ = adressentyp_kurzbz');
+				$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 +674,87 @@ 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
+		$personOnly = $anlegen = $this->input->post('personOnly');
 
-		// Anmerkung with Ausbildungsart
-		$studiengang_kz = $this->input->post('studiengang_kz');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		$ausbildungsart = $this->input->post('ausbildungsart');
-		$anmerkung = $this->input->post('anmerkungen');
-		$foerderrelevant = null;
-		if ($ausbildungsart)
-			$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;
-
-		// 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');
-
-		$prestudent_id = getData($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')
-			);
-		}
-		else
+		if (!$personOnly)
 		{
+			// Prestudent anlegen
+			$data = [
+				'aufmerksamdurch_kurzbz' => 'k.A.',
+				'person_id' => $person_id,
+				'studiengang_kz' => $this->input->post('studiengang_kz'),
+				'ausbildungcode' => $this->input->post('letzteausbildung'),
+				'anmerkung' => $this->input->post('anmerkungen'),
+				'reihungstestangetreten' => false,
+				'bismelden' => true
+			];
+			$ausbildungsart = $this->input->post('ausbildungsart');
+			if ($ausbildungsart)
+				$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
+			// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
+			$incoming = $this->input->post('incoming');
+			if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
+				$data['foerderrelevant'] = false;
+			// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
+			$this->PrestudentModel->addOrder('zgvmas_code');
+			$this->PrestudentModel->addOrder('zgv_code', 'DESC');
+			$this->PrestudentModel->addLimit(1);
+			$result = $this->PrestudentModel->loadWhere([
+				'person_id' => $person_id
+			]);
+			$prestudent = $this->getDataOrTerminateWithError($result);
+			if ($prestudent) {
+				$prestudent = current($prestudent);
+				if ($prestudent->zgv_code) {
+					$data['zgv_code'] = $prestudent->zgv_code;
+					$data['zgvort'] = $prestudent->zgvort;
+					$data['zgvdatum'] = $prestudent->zgvdatum;
+
+					$data['zgvmas_code'] = $prestudent->zgvmas_code;
+					$data['zgvmaort'] = $prestudent->zgvmaort;
+					$data['zgvmadatum'] = $prestudent->zgvmadatum;
+				}
+			}
+			// Prestudent speichern
+			$result = $this->PrestudentModel->insert($data);
+			$prestudent_id = $this->getDataOrTerminateWithError($result);
+
 			// Prestudent Rolle Anlegen
-			$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;
+			$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);
 
-		return success($prestudent_id);
+			if ($incoming) {
+				// TODO(chris): IMPLEMENT!
+				//Matrikelnummer und UID generieren
+				//Benutzerdatensatz anlegen
+				//Studentendatensatz anlegen
+				//StudentLehrverband anlegen
+			}
+		}
+		// TODO(chris): DEBUG
+		/*$result = $this->PrestudentModel->loadWhere([
+			'pestudent_id' => 1
+		]);
+		if (isError($result)) {
+			return $result;
+		}*/
+
+		return success($person_id);
 	}
 
 	public function requiredIfNotPersonId($value)
@@ -766,84 +766,20 @@ class Student extends FHCAPI_Controller
 	
 	public function requiredIfAddressFunc($value)
 	{
-		if (!isset($_POST['address']['checked']) || !$_POST['address']['checked'])
+		if (!$_POST['address']['func'] || $_POST['address']['func'] == 0)
 			return true;
 		return !!$value;
 	}
 
 	public function requiredIfStudentFunc($value)
 	{
-		if (isset($_POST['personOnly']) && $_POST['personOnly'])
+		if ($_POST['personOnly'])
 			return true;
 		return !!$value;
 	}
 
-	public function requiredIfStudentAndNotIncomingFunc($value)
+	public function isValidDate($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

@@ -611,7 +611,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) . " 
@@ -626,7 +626,7 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
-
+		
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -801,9 +801,14 @@ class Students extends FHCAPI_Controller
 
 		//add status per semester
 		$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->addSelectPrioRel();
@@ -850,45 +855,6 @@ class Students extends FHCAPI_Controller
 	{
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
-		$this->load->config('stv');
-
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$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');
@@ -911,17 +877,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');
 
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-		}
-
 
 		$this->PrestudentModel->addSelect("b.uid");
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addSelect('tag_data_agg.tags');
-		}
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');
@@ -940,9 +897,14 @@ class Students extends FHCAPI_Controller
 
 		//add status per semester
 		$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->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
@@ -979,7 +941,6 @@ class Students extends FHCAPI_Controller
 
 		$this->PrestudentModel->addSelect('mentor');
 		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect('unruly');
 
 		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
 

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

@@ -215,7 +215,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');
 

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

@@ -76,7 +76,9 @@ class Vertrag extends FHCAPI_Controller
 
 		if (isError($allOe)) $this->terminateWithError(getError($allOe), self::ERROR_TYPE_GENERAL);
 
-		$allOe = hasData($allOe) ? array_column(getData($allOe), 'oe_kurzbz') : [];
+		$allOe = hasData($allOe) ? getData($allOe) : [];
+
+		$this->addMeta('oe', $allOe);
 
 		// * then check if the user has permissions to cancel the corresponding lv-organisational units
 		if (!$this->permissionlib->isBerechtigtMultipleOe('admin', $allOe, 'suid') &&

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/components/Cis/Mylv.php

@@ -13,13 +13,12 @@ class Mylv extends Auth_Controller
 	 */
 	public function __construct()
 	{
-		
 		parent::__construct([
-			'Student' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
-			'Studiensemester' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
-			'Lvs' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
-			'Info' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
-			'Pruefungen' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'] // TODO(chris): permissions?
+			'Student' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Studiensemester' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Lvs' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Info' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'Pruefungen' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
 		]);
 	}
 
@@ -45,27 +44,13 @@ class Mylv extends Auth_Controller
 	public function Studiensemester()
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID())) ?? false;
-		if($isMitarbeiter) {
-			$result = $this->StudiensemesterModel->getWhereMitarbeiterHasLvs(getAuthUID());
+		$result = $this->StudiensemesterModel->getWhereStudentHasLvs(getAuthUID());
 
-			if (isError($result))
-				return $this->outputJsonError(getError($result));
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
 
-			$this->outputJsonSuccess(getData($result));
-		} else if(getData($this->StudentModel->isStudent(getAuthUID())) ?? false) { // $isStudent
-			$result = $this->StudiensemesterModel->getWhereStudentHasLvs(getAuthUID());
-
-			if (isError($result))
-				return $this->outputJsonError(getError($result));
-
-			$this->outputJsonSuccess(getData($result));
-		} else {
-			$this->outputJsonError('neither student or mitarbeiter');
-		}
+		$this->outputJsonSuccess(getData($result));
 	}
 
 	/**
@@ -73,27 +58,13 @@ class Mylv extends Auth_Controller
 	public function Lvs($studiensemester_kurzbz)
 	{
 		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID())) ?? false;
-		if($isMitarbeiter) {
-			$result = $this->LehrveranstaltungModel->getLvsByMitarbeiterInSemester(getAuthUID(), $studiensemester_kurzbz);
+		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
 
-			if (isError($result))
-				return $this->outputJsonError(getError($result));
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
 
-			$this->outputJsonSuccess(getData($result));
-		} else if(getData($this->StudentModel->isStudent(getAuthUID())) ?? false) { // $isStudent
-			$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
-
-			if (isError($result))
-				return $this->outputJsonError(getError($result));
-
-			$this->outputJsonSuccess(getData($result));
-		} else {
-			$this->outputJsonError('neither student or mitarbeiter');
-		}
+		$this->outputJsonSuccess(getData($result));
 	}
 
 	/**

application/controllers/dashboard/Admin.php

@@ -1,52 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- */
-class Admin extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		// Set required permissions
-		parent::__construct(
-			array(
-				'index' => 'dashboard/admin:rw',
-				'preview' => 'dashboard/admin:r',
-			)
-		);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-	public function index()
-	{
-		$this->load->view('dashboard/admin.php', []);
-	}
-
-	public function preview($dashboard_kurzbz = 'CIS')
-	{
-		$this->load->view('dashboard/preview.php', [
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
-	}
-}

application/controllers/dashboard/Api.php

@@ -0,0 +1,76 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class Api extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'		=> 'dashboard/admin:rw',
+				'getNews'	=> 'dashboard/benutzer:r',
+                'getAmpeln'	=> 'dashboard/benutzer:r',
+			)
+		);
+
+		$this->load->library('AuthLib', null, 'AuthLib');
+
+		$this->_setAuthUID();
+	}
+
+	public function index()
+	{
+		echo 'Dashboard API Controller';
+	}
+
+	/**
+	 * Get News.
+	 */
+	public function getNews()
+	{
+		$limit =  $this->input->get('limit');
+
+		$this->load->model('content/News_model', 'NewsModel');
+
+		$result = $this->NewsModel->getAll($limit);
+
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
+
+
+	/**
+	 * Get Ampeln.
+	 */
+	public function getAmpeln()
+	{
+
+		$this->load->model('content/Ampel_model', 'AmpelModel');
+		$result = $this->AmpelModel->getByUser($this->_uid);
+
+		if (hasData($result))
+		{
+			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->terminateWithJsonError('fehler entdeckt');
+		}
+	}
+
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid) show_error('User authentification failed');
+	}
+}

application/controllers/dashboard/Config.php

@@ -0,0 +1,216 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Config
+ *
+ * @author bambi
+ */
+class Config extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/benutzer:r',
+				'dummy'							=> 'dashboard/benutzer:r',
+				'genWidgetId'					=> 'dashboard/benutzer:rw',
+				'addWidgetsToPreset'			=> 'dashboard/admin:rw',
+				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
+				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
+				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
+				'funktionen'					=> 'dashboard/admin:r',
+				'preset'						=> 'dashboard/admin:r',
+				'presetBatch'					=> 'dashboard/admin:r'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->library('AuthLib', null, 'AuthLib');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+	}
+	
+	public function index()
+	{
+		$dashboard_kurzbz = $this->input->get('db');
+		$uid = $this->AuthLib->getAuthObj()->username;
+
+		$dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
+		if(!$dashboard) {
+			http_response_code(404);
+			$this->terminateWithJsonError(array(
+				'error' => 'Dashboard ' . $dashboard_kurzbz . ' not found.'
+			));
+		}
+		
+		$mergedconfig = $this->DashboardLib->getMergedConfig($dashboard->dashboard_id, $uid);
+		$this->outputJsonSuccess($mergedconfig);
+	}
+	
+	public function genWidgetId()
+	{
+		$dashboard_kurzbz = $this->input->get('db');
+		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
+		$this->outputJsonSuccess(array(
+			'widgetid' => $widgetid
+		));
+	}
+	
+	public function addWidgetsToPreset()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		
+		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		
+		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		
+		$preset->preset = json_encode($preset_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if (isError($result)) {
+			http_response_code(500);
+			$this->terminateWithJsonError('preset could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'preset successfully stored.', 'data' => $preset_decoded));
+	}
+	
+	public function removeWidgetFromPreset()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$widgetid = $input->widgetid;
+				
+		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if ($preset === null) {
+			http_response_code(404);
+			$this->terminateWithJsonError('preset for dashboard ' . $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz . ' not found.');
+		}
+		
+		$preset_decoded = json_decode($preset->preset, true);
+		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$preset->preset = json_encode($preset_decoded);
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if (isError($result))
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');
+		}
+		$this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
+	}
+
+	public function addWidgetsToUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$uid = $this->AuthLib->getAuthObj()->username;
+		
+		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
+		
+		$override_decoded = json_decode($override->override, true);
+
+		$this->DashboardLib->addWidgetsToWidgets($override_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->DashboardLib->insertOrUpdateOverride($override);
+		if (isError($result)) {
+			http_response_code(500);
+			$this->terminateWithJsonError('override could not be saved');
+		}
+		
+		$this->outputJsonSuccess(array('msg' => 'override successfully stored.', 'data' => $override_decoded));
+	}
+	
+	public function removeWidgetFromUserOverride()
+	{
+		$input = json_decode($this->input->raw_input_stream);
+		$dashboard_kurzbz = $input->db;
+		$funktion_kurzbz = $input->funktion_kurzbz;
+		$uid = $this->AuthLib->getAuthObj()->username;
+		$widgetid = $input->widgetid;
+		
+		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
+		if (empty($override)) {
+			http_response_code(404);
+			$this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
+		}
+		
+		$override_decoded = json_decode($override->override, true);
+		
+		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded, $funktion_kurzbz, $widgetid))
+		{
+			http_response_code(404);
+			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
+		}
+		
+		$override->override = json_encode($override_decoded);
+		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
+		if (isError($result))
+		{
+			http_response_code(500);
+			$this->terminateWithJsonError('failed to remove widget');
+		}
+		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
+	}
+	
+	public function funktionen()
+	{
+		$funktionen = $this->FunktionModel->load();
+
+		if (isError($funktionen)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($funktionen)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($funktionen) ?: []);
+	}
+	
+	public function preset()
+	{
+		$db = $this->input->get('db');
+		$funktion = $this->input->get('funktion');
+
+		$conf = $this->DashboardLib->getPreset($db, $funktion);
+
+		if (!$conf)
+			return $this->outputJsonSuccess(['widgets' => [$funktion => []]]);
+
+		return $this->outputJsonSuccess(json_decode($conf->preset, true));
+	}
+	
+	public function presetBatch()
+	{
+		$db = $this->input->get('db');
+		$funktionen = $this->input->get('funktionen');
+		$result = [];
+
+		foreach ($funktionen as $funktion) {
+			$conf = $this->DashboardLib->getPreset($db, $funktion);
+			if ($conf)
+			{
+				$preset = json_decode($conf->preset, true);
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
+			}
+			else
+				$result[$funktion] = [];
+		}
+
+		return $this->outputJsonSuccess($result);
+	}
+}

application/controllers/dashboard/Dashboard.php

@@ -0,0 +1,86 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Dashboard extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> 'dashboard/admin:r',
+				'create'						=> 'dashboard/admin:rw',
+				'update'						=> 'dashboard/admin:rw',
+				'delete'						=> 'dashboard/admin:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
+	}
+	
+	public function index()
+	{
+		$result = $this->DashboardModel->load();
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function create()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->insert($input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function update()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->update($input->dashboard_id, $input);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function delete()
+	{
+		$input = $this->getPostJSON();
+
+		$result = $this->DashboardModel->delete($input->dashboard_id);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		
+		return $this->outputJsonSuccess(getData($result) ?: []);
+	}
+}

application/controllers/dashboard/DashboardDemo.php

@@ -0,0 +1,58 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class DashboardDemo extends Auth_Controller
+{
+    private $_uid;  // uid of the logged user
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        // Set required permissions
+        parent::__construct(
+            array(
+                'index' => 'dashboard/benutzer:r',
+                'admin' => 'dashboard/admin:rw'
+            )
+        );
+
+        $this->load->library('AuthLib');
+        $this->load->library('WidgetLib');
+
+        $this->_setAuthUID(); // sets property uid
+
+        $this->setControllerId(); // sets the controller id
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+	public function index()
+	{
+		$this->load->view('dashboard/dashboard_demo.php', []);
+	}
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+    public function admin()
+    {
+        $this->load->view('dashboard/dashboard_demo_admin.php', []);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Private methods
+
+    /**
+     * Retrieve the UID of the logged user and checks if it is valid
+     */
+    private function _setAuthUID()
+    {
+        $this->_uid = getAuthUID();
+
+        if (!$this->_uid) show_error('User authentification failed');
+    }
+}

application/controllers/dashboard/Widget.php

@@ -0,0 +1,109 @@
+<?php
+defined('BASEPATH') || exit('No direct script access allowed');
+/**
+ * Description of Widget
+ *
+ * @author chris
+ */
+class Widget extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
+				'getAll'						=> 'dashboard/admin:r',
+				'getWidgetsForDashboard'		=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
+				'setAllowed'					=> 'dashboard/admin:rw'
+			)
+		);
+		
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+		$this->load->model('dashboard/Widget_model', 'WidgetModel');
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+	}
+	
+	public function index()
+	{
+		$widget_id = $this->input->get('id');
+
+		$widget = $this->WidgetModel->load($widget_id);
+
+		if (isError($widget) || !getData($widget))
+			return $this->outputJsonSuccess([
+				"widget_id" => 0,
+				"widget_kurzbz" => "notfound",
+				"arguments" => json_encode([
+					"className" => 'alert-danger',
+					"title" => 'Widget Not Found',
+					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
+				]),
+				"setup" => json_encode([
+					"name" => 'Widget Not Found',
+					"file" => 'DashboardWidget/Default.js',
+					"width" => 1,
+					"height" => 1
+				])
+			]);
+		return $this->outputJsonSuccess(current(getData($widget)));
+	}
+	
+	public function getAll()
+	{
+		$dashboard_id = $this->input->get('dashboard_id');
+		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function getWidgetsForDashboard()
+	{
+		$db = $this->input->get('db');
+		$result = $this->WidgetModel->getForDashboard($db);
+
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+
+		$this->outputJsonSuccess(getData($result) ?: []);
+	}
+	
+	public function setAllowed()
+	{
+		$input = $this->getPostJSON();
+
+		$dashboard_id = $input->dashboard_id;
+		$widget_id = $input->widget_id;
+		$action = $input->action;
+
+		if ($action == 'add') {
+			$result = $this->DashboardWidgetModel->insert([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		} elseif ($action == 'delete') {
+			$result = $this->DashboardWidgetModel->delete([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		} else {
+			http_response_code(404); // TODO(chris): 400?
+			$this->terminateWithJsonError([
+				'error' => 'action value invalid'
+			]);
+		}
+		if (isError($result)) {
+			http_response_code(404);
+			$this->terminateWithJsonError([
+				'error' => getError($result)
+			]);
+		}
+		return $this->outputJsonSuccess(getData($result));
+	}
+}

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/lehre/Pruefungsprotokoll.php

@@ -215,11 +215,8 @@ class Pruefungsprotokoll extends Auth_Controller
 			if (hasData($abschlusspruefung))
 			{
 				$abschlusspruefung_data = getData($abschlusspruefung);
-				if ($this->permissionlib->isBerechtigt('admin')
-					|| (
-						isset($abschlusspruefung_data->studiengang_kz)
-						&& $this->permissionlib->isBerechtigt('assistenz', 'suid', $abschlusspruefung_data->studiengang_kz)
-					)
+				if ($this->permissionlib->isBerechtigt('admin') ||
+					(isset($abschlusspruefung_data->studiengang_kz) && $this->permissionlib->isBerechtigt('assistenz', 'suid', $abschlusspruefung_data->studiengang_kz))
 					|| $this->_uid === $abschlusspruefung_data->uid_vorsitz)
 					$result = $abschlusspruefung;
 				else

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()
@@ -417,7 +432,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$notiz_id = $this->input->post('notiz_id');
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
-		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || public.tbl_notiz_dokument.dms_id AS preview');
 
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
 		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
@@ -426,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)
@@ -443,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)
@@ -462,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)
 {

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;
 
@@ -258,210 +250,6 @@ function generateSkipLink($skipID)
 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');
-	}
+	$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/libraries/AntragLib.php

@@ -128,7 +128,7 @@ class AntragLib
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
 		// NOTE(chris): get last status that is not pause
-		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,

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

@@ -50,7 +50,6 @@ class PermissionLib
 	const LOGINAS_PERSONIDS_BLACKLIST = 'permission_loginas_personids_blacklist';
 
 	private $_ci; // CI instance
-	private $access_rights; // current users access rights
 	private static $bb; // benutzerberechtigung
 
 	/**
@@ -62,8 +61,6 @@ class PermissionLib
 		// Loads CI instance
 		$this->_ci =& get_instance();
 
-		$this->access_rights = null;
-
 		$this->_ci->config->load('permission'); // Loads permission configuration
 
 		// If it's NOT called from command line
@@ -72,10 +69,8 @@ class PermissionLib
 			// API Caller rights initialization
 			$authObj = $this->_ci->authlib->getAuthObj();
 			self::$bb = new benutzerberechtigung();
-			if ($authObj) {
+			if ($authObj)
 				self::$bb->getBerechtigungen($authObj->{AuthLib::AO_USERNAME});
-				$this->access_rights = self::$bb->berechtigungen;
-			}
 		}
 	}
 
@@ -345,16 +340,6 @@ class PermissionLib
         }
     }
 
-	/**
-	 * Returns the access rights for the current user
-	 *
-	 * @return array|null
-	 */
-	public function getAccessRights()
-	{
-		return $this->access_rights;
-	}
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 

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

@@ -40,16 +40,13 @@ class StundenplanLib
 	 * @return stdClass
 	 * @access public
 	 */
-	public function getEventsUser($start, $end, $uid = null)
+	public function getEventsUser($start, $end)
 	{
 		$this->_ci =& get_instance();
 
 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		if (!$uid) {
-			$uid = getAuthUID();
-		}
-		
+		$uid = getAuthUID();
 		if (is_null($uid))
 			return error("No UID");
 		
@@ -114,7 +111,6 @@ class StundenplanLib
 			return $stundenplan_data;
 		$stundenplan_data = getData($stundenplan_data) ?? [];
 
-		$this->_ci->addMeta("stundenplanData", $stundenplan_data);
 		$function_error = $this->expandObjectInformation($stundenplan_data);
 		if ($function_error)
 			return $function_error;
@@ -221,7 +217,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
 	{
 		$this->_ci =& get_instance();
 
@@ -232,14 +228,14 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? getAuthUID()));
+		$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, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 		}
 		
 		if (isError($reservierungen))
@@ -361,10 +357,7 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object_data = getData($ort_content_object);
-				$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
-					? $ort_content_object_data[0]
-					: null;
+				$ort_content_object = getData($ort_content_object)[0];
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}
@@ -375,39 +368,6 @@ class StundenplanLib
 			$item->gruppe = $gruppe_obj_array;
 			$item->lektor = $lektor_obj_array;
 
-			$this->_ci->load->library('PermissionLib');
-			$berechtigt_begrenzt  = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt', 'sui');
-
-			$now = time();
-			$res_lektor_start = $this->jump_day($now, RES_TAGE_LEKTOR_MIN - 1);
-			$res_lektor_ende  = mktime(0, 0, 0, date('m', $now), date('d', $now) + RES_TAGE_LEKTOR_BIS, date('Y', $now));
-
-			$start_date = is_numeric($item->beginn) ? $item->beginn : strtotime($item->beginn);
-			if (!date('w', $start_date)) {
-				$start_date = $this->jump_day($start_date, 1);
-			}
-
-			$start_date_str = date('Y-m-d', $start_date);
-			$res_lektor_start_str = date('Y-m-d', $res_lektor_start);
-			$res_lektor_ende_str = date('Y-m-d', $res_lektor_ende);
-
-			$show_delete = (
-				(
-					$berechtigt_begrenzt &&
-					(
-						(isset($item->insertvon) && $item->insertvon == getAuthUID()) ||
-						(isset($item->uids) && in_array(getAuthUID(), $item->uids))
-					)
-				) &&
-				$start_date_str >= $res_lektor_start_str &&
-				$start_date_str <= $res_lektor_ende_str
-			);
-
-			if ($show_delete)
-				$item->deletable = true;
-			else
-				$item->deletable = false;
-
 		}
 	}
 
@@ -485,237 +445,6 @@ class StundenplanLib
 		return success($ferienEventsFlattened);
 	}
 
-	public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
-		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
-		if (isError($stundenplan_data))
-			return $stundenplan_data;
-		$stundenplan_data = getData($stundenplan_data) ?? [];
-
-		$function_error = $this->expandObjectInformation($stundenplan_data);
-		if ($function_error)
-			return $function_error;
-
-		return success($stundenplan_data);
-	}
-
-	public function addReservation($start, $end, $title, $beschreibung, $ort_kurzbz, $lektoren = null, $studiengang = null, $semester = null, $verband = null, $gruppe = null, $spezialgruppe = null)
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
-		$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
-		$this->_ci->load->model('ressource/stundenplan_model', 'StundenplanModel');
-		$this->_ci->load->library('PermissionLib');
-
-		$startTime = new DateTime($start);
-		$endTime = new DateTime($end);
-
-		$stunden = $this->_ci->StundeModel->loadWhere(array(
-			'beginn <' => $endTime->format('H:i:s'),
-			'ende >' => $startTime->format('H:i:s')
-		));
-
-		if (!hasData($stunden))
-		{
-			return error("Keine Stunden vorhanden");
-		}
-
-		$stunden = array_column(getData($stunden), 'stunde');
-
-		$this->_ci->StundenplandevModel->db->select('1');
-		$this->_ci->StundenplandevModel->db->where('datum', $startTime->format('Y-m-d'));
-		$this->_ci->StundenplandevModel->db->where('ort_kurzbz', $ort_kurzbz);
-		$this->_ci->StundenplandevModel->db->where_in('stunde', $stunden);
-		$stundenplandev_belegung = $this->_ci->StundenplandevModel->load();
-
-		$this->_ci->StundenplanModel->db->select('1');
-		$this->_ci->StundenplanModel->db->where('ort_kurzbz', $ort_kurzbz);
-		$this->_ci->StundenplanModel->db->where('datum', $startTime->format('Y-m-d'));
-		$this->_ci->StundenplanModel->db->where_in('stunde', $stunden);
-		$stundenplan_belegung = $this->_ci->StundenplanModel->load();
-
-		if ((hasData($stundenplandev_belegung) || hasData($stundenplan_belegung))
-			&& !$this->_ci->permissionlib->isBerechtigt('lehre/reservierungAdvanced'))
-			return error ('lvplan/bereitsReserviert');
-
-		$this->_ci->ReservierungModel->addSelect('stunde');
-		$reservation_hours = $this->_ci->ReservierungModel->loadWhere(array('datum' => $startTime->format('Y-m-d'), 'ort_kurzbz' => $ort_kurzbz));
-
-
-		if (isError($reservation_hours))
-			return $reservation_hours;
-
-		$reservation_hours = hasData($reservation_hours) ? array_column(getData($reservation_hours), 'stunde') : array();
-
-		if (!empty(array_intersect($stunden, $reservation_hours))
-			&& !$this->_ci->permissionlib->isBerechtigt('lehre/reservierungAdvanced'))
-			return error("lvplan/bereitsReserviert");
-
-
-		if (!empty($lektoren))
-		{
-			foreach ($lektoren as $lektor)
-			{
-				$insert = array('ort_kurzbz' => $ort_kurzbz,
-					'datum' => $startTime->format('Y-m-d'),
-					'titel' => $title,
-					'studiengang_kz' => is_null($studiengang) ? 0 : $studiengang,
-					'beschreibung' => $beschreibung,
-					'insertvon' => getAuthUID(),
-					'uid' => $lektor,
-					'semester' => is_null($semester) ? null : $semester,
-					'verband' => is_null($verband) ? null : $verband,
-					'gruppe' => is_null($gruppe) ? null : $gruppe,
-					'gruppe_kurzbz' => is_null($spezialgruppe) ? null : $spezialgruppe,
-				);
-
-				foreach ($stunden as $stunde)
-				{
-					$insert['stunde'] = $stunde;
-					$check_insert = $this->_ci->ReservierungModel->insert($insert);
-					if (isError($check_insert))
-						return $check_insert;
-				}
-			}
-		}
-		else
-		{
-			foreach ($stunden as $stunde)
-			{
-				$check_insert = $this->_ci->ReservierungModel->insert(array(
-					'ort_kurzbz' => $ort_kurzbz,
-					'uid' => getAuthUID(),
-					'stunde' => $stunde,
-					'datum' => $startTime->format('Y-m-d'),
-					'titel' => $title,
-					'studiengang_kz' => is_null($studiengang) ? 0 : $studiengang,
-					'beschreibung' => $beschreibung,
-					'insertvon' => getAuthUID()
-				));
-				if (isError($check_insert))
-					return $check_insert;
-			}
-		}
-
-		return success("Erfolgreich");
-	}
-
-	public function deleteReservation($reservierung_id)
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
-		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->_ci->load->library('PermissionLib');
-
-
-		$this->_ci->ReservierungModel->db->where_in('reservierung_id', $reservierung_id);
-		$reservation = $this->_ci->ReservierungModel->load();
-		if (isError($reservation))
-			return $reservation;
-
-		if (!hasData($reservation))
-			return error("Reservierungen nicht gefunden");
-
-		$reservations = getData($reservation);
-
-		$today = new DateTime();
-		foreach ($reservations as $reservierung)
-		{
-			if ($today->format('Y-m-d') > $reservierung->datum)
-				return error("Vergangene Reservierungen können nicht gelöscht werden");
-
-			if (($this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt')) && ($reservierung->insertvon == getAuthUID() || $reservierung->uid === getAuthUID()))
-			{
-				$delete_result = $this->_ci->ReservierungModel->delete($reservierung->reservierung_id);
-
-				if (isError($delete_result))
-					return $delete_result;
-			}
-		}
-		return success("Erfolgreich");
-	}
-
-
-	public function getReservableMap($ort_kurzbz, $start_date, $end_date)
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
-		$this->_ci->load->library('PermissionLib');
-
-		$berechtigt_begrenzt  = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt', 'suid');
-		$berechtigt_erweitert = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung', 'suid');
-
-		$ort_data = $this->_ci->OrtModel->load($ort_kurzbz);
-		if (isError($ort_data) || !hasData($ort_data))
-			return [];
-
-		$ort_data = getData($ort_data)[0];
-
-		if (!$ort_data->reservieren)
-			return [];
-
-		if (!$berechtigt_begrenzt && !$berechtigt_erweitert)
-			return [];
-
-		$start_ts = is_numeric($start_date) ? (int)$start_date : strtotime($start_date);
-		$end_ts = is_numeric($end_date) ? (int)$end_date : strtotime($end_date);
-
-		if (!$start_ts || !$end_ts)
-			return [];
-
-		if ($end_ts < $start_ts)
-		{
-			$tmp = $start_ts;
-			$start_ts = $end_ts;
-			$end_ts = $tmp;
-		}
-
-		$now = time();
-		$tage_min = defined('RES_TAGE_LEKTOR_MIN') ? (int)RES_TAGE_LEKTOR_MIN : 0;
-		$tage_bis = defined('RES_TAGE_LEKTOR_BIS') ? (int)RES_TAGE_LEKTOR_BIS : 0;
-
-		$datum_res_lektor_start = $this->jump_day($now, $tage_min - 1);
-		$datum_res_lektor_ende = $this->jump_day($now, $tage_bis);
-
-		$start_ymd_allowed = date('Y-m-d', $datum_res_lektor_start);
-		$end_ymd_allowed = date('Y-m-d', $datum_res_lektor_ende);
-
-		$result = [];
-
-		$current = strtotime(date('Y-m-d', $start_ts) . ' 00:00:00');
-		$end_day = strtotime(date('Y-m-d', $end_ts) . ' 00:00:00');
-
-		while ($current <= $end_day)
-		{
-			$ymd = date('Y-m-d', $current);
-
-			if ((int)date('w', $current) === 0)
-			{
-				$result[$ymd] = false;
-				$current = $this->jump_day($current, 1);
-				continue;
-			}
-
-			$result[$ymd] = ($ymd >= $start_ymd_allowed && $ymd <= $end_ymd_allowed) ? true : false;
-
-			$current = $this->jump_day($current, 1);
-		}
-
-		return success($result);
-	}
-
-	private function jump_day($timestamp, $days)
-	{
-		$days = (int)$days;
-		$prefix = ($days >= 0 ? '+' : '');
-		return strtotime($prefix . $days . ' days', $timestamp);
-	}
-
 	// start of the private functions ########################################################################################################
 
 	// function used to sort an array of studiensemester strings