Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id

# Conflicts:
#	public/js/components/Calendar/Base/DragAndDrop.js
#	public/js/components/Calendar/Base/Grid/Line.js
#	public/js/composables/EventLoader.js

.gitignore

@@ -1,6 +1,5 @@
 documents/
 vendor/
-public/vendor
 
 /nbproject/
 .vscode

application/config/Events.php

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

application/config/infocenter.php

@@ -3,4 +3,3 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 $config['infocenter_studiengang_kz'] = '10021, 10027, 10002';
-$config['infocenter_qualifikationskurs_kz'] = '10002';

application/config/lvverwaltung.php

@@ -8,15 +8,4 @@ $config['lvverwaltung_tags'] = [
 ];
 */
 
-$config['lvverwaltung_tags'] = [];
-
-# Additional columns:
-/*
-$config["list_columns"] = [
-	'fieldname' => [
-		'js' => 'path/to/snippet.js', // tabulator config snippet (eg: return { name: 'Name', field: 'fieldname' }; )
-		// NOTE: 'default' & 'joins' like in stv.php config are currently not available here
-	]
-];
-*/
-
+$config['lvverwaltung_tags'] = [];

application/config/navigation.php

@@ -170,13 +170,6 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 51,
 					'requiredPermissions' => 'vertrag/mitarbeiter:r'
-				),
-				'studierendenverwaltung' => array(
-					'link' => site_url('studentenverwaltung'),
-					'description' => 'Studierendenverwaltung',
-					'expand' => true,
-					'sort' => 52,
-					'requiredPermissions' => ['admin:r', 'assistenz:r']
 				)
 			)
 		),
@@ -385,7 +378,7 @@ $config['navigation_menu']['apps'] = [
 	],
 	'lav' => [
 		'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
-		'description' => 'Lehrauftragsverwaltung',
+		'description' => 'Lehraufträge',
 		#'icon' => 'person-chalkboard',
 		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r')
 	]

application/config/routes.php

@@ -75,71 +75,68 @@ $route['Abgabetool/Student'] = 'Cis/Abgabetool/Student';
 $route['Abgabetool/Student/(:any)'] = 'Cis/Abgabetool/Student/$1';
 $route['Abgabetool/Deadlines'] = 'Cis/Abgabetool/Deadlines';
 
-// Studierendenverwaltung App Routes
-$route['studvw'] = 'studentenverwaltung/index';
-$route['studvw/.*'] = 'studentenverwaltung/index';
-// Old routes
-$route['studentenverwaltung'] = 'redirect/301/studvw';
-$route['studentenverwaltung/(:any)'] = 'redirect/301/studvw/stdsem/$1';
-$route['studentenverwaltung/(:any)/(prestudent|student|person|search)/(:any)'] = 'redirect/301/studvw/stdsem/$1/$2/$3';
-$route['studentenverwaltung/(:any)/prestudent/(:any)/tab/:any'] = 'redirect/301/studvw/stdsem/$1/prestudent/$2';
-$route['studentenverwaltung/(:any)/search/(:any)/(:any)'] = 'redirect/301/studvw/stdsem/$1/search/$2/$3';
-$route['studentenverwaltung/(:any)/(:any)'] = 'redirect/301/studvw/stdsem/$1/stg/$2';
-
 // Studierendenverwaltung List Routes
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/incoming/1'] = 'api/frontend/v1/stv/students/getIncoming/$1';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/outgoing/1'] = 'api/frontend/v1/stv/students/getOutgoing/$1';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/shared_studies/1'] = 'api/frontend/v1/stv/students/getGemeinsamestudien/$1';
+$route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/index';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/:any/1/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1';
+// (studiensemester_kurzbz)/inout[/(incoming|outgoing|gemeinsamestudien)]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout'] = 'api/frontend/v1/stv/Students/index';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming/$1';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing/$1';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien/$1';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/:any/1/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2';
+// (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/verband/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/verband/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/stv/students/getStudents/$1/$2';
+// (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/verband/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/verband/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgform/$1/$2/$3';
+// (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/semester/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsSpezialgruppe/$1/$2/$3/$4';
+// (studiensemester_kurzbz)/(studiengang_kz)[/(semester)[/(verband)[/(gruppe)]]]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/group/(:any)'] = 'api/frontend/v1/stv/students/getStudentsOrgformSpezialgruppe/$1/$3/$2/$4/$5';
+// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/prestudent/(:any)'] = 'api/frontend/v1/stv/students/getPrestudent/$1/$2';
+// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/student/(:any)'] = 'api/frontend/v1/stv/students/getStudent/$1/$2';
+// // (studiensemester_kurzbz)/uid/(uid)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
+// // (studiensemester_kurzbz)/prestudent/(prestudent_id)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'api/frontend/v1/stv/Students/getPrestudent/$1/$2';
+// // (studiensemester_kurzbz)/person/(person_id)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/person/(:num)'] = 'api/frontend/v1/stv/Students/getPerson/$1/$2';
 
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/person/(:any)'] = 'api/frontend/v1/stv/students/getPerson/$1/$2';
-
-$route['api/frontend/v1/treemenudata/stv/.*'] = 'api/frontend/v1/stv/students/index';
-
-// Lvverwaltung List Routes
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
 
+$route['lvplan/caldav'] = 'LvPlanCalDAV';
+$route['lvplan/caldav/.*'] = 'LvPlanCalDAV';
+$route['lvplan/ical/subscription/google'] = 'LvPlanICALSubscription';
+$route['lvplan/ical/download'] = 'LvPlanICALDownload';
+$route['lvplan/csv/download'] = 'LvPlanCSVDownload';
+$route['lvplan/excel/download'] = 'LvPlanExcelDownload';
+$route['lvplan/html/preview'] = 'LvPlanHTMLPreview';
+$route['lvplan/html/detail'] = 'LvPlanHTMLDetail';
 
 // load routes from extensions, also look for environment-specific configs
 $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];
 
+$route['api/frontend/v1/tempus/Tags/getTagsByCalendar/(:num)'] = 'api/frontend/v1/tempus/Tags/getTagsByCalendar/$1';
+
 foreach($subdirs as $subdir)
 {
 	if(is_dir($subdir))

application/config/studierendenantrag.php

@@ -197,11 +197,3 @@ $config['unterbrechung_enabled'] = true;
  */
 $config['wiederholung_enabled'] = true;
 
-/**
- * Modal with Infotext of TLC
- * if true, there will be shown an info modal in the studentsView after the first button ABMELDUNG
- *
- * @var boolean
- */
-$config['showInfoModalAbmeldung'] = true;
-

application/config/stv.php

@@ -1,27 +1,6 @@
 <?php
 
 $config['number_displayed_past_studiensemester_default'] = 5;
-
-# Additional columns:
-/*
-$config["list_columns"] = [
-	'fieldname' => [
-		'js' => 'path/to/snippet.js', // tabulator config snippet (eg: return { name: 'Name', field: 'fieldname' }; )
-		'default' => "SQL SELECT statement for value",
-		'joins' => [
-			// additional joins needed for the SELECT statement above
-			[
-				'tablename',
-				'join condition', // single fieldname for USING or full condition for ON
-				'LEFT|RIGHT', // optional - join type
-				'after_xxx|before_xxx|end' // optional - position in query
-			]
-			// ...
-		]
-	]
-];
-*/
-
 $config['tabs'] =
 	[
 		'details' => [
@@ -81,13 +60,7 @@ $config['tabs'] =
 		],
 		'notes' => [
 			//if true, the count of Messages will be shown in the header of the Tab Messages
-			'showCountNotes' => true,
-
-			//if true: section with following fields will be displayed: 'verfasser', 'bearbeiter', 'von', 'bis' and 'erledigt'
-			'showErweitert' => false,
-
-			//notizlayout: choose of "classicFas", "twoColumnsFormLeft", twoColumnsFormRight, popupModal"
-			'notizLayout' => 'popupModal'
+			'showCountNotes' => true
 		],
 		'combinePeople' => [
 			//multitab should only be shown with this length of selection
@@ -160,25 +133,13 @@ $config['students_tab_order'] = [
 
 $config['stv_prestudent_tags'] = [
 	'prioone' => ['readonly' => false],
-	'priotwo' => ['readonly' => false],
+	'priotwo' => ['readonly' => true],
 	'hinweis' => ['readonly' => false],
-	'hinweis_assistenz' => ['readonly' => false],
-	'hinweis_kf' => ['readonly' => false],
+	'hinweis_assistenz' => ['readonly' => true],
+	'hinweis_kf' => ['readonly' => true],
 	'hinweis_lehrende' => ['readonly' => false],
-	'hinweis_stg_kf' => ['readonly' => false],
-	'finished_stg' => ['readonly' => false],
-	'finished_kf' => ['readonly' => false],
-	'inwork_kf' => ['readonly' => false],
-	'dd_auto' => ['readonly' => true],
-	'wh_auto' => ['readonly' => true],
-	'prewh_auto' => ['readonly' => true],
-	'out_auto' => ['readonly' => true],
-	'zgv_auto' => ['readonly' => true],
-	'unterbrecher_auto' => ['readonly' => true],
-	'stbtr_erh_auto' => ['readonly' => true],
-	'jgv_auto' => ['readonly' => true],
-	'in_auto' => ['readonly' => true],
-	'preabbr_auto' => ['readonly' => true],
+	'hinweis_stg_kf' => ['readonly' => true],
+	'finished_stg' => ['readonly' => true],
+	'finished_kf' => ['readonly' => true],
+	'inwork_kf' => ['readonly' => true],
 ];
-
-$config['userAutomatedTags'] = 'sftest';

application/config/tempus.php

@@ -0,0 +1,12 @@
+<?php
+
+$config['send_update_mails'] = false;
+$config['calendar_start'] = 7;
+$config['calendar_end'] = 23;
+
+
+$config['tempus_tags'] = [
+	'prioone' => ['readonly' => false],
+	'priotwo' => ['readonly' => true],
+	'hinweis' => ['readonly' => false],
+];

application/config/treemenu/stg_base.php

@@ -1,65 +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');
-
-$config['root'] = [
-	'stg' => [
-		'prestudent' => [
-			'stdsem' => [
-				'interessenten' => [
-					'bewerbungnichtabgeschickt',
-					'bewerbungabgeschickt',
-					'zgv',
-					'statusbestaetigt' => [
-						'statusbestaetigtrtnichtangemeldet',
-						'statusbestaetigtrtangemeldet'
-					],
-					'reihungstestnichtangemeldet',
-					'reihungstestangemeldet'
-				],
-				'bewerber' => [
-					'bewerberrtnichtangemeldet',
-					'bewerberrtangemeldet' => [
-						'bewerberrtangemeldetteilgenommen',
-						'bewerberrtangemeldetnichtteilgenommen'
-					]
-				],
-				'aufgenommen',
-				'warteliste',
-				'absage',
-				'incoming'
-			]
-		],
-		'semester' => [
-			'group',
-			'verband' => [
-				'group'
-			]
-		]
-	],
-	'inout' => [
-		'incoming',
-		'outgoing',
-		'shared_studies'
-	]
-];
-
-// copy stg tree into stg/orgforms
-$config['root']['stg']['orgform'] = $config['root']['stg'];

application/controllers/Cis/Compat.php

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

application/controllers/Cis/Documents.php

@@ -20,12 +20,8 @@ class Documents extends Auth_Controller
 			'download' => [self::PERM_LOGGED]
 		]);
 
-		// Load models
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
-		// Load libraries
-		$this->load->library('AkteLib');
-
 		$this->loadPhrases([
 			'global',
 			'tools'
@@ -116,12 +112,10 @@ class Documents extends Auth_Controller
 
 		$selfservice = null;
 		if (!defined('CIS_DOKUMENTE_SELFSERVICE') || CIS_DOKUMENTE_SELFSERVICE) {
+			$this->load->model('crm/Akte_model', 'AkteModel');
 			$selfservice = [];
 			foreach ($person_ids as $person_id) {
-				$result = $this->aktelib->getByPersonId(
-					$person_id,
-					true
-				);
+				$result = $this->AkteModel->getArchiv($person_id, null, true);
 				if (isError($result))
 					return $this->load->view('errors/html/error_db.php', [
 						'heading' => 'Database Error',
@@ -153,13 +147,14 @@ class Documents extends Auth_Controller
 		if (!is_numeric($akte_id))
 			return show_404();
 
-		$result = $this->aktelib->getByAkteId($akte_id);
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$result = $this->AkteModel->load($akte_id);
 		if (isError($result))
 			return show_error(getError($result));
 		$akte = getData($result);
 		if (!$akte)
 			return show_404();
-		$akte = reset($akte);
+		$akte = current($akte);
 
 		$admin_access = false;
 		if ($uid !== null && $this->permissionlib->isBerechtigt('admin')) {

application/controllers/Cis/ProfilUpdate.php

@@ -64,7 +64,7 @@ class ProfilUpdate extends Auth_Controller
 			{
 				// Get file to be downloaded from DMS
 				$newFilename = $this->uid . "/document_" . $dms_id;
-				$download = $this->dmslib->getOutputFileInfo($dms_id);
+				$download = $this->dmslib->download($dms_id);
 				if (isError($download))
 					return $download;
 
@@ -84,4 +84,3 @@ class ProfilUpdate extends Auth_Controller
 		}
 	}
 }
-

application/controllers/Cis/Pub.php

@@ -29,15 +29,11 @@ class Pub extends Auth_Controller
 	 */
 	public function bild($source, $id)
 	{
-		$person_id_user = getAuthPersonId();
-		$serverzugriff = false;
-		// Default Bild (Dummy Profilbild)
-		$outputFileName = FHCPATH . 'skin/images/profilbild_dummy.jpg';
-		$outputFileContent = '';
-		$mimetype = 'application/jpeg';
-
 		$this->load->model('person/Person_model', 'PersonModel');
 
+		$person_id_user = '';
+		$serverzugriff = false;
+
 		// Wenn das Bild direkt aufgerufen wird, ist eine Authentifizierung erforderlich
 		// Wenn es vom Server selbst aufgerufen wird, ist keine Auth. notwendig
 		// (z.B. fuer die Erstellung von PDFs)
@@ -49,27 +45,31 @@ class Pub extends Auth_Controller
 					'zugangscode' => $_SESSION['incoming/user']
 				]);
 				if (hasData($result))
-					$person_id_user = getData($result)[0]->person_id;
+					$person_id_user = current(getData($result))->person_id;
 			} elseif (isset($_SESSION['prestudent/user'])) { // Von Prestudententool
 				$result = $this->PersonModel->loadWhere([
 					'zugangscode' => $_SESSION['prestudent/user']
 				]);
 				if (hasData($result))
-					$person_id_user = getData($result)[0]->person_id;
+					$person_id_user = current(getData($result))->person_id;
 			} elseif (isset($_SESSION['bewerbung/personId'])) { // Von Bewerbungstool
 				$person_id_user = $_SESSION['bewerbung/personId'];
+			} else {
+				$person_id_user = getAuthPersonId();
 			}
 		} else {
 			$serverzugriff = true;
 		}
 
-		// If the picture is from the person table
-		if ($source == 'person' && is_numeric($id)) {
+		// Default Bild (Dummy Profilbild)
+		$cTmpHEX = base64_encode(file_get_contents(FHCPATH . 'skin/images/profilbild_dummy.jpg'));
+
+		if ($source == 'person' && $id) {
 			$foto_gesperrt = false;
 			// Person laden und Fotosperre überprüfen
 			$result = $this->PersonModel->load($id);
 			if (hasData($result)) {
-				$person = getData($result)[0];
+				$person = current(getData($result));
 				if ($person->foto_sperre) {
 					// Wenn der User selbst darauf zugreift darf er das Bild sehen
 					$foto_gesperrt = ($person_id_user != $id);
@@ -77,57 +77,91 @@ class Pub extends Auth_Controller
 					$foto_gesperrt = true;
 				}
 
-				if (!isEmptyString($person->foto) && !$foto_gesperrt) {
-					$outputFileContent = base64_decode($person->foto);
+				if ($person->foto && !$foto_gesperrt) {
+					$cTmpHEX = base64_decode($person->foto);
 				}
 			}
 		}
-
-		// If the picture is from the akte/dms
-		if($source == 'akte' && is_numeric($id))
+		if($source == 'akte' && $id != '')
 		{
-			$mimetype = '';
-			$this->load->library('AkteLib');
+			$this->load->model('crm/Akte_model', 'AkteModel');
 
-			$akteResult = $this->aktelib->getByAkteId($id, 'Lichtbil');
+			$this->AkteModel->addJoin('public.tbl_person', 'person_id');
+			$result = $this->AkteModel->loadWhere([
+				'person_id' => $id,
+				'dokument_kurzbz' => 'Lichtbil'
+			]);
 
-			if (hasData($akteResult)) {
+			if (hasData($result)) {
 				$foto_gesperrt = false;
-				$akte = getData($akteResult)[0];
 
-				$personResult = $this->PersonModel->load($akte->person_id);
-				if (hasData($personResult)) {
-					$person = getData($personResult)[0];
-					if ($person->foto_sperre) {
-						$foto_gesperrt = ($person_id_user != $id);
-					} elseif (!$person_id_user && !$serverzugriff) {
-						$foto_gesperrt = true;
-					}
+				$akte = current(getData($result));
+				if ($akte->foto_sperre) {
+					// Wenn der User selbst darauf zugreift darf er das Bild sehen
+					$foto_gesperrt = ($person_id_user != $id);
+				} elseif (!$person_id_user && !$serverzugriff) {
+					$foto_gesperrt = true;
 				}
 
 				// Wenn das Foto nicht im Inhalt steht wird aus aus dem DMS geladen
-				if (!isEmptyString($akte->inhalt)) {
-					$outputFileContent = base64_decode($akte->inhalt);
-					$mimetype = $akte->mimetype;
+				if (!$akte->inhalt && $akte->dms_id) {
+					$this->load->model('content/Dms_model', 'DmsModel');
+					$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
+
+					$this->DmsModel->addJoin('campus.tbl_dms_version', 'dms_id');
+					$this->DmsModel->addOrder('version', 'DESC');
+					$this->DmsModel->addLimit(1);
+					$result = $this->DmsModel->load($akte->dms_id);
+
+					if (!hasData($result))
+						die('Kein Dokument vorhanden');
+
+					$dms = current(getData($result));
+
+					$filename = DMS_PATH . $dms->filename;
+
+					$this->DmsVersionModel->update([
+						'dms_id' => $dms->dms_id,
+						'version' => $dms->version
+					], [
+						'letzterzugriff' => date('c')
+					]);
+
+					if (file_exists($filename)) {
+						$handle = fopen($filename, "r");
+						if ($handle) {
+							while (!feof($handle)) {
+								$akte->inhalt .= fread($handle, 8192);
+							}
+							fclose($handle);
+						} else {
+							echo 'Fehler: Datei konnte nicht geoeffnet werden';
+						}
+					} else {
+						echo 'Die Datei existiert nicht';
+					}
+				}
+
+				if ($akte->inhalt && !$foto_gesperrt) {
+					$cTmpHEX = $akte->inhalt;
 				}
 			}
 		}
 
-		// If file content is provided
-		if (!isEmptyString($outputFileContent))
-		{
-			// If a mimetype is still not found
-			if (isEmptyString($mimetype))
-			{
-				$fo = finfo_open();
-				$mimetype = finfo_buffer($fo, $outputFileContent, FILEINFO_MIME_TYPE);
-			}
-			$this->outputImageByContent($mimetype, $outputFileContent);
-		}
-		else // otherwise use the file
-		{
-			$this->outputImageByFile($mimetype, $outputFileName);
+		// die bilder werden, sofern es funktioniert, in jpg umgewandelt da es sonst zu fehlern beim erstellen
+		// von pdfs kommen kann.
+
+		$im = @imagecreatefromstring(base64_decode($cTmpHEX));
+		if ($im) {
+			@ob_clean();
+			header("Content-type: image/jpeg");
+			exit(imagejpeg($im));
+		} else {
+			// bei manchen Bildern funktioniert die konvertierung nicht
+			// diese werden dann einfach so angezeigt.
+			@ob_clean();
+			header("Content-type: image/gif");
+			exit($cTmpHEX);
 		}
 	}
 }
-

application/controllers/Documents.php

@@ -143,7 +143,7 @@ class Documents extends Auth_Controller
 
 			$result = $this->VorlagestudiengangModel->getCurrent($xsl, $xsl_oe_kurzbz, $version);
 			if (isError($result))
-				show_error(getError($result));
+				return show_error(getError($result));
 			if (!hasData($result))
 				return show_404();
 			
@@ -226,13 +226,13 @@ class Documents extends Auth_Controller
 
 		$result = $this->VorlageModel->load($xsl);
 		if (isError($result))
-			show_error(getError($result));
+			return show_error(getError($result));
 		if (!hasData($result))
 			show_404();
 		
 		$vorlage = current(getData($result));
 		if ($sign_user && !$vorlage->signierbar)
-			show_error($this->p->t("stv", "grades_error_sign"));
+			return show_error($this->p->t("stv", "grades_error_sign"));
 
 		
 		// Filename
@@ -284,23 +284,11 @@ class Documents extends Auth_Controller
 		// XML Data
 		$result = $this->documentexportlib->getDataURL($xml, $params);
 		if (isError($result))
-			show_error(getError($result));
+			return show_error(getError($result));
 
 		$data = getData($result);
 
-		// Get the content
-		$contentResult = $this->documentexportlib->getContent($filename, $vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
-
-		// If an error occurred
-		if (isError($contentResult)) show_error(getError($contentResult));
-
-		$fileObj = new stdClass();
-		$fileObj->file_content = getData($contentResult);
-		$fileObj->name = $filename;
-		$fileObj->mimetype = isEmptyString($vorlage->mimetype) ? 'application/pdf' : $vorlage->mimetype;
-		$fileObj->disposition = 'attachment';
-
-		// Download
-		$this->outputFile($fileObj);
+		// Output
+		$this->documentexportlib->showContent($filename, $vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
 	}
 }

application/controllers/LvPlanCSVDownload.php

@@ -0,0 +1,311 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+require_once(FHCPATH.'include/functions.inc.php');
+
+class LvPlanCSVDownload extends Auth_Controller
+{
+	const MAX_DATE_RANGE = 34560000; // 400 days
+
+	/**
+	 * Object initialization.
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('ressource/Ort_model', 'OrtModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->loadPhrases(array('global', 'lehre', 'ui'));
+	}
+
+	/**
+	 * Serves an authenticated CSV file download.
+	 *
+	 * @return void
+	 */
+	public function index()
+	{
+		$type = $this->getType();
+		$uid = getAuthUID();
+		$ortKurzbz = null;
+		$verbandFilters = null;
+		if ($type === 'ort')
+			$ortKurzbz = $this->getRoom();
+		elseif ($type === 'verband')
+			$verbandFilters = $this->getVerbandFilters();
+		else
+		{
+			$uid = $this->getUid();
+			$this->authorizeUid($uid);
+			$this->validateUid($uid);
+		}
+		$target = $this->getTarget();
+		list($begin, $ende) = $this->getDateRange();
+
+		$this->load->library('LvPlanCSVLib');
+		$content = $this->lvplancsvlib->getContent(
+			$uid,
+			$begin,
+			$ende,
+			$type,
+			$target,
+			$ortKurzbz,
+			$verbandFilters
+		);
+
+		$filename = $this->getFilename($begin, $ende, $target);
+
+		$this->output
+			->set_content_type('text/csv', 'UTF-8')
+			->set_header('Content-Disposition: attachment; filename="'.$filename.'"')
+			->set_header('Pragma: public')
+			->set_header('Expires: 0')
+			->set_output($content);
+	}
+
+	/**
+	 * @return string Requested timetable type.
+	 */
+	private function getType()
+	{
+		$type = $this->input->get('type', true);
+
+		if (!in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
+			show_error('Ungueltiger Parameter: type', 400);
+
+		return $type;
+	}
+
+	/**
+	 * @return string Requested user UID.
+	 */
+	private function getUid()
+	{
+		$uid = $this->input->get('pers_uid', true);
+
+		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+
+		return $uid;
+	}
+
+	/**
+	 * @return string Requested room identifier.
+	 */
+	private function getRoom()
+	{
+		$ortKurzbz = $this->input->get('ort_kurzbz', true);
+		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		$this->OrtModel->addSelect('ort_kurzbz');
+		$room = $this->OrtModel->load($ortKurzbz);
+		if (isError($room))
+			show_error(getError($room), 500);
+		if (!hasData($room))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		return $ortKurzbz;
+	}
+
+	/**
+	 * @return array Requested Lehrverband filters.
+	 */
+	private function getVerbandFilters()
+	{
+		$stgKz = $this->getInteger('stg_kz', true);
+		$semester = $this->getInteger('sem', false, true);
+		$verband = $this->getOptionalFilter('ver');
+		$gruppe = $this->getOptionalFilter('grp');
+
+		$this->StudiengangModel->addSelect('studiengang_kz');
+		$studiengang = $this->StudiengangModel->load($stgKz);
+		if (isError($studiengang))
+			show_error(getError($studiengang), 500);
+		if (!hasData($studiengang))
+			show_error('Ungueltiger Parameter: stg_kz', 400);
+
+		return array(
+			'stg_kz' => $stgKz,
+			'sem' => $semester,
+			'ver' => $verband,
+			'grp' => $gruppe
+		);
+	}
+
+	private function getInteger($name, $signed, $optional = false)
+	{
+		$value = $this->input->get($name, true);
+		if ($optional && ($value === null || $value === ''))
+			return null;
+
+		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
+		if (!is_string($value) || !preg_match($pattern, $value))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		$integer = filter_var($value, FILTER_VALIDATE_INT);
+		if ($integer === false || (!$signed && $integer < 0))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		return $integer;
+	}
+
+	private function getOptionalFilter($name)
+	{
+		$value = $this->input->get($name, true);
+		if ($value === null || $value === '' || $value === '0')
+			return null;
+		if (!is_string($value)
+			|| !check_utf8($value)
+			|| mb_strlen($value) > 20
+			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
+		{
+			show_error('Ungueltiger Parameter: '.$name, 400);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * @return string|null Requested CSV target.
+	 */
+	private function getTarget()
+	{
+		$target = $this->input->get('target', true);
+
+		if ($target !== null && $target !== 'outlook')
+			show_error('Ungueltiger Parameter: target', 400);
+
+		return $target;
+	}
+
+	/**
+	 * Validates and expands the requested range to complete weeks.
+	 *
+	 * @return array{0: int, 1: int} Begin and end timestamps.
+	 */
+	private function getDateRange()
+	{
+		$begin = $this->getTimestamp('begin');
+		$ende = $this->getTimestamp('ende');
+
+		if ($ende < $begin)
+			show_error('Ungueltiger Datumsbereich', 400);
+
+		if ($ende - $begin > self::MAX_DATE_RANGE)
+			show_error('Datumsbereich zu gross', 400);
+
+		$begin = strtotime('monday this week', $begin);
+		$ende = strtotime('sunday this week', $ende);
+
+		return array($begin, $ende);
+	}
+
+	/**
+	 * Builds the CSV download filename.
+	 *
+	 * @param int $begin Range start timestamp.
+	 * @param int $ende Range end timestamp.
+	 * @param string|null $target Requested CSV target.
+	 * @return string Filename.
+	 */
+	private function getFilename($begin, $ende, $target)
+	{
+		$studiensemester = $this->getStudiensemester($begin, $ende);
+
+		$filename = $this->p->t('global', 'termine');
+		if ($studiensemester !== null)
+			$filename .= '_'.$studiensemester->studiensemester_kurzbz;
+		$filename .= '-'.date('Ymd');
+		if ($target === 'outlook')
+			$filename .= '_outlook';
+		$filename .= '.csv';
+
+		return $filename;
+	}
+
+	/**
+	 * Gets the study semester covered by the requested date range.
+	 *
+	 * @param int $begin Range start timestamp.
+	 * @param int $ende Range end timestamp.
+	 * @return object|null Study semester, if one overlaps the range.
+	 */
+	private function getStudiensemester($begin, $ende)
+	{
+		$semesterRange = $this->StudiensemesterModel->getByDateRange(
+			date('Y-m-d', $begin),
+			date('Y-m-d', $ende)
+		);
+
+		if (isError($semesterRange) || !hasData($semesterRange))
+			return null;
+
+		$studiensemester = current(getData($semesterRange));
+
+		return $studiensemester;
+	}
+
+	/**
+	 * @param string $name GET parameter name.
+	 * @return int Unix timestamp.
+	 */
+	private function getTimestamp($name)
+	{
+		$value = $this->input->get($name, true);
+
+		if (!is_string($value) || !ctype_digit($value))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		$timestamp = filter_var(
+			$value,
+			FILTER_VALIDATE_INT,
+			array('options' => array('min_range' => 0))
+		);
+
+		if ($timestamp === false)
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		return $timestamp;
+	}
+
+	/**
+	 * Ensures access to another user's timetable is explicitly permitted.
+	 *
+	 * @param string $uid Requested user UID.
+	 * @return void
+	 */
+	private function authorizeUid($uid)
+	{
+		if ($uid !== getAuthUID()
+			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
+		{
+			show_error('Forbidden', 403);
+		}
+	}
+
+	/**
+	 * Ensures the requested user exists.
+	 *
+	 * @param string $uid Requested user UID.
+	 * @return void
+	 */
+	private function validateUid($uid)
+	{
+		$this->BenutzerModel->addSelect('uid');
+		$user = $this->BenutzerModel->load(array($uid));
+
+		if (isError($user))
+			show_error(getError($user), 500);
+
+		if (!hasData($user))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+	}
+}

application/controllers/LvPlanCalDAV.php

@@ -0,0 +1,58 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class LvPlanCalDAV extends FHC_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+        parent::__construct();
+		$this->load->library('sabredav/SabreDAVAuthLib');
+        $this->load->library('sabredav/SabreDAVCalDAVLib');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function index()
+	{
+       
+        $authBackend = new SabreDAVAuthLib();
+        $principalBackend = new SabreDAVACLPrincipalBackend($authBackend);
+        $calendarBackend = new SabreDAVCalDAVBackend($authBackend);
+
+        $tree = array(
+            new \Sabre\CalDAV\Principal\Collection($principalBackend),
+            new \Sabre\CalDAV\CalendarRoot($principalBackend, $calendarBackend)
+        );
+
+        $server = new \Sabre\DAV\Server($tree);
+
+        $baseUri = '/' . implode('/', array_filter([
+            trim(BASE_LOCATION, '/'),
+            trim($this->config->item('index_page'), '/'),
+            'lvplan',
+            'caldav'
+        ]));
+        $server->setBaseUri($baseUri);
+
+        $authBackend->setRealm('SabreDAV');
+        $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
+        $server->addPlugin($authPlugin);
+
+        $caldavPlugin = new \Sabre\CalDAV\Plugin();
+        $server->addPlugin($caldavPlugin);
+
+        $aclPlugin = new \Sabre\DAVACL\Plugin();
+        $server->addPlugin($aclPlugin);
+
+        $browser = new \Sabre\DAV\Browser\Plugin();
+        $server->addPlugin($browser);
+
+        $server->exec();
+	}
+}

application/controllers/LvPlanExcelDownload.php

@@ -0,0 +1,292 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+require_once(FHCPATH.'include/functions.inc.php');
+
+class LvPlanExcelDownload extends Auth_Controller
+{
+	const MAX_DATE_RANGE = 34560000; // 400 days
+
+	/**
+	 * Object initialization.
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('ressource/Ort_model', 'OrtModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->loadPhrases(array('global'));
+	}
+
+	/**
+	 * Serves an authenticated Excel file download.
+	 *
+	 * @return void
+	 */
+	public function index()
+	{
+		$type = $this->getType();
+		$uid = getAuthUID();
+		$ortKurzbz = null;
+		$verbandFilters = null;
+		if ($type === 'ort')
+			$ortKurzbz = $this->getRoom();
+		elseif ($type === 'verband')
+			$verbandFilters = $this->getVerbandFilters();
+		else
+		{
+			$uid = $this->getUid();
+			$this->authorizeUid($uid);
+			$this->validateUid($uid);
+		}
+		list($begin, $ende) = $this->getDateRange();
+
+		$this->load->library('LvPlanExcelLib');
+		$content = $this->lvplanexcellib->getContent(
+			$uid,
+			$begin,
+			$ende,
+			$type,
+			$ortKurzbz,
+			$verbandFilters
+		);
+
+		$filename = $this->getFilename($begin, $ende);
+
+		$this->output
+			->set_content_type('application/vnd.ms-excel')
+			->set_header('Content-Disposition: attachment; filename="'.$filename.'"')
+			->set_header('Pragma: public')
+			->set_header('Expires: 0')
+			->set_output($content);
+	}
+
+	/**
+	 * @return string Requested timetable type.
+	 */
+	private function getType()
+	{
+		$type = $this->input->get('type', true);
+
+		if (!in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
+			show_error('Ungueltiger Parameter: type', 400);
+
+		return $type;
+	}
+
+	/**
+	 * @return string Requested user UID.
+	 */
+	private function getUid()
+	{
+		$uid = $this->input->get('pers_uid', true);
+
+		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+
+		return $uid;
+	}
+
+	/**
+	 * @return string Requested room identifier.
+	 */
+	private function getRoom()
+	{
+		$ortKurzbz = $this->input->get('ort_kurzbz', true);
+		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		$this->OrtModel->addSelect('ort_kurzbz');
+		$room = $this->OrtModel->load($ortKurzbz);
+		if (isError($room))
+			show_error(getError($room), 500);
+		if (!hasData($room))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		return $ortKurzbz;
+	}
+
+	/**
+	 * @return array Requested Lehrverband filters.
+	 */
+	private function getVerbandFilters()
+	{
+		$stgKz = $this->getInteger('stg_kz', true);
+		$semester = $this->getInteger('sem', false, true);
+		$verband = $this->getOptionalFilter('ver');
+		$gruppe = $this->getOptionalFilter('grp');
+
+		$this->StudiengangModel->addSelect('studiengang_kz');
+		$studiengang = $this->StudiengangModel->load($stgKz);
+		if (isError($studiengang))
+			show_error(getError($studiengang), 500);
+		if (!hasData($studiengang))
+			show_error('Ungueltiger Parameter: stg_kz', 400);
+
+		return array(
+			'stg_kz' => $stgKz,
+			'sem' => $semester,
+			'ver' => $verband,
+			'grp' => $gruppe
+		);
+	}
+
+	private function getInteger($name, $signed, $optional = false)
+	{
+		$value = $this->input->get($name, true);
+		if ($optional && ($value === null || $value === ''))
+			return null;
+
+		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
+		if (!is_string($value) || !preg_match($pattern, $value))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		$integer = filter_var($value, FILTER_VALIDATE_INT);
+		if ($integer === false || (!$signed && $integer < 0))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		return $integer;
+	}
+
+	private function getOptionalFilter($name)
+	{
+		$value = $this->input->get($name, true);
+		if ($value === null || $value === '' || $value === '0')
+			return null;
+		if (!is_string($value)
+			|| !check_utf8($value)
+			|| mb_strlen($value) > 20
+			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
+		{
+			show_error('Ungueltiger Parameter: '.$name, 400);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Validates and expands the requested range to complete weeks.
+	 *
+	 * @return array{0: int, 1: int} Begin and end timestamps.
+	 */
+	private function getDateRange()
+	{
+		$begin = $this->getTimestamp('begin');
+		$ende = $this->getTimestamp('ende');
+
+		if ($ende < $begin)
+			show_error('Ungueltiger Datumsbereich', 400);
+
+		if ($ende - $begin > self::MAX_DATE_RANGE)
+			show_error('Datumsbereich zu gross', 400);
+
+		$begin = strtotime('monday this week', $begin);
+		$ende = strtotime('sunday this week', $ende);
+
+		return array($begin, $ende);
+	}
+
+	/**
+	 * Builds the Excel download filename.
+	 *
+	 * @param int $begin Range start timestamp.
+	 * @param int $ende Range end timestamp.
+	 * @return string Filename.
+	 */
+	private function getFilename($begin, $ende)
+	{
+		$studiensemester = $this->getStudiensemester($begin, $ende);
+
+		$filename = $this->p->t('global', 'termine');
+		if ($studiensemester !== null)
+			$filename .= '_'.$studiensemester->studiensemester_kurzbz;
+		$filename .= '-'.date('Ymd').'.xls';
+
+		return $filename;
+	}
+
+	/**
+	 * Gets the study semester covered by the requested date range.
+	 *
+	 * @param int $begin Range start timestamp.
+	 * @param int $ende Range end timestamp.
+	 * @return object|null Study semester, if one overlaps the range.
+	 */
+	private function getStudiensemester($begin, $ende)
+	{
+		$semesterRange = $this->StudiensemesterModel->getByDateRange(
+			date('Y-m-d', $begin),
+			date('Y-m-d', $ende)
+		);
+
+		if (isError($semesterRange) || !hasData($semesterRange))
+			return null;
+
+		$studiensemester = current(getData($semesterRange));
+
+		return $studiensemester;
+	}
+
+	/**
+	 * @param string $name GET parameter name.
+	 * @return int Unix timestamp.
+	 */
+	private function getTimestamp($name)
+	{
+		$value = $this->input->get($name, true);
+
+		if (!is_string($value) || !ctype_digit($value))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		$timestamp = filter_var(
+			$value,
+			FILTER_VALIDATE_INT,
+			array('options' => array('min_range' => 0))
+		);
+
+		if ($timestamp === false)
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		return $timestamp;
+	}
+
+	/**
+	 * Ensures access to another user's timetable is explicitly permitted.
+	 *
+	 * @param string $uid Requested user UID.
+	 * @return void
+	 */
+	private function authorizeUid($uid)
+	{
+		if ($uid !== getAuthUID()
+			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
+		{
+			show_error('Forbidden', 403);
+		}
+	}
+
+	/**
+	 * Ensures the requested user exists.
+	 *
+	 * @param string $uid Requested user UID.
+	 * @return void
+	 */
+	private function validateUid($uid)
+	{
+		$this->BenutzerModel->addSelect('uid');
+		$user = $this->BenutzerModel->load(array($uid));
+
+		if (isError($user))
+			show_error(getError($user), 500);
+
+		if (!hasData($user))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+	}
+}

application/controllers/LvPlanHTMLDetail.php

@@ -0,0 +1,333 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+require_once(FHCPATH.'include/functions.inc.php');
+
+class LvPlanHTMLDetail extends Auth_Controller
+{
+	const TIMEZONE = 'Europe/Vienna';
+
+	/**
+	 * Object initialization.
+	 */
+	public function __construct()
+	{
+		parent::__construct(array(
+			'index' => array('basis/cis:r')
+		));
+
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('ressource/Ort_model', 'OrtModel');
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+		$this->loadPhrases(array(
+			'global' => array('termine'),
+			'ui' => array('organisierende', 'teilnehmende')
+		));
+	}
+
+	/**
+	 * Serves details for one hour in the HTML timetable preview.
+	 *
+	 * @return void
+	 */
+	public function index()
+	{
+		$type = $this->getType();
+		$datum = $this->getDate();
+		$hour = $this->getHour();
+
+		if ($type === 'verband')
+			$filters = $this->getVerbandFilters();
+		elseif ($type === 'ort')
+			$filters = $this->getRoomFilters();
+		else
+			$filters = $this->getPersonalFilters();
+
+		$this->load->library('LvPlanHTMLDetailLib');
+		$content = $this->lvplanhtmldetaillib->getContent(
+			$datum,
+			$hour,
+			$type,
+			$filters
+		);
+
+		$this->output
+			->set_content_type('text/html', 'UTF-8')
+			->set_header('X-Content-Type-Options: nosniff')
+			->set_output($content);
+	}
+
+	/**
+	 * @return string Requested timetable type.
+	 */
+	private function getType()
+	{
+		$type = $this->input->get('type', true);
+
+		if (!in_array($type, array('student', 'lektor', 'verband', 'ort'), true))
+			show_error('Ungueltiger Parameter: type', 400);
+
+		return $type;
+	}
+
+	/**
+	 * @return string Date in YYYY-MM-DD format.
+	 */
+	private function getDate()
+	{
+		$value = $this->input->get('datum', true);
+		if (!is_string($value) || !preg_match('/^\d{4}-\d{2}-\d{2}$/', $value))
+			show_error('Ungueltiger Parameter: datum', 400);
+
+		$date = DateTime::createFromFormat(
+			'!Y-m-d',
+			$value,
+			new DateTimeZone(self::TIMEZONE)
+		);
+		$errors = DateTime::getLastErrors();
+		if ($date === false
+			|| ($errors !== false
+				&& ($errors['warning_count'] > 0 || $errors['error_count'] > 0))
+			|| $date->format('Y-m-d') !== $value)
+		{
+			show_error('Ungueltiger Parameter: datum', 400);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * @return array Selected timetable hour.
+	 */
+	private function getHour()
+	{
+		$number = $this->getInteger('stunde', false);
+		$this->StundeModel->addSelect('stunde, beginn, ende');
+		$result = $this->StundeModel->load($number);
+
+		if (isError($result))
+			show_error(getError($result), 500);
+		if (!hasData($result))
+			show_error('Ungueltiger Parameter: stunde', 400);
+
+		$hours = getData($result);
+		$hour = reset($hours);
+		$begin = isset($hour->beginn) ? (string)$hour->beginn : '';
+		$end = isset($hour->ende) ? (string)$hour->ende : '';
+		$beginSeconds = $this->timeToSeconds($begin);
+		$endSeconds = $this->timeToSeconds($end);
+
+		if ($beginSeconds === null || $endSeconds === null || $endSeconds <= $beginSeconds)
+			show_error('Ungueltiges Stundenraster', 500);
+
+		return array(
+			'number' => (string)$hour->stunde,
+			'begin' => $begin,
+			'end' => $end
+		);
+	}
+
+	/**
+	 * @return array Personal timetable filters.
+	 */
+	private function getPersonalFilters()
+	{
+		$uid = $this->input->get('pers_uid', true);
+		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+
+		if ($uid !== getAuthUID()
+			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
+		{
+			show_error('Forbidden', 403);
+		}
+
+		$this->BenutzerModel->addSelect(
+			'tbl_benutzer.uid, tbl_person.titelpre, tbl_person.vorname, '
+			.'tbl_person.nachname, tbl_person.titelpost'
+		);
+		$this->BenutzerModel->addJoin('public.tbl_person', 'person_id', 'LEFT');
+		$result = $this->BenutzerModel->load(array($uid));
+
+		if (isError($result))
+			show_error(getError($result), 500);
+		if (!hasData($result))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+
+		$users = getData($result);
+		$user = reset($users);
+		$nameParts = array();
+		foreach (array('titelpre', 'vorname', 'nachname', 'titelpost') as $property)
+		{
+			if (isset($user->{$property}) && trim($user->{$property}) !== '')
+				$nameParts[] = trim($user->{$property});
+		}
+
+		return array(
+			'uid' => $uid,
+			'full_name' => implode(' ', $nameParts)
+		);
+	}
+
+	/**
+	 * @return array Room timetable filters.
+	 */
+	private function getRoomFilters()
+	{
+		$ortKurzbz = $this->input->get('ort_kurzbz', true);
+		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		$this->OrtModel->addSelect('ort_kurzbz, bezeichnung, content_id');
+		$result = $this->OrtModel->load($ortKurzbz);
+
+		if (isError($result))
+			show_error(getError($result), 500);
+		if (!hasData($result))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		$rooms = getData($result);
+		$room = reset($rooms);
+
+		return array(
+			'ort_kurzbz' => $ortKurzbz,
+			'bezeichnung' => isset($room->bezeichnung) ? $room->bezeichnung : '',
+			'content_id' => isset($room->content_id) ? $room->content_id : null
+		);
+	}
+
+	/**
+	 * @return array Lehrverband timetable filters.
+	 */
+	private function getVerbandFilters()
+	{
+		$stgKz = $this->getInteger('stg_kz', true);
+		$semester = $this->getInteger('sem', false, true);
+		$verband = $this->getOptionalFilter('ver');
+		$gruppe = $this->getOptionalFilter('grp');
+		$ortKurzbz = $this->getOptionalRoomFilter();
+
+		$this->StudiengangModel->addSelect(
+			'studiengang_kz, UPPER(typ || kurzbz) AS stg_kurzbz'
+		);
+		$result = $this->StudiengangModel->load($stgKz);
+
+		if (isError($result))
+			show_error(getError($result), 500);
+		if (!hasData($result))
+			show_error('Ungueltiger Parameter: stg_kz', 400);
+
+		$programs = getData($result);
+		$program = reset($programs);
+
+		return array(
+			'stg_kz' => $stgKz,
+			'stg_kurzbz' => isset($program->stg_kurzbz)
+				? $program->stg_kurzbz
+				: '',
+			'sem' => $semester,
+			'ver' => $verband,
+			'grp' => $gruppe,
+			'ort_kurzbz' => $ortKurzbz
+		);
+	}
+
+	/**
+	 * Returns the room selected in a Verband preview cell, if present.
+	 *
+	 * @return string|null
+	 */
+	private function getOptionalRoomFilter()
+	{
+		$ortKurzbz = $this->input->get('ort_kurzbz', true);
+		if ($ortKurzbz === null || $ortKurzbz === '')
+			return null;
+		if (!is_string($ortKurzbz) || !check_utf8($ortKurzbz))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		$this->OrtModel->addSelect('ort_kurzbz');
+		$result = $this->OrtModel->load($ortKurzbz);
+
+		if (isError($result))
+			show_error(getError($result), 500);
+		if (!hasData($result))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		return $ortKurzbz;
+	}
+
+	/**
+	 * @param string $name GET parameter name.
+	 * @param bool $signed Whether negative values are allowed.
+	 * @param bool $optional Whether the parameter may be omitted or empty.
+	 * @return int|null
+	 */
+	private function getInteger($name, $signed, $optional = false)
+	{
+		$value = $this->input->get($name, true);
+		if ($optional && ($value === null || $value === ''))
+			return null;
+
+		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
+		if (!is_string($value) || !preg_match($pattern, $value))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		$isNegative = $signed && substr($value, 0, 1) === '-';
+		$digits = $isNegative ? substr($value, 1) : $value;
+		$digits = ltrim($digits, '0');
+		if ($digits === '')
+			$digits = '0';
+		$normalizedValue = $isNegative && $digits !== '0' ? '-'.$digits : $digits;
+
+		$integer = filter_var($normalizedValue, FILTER_VALIDATE_INT);
+		if ($integer === false || (!$signed && $integer < 0))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		return $integer;
+	}
+
+	/**
+	 * Returns null for the legacy wildcard values "" and "0".
+	 *
+	 * @param string $name GET parameter name.
+	 * @return string|null
+	 */
+	private function getOptionalFilter($name)
+	{
+		$value = $this->input->get($name, true);
+		if ($value === null || $value === '' || $value === '0')
+			return null;
+
+		if (!is_string($value)
+			|| !check_utf8($value)
+			|| mb_strlen($value) > 20
+			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
+		{
+			show_error('Ungueltiger Parameter: '.$name, 400);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * @param string $time PostgreSQL time value.
+	 * @return int|null
+	 */
+	private function timeToSeconds($time)
+	{
+		if (!preg_match('/^(\d{1,2}):(\d{2})(?::(\d{2})(?:\.\d+)?)?$/', $time, $matches))
+			return null;
+
+		$hours = (int)$matches[1];
+		$minutes = (int)$matches[2];
+		$seconds = isset($matches[3]) ? (int)$matches[3] : 0;
+
+		if ($hours > 23 || $minutes > 59 || $seconds > 59)
+			return null;
+
+		return $hours * 3600 + $minutes * 60 + $seconds;
+	}
+}

application/controllers/LvPlanHTMLPreview.php

@@ -0,0 +1,356 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+require_once(FHCPATH.'include/functions.inc.php');
+
+class LvPlanHTMLPreview extends Auth_Controller
+{
+	const MAX_DATE_RANGE = 34560000; // 400 days
+	const DEFAULT_RESERVATION_MIN_DAYS = 1;
+	const DEFAULT_RESERVATION_END_DATE = '2099-01-01';
+
+	/**
+	 * Object initialization.
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('ressource/Ort_model', 'OrtModel');
+		$this->loadPhrases(
+			array(
+				'lvplan' => array(
+					'room_not_reservable',
+					'room_reservation_restricted_to_period'
+				)
+			)
+		);
+	}
+
+	/**
+	 * Serves an authenticated, printable timetable preview.
+	 *
+	 * @return void
+	 */
+	public function index()
+	{
+		$type = $this->getType();
+		list($begin, $ende) = $this->getDateRange();
+		if ($type === 'verband')
+			$filters = $this->getVerbandFilters();
+		elseif ($type === 'ort')
+			$filters = $this->getRoomFilters();
+		else
+			$filters = $this->getPersonalFilters($type);
+
+		$this->load->library('LvPlanHTMLLib');
+		$content = $this->lvplanhtmllib->getContent(
+			$begin,
+			$ende,
+			$type,
+			$filters
+		);
+
+		$this->output
+			->set_content_type('text/html', 'UTF-8')
+			->set_header('X-Content-Type-Options: nosniff')
+			->set_output($content);
+	}
+
+	/**
+	 * @return string Requested timetable type.
+	 */
+	private function getType()
+	{
+		$type = $this->input->get('type', true);
+
+		if (!in_array($type, array('student', 'lektor', 'verband', 'ort'), true))
+			show_error('Ungueltiger Parameter: type', 400);
+
+		return $type;
+	}
+
+	/**
+	 * @return array Personal preview filters.
+	 */
+	private function getPersonalFilters($type)
+	{
+		// Legacy wochenplan calendar links include empty Lehrverband parameters
+		// for personal plans. They are irrelevant when type is student or lektor.
+		if ($this->hasVerbandParameters())
+			show_error('Ungueltige Parameterkombination', 400);
+
+		$uid = $this->input->get('pers_uid', true);
+		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+
+		if ($uid !== getAuthUID()
+			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
+		{
+			show_error('Forbidden', 403);
+		}
+
+		$this->BenutzerModel->addSelect(
+			'tbl_benutzer.uid, tbl_person.titelpre, tbl_person.vorname, '
+			.'tbl_person.nachname, tbl_person.titelpost'
+		);
+		$this->BenutzerModel->addJoin('public.tbl_person', 'person_id', 'LEFT');
+		$user = $this->BenutzerModel->load(array($uid));
+
+		if (isError($user))
+			show_error(getError($user), 500);
+		if (!hasData($user))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+		$users = getData($user);
+		$userData = reset($users);
+		$nameParts = array();
+		foreach (array('titelpre', 'vorname', 'nachname', 'titelpost') as $property)
+		{
+			if (isset($userData->{$property}) && trim($userData->{$property}) !== '')
+				$nameParts[] = trim($userData->{$property});
+		}
+
+		$filters = array(
+			'uid' => $uid,
+			'full_name' => implode(' ', $nameParts)
+		);
+
+		if ($type === 'student')
+		{
+			$this->StudentModel->addSelect(
+				'studiengang_kz, semester, verband, gruppe'
+			);
+			$student = $this->StudentModel->load(array($uid));
+
+			if (isError($student))
+				show_error(getError($student), 500);
+			if (!hasData($student))
+				show_error('Ungueltiger Parameter: pers_uid', 400);
+
+			$students = getData($student);
+			$studentData = reset($students);
+			$filters['stg_kz'] = $studentData->studiengang_kz;
+			$filters['sem'] = $studentData->semester;
+			$filters['ver'] = $studentData->verband;
+			$filters['grp'] = $studentData->gruppe;
+		}
+
+		return $filters;
+	}
+
+	/**
+	 * Legacy room links also carry pers_uid, but the UID does not filter or
+	 * authorize a room plan. Only ort_kurzbz identifies the requested plan.
+	 *
+	 * @return array Room preview filters.
+	 */
+	private function getRoomFilters()
+	{
+		$ortKurzbz = $this->input->get('ort_kurzbz', true);
+		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		$this->OrtModel->addSelect('ort_kurzbz, bezeichnung, reservieren');
+		$room = $this->OrtModel->load($ortKurzbz);
+
+		if (isError($room))
+			show_error(getError($room), 500);
+		if (!hasData($room))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		$rooms = getData($room);
+		$roomData = reset($rooms);
+		$reservationMinDays = defined('RES_TAGE_LEKTOR_MIN')
+			? (int)constant('RES_TAGE_LEKTOR_MIN')
+			: self::DEFAULT_RESERVATION_MIN_DAYS;
+		$reservationEndDate = defined('RES_TAGE_LEKTOR_BIS')
+			? constant('RES_TAGE_LEKTOR_BIS')
+			: self::DEFAULT_RESERVATION_END_DATE;
+		$reservationStart = jump_day(
+			time(),
+			$reservationMinDays - 1
+		);
+		$reservationEnd = strtotime($reservationEndDate);
+
+		return array(
+			'ort_kurzbz' => $ortKurzbz,
+			'bezeichnung' => isset($roomData->bezeichnung) ? $roomData->bezeichnung : '',
+			'room_reservable' => isset($roomData->reservieren)
+				&& $roomData->reservieren === true,
+			'room_reservation_permitted' => $this->permissionlib->isBerechtigt(
+				'lehre/reservierung:begrenzt',
+				'sui'
+			),
+			'room_reservation_start' => $reservationStart,
+			'room_reservation_end' => $reservationEnd,
+			'room_not_reservable_message' => $this->p->t(
+				'lvplan',
+				'room_not_reservable'
+			),
+			'room_reservation_restricted_message' => $this->p->t(
+				'lvplan',
+				'room_reservation_restricted_to_period',
+				array(
+					'start_date' => date('d.m.Y', $reservationStart),
+					'end_date' => date('d.m.Y', $reservationEnd)
+				)
+			)
+		);
+	}
+
+	/**
+	 * @return array Lehrverband preview filters.
+	 */
+	private function getVerbandFilters()
+	{
+		// Legacy wochenplan links always carry pers_uid. It does not filter or
+		// authorize a Lehrverband plan and is intentionally ignored here.
+		$stgKz = $this->getInteger('stg_kz', true);
+		$semester = $this->getInteger('sem', false, true);
+		$verband = $this->getOptionalFilter('ver');
+		$gruppe = $this->getOptionalFilter('grp');
+
+		$this->StudiengangModel->addSelect(
+			'studiengang_kz, UPPER(typ || kurzbz) AS stg_kurzbz'
+		);
+		$studiengang = $this->StudiengangModel->load($stgKz);
+
+		if (isError($studiengang))
+			show_error(getError($studiengang), 500);
+		if (!hasData($studiengang))
+			show_error('Ungueltiger Parameter: stg_kz', 400);
+		$studiengaenge = getData($studiengang);
+		$studiengangData = reset($studiengaenge);
+
+		return array(
+			'stg_kz' => $stgKz,
+			'stg_kurzbz' => isset($studiengangData->stg_kurzbz)
+				? $studiengangData->stg_kurzbz
+				: '',
+			'sem' => $semester,
+			'ver' => $verband,
+			'grp' => $gruppe
+		);
+	}
+
+	/**
+	 * @return bool Whether any non-empty Lehrverband-only parameters were supplied.
+	 */
+	private function hasVerbandParameters()
+	{
+		foreach (array('stg_kz', 'sem', 'ver', 'grp') as $name)
+		{
+			$value = $this->input->get($name, true);
+			if ($value !== null && $value !== '')
+				return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param string $name GET parameter name.
+	 * @param bool $signed Whether negative values are allowed.
+	 * @param bool $optional Whether the parameter may be omitted or empty.
+	 * @return int|null
+	 */
+	private function getInteger($name, $signed, $optional = false)
+	{
+		$value = $this->input->get($name, true);
+		if ($optional && ($value === null || $value === ''))
+			return null;
+
+		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
+
+		if (!is_string($value) || !preg_match($pattern, $value))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		$isNegative = $signed && substr($value, 0, 1) === '-';
+		$digits = $isNegative ? substr($value, 1) : $value;
+		$digits = ltrim($digits, '0');
+		if ($digits === '')
+			$digits = '0';
+		$normalizedValue = $isNegative && $digits !== '0' ? '-'.$digits : $digits;
+
+		$integer = filter_var($normalizedValue, FILTER_VALIDATE_INT);
+		if ($integer === false || (!$signed && $integer < 0))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		return $integer;
+	}
+
+	/**
+	 * Returns null for the legacy wildcard values "" and "0".
+	 *
+	 * @param string $name GET parameter name.
+	 * @return string|null
+	 */
+	private function getOptionalFilter($name)
+	{
+		$value = $this->input->get($name, true);
+
+		if ($value === null || $value === '' || $value === '0')
+			return null;
+
+		if (!is_string($value)
+			|| !check_utf8($value)
+			|| mb_strlen($value) > 20
+			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
+		{
+			show_error('Ungueltiger Parameter: '.$name, 400);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Validates and expands the requested range to complete weeks.
+	 *
+	 * @return array{0: int, 1: int} Begin and end timestamps.
+	 */
+	private function getDateRange()
+	{
+		$begin = $this->getTimestamp('begin');
+		$ende = $this->getTimestamp('ende');
+
+		if ($ende < $begin)
+			show_error('Ungueltiger Datumsbereich', 400);
+		if ($ende - $begin > self::MAX_DATE_RANGE)
+			show_error('Datumsbereich zu gross', 400);
+
+		$begin = strtotime('monday this week', $begin);
+		$ende = strtotime('sunday this week', $ende);
+
+		return array($begin, $ende);
+	}
+
+	/**
+	 * @param string $name GET parameter name.
+	 * @return int Unix timestamp.
+	 */
+	private function getTimestamp($name)
+	{
+		$value = $this->input->get($name, true);
+
+		if (!is_string($value) || !ctype_digit($value))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		$timestamp = filter_var(
+			$value,
+			FILTER_VALIDATE_INT,
+			array('options' => array('min_range' => 0))
+		);
+
+		if ($timestamp === false)
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		return $timestamp;
+	}
+}

application/controllers/LvPlanICALDownload.php

@@ -0,0 +1,308 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+require_once(FHCPATH.'include/functions.inc.php');
+
+class LvPlanICALDownload extends Auth_Controller
+{
+	const MAX_DATE_RANGE = 34560000; // 400 days
+
+	/**
+	 * Object initialization.
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('ressource/Ort_model', 'OrtModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->loadPhrases(array('global', 'lehre', 'ui'));
+	}
+
+	/**
+	 * Serves an authenticated iCalendar file download.
+	 *
+	 * @return void
+	 */
+	public function index()
+	{
+		$type = $this->getType();
+		$uid = getAuthUID();
+		$ortKurzbz = null;
+		$verbandFilters = null;
+		if ($type === 'ort')
+			$ortKurzbz = $this->getRoom();
+		elseif ($type === 'verband')
+			$verbandFilters = $this->getVerbandFilters();
+		else
+		{
+			$uid = $this->getUid();
+			$this->authorizeUid($uid);
+			$this->validateUid($uid);
+		}
+		$version = $this->getVersion();
+		list($begin, $ende) = $this->getDateRange();
+
+		$this->load->library('LvPlanICALLib');
+		$content = $this->lvplanicallib->getContent(
+			$uid,
+			$begin,
+			$ende,
+			$type,
+			$version,
+			$ortKurzbz,
+			$verbandFilters
+		);
+
+		$filename = $this->getFilename($begin, $ende, $version);
+
+		$this->output
+			->set_content_type('text/calendar', 'UTF-8')
+			->set_header('Content-Disposition: attachment; filename="'.$filename.'"')
+			->set_header('Pragma: public')
+			->set_header('Expires: 0')
+			->set_output($content);
+	}
+
+	/**
+	 * @return string Requested timetable type.
+	 */
+	private function getType()
+	{
+		$type = $this->input->get('type', true);
+
+		if (!in_array($type, array('student', 'lektor', 'ort', 'verband'), true))
+			show_error('Ungueltiger Parameter: type', 400);
+
+		return $type;
+	}
+
+	/**
+	 * @return string Requested user UID.
+	 */
+	private function getUid()
+	{
+		$uid = $this->input->get('pers_uid', true);
+
+		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+
+		return $uid;
+	}
+
+	/**
+	 * @return string Requested room identifier.
+	 */
+	private function getRoom()
+	{
+		$ortKurzbz = $this->input->get('ort_kurzbz', true);
+		if (!is_string($ortKurzbz) || $ortKurzbz === '' || !check_utf8($ortKurzbz))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		$this->OrtModel->addSelect('ort_kurzbz');
+		$room = $this->OrtModel->load($ortKurzbz);
+		if (isError($room))
+			show_error(getError($room), 500);
+		if (!hasData($room))
+			show_error('Ungueltiger Parameter: ort_kurzbz', 400);
+
+		return $ortKurzbz;
+	}
+
+	/**
+	 * @return array Requested Lehrverband filters.
+	 */
+	private function getVerbandFilters()
+	{
+		$stgKz = $this->getInteger('stg_kz', true);
+		$semester = $this->getInteger('sem', false, true);
+		$verband = $this->getOptionalFilter('ver');
+		$gruppe = $this->getOptionalFilter('grp');
+
+		$this->StudiengangModel->addSelect('studiengang_kz');
+		$studiengang = $this->StudiengangModel->load($stgKz);
+		if (isError($studiengang))
+			show_error(getError($studiengang), 500);
+		if (!hasData($studiengang))
+			show_error('Ungueltiger Parameter: stg_kz', 400);
+
+		return array(
+			'stg_kz' => $stgKz,
+			'sem' => $semester,
+			'ver' => $verband,
+			'grp' => $gruppe
+		);
+	}
+
+	private function getInteger($name, $signed, $optional = false)
+	{
+		$value = $this->input->get($name, true);
+		if ($optional && ($value === null || $value === ''))
+			return null;
+
+		$pattern = $signed ? '/^-?\d+$/' : '/^\d+$/';
+		if (!is_string($value) || !preg_match($pattern, $value))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		$integer = filter_var($value, FILTER_VALIDATE_INT);
+		if ($integer === false || (!$signed && $integer < 0))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		return $integer;
+	}
+
+	private function getOptionalFilter($name)
+	{
+		$value = $this->input->get($name, true);
+		if ($value === null || $value === '' || $value === '0')
+			return null;
+		if (!is_string($value)
+			|| !check_utf8($value)
+			|| mb_strlen($value) > 20
+			|| !preg_match('/^[[:alnum:]_-]+$/u', $value))
+		{
+			show_error('Ungueltiger Parameter: '.$name, 400);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * @return int Requested iCalendar major version.
+	 */
+	private function getVersion()
+	{
+		$version = $this->input->get('version', true);
+
+		if (!in_array($version, array('1', '2'), true))
+			show_error('Ungueltiger Parameter: version', 400);
+
+		return (int)$version;
+	}
+
+	/**
+	 * Validates and expands the requested range to complete weeks.
+	 *
+	 * @return array{0: int, 1: int} Begin and end timestamps.
+	 */
+	private function getDateRange()
+	{
+		$begin = $this->getTimestamp('begin');
+		$ende = $this->getTimestamp('ende');
+
+		if ($ende < $begin)
+			show_error('Ungueltiger Datumsbereich', 400);
+
+		if ($ende - $begin > self::MAX_DATE_RANGE)
+			show_error('Datumsbereich zu gross', 400);
+
+		$begin = strtotime('monday this week', $begin);
+		$ende = strtotime('sunday this week', $ende);
+
+		return array($begin, $ende);
+	}
+
+	/**
+	 * Builds the iCalendar download filename.
+	 *
+	 * @param int $begin Range start timestamp.
+	 * @param int $ende Range end timestamp.
+	 * @param int $version iCalendar major version.
+	 * @return string Filename.
+	 */
+	private function getFilename($begin, $ende, $version)
+	{
+		$studiensemester = $this->getStudiensemester($begin, $ende);
+
+		$filename = $this->p->t('global', 'termine');
+		if ($studiensemester !== null)
+			$filename .= '_'.$studiensemester->studiensemester_kurzbz;
+		$filename .= '-'.date('Ymd').'_ical'.$version.'.ics';
+
+		return $filename;
+	}
+
+	/**
+	 * Gets the study semester covered by the requested date range.
+	 *
+	 * @param int $begin Range start timestamp.
+	 * @param int $ende Range end timestamp.
+	 * @return object|null Study semester, if one overlaps the range.
+	 */
+	private function getStudiensemester($begin, $ende)
+	{
+		$semesterRange = $this->StudiensemesterModel->getByDateRange(
+			date('Y-m-d', $begin),
+			date('Y-m-d', $ende)
+		);
+
+		if (isError($semesterRange) || !hasData($semesterRange))
+			return null;
+
+		$studiensemester = current(getData($semesterRange));
+
+		return $studiensemester;
+	}
+
+	/**
+	 * @param string $name GET parameter name.
+	 * @return int Unix timestamp.
+	 */
+	private function getTimestamp($name)
+	{
+		$value = $this->input->get($name, true);
+
+		if (!is_string($value) || !ctype_digit($value))
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		$timestamp = filter_var(
+			$value,
+			FILTER_VALIDATE_INT,
+			array('options' => array('min_range' => 0))
+		);
+
+		if ($timestamp === false)
+			show_error('Ungueltiger Parameter: '.$name, 400);
+
+		return $timestamp;
+	}
+
+	/**
+	 * Ensures access to another user's timetable is explicitly permitted.
+	 *
+	 * @param string $uid Requested user UID.
+	 * @return void
+	 */
+	private function authorizeUid($uid)
+	{
+		if ($uid !== getAuthUID()
+			&& !$this->permissionlib->isBerechtigt('basis/other_lv_plan'))
+		{
+			show_error('Forbidden', 403);
+		}
+	}
+
+	/**
+	 * Ensures the requested user exists.
+	 *
+	 * @param string $uid Requested user UID.
+	 * @return void
+	 */
+	private function validateUid($uid)
+	{
+		$this->BenutzerModel->addSelect('uid');
+		$user = $this->BenutzerModel->load(array($uid));
+
+		if (isError($user))
+			show_error(getError($user), 500);
+
+		if (!hasData($user))
+			show_error('Ungueltiger Parameter: pers_uid', 400);
+	}
+}

application/controllers/LvPlanICALSubscription.php

@@ -0,0 +1,167 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+require_once(FHCPATH.'include/functions.inc.php');
+
+class LvPlanICALSubscription extends FHC_Controller
+{
+	/**
+	 * Encrypted calendar subscription token.
+	 *
+	 * @var string|null
+	 */
+	private $cal;
+
+	/**
+	 * UID authenticated by the calendar subscription token.
+	 *
+	 * @var string
+	 */
+	private $uid;
+
+	/**
+	 * First date included in the subscription feed.
+	 *
+	 * @var int Unix timestamp at local midnight
+	 */
+	private $begin;
+
+	/**
+	 * Last date included in the subscription feed.
+	 *
+	 * @var int Unix timestamp at local midnight
+	 */
+	private $ende;
+
+	/**
+	 * Object initialization.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->cal = $this->input->get('cal', true);
+		$this->uid = $this->authenticateSubscription($this->cal);
+
+		list($this->begin, $this->ende) = $this->determineDateRange();
+	}
+
+	/**
+	 * Serves the iCalendar subscription feed.
+	 *
+	 * @return void
+	 */
+	public function index()
+	{
+		$this->load->library('LvPlanICALLib');
+
+		$content = $this->lvplanicallib->getContent(
+			$this->uid,
+			$this->begin,
+			$this->ende,
+			null,
+			2,
+			null,
+			null,
+			'FH-Kalender'
+		);
+
+		$filename = 'FH-Kalender_'.date('m_Y', $this->begin).'_ical.ics';
+
+		$this->output
+			->set_content_type('text/calendar', 'UTF-8')
+			->set_header('Content-Disposition: inline; filename="'.$filename.'"')
+			->set_header('Pragma: public')
+			->set_header('Expires: 0')
+			->set_output($content);
+	}
+
+	/**
+	 * Authenticates an encrypted calendar subscription token.
+	 *
+	 * @param string|null $cal Encrypted UID from the subscription URL.
+	 * @return string Authenticated UID.
+	 */
+	private function authenticateSubscription($cal)
+	{
+		if (isEmptyString($cal))
+			show_error('Fehlerhafter Parameter', 400);
+
+		if (!defined('LVPLAN_CYPHER_KEY'))
+			show_error('LVPLAN_CYPHER_KEY is not configured', 500);
+
+		$uid = decryptData($cal, constant('LVPLAN_CYPHER_KEY'));
+
+		if (!is_string($uid) || $uid === '' || !check_utf8($uid))
+			show_error('Fehlerhafter Parameter', 400);
+
+		$this->BenutzerModel->addSelect('uid');
+		$user = $this->BenutzerModel->load([$uid]);
+
+		if (isError($user))
+			show_error(getError($user), 500);
+
+		if (!hasData($user))
+			show_error('Ungueltiger Benutzername', 401);
+
+		return $uid;
+	}
+
+	/**
+	 * Determines the subscription range from the current or next semester.
+	 *
+	 * During the final 30 days of the selected semester, the range is
+	 * extended through the following semester. The resulting range is
+	 * expanded to complete Monday-to-Sunday weeks.
+	 *
+	 * @return array{0: int, 1: int} Begin and end timestamps.
+	 */
+	private function determineDateRange()
+	{
+		$semesterResult = $this->StudiensemesterModel->getAkt();
+
+		if (isError($semesterResult))
+			show_error(getError($semesterResult), 500);
+
+		if (!hasData($semesterResult))
+		{
+			$semesterResult = $this->StudiensemesterModel->getNext();
+
+			if (isError($semesterResult))
+				show_error(getError($semesterResult), 500);
+		}
+
+		if (!hasData($semesterResult))
+			show_error('Studiensemester konnte nicht gefunden werden', 500);
+
+		$semester = current(getData($semesterResult));
+		$begin = strtotime($semester->start);
+		$ende = strtotime($semester->ende);
+
+		$semesterEnd = new DateTime($semester->ende);
+		$daysFromSemesterEnd = (int)$semesterEnd
+			->diff(new DateTime())
+			->format('%R%a');
+
+		if ($daysFromSemesterEnd >= -30)
+		{
+			$nextSemesterResult = $this->StudiensemesterModel
+				->getNextFrom($semester->studiensemester_kurzbz);
+
+			if (isError($nextSemesterResult))
+				show_error(getError($nextSemesterResult), 500);
+
+			if (hasData($nextSemesterResult))
+				$ende = strtotime(current(getData($nextSemesterResult))->ende);
+		}
+ 
+		$begin = strtotime('monday this week', $begin);
+		$ende = strtotime('sunday this week', $ende);
+		return [$begin, $ende];
+	}
+}

application/controllers/Tempus.php

@@ -0,0 +1,40 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Tempus extends Auth_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		
+		// Load Config
+		$this->load->config('calendar');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function _remap()
+	{
+
+		$this->load->view('Tempus', [
+			'permissions' => [
+				'admin' => $this->permissionlib->isBerechtigt('admin')
+			],
+			'variables' => [
+				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
+				'timezone' => $this->config->item('timezone')
+			]
+		]);
+	}
+}

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

@@ -67,11 +67,8 @@ class CisMenu extends FHCAPI_Controller
 
 	private function generateUrlForMenuItem($menuItem)
 	{
-		if(!isset($menuItem->url))
-		{
-			$menuItem->url = $this->menuItemUrlHelper($menuItem);
-			unset($menuItem->content);
-		}
+		$menuItem->url = $this->menuItemUrlHelper($menuItem);
+		unset($menuItem->content);
 
 		if ($menuItem->childs && count($menuItem->childs)) {
 			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
@@ -86,7 +83,7 @@ class CisMenu extends FHCAPI_Controller
 			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
 		}
 
-		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
+		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
 			return '';
 		}
 
@@ -94,8 +91,6 @@ class CisMenu extends FHCAPI_Controller
 		$doc->loadXML($menuItem->content);
 		$urlElem = $doc->getElementsByTagName('url')->item(0);
 
-		$this->menuItemUrlTargetHelper($menuItem, $doc);
-
 		if (!$urlElem) {
 			return '';
 		}
@@ -127,18 +122,5 @@ class CisMenu extends FHCAPI_Controller
 		return $url;
 	}
 
-	private function menuItemUrlTargetHelper($menuItem, $xmldoc)
-	{
-		if($menuItem->template_kurzbz === 'redirect')
-		{
-			$targetElem = $xmldoc->getElementsByTagName('target')->item(0);
-			$target = ($targetElem) ? $targetElem->textContent : '';
-			if(!in_array($target, array('_self', '_top', '_blank')))
-			{
-				$target = '_self';
-			}
-			$menuItem->target = $target;
-		}
-	}
 }
 

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

@@ -51,8 +51,6 @@ class Documents extends FHCAPI_Controller
 		$this->loadPhrases([
 			'stv'
 		]);
-
-		$this->load->library('DocumentExportLib');
 	}
 
 	/**
@@ -102,11 +100,23 @@ class Documents extends FHCAPI_Controller
 	{
 		$akteExportData = $this->_getAkteExportData($xml, $xsl, $sign_user);
 
-		$akteData = $akteExportData['akteData'];
-		$exportData = $akteExportData['exportData'];
+		$akteData = $akteData['akteData'];
+		$exportData = $akteData['exportData'];
+
+		/**
+		 *				[
+					'vorlage' => $vorlage,
+					'xml_data' => $data,
+					'oe_kurzbz' => $xsl_oe_kurzbz,
+					'version' => $version,
+					'outputformat' => $outputformat,
+					'sign_user' => $sign_user
+				]
+		 */
 
 		// Output
-		$contentResult = $this->documentexportlib->getContent(
+		$result = $this->documentexportlib->showContent(
+			$akteData['akteData']['inhalt'],
 			$exportData['vorlage'],
 			$exportData['xml_data'],
 			$exportData['oe_kurzbz'],
@@ -115,9 +125,7 @@ class Documents extends FHCAPI_Controller
 			$exportData['sign_user']
 		);
 
-		$content = $this->getDataOrTerminateWithError($contentResult);
-
-		$this->terminateWithFileOutput($akteData['mimetype'], $content, $akteData['titel'] . '.pdf');
+		$this->terminateWithSuccess(true);
 	}
 
 	/**
@@ -153,10 +161,12 @@ class Documents extends FHCAPI_Controller
 			$this->load->library('form_validation');
 			if (!$xml) {
 				$xml = $this->input->post_get('xml');
+				$this->addMeta('xml', $xml);
 				$this->form_validation->set_rules('xml', 'xml', 'required');
 			}
 			if (!$xsl) {
 				$xsl = $this->input->post_get('xsl');
+				$this->addMeta('xsl', $xsl);
 				$this->form_validation->set_rules('xsl', 'xsl', 'required');
 			}
 
@@ -455,13 +465,18 @@ class Documents extends FHCAPI_Controller
 		if ($sign_user && !$vorlage->signierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_sign"));
 
+
+		$this->load->library('DocumentExportLib');
+
 		// XML Data
 		$result = $this->documentexportlib->getDataURL($xml, $params);
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->documentexportlib->addArchiveToData($data);
-		$contentResult = $this->documentexportlib->getContent($vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
 
-		$content = $this->getDataOrTerminateWithError($contentResult);
+		// Output
+		$result = $this->documentexportlib->getContent($vorlage, $data, $xsl_oe_kurzbz, $version, $outputformat, $sign_user);
+
+		$content = $this->getDataOrTerminateWithError($result);
 		$akteData['titel'] .= '.pdf';
 		$akteData['inhalt'] = base64_encode($content);
 
@@ -479,4 +494,3 @@ class Documents extends FHCAPI_Controller
 		];
 	}
 }
-

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

@@ -56,9 +56,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
-		$studiengang_kz = $this->getStudiengangKz($stg_kz);
-
-		$lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $studiengang_kz);
+		$lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $stg_kz);
 		$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
 
 		$tree = [];
@@ -77,17 +75,15 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($tree);
 	}
-	public function getByStg($studiensemester_kurzbz = null, $stg_kz = null, $semester = null)
+	public function getByStg($studiensemester_kurzbz = null, $studiengang_kz = null, $semester = null)
 	{
-		$studiengang_kz = $this->getStudiengangKz($stg_kz);
-
-		if (is_null($studiengang_kz) || !preg_match("/^(-?[1-9][0-9]*|0)$/", (string)$studiengang_kz))
+		if (is_null($studiengang_kz) || !preg_match("/^-?[1-9][0-9]*$/", (string)$studiengang_kz))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$verband = null;
 		if (!is_null($semester) && !is_numeric($semester))
 		{
-			$verband = $this->getOrgformKurzbz($semester);
+			$verband = $semester;
 			$semester = null;
 		}
 
@@ -264,53 +260,18 @@ class Lehrveranstaltung extends FHCAPI_Controller
 		}
 	}
 
-	protected function getStudiengangKz($studiengang_typ_kurzbz)
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$result = $this->StudiengangModel->loadWhere([
-			'LOWER(CONCAT(typ, kurzbz)) =' => strtolower($studiengang_typ_kurzbz)
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			return null;
-
-		return current($data)->studiengang_kz;
-	}
-
 	private function getStudiensemesterKurzbz($studiensemester_kurzbz = null)
 	{
 		if (!is_null($studiensemester_kurzbz))
 		{
-			$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere([
-				'LOWER(studiensemester_kurzbz)' => strtolower($studiensemester_kurzbz)
-			]);
+			$studiensemester_result = $this->_ci->StudiensemesterModel->load($studiensemester_kurzbz);
 
 			if (isError($studiensemester_result) || !hasData($studiensemester_result))
-				$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 			return getData($studiensemester_result)[0]->studiensemester_kurzbz;
 		}
 
 		$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 	}
-
-	protected function getOrgformKurzbz($orgform_kurzbz)
-	{
-		if ($orgform_kurzbz === null)
-			return null;
-
-		$this->load->model('codex/Orgform_model', 'OrgformModel');
-		$result = $this->OrgformModel->loadWhere([
-			'LOWER(orgform_kurzbz) =' => strtolower($orgform_kurzbz)
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			return $orgform_kurzbz;
-
-		return current($data)->orgform_kurzbz;
-	}
 }

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

@@ -49,8 +49,6 @@ class LvPlan extends FHCAPI_Controller
 			'getLehrverband' => self::PERM_LOGGED,
 			'permissionOtherLvPlan' => self::PERM_LOGGED,
 			'compactibleEventTypes' => self::PERM_LOGGED,
-			'getLeEvents' => self::PERM_LOGGED,
-			'getLvEvents' => self::PERM_LOGGED,
 		]);
 
 		$this->load->library('LogLib');
@@ -62,13 +60,7 @@ class LvPlan extends FHCAPI_Controller
 			'dbExecuteUser' => 'RESTful API'
 		));
 
-        $this->load->library('form_validation');
-		$this->load->library('PhrasesLib');
-		$this->loadPhrases(
-			array(
-				'ui'
-			)
-		);
+		$this->load->library('form_validation');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -114,7 +106,6 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching lvplan events
 		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
-
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events
@@ -205,38 +196,6 @@ class LvPlan extends FHCAPI_Controller
 		));
 	}
 
-	public function getLeEvents($le_id = null, $start_date = null, $end_date = null, $stundenplan = 'stundenplandev')
-	{
-
-		if (is_null($le_id) || is_null($start_date) || is_null($end_date))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		if ($stundenplan !== 'stundenplandev' && $stundenplan !== 'stundenplan')
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->library('StundenplanLib');
-
-		$result = $this->stundenplanlib->getEventsByLE($le_id, $start_date, $end_date, $stundenplan);
-		$lvplanEvents = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($lvplanEvents);
-	}
-
-	public function getLvEvents($lv_id = null, $start_date = null, $end_date = null, $stundenplan = 'stundenplandev')
-	{
-		if (is_null($lv_id) || is_null($start_date) || is_null($end_date))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		if ($stundenplan !== 'stundenplandev' && $stundenplan !== 'stundenplan')
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->library('StundenplanLib');
-
-		$result = $this->stundenplanlib->getEventsByLV($lv_id, $start_date, $end_date, $stundenplan);
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
 	public function studiensemesterDateInterval($date)
 	{

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

@@ -17,61 +17,60 @@
  */
 
 if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+    exit('No direct script access allowed');
 
 class OtherLvPlan extends FHCAPI_Controller
 {
 
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'otherLvPlanViewData' => ['basis/other_lv_plan:r'],
-		]);
+    /**
+     * 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');
-		$this->load->library('ProfilLib');
+        $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+        $this->load->model('person/Benutzer_model', 'BenutzerModel');
 
-	}
+    }
 
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
+    //------------------------------------------------------------------------------------------------------------------
+    // 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;
+    /**
+     * 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;
 
-		$resProfileData = $this->profillib->getView($uid);
-		$profileData = hasData($resProfileData) ? getData($resProfileData) : null;
+        $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" => $profileData->data->foto,
-				"vorname" => $profileData->data->vorname,
-				"nachname" => $profileData->data->nachname,
-				"titel" => $profileData->data->titel,
-				"postnomen" => $profileData->data->postnomen,
-			],
-		];
+        $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);
-	}
+        $this->terminateWithSuccess($viewData);
+    }
 
-	// -----------------------------------------------------------------------------------------------------------------
-	// Private methods
+    // -----------------------------------------------------------------------------------------------------------------
+    // Private methods
 
 }
 

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

@@ -136,7 +136,7 @@ class ProfilUpdate extends FHCAPI_Controller
 				$this->uid == $profil_update->uid
 			) {
 				// Get file to be downloaded from DMS
-				$download = $this->dmslib->getOutputFileInfo($dms_id);
+				$download = $this->dmslib->download($dms_id);
 				$download = $this->getDataOrTerminateWithError($download);
 				// Download file
 				$this->outputFile($download);
@@ -456,28 +456,24 @@ class ProfilUpdate extends FHCAPI_Controller
 			$_FILES['files']['error'] = $files['error'][$i];
 			$_FILES['files']['size'] = $files['size'][$i];
 
-			// File upload
-			$uploadDataResult = $this->uploadFile('files', array('jpg', 'png', 'pdf'));
-			if (isError($uploadDataResult)) $this->addError(getError($uploadDataResult));
-			if (!hasData($uploadDataResult)) $this->addError('Upload failed');
+			$dms = [
+				"kategorie_kurzbz" => "profil_aenderung",
+				"version" => 0,
+				"name" => $_FILES['files']['name'],
+				"mimetype" => $_FILES['files']['type'],
+				"beschreibung" => $this->uid . " Profil Änderung",
+				"insertvon" => $this->uid,
+				"insertamum" => "NOW()",
+			];
 
-			if (hasData($uploadDataResult))
-			{
-				// Add file to the DMS (DB + file system)
-				$dms_res = $this->dmslib->add(
-					getData($uploadDataResult)['file_name'],
-                        	        getData($uploadDataResult)['file_type'],
-                        	        fopen(getData($uploadDataResult)['full_path'], 'r'),
-                        	        'profil_aenderung', // kategorie_kurzbz
-                        	        null, // dokument_kurzbz
-                        	        null, // beschreibung
-                        	        false, // cis_suche
-                        	        null, // schlagworte
-                        	        getAuthUID() // insertvon
-				);
-				$dms_res = $this->getDataOrTerminateWithError($dms_res);
-				array_push($res, $dms_res);
+			$tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
+			
+			if(isError($tmp_res)){
+				$this->addError(getError($tmp_res));
 			}
+
+			$tmp_res = $this->getDataOrTerminateWithError($tmp_res);
+			array_push($res, $tmp_res);
 		}
 
 		$this->terminateWithSuccess($res);

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

@@ -31,7 +31,7 @@ class RendererLoader extends FHCAPI_Controller
 
 		parent::__construct([
 			'GetRenderers' => self::PERM_LOGGED,
-           
+			'GetTempusRenderers' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -66,6 +66,26 @@ class RendererLoader extends FHCAPI_Controller
 		$this->terminateWithSuccess($renderer_paths);
 	}
 
+	public function GetTempusRenderers(){
+		$renderer_paths = [];
+		Events::trigger(
+				'loadRenderers',
+				function & () use (&$renderer_paths)
+				{
+					return $renderer_paths;
+				}
+			);
+
+		Events::trigger(
+				'loadTempusRenderers',
+				function & () use (&$renderer_paths)
+				{
+					return $renderer_paths;
+				}
+			);
+		$this->terminateWithSuccess($renderer_paths);
+	}
+
 	
 	
 

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

@@ -167,9 +167,7 @@ class Studium extends FHCAPI_Controller
 		if($aktuelles_studienplan){
 			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
 			foreach($lehrveranstaltungen as $lehrv){
-				// a lehrveranstaltung without a modul has no children and gets its lektoren directly
-				$lvs = isset($lehrv->lehrveranstaltungen) ? $lehrv->lehrveranstaltungen : [$lehrv];
-				foreach($lvs as $lv){
+				foreach($lehrv->lehrveranstaltungen as $lv){
 					$lvLektoren =$this->computeLektorenFromLehrveranstaltung($lv->lehrveranstaltung_id,$aktuelles_semester, $aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
 					$lv->lektoren = $lvLektoren;
 				}
@@ -288,7 +286,6 @@ SELECT tbl_lehrveranstaltung.*,
 		$lehrveranstaltungen = $this->LehrveranstaltungModel->execReadOnlyQuery($query,[$studienplan_id, $semester]);
 		
 		$lehrveranstaltungen = $this->getDataOrTerminateWithError($lehrveranstaltungen);
-		
 		usort($lehrveranstaltungen, function($a, $b){
 			if($a->lehrtyp_kurzbz == "modul"){
 				return -1;
@@ -305,17 +302,12 @@ SELECT tbl_lehrveranstaltung.*,
 			}
 			else{
 				$parent =array_filter($carry, function($item)use($lehrv){
-					return isset($item->lehrveranstaltungen)
-						&& $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
+					return $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
 				});
 				$parent = current($parent);
 				if($parent){
 					$parent->lehrveranstaltungen[] = $lehrv;
 				}
-				else{
-					// lehrveranstaltung without a modul: keep it on the top level
-					array_push($carry, $lehrv);
-				}
 			}
 			return $carry;
 		}, []);

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

@@ -1,162 +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');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the PhrasesLib (back-end)
- * Provides data to the ajax get calls about the Phrasen plugin
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
-class TabulatorPresets extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getTabulatorPresets' => self::PERM_LOGGED,
-			'createTabulatorPreset' => self::PERM_LOGGED,
-			'updateTabulatorPreset' => self::PERM_LOGGED,
-			'deleteTabulatorPreset' => self::PERM_LOGGED,
-		]);
-
-		$this->load->model('tabulator/Tabulator_preset_model', 'TabulatorPresetModel');
-
-		$this->loadPhrases([
-			'global',
-			'tabulator_presets'
-		]);
-	}
-	
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getTabulatorPresets()
-	{
-		$tableName = $this->input->get("tableName");
-		if (!$tableName) {
-			$this->terminateWithError(error($this->p->t("tabulator_presets", "invalid_params_err_msg")));
-		}
-
-		$uid = getAuthUID();
-		$presets = $this->TabulatorPresetModel->getTabulatorPresetsByUserAndTable($uid, $tableName);
-		$presetsData = $this->getDataOrTerminateWithError($presets) ?? [];
-
-		$this->terminateWithSuccess($presetsData);
-	}
-
-	public function createTabulatorPreset()
-	{
-		$tableName = $this->input->post("tableName");
-		$presetName = $this->input->post("presetName");
-		$preset = $this->input->post("preset");
-
-		if (!$tableName || !$presetName || !$preset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
-		}
-
-		$uid = getAuthUID();
-
-		$existingPresetsResult = $this->TabulatorPresetModel->getTabulatorPresetsByUserAndTable($uid, $tableName);
-		$existingPresets = $this->getDataOrTerminateWithError($existingPresetsResult) ?? [];
-
-		if (count($existingPresets) > 19) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "max_presets_count_err_msg"), "general", 409);
-		}
-
-		$existingPresetNames = array_map(function($presetInfo) {
-			return $presetInfo->preset_name;
-		}, $existingPresets);
-
-		if (in_array($presetName, $existingPresetNames)) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_name_duplicate_err_msg"), "general", 409);
-		}
-
-		$presetCreationResult = $this->TabulatorPresetModel->createTabulatorPreset($uid, $tableName, $presetName, $preset);
-
-		if (isError($presetCreationResult)) {
-			$this->terminateWithError($presetCreationResult->retval);
-		}
-
-		$newPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetCreationResult->retval);
-		$newPresetArray = $this->getDataOrTerminateWithError($newPresetData) ?? [null];
-		$newPreset = $newPresetArray[0];
-
-		$this->terminateWithSuccess($newPreset);
-	}
-
-	public function updateTabulatorPreset()
-	{
-		$presetId = $this->input->post("presetId");
-		$preset = $this->input->post("preset");
-
-		if (!$presetId || !$preset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
-		} 
-
-		$existingPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
-		$existingPresetArray = $this->getDataOrTerminateWithError($existingPresetData) ?? [null];
-		$existingPreset = $existingPresetArray[0];
-		if (!$existingPreset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_found_err_msg"), "general", 404);
-		}
-
-		$uid = getAuthUID();
-		if ($existingPreset->benutzer_uid !== $uid) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_own_update_err_msg"), "general", 403);
-		}
-
-		$presetUpdateResult = $this->TabulatorPresetModel->updateTabulatorPreset($presetId, $preset);
-		if (isError($presetUpdateResult)) {
-			$this->terminateWithError($presetUpdateResult->retval);
-		}
-
-		$updatedPresetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
-		$updatedPresetArray = $this->getDataOrTerminateWithError($updatedPresetData) ?? [null];
-		$updatedPreset = $updatedPresetArray[0];
-
-		$this->terminateWithSuccess($updatedPreset);
-	}
-
-	public function deleteTabulatorPreset()
-	{
-		$presetId = $this->input->post("presetId");
-		if (!$presetId) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "invalid_params_err_msg"), "general", 400);
-		}
-
-		$presetData = $this->TabulatorPresetModel->getTabulatorPreset($presetId);
-		$presetArray = $this->getDataOrTerminateWithError($presetData) ?? [null];
-		$preset = $presetArray[0];
-		if (!$preset) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_found_err_msg"), "general", 404);
-		}
-
-		$uid = getAuthUID();
-		if ($preset->benutzer_uid !== $uid) {
-			$this->terminateWithError($this->p->t("tabulator_presets", "preset_not_own_delete_err_msg"), "general", 403);
-		}
-
-		$presetDeletionResult = $this->TabulatorPresetModel->deleteTabulatorPreset($presetId);
-		if (isError($presetDeletionResult)) {
-			$this->terminateWithError($presetDeletionResult->retval);
-		}
-
-		$this->terminateWithSuccess();
-	}
-
-}

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

@@ -1,148 +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');
-
-use \ReflectionMethod as ReflectionMethod;
-use \ReflectionFunction as ReflectionFunction;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about menues
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Treemenu extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		// Load Router
-		$router = load_class('Router');
-
-		// Load Config
-		$config = load_class('Config');
-		$config->load('treemenu');
-
-		// Get Treemenu name & config
-		$name = $router->method;
-		$conf = $config->item($name);
-		
-		// Get Permissions from config
-		$permissions = $conf['permissions'] ?? self::PERM_ANONYMOUS;
-
-		// Call constructor
-		parent::__construct([
-			$name => $permissions
-		]);
-
-		// Load Library
-		$libraryName = $conf['library'] ?? null;
-		$this->load->library($libraryName, null, 'treemenulib');
-	}
-	
-	/**
-	 * @param string		$method
-	 * @param array			$params				(optional)
-	 *
-	 * @return void
-	 */
-	public function _remap($method, $params = [])
-	{
-		if (!$this->treemenulib)
-			show_404();
-
-		$this->addMeta('ci_method', $method);
-		$this->addMeta('ci_params', $params);
-		
-		$params = $this->uri->uri_to_assoc(6); // 6 = start of $params
-		$config = $this->treemenulib->config;
-
-		foreach (array_keys($params) as $key) {
-			if (!isset($config[$key]) || !$config[$key])
-				show_404();
-
-			$config = $config[$key];
-		}
-
-		// Prepare aliases
-		$argumentaliases = [];
-		if (property_exists($this->treemenulib, 'path_to_argument'))
-			$argumentaliases = array_flip($this->treemenulib->path_to_argument);
-		$methodaliases = [];
-		if (property_exists($this->treemenulib, 'redirect_method'))
-			$methodaliases = $this->treemenulib->redirect_method;
-		
-		$items = [];
-		foreach ($config as $uripart => $children) {
-			if (!is_array($children)) {
-				$uripart = $children;
-				$children = [];
-			}
-
-			$methodName = $uripart;
-			if (isset($methodaliases[$methodName])) {
-				$methodName = $methodaliases[$methodName];
-			} elseif (strpbrk($methodName, ' _-') !== false) {
-				$methodName = lcfirst(str_replace([' ', '_', '-'], '', ucwords($methodName, " \t\r\n\f\v_-")));
-			}
-
-			// Prepare arguments
-			if (is_callable($methodName, false, $name)) {
-				if (is_string($methodName) && is_callable([$this->treemenulib, $methodName]))
-					$callable = [$this->treemenulib, $methodName];
-				else
-					$callable = $methodName;
-			} else {
-				$callable = [$this->treemenulib, $methodName];
-			}
-
-			if (is_array($callable))
-				$reflection = new ReflectionMethod($callable[0], $callable[1]);
-			elseif (is_string($callable) && strstr($callable, '::'))
-				$reflection = new ReflectionMethod($callable);
-			elseif ($name != 'Closure::__invoke' && strstr($name, '::__invoke'))
-				$reflection = new ReflectionMethod($callable, '__invoke');
-			else
-				$reflection = new ReflectionFunction($callable);
-
-			$arguments = [];
-			foreach ($reflection->getParameters() as $arg) {
-				if ($arg->name == 'path_template') {
-					$path = $params;
-					$path[$uripart] = '%s';
-					$arguments[] = $this->uri->assoc_to_uri($path);
-				} elseif ($arg->name == 'has_children') {
-					$arguments[] = $children;
-				} elseif ($arg->name == 'original_method') {
-					$arguments[] = $uripart;
-				} elseif (isset($argumentaliases[$arg->name]) && isset($params[$argumentaliases[$arg->name]])) {
-					$arguments[] = $params[$argumentaliases[$arg->name]];
-				} elseif (isset($params[$arg->name])) {
-					$arguments[] = $params[$arg->name];
-				} else {
-					$arguments[] = null;
-				}
-			}
-
-			// Call function from lib
-			$items = array_merge($items, call_user_func_array($callable, $arguments));
-		}
-
-		$this->terminateWithSuccess($items);
-	}
-}

application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php

@@ -259,7 +259,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$kaution = $this->input->post('kaution');
 		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram') == "" ? null : $this->input->post('retouram');
+		$retouram = $this->input->post('retouram');
 
 		// NOTE(chris): transform_kartennummer
 		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)

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

@@ -101,9 +101,6 @@ class Widget extends FHCAPI_Controller
 			$tmpsetup = json_decode($widget->setup);
 			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
 			$widget->setup = $tmpsetup;
-			$widget->permitted = empty($widget->berechtigung_kurzbz) 
-				|| $this->permissionlib->isBerechtigt($widget->berechtigung_kurzbz);
-
 			return $widget;
 		}, $widgets);
 

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

@@ -9,10 +9,9 @@ class Detailheader extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r', 'admin:r', 'assistenz:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r', 'admin:r', 'assistenz:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r', 'admin:r', 'assistenz:r'],
-			'getSemesterStati' => ['admin:r', 'assistenz:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 	}
 
@@ -49,17 +48,6 @@ class Detailheader extends FHCAPI_Controller
 		$this->terminateWithSuccess(current($data));
 	}
 
-	public function getSemesterStati($prestudent_id)
-	{
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$result = $this->PrestudentstatusModel->getAllPrestudentstatiWithStudiensemester($prestudent_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
 }
 
 

application/controllers/api/frontend/v1/funktionen/Funktionen.php

@@ -294,10 +294,6 @@ class Funktionen extends FHCAPI_Controller
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
-		if($datum_von == '')
-			$datum_von = null;
-		if($datum_bis == '')
-			$datum_bis = null;
 
 		$result = $this->BenutzerfunktionModel->update(
 			[

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

@@ -1,86 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Config extends FHCAPI_Controller
-{
-	private $_ci;
-	private $_uid;
-
-	public function __construct()
-	{
-		parent::__construct([
-			'get' => ['admin:r', 'assistenz:r'],
-			'set' => ['admin:r', 'assistenz:r'],
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_setAuthUID();
-
-		$this->loadPhrases([
-			'lehre'
-		]);
-
-		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
-		$this->_ci->load->library('PermissionLib');
-
-	}
-
-
-	public function get()
-	{
-		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
-			$this->terminateWithSuccess([]);
-
-		$ignore_kollision = $this->_ci->variablelib->getVar('ignore_kollision');
-		$ignore_zeitsperre = $this->_ci->variablelib->getVar('ignore_zeitsperre');
-		$ignore_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung');
-
-		$config['ignore_kollision'] = [
-			"type" => "checkbox",
-			"label" => 'ignore_kollision',
-			"value" => $ignore_kollision,
-		];
-
-		$config['ignore_zeitsperre'] = [
-			"type" => "checkbox",
-			"label" => 'ignore_zeitsperre',
-			"value" => $ignore_zeitsperre,
-		];
-
-		$config['ignore_reservierung'] = [
-			"type" => "checkbox",
-			"label" => 'ignore_reservierung',
-			"value" => $ignore_reservierung,
-		];
-
-		$this->terminateWithSuccess($config);
-	}
-	public function set()
-	{
-		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
-			$this->terminateWithSuccess([]);
-
-		$this->load->model('system/Variable_model', 'VariableModel');
-
-		foreach (['ignore_kollision','ignore_zeitsperre','ignore_reservierung'] as $variable)
-		{
-			if ($this->_ci->input->post($variable) !== null)
-			{
-				$this->VariableModel->update(array('uid' => $this->_uid, 'name' => $variable), array('wert' => $this->input->post($variable)));
-
-			}
-		}
-
-		$this->terminateWithSuccess();
-	}
-
-	private function _setAuthUID()
-	{
-		$this->_uid = getAuthUID();
-
-		if (!$this->_uid)
-			show_error('User authentification failed');
-	}
-}

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

@@ -0,0 +1,47 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Favorites extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+	}
+
+	public function index()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['lv_favorites']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if (!$data)
+			$this->terminateWithSuccess(null);
+		else
+			$this->terminateWithSuccess(isset($data['lv_favorites']) ? $data['lv_favorites'] : null);
+	}
+
+	public function set()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$favorites = $this->input->post('favorites');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'lv_favorites', $favorites);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess(true);
+	}
+}

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

@@ -15,7 +15,6 @@ class Gruppe extends FHCAPI_Controller
 			'getBenutzerSearch' => ['admin:r', 'assistenz:r'],
 			'getAllSearch' => ['admin:r', 'assistenz:r'],
 			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
-			'getGruppe' => ['admin:r', 'assistenz:r'],
 		]);
 
 		$this->_ci = &get_instance();
@@ -68,7 +67,7 @@ class Gruppe extends FHCAPI_Controller
 
 		$this->checkPermission($lehreinheit_id);
 
-		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, $lehrverband === true || $lehrverband === 'true');
+		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, !($lehrverband === 'false'));
 
 		if (isError($result))
 			$this->terminateWithError(getError($result));
@@ -76,71 +75,6 @@ class Gruppe extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getGruppe()
-	{
-		$lehrverband = $this->input->post('lehrverband');
-
-		$gruppen_result = array();
-
-		if ($lehrverband === false)
-		{
-			$gruppen_result = $this->_ci->GruppeModel->loadWhere(array(
-				'studiengang_kz' => $this->input->post('stg_kz'),
-				'gruppe_kurzbz' => $this->input->post('gruppe_kurzbz'),
-				'aktiv' => true
-			));
-		}
-		else if ($lehrverband === true)
-		{
-
-			if (!isEmptyString($this->input->post('verband')))
-			{
-				$this->LehrverbandModel->db->where('verband', $this->input->post('verband'));
-			}
-			else
-			{
-				$this->LehrverbandModel->db->group_start();
-				$this->LehrverbandModel->db->where("trim(verband) = ''");
-				$this->LehrverbandModel->db->or_where("verband IS NULL");
-				$this->LehrverbandModel->db->group_end();
-			}
-
-			if (!isEmptyString($this->input->post('gruppe')))
-			{
-				$this->LehrverbandModel->db->where('gruppe', $this->input->post('gruppe'));
-			}
-			else
-			{
-				$this->LehrverbandModel->db->group_start();
-				$this->LehrverbandModel->db->where("trim(gruppe) = ''");
-				$this->LehrverbandModel->db->or_where("gruppe IS NULL");
-				$this->LehrverbandModel->db->group_end();
-			}
-
-			if (!isEmptyString((string)$this->input->post('semester')))
-			{
-				$this->LehrverbandModel->db->where('semester', $this->input->post('semester'));
-			}
-			else
-			{
-
-				$this->LehrverbandModel->db->group_start();
-				$this->LehrverbandModel->db->where("semester = ''");
-				$this->LehrverbandModel->db->or_where("semester IS NULL");
-				$this->LehrverbandModel->db->group_end();
-			}
-
-			$gruppen_result = $this->LehrverbandModel->loadWhere(array('studiengang_kz' => $this->input->post('stg_kz'), 'aktiv' => true));
-		}
-
-		if (!hasData($gruppen_result))
-			return $this->terminateWithError('No group found');
-
-		$gruppen_array = getData($gruppen_result)[0];
-
-		$this->terminateWithSuccess($gruppen_array->gid);
-	}
-
 	public function getByLehreinheit($lehreinheit_id = null)
 	{
 		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id))
@@ -184,54 +118,17 @@ class Gruppe extends FHCAPI_Controller
 
 		$query_words = explode(' ', $query);
 
-		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
-											studiengang_kz,
-											semester,
-											bezeichnung,
-											gid,
-											\'false\' as lehrverband');
-		$this->_ci->GruppeModel->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
-		$this->_ci->GruppeModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->GruppeModel->db->group_start();
-			$this->_ci->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->_ci->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->_ci->GruppeModel->db->group_end();
-		}
-		$this->_ci->GruppeModel->db->group_end();
-
-		$gruppen_result = $this->_ci->GruppeModel->load();
-
-		$gruppen_array = array();
+		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
 
 		if (isError($gruppen_result))
 			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
 
+		$gruppen_array = array();
+
 		if (hasData($gruppen_result))
 			$gruppen_array = getData($gruppen_result);
 
-		$this->_ci->LehrverbandModel->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
-												studiengang_kz,
-												semester,
-												tbl_lehrverband.bezeichnung,
-												gid,
-												\'true\' as lehrverband');
-		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-		$this->_ci->LehrverbandModel->addOrder('verband');
-		$this->_ci->LehrverbandModel->addOrder('gruppe');
-		$this->_ci->LehrverbandModel->db->where(array('tbl_lehrverband.aktiv' => true));
-
-		$this->_ci->LehrverbandModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->LehrverbandModel->db->group_start();
-			$this->_ci->LehrverbandModel->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
-			$this->_ci->LehrverbandModel->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
-			$this->_ci->LehrverbandModel->db->group_end();
-		}
-		$this->_ci->LehrverbandModel->db->group_end();
-		$lehrverband_result = $this->_ci->LehrverbandModel->load();
+		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
 
 		$lehrverband_array = array();
 

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

@@ -134,14 +134,9 @@ class Lektor extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$nullable_fields = array('semesterstunden', 'stundensatz', 'planstunden');
-
-		foreach ($nullable_fields as $nullable_field)
+		if (isset($formData['semesterstunden']) && (!is_numeric($formData['semesterstunden']) || $formData['semesterstunden'] === ''))
 		{
-			if (isset($formData[$nullable_field]) && (!is_numeric($formData[$nullable_field]) || $formData[$nullable_field] === ''))
-			{
-				$formData[$nullable_field] = null;
-			}
+			$formData['semesterstunden'] = null;
 		}
 
 		$lehreinheit_permission = $this->checkPermission($lehreinheit_id, array('admin', 'assistenz', 'lv-plan'));
@@ -149,9 +144,6 @@ class Lektor extends FHCAPI_Controller
 		if (!$lehreinheit_permission)
 			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
 
-		if (!is_null($this->getLektorVertrag($lehreinheit_id, $mitarbeiter_uid)) && (array_key_exists('mitarbeiter_uid', $formData) && $mitarbeiter_uid !== $formData['mitarbeiter_uid']))
-			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
-
 		$result = $this->_ci->lektorlib->updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $formData);
 
 		if (isError($result)) $this->terminateWithError(getError($result));
@@ -162,7 +154,7 @@ class Lektor extends FHCAPI_Controller
 	{
 		$value = str_replace(',', '.', $value);
 
-		if (!is_numeric($value) && $value !== "")
+		if (!is_numeric($value))
 		{
 			$this->form_validation->set_message('_check_decimal', 'Das Feld {field} muss eine Zahl sein.');
 			return false;

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

@@ -1,84 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Noten extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getCertificate' => 'student/noten:r',
-			'getTeacherProposal' => 'student/noten:r',
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load Phrases
-		$this->loadPhrases([
-			'stv',
-			'person',
-			'lehre'
-		]);
-	}
-
-	public function getCertificate($lv_id, $studiensemester_kurzbz = null)
-	{
-		if (is_null($lv_id) || !ctype_digit((string)$lv_id))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->model('education/lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$result = $this->LehrveranstaltungModel->loadWhere([
-			'lehrveranstaltung_id' => $lv_id
-		]);
-
-		$lehrveranstaltung = $this->getDataOrTerminateWithError($result);
-
-		if (!$lehrveranstaltung)
-			$this->terminateWithSuccess([]);
-
-		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
-		{
-			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
-		}
-
-		$result = $this->ZeugnisnoteModel->getZeugnisnoten(null, $studiensemester_kurzbz, $lehrveranstaltung[0]->lehrveranstaltung_id);
-
-		$grades = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($grades);
-	}
-
-	public function getTeacherProposal($lv_id, $studiensemester_kurzbz = null)
-	{
-		if (is_null($lv_id) || !ctype_digit((string)$lv_id))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->load->model('education/lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$result = $this->LehrveranstaltungModel->loadWhere([
-			'lehrveranstaltung_id' => $lv_id
-		]);
-
-		$lehrveranstaltung = $this->getDataOrTerminateWithError($result);
-
-		if (!$lehrveranstaltung)
-			$this->terminateWithSuccess([]);
-
-		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
-		{
-			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
-		}
-
-		$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, null, $studiensemester_kurzbz);
-
-		$grades = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($grades);
-	}
-
-}

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

@@ -19,8 +19,6 @@
 if (!defined('BASEPATH'))
 	exit('No direct script access allowed');
 
-use CI3_Events as Events;
-
 class Setup extends FHCAPI_Controller
 {
 	private $_ci;
@@ -29,8 +27,7 @@ class Setup extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getLETabs' => ['admin:r', 'assistenz:r'],
-			'getLVTabs' => ['admin:r', 'assistenz:r'],
+			'getTabs' => ['admin:r', 'assistenz:r'],
 			'getStudiensemester' => ['admin:r', 'assistenz:r'],
 			'getSprache' => ['admin:r', 'assistenz:r'],
 			'getRaumtyp' => ['admin:r', 'assistenz:r'],
@@ -44,10 +41,9 @@ class Setup extends FHCAPI_Controller
 		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
 
 		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
-		$this->_ci->load->helper('hlp_document');
 	}
 
-	public function getLETabs()
+	public function getTabs()
 	{
 		$tabs['details'] = array (
 			'title' =>  'Details',
@@ -64,43 +60,11 @@ class Setup extends FHCAPI_Controller
 			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Lektor.js'),
 			'config' => []
 		);
-		$tabs['termine'] = array (
-			'title' =>  'Termine',
-			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Termine.js'),
-			'config' => []
-		);
 		$tabs['notiz'] = array (
 			'title' =>  'Notizen',
 			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Notiz.js'),
 			'config' => []
 		);
-
-		Events::trigger('lvv_conf_tabs', function & () use (&$tabs) {
-			return $tabs;
-		});
-
-		$this->terminateWithSuccess($tabs);
-	}
-
-	public function getLVTabs()
-	{
-		$tabs['termine'] = array (
-			'title' =>  'Termine',
-			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/LVTermine.js'),
-			'config' => []
-		);
-		$tabs['noten'] = array (
-			'title' =>  'Noten',
-			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Noten.js'),
-			'config' => [
-				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
-				'edit' => 'both', // Possible values: both|header|inline
-				'delete' => 'inline', // Possible values: both|header|inline
-				'documents' => 'inline', // Possible values: both|header|inline
-				'documentslist' => gradesDocumentsList(),
-				'semesterSelect' => false
-			]
-		);
 		$this->terminateWithSuccess($tabs);
 	}
 

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

@@ -0,0 +1,257 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class StgTree extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->getBase();
+
+		if (!$this->permissionlib->isBerechtigt('assistenz', 's', $method)
+			&& !$this->permissionlib->isBerechtigt('admin', 's', $method)
+		) {
+			return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
+		}
+
+		$count = count($params);
+		if (!$count)
+			return $this->getStudiengang($method);
+
+		if ($count == 1) {
+			if (is_numeric($params[0]))
+				return $this->getSemester($method, $params[0]);
+			else
+				return $this->getStudiengang($method, $params[0]);
+		}
+		if ($count == 2) {
+			if (is_numeric($params[0]))
+				return $this->getVerband($method, $params[0], $params[1]);
+			else
+				return $this->getSemester($method, $params[1], $params[0]);
+		}
+
+
+
+		show_404();
+	}
+
+	protected function getBase()
+	{
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("v.studiengang_kz AS link");
+		$this->StudiengangModel->addSelect(
+			"CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
+			false
+		);
+		$this->StudiengangModel->addSelect('erhalter_kz');
+		$this->StudiengangModel->addSelect('typ');
+		$this->StudiengangModel->addSelect('kurzbz');
+		$this->StudiengangModel->addSelect('studiengang_kz');
+		$this->StudiengangModel->addSelect('studiengang_kz AS stg_kz');
+
+		$this->StudiengangModel->addOrder('erhalter_kz');
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$stgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$stgs = array_merge($stgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+
+		if (!$stgs)
+			$this->terminateWithSuccess([]);
+
+		$this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
+
+		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	protected function getStudiengang($studiengang_kz, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(
+			UPPER(CONCAT(typ, kurzbz)), 
+			'-', 
+			semester, 
+			(
+				SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END 
+				FROM public.tbl_lehrverband 
+				WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester 
+				ORDER BY verband, gruppe LIMIT 1
+			)
+		) AS name", false);
+
+		$this->StudiengangModel->addSelect('semester');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->StudiengangModel->addOrder('semester');
+
+		$result = $this->StudiengangModel->loadWhere([
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.aktiv' => true
+		]);
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$result = $this->StudiengangModel->load($studiengang_kz);
+		$result = $this->getDataOrTerminateWithError($result);
+		if ($result)
+		{
+			if (current($result)->mischform)
+			{
+				$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
+
+				$this->StudienordnungModel->addDistinct();
+				$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
+				$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+				$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS orgform_kurzbz");
+				$this->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
+				$this->StudienordnungModel->addSelect("TRUE as leaf", false);
+
+				$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
+
+				$result = $this->StudienordnungModel->loadWhere([
+					'aktiv' => true,
+					'studiengang_kz' => $studiengang_kz,
+					'p.orgform_kurzbz !=' => 'DDP'
+				]);
+				$result = $this->getDataOrTerminateWithError($result);
+
+				$list = array_merge($list, $result);
+			}
+		}
+		$this->terminateWithSuccess($list);
+	}
+
+	protected function getSemester($studiengang_kz, $semester, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/';
+
+
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+
+		$this->GruppeModel->addDistinct();
+		$this->GruppeModel->addSelect("CONCAT(" . $this->GruppeModel->escape($link . 'grp/') . ", gruppe_kurzbz) AS link", false);
+		$this->GruppeModel->addSelect("CONCAT(gruppe_kurzbz, ' (', bezeichnung, ')') AS name", false);
+		$this->GruppeModel->addSelect("TRUE AS leaf", false);
+
+		$this->GruppeModel->addSelect('sort');
+		$this->GruppeModel->addSelect('gruppe_kurzbz');
+		$this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->GruppeModel->addOrder('sort');
+		$this->GruppeModel->addOrder('gruppe_kurzbz');
+
+		$where = [
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false
+		];
+
+		if ($org_form !== null)
+			$where['orgform_kurzbz'] = $org_form;
+
+		$result = $this->GruppeModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", verband) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
+
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($semester) . ' AS semester');
+		$this->StudiengangModel->addSelect('verband');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->StudiengangModel->addOrder('verband');
+
+		$this->StudiengangModel->addGroupBy('link, name, verband');
+
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		$list = array_merge($list, $result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	protected function getVerband($studiengang_kz, $semester, $verband, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/'. $verband . '/';
+
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", gruppe) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, gruppe, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband AND gruppe=v.gruppe ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
+
+		$this->StudiengangModel->addSelect('v.semester');
+		$this->StudiengangModel->addSelect('v.verband');
+		$this->StudiengangModel->addSelect('gruppe');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->StudiengangModel->addOrder('gruppe');
+
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband' => $verband,
+			'v.gruppe !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester)
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($list);
+	}
+}

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

@@ -26,10 +26,7 @@ class Studiensemester extends FHCAPI_Controller
 				'getAll' => self::PERM_LOGGED,
 				'getAktNext' => self::PERM_LOGGED,
 				'getStudienjahrByStudiensemester' => self::PERM_LOGGED,
-				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED,
-				'current' => self::PERM_LOGGED,
-				'set' => self::PERM_LOGGED,
-				'getContainingOrNearestByDateRange' => self::PERM_LOGGED,
+				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED
 			)
 		);
 		// Load model StudiensemesterModel
@@ -169,50 +166,4 @@ class Studiensemester extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess(array($studiensemester, $aktuell));
 	}
-
-	public function current()
-	{
-		$result = $this->StudiensemesterModel->getNearest();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			$this->terminateWithError('Kein Studiensemester aktiv');
-		if (count($data) > 1)
-			$this->terminateWithError('Mehrere Studiensemester aktiv');
-
-		$this->terminateWithSuccess(current($data)->studiensemester_kurzbz);
-	}
-
-	public function set()
-	{
-		$this->load->library('AuthLib');
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$stdsem = $this->input->post('studiensemester_kurzbz');
-
-		$this->load->model('system/Variable_model', 'VariableModel');
-
-		$result = $this->VariableModel->setVariable(getAuthUID(), 'semester_aktuell', $stdsem);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(true);
-	}
-
-	public function getContainingOrNearestByDateRange()
-	{
-		$from = $this->input->get("from");
-		$to = $this->input->get("to");
-
-		$result = $this->StudiensemesterModel->getContainingOrNearestByDateRange($from, $to);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
 }

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

@@ -158,27 +158,19 @@ class Unterbrechung extends FHCAPI_Controller
 		if (isset($_FILES['attachment']) && (!isset($_FILES['attachment']['error']) || $_FILES['attachment']['error'] != UPLOAD_ERR_NO_FILE)) {
 			$this->load->library('DmsLib');
 
+			$dms = $this->config->item('unterbrechung_dms');
+			if (!count(array_filter($dms, function ($v) {
+				return $v !== null;
+			})))
+				$dms = ['kategorie_kurzbz' => 'Akte'];
+			$dms['version'] = 0;
 
-			$uploadDataResult = $this->uploadFile('attachment', $this->config->item('unterbrechung_dms_filetypes') ?: array('*'));
+			$allowed_filetypes = $this->config->item('unterbrechung_dms_filetypes') ?: ['*'];
+			$result = $this->dmslib->upload($dms, 'attachment', $allowed_filetypes);
 
-			$data = $this->getDataOrTerminateWithError($uploadDataResult);
-
-			// Add file to the DMS (DB + file system)
-			$dms_res = $this->dmslib->add(
-				getData($uploadDataResult)['file_name'],
-				getData($uploadDataResult)['file_type'],
-				fopen(getData($uploadDataResult)['full_path'], 'r'),
-				'studierendenantrag',
-				null, // dokument_kurzbz
-				null, // beschreibung
-				false, // cis_suche
-				null, // schlagworte
-				getAuthUID() // insertvon
-			);
-
-			$dms_data = $this->getDataOrTerminateWithError($dms_res);
-
-			$dms_id = $dms_data->dms_id;
+			$data = $this->getDataOrTerminateWithError($result);
+			
+			$dms_id = $data['dms_id'];
 		}
 
 		$result = $this->antraglib->createUnterbrechung($prestudent_id, $studiensemester, getAuthUID(), $grund, $datum_wiedereinstieg, $dms_id);

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

@@ -246,12 +246,12 @@ class Abschlusspruefung extends FHCAPI_Controller
 	{
 		$searchString = $this->input->get('searchString') ?? '';
 
-		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$result = $this->PersonModel->searchPerson($searchString, 'mitMaUid');
+		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'ohneMaUid');
 
 		if (isError($result)) {
-			  $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->terminateWithSuccess($result ?: []);
@@ -371,9 +371,6 @@ class Abschlusspruefung extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$datum = $formData['datum'] == '' ? null : $formData['datum'];
-		$sponsion = $formData['sponsion'] == '' ? null : $formData['sponsion'];
-
 		$result = $this->AbschlusspruefungModel->update(
 			[
 				'abschlusspruefung_id' => $abschlusspruefung_id
@@ -385,8 +382,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 				'vorsitz' => $vorsitz,
 				'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
 				'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
-				'datum' => $datum,
-				'sponsion' => $sponsion,
+				'datum' => $formData['datum'],
+				'sponsion' => $formData['sponsion'],
 				'pruefer1' => $pruefer1,
 				'pruefer2' => $pruefer2,
 				'pruefer3' => $pruefer3,

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

@@ -32,8 +32,8 @@ class Akte extends Auth_Controller
 			'download' => ['admin:w', 'assistenz:w'],
 		]);
 
-		// Load libraries
-		$this->load->library('AkteLib');
+		// Load models
+		$this->load->model('crm/Akte_model', 'AkteModel');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -49,22 +49,22 @@ class Akte extends Auth_Controller
 
 		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');
 
-		$akteResult = $this->aktelib->getByAkteId($akte_id);
+		$result = $this->AkteModel->load($akte_id);
 
-		if (!hasData($akteResult)) $this->terminateWithError('Akte not found');
+		if (!hasData($result)) $this->terminateWithError('Akte not found');
 
-		$data = getData($akteResult)[0];
+		$data = getData($result)[0];
 
-		if (!isEmptyString($data->inhalt))
+		if (isset($data->inhalt) && $data->inhalt != '')
 		{
-			$fileObj = new stdClass();
-			$fileObj->file_content = base64_decode($data->inhalt);
-			$fileObj->name = $data->filename;
-			$fileObj->mimetype = $data->mimetype;
-			$fileObj->disposition = 'attachment';
-
-			$this->outputFile($fileObj);
+			header('Content-Description: File Transfer');
+			header('Content-Type: '. $data->mimetype);
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+			echo base64_decode($data->inhalt);
+			die();
 		}
 	}
 }
-

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

@@ -46,9 +46,6 @@ class Archiv extends FHCAPI_Controller
 		$this->load->model('crm/Akte_model', 'AkteModel');
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
-		// Load libraries
-		$this->load->library('AkteLib');
-
 		// Load language phrases
 		$this->loadPhrases([
 			'archiv'
@@ -60,7 +57,7 @@ class Archiv extends FHCAPI_Controller
 
 	/**
 	 * Get archive documents for a person
-
+	 
 	 * @return void
 	 */
 	public function getArchiv()
@@ -77,11 +74,7 @@ class Archiv extends FHCAPI_Controller
 				$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$result = $this->aktelib->getByPersonId(
-			$person_id,
-			null, // dokument_kurzbz
-			true // archiv
-		);
+		$result = $this->AkteModel->getArchiv($person_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -101,6 +94,51 @@ class Archiv extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * 
+	 * @param
+	 * @return object success or error
+	 */
+	public function download()
+	{
+		$akte_id = $this->input->get('akte_id');
+
+		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');
+
+		$result = $this->AkteModel->load($akte_id);
+
+		if (!hasData($result)) $this->terminateWithError('Akte not found');
+
+		$data = getData($result)[0];
+
+		$fileObj = new stdClass();
+		if (isset($data->inhalt) && $data->inhalt != '')
+		{
+			// Define handle to output stream
+			$tmpFilePointer   = fopen("php://output", 'w');
+			$meta_data = stream_get_meta_data($tmpFilePointer);
+			$filename = $meta_data["uri"];
+			fwrite($tmpFilePointer, $data->inhalt);
+
+			header('Content-Description: File Transfer');
+			header('Content-Type: '. $data->mimetype);
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			//header('Content-Length: ' . filesize($fileObj->file));
+			//header("Content-type: $data->mimetype");
+			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+			readfile($filename);
+			die();
+		}
+		else
+		{
+			$this->load->library('AkteLib');
+
+			$result = $this->aktelib->get($akte_id);
+		}
+	}
+
 	/**
 	 * Updating an Akte
 	 * @return void
@@ -155,7 +193,7 @@ class Archiv extends FHCAPI_Controller
 			$this->addMeta('content', base64_encode($content));
 		}
 
-
+		
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
 				$data[$field] = $this->input->post($field);
@@ -210,7 +248,7 @@ class Archiv extends FHCAPI_Controller
 				'akte_id' => $akte_id
 			]));
 		}
-
+		
 		$result = $this->AkteModel->delete($akte_id);
 		if (isError($result)) $this->terminateWithError(getError($result));
 

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

@@ -301,7 +301,6 @@ class Config extends FHCAPI_Controller
 
 	public function student()
 	{
-		$this->load->helper('hlp_document');
 		$result = [];
 		$config = $this->config->item('tabs');
 
@@ -377,9 +376,9 @@ class Config extends FHCAPI_Controller
 			'config' => [
 				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
 				'edit' => 'both', // Possible values: both|header|inline
-				'delete' => 'inline', // Possible values: both|header|inline
-				'documents' => 'inline', // Possible values: both|header|inline
-				'documentslist' => gradesDocumentsList()
+				'delete' => 'both', // Possible values: both|header|inline
+				'documents' => 'both', // Possible values: both|header|inline
+				'documentslist' => $this->gradesDocumentsList()
 			]
 		];
 
@@ -623,6 +622,188 @@ class Config extends FHCAPI_Controller
 		] + $this->kontoColumns();
 	}
 
+	/**
+	 * Helper function to generate the default documentslist config for the
+	 * grades tab.
+	 *
+	 * The resulting array consists of elements which are associative arrays
+	 * that can have the following entries:
+	 * title			(required) on the first level this can be HTML code.
+	 * permissioncheck	(optional) an URL to an FHCAPI endpoint which returns
+	 * 						true or false.
+	 * link				(optional) an URL that will be called if "action" and
+	 * 						"children" are not defined.
+	 * action			(optional) an associative array that describes an
+	 * 						POST action that will be called if "children" is
+	 * 						not defined.
+	 * 						It can have the following entries:
+	 * - url			(required) an URL to an FHCAPI endpoint.
+	 * - post			(optional) an associative array with the POST data to
+	 * 						be sent.
+	 * - response		(optional) a string that will be displayed on success.
+	 * children			(optional) an array of child elements
+	 *
+	 * All strings that start with { and end with } in the URLs and the
+	 * actions post parameter will be replaced with the corresponding
+	 * attribute of the current dataset (e.G: {uid} will be replaced with the
+	 * uid of the current dataset)
+	 *
+	 * @return array
+	 */
+	protected function gradesDocumentsList()
+	{
+		$permissioncheck = site_url("api/frontend/v1/documents/permissionAlternativeFormat/{studiengang_kz}");
+
+		$title_ger = $this->p->t("global", "deutsch");
+		$title_eng = $this->p->t("global", "englisch");
+		$title_ff = $this->p->t("stv", "document_certificate");
+		$title_lv = $this->p->t("stv", "document_coursecertificate");
+
+		$link_ff = "documents/export/" .
+			"zertifikat.rdf.php/" .
+			"Zertifikat" .
+			"?stg_kz={studiengang_kz_lv}" .
+			"&uid={uid}" .
+			"&ss={studiensemester_kurzbz}" .
+			"&lvid={lehrveranstaltung_id}";
+		$link_lv_ger = "documents/export/" .
+			"lehrveranstaltungszeugnis.rdf.php/" .
+			"LVZeugnis" .
+			"?stg_kz={studiengang_kz}" .
+			"&uid={uid}" .
+			"&ss={studiensemester_kurzbz}" .
+			"&lvid={lehrveranstaltung_id}";
+		$link_lv_eng = "documents/export/" .
+			"lehrveranstaltungszeugnis.rdf.php/" .
+			"LVZeugnisEng" .
+			"?stg_kz={studiengang_kz}" .
+			"&uid={uid}" .
+			"&ss={studiensemester_kurzbz}" .
+			"&lvid={lehrveranstaltung_id}";
+
+		$archive_url = "api/frontend/v1/documents/archiveSigned";
+		$archive_response = $this->p->t("stv", "document_signed_and_archived");
+		$archive_post_ff = [
+			"xml" => "zertifikat.rdf.php",
+			"xsl" => "Zertifikat",
+			"stg_kz" => "{studiengang_kz_lv}",
+			"uid" => "{uid}",
+			"ss" => "{studiensemester_kurzbz}",
+			"lvid" => "{lehrveranstaltung_id}"
+		];
+		$archive_post_lv_ger = [
+			"xml" => "lehrveranstaltungszeugnis.rdf.php",
+			"xsl" => "LVZeugnis",
+			"stg_kz" => "{studiengang_kz}",
+			"uid" => "{uid}",
+			"ss" => "{studiensemester_kurzbz}",
+			"lvid" => "{lehrveranstaltung_id}"
+		];
+		$archive_post_lv_eng = [
+			"xml" => "lehrveranstaltungszeugnis.rdf.php",
+			"xsl" => "LVZeugnisEng",
+			"stg_kz" => "{studiengang_kz}",
+			"uid" => "{uid}",
+			"ss" => "{studiensemester_kurzbz}",
+			"lvid" => "{lehrveranstaltung_id}"
+		];
+
+		$list = [
+			[
+				'title' => '<i class="fa fa-download" title="' . $this->p->t("stv", "document_download") . '"></i>',
+				'children' => [
+					[
+						'title' => $title_ff,
+						'link' => site_url($link_ff)
+					],
+					[
+						'title' => $title_lv,
+						'children' => [
+							[
+								'title' => $title_ger,
+								'link' => site_url($link_lv_ger),
+								'children' => [
+									[
+										'title' => 'PDF',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_ger)
+									],
+									[
+										'title' => 'DOC',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_ger . "&output=doc")
+									],
+									[
+										'title' => 'ODT',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_ger . "&output=odt")
+									]
+								]
+							],
+							[
+								'title' => $title_eng,
+								'link' => site_url($link_lv_eng),
+								'children' => [
+									[
+										'title' => 'PDF',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_eng)
+									],
+									[
+										'title' => 'DOC',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_eng . "&output=doc")
+									],
+									[
+										'title' => 'ODT',
+										'permissioncheck' => $permissioncheck,
+										'link' => site_url($link_lv_eng . "&output=odt")
+									]
+								]
+							]
+						]
+					]
+				]
+			],
+			[
+				'title' => '<i class="fas fa-archive" title="' . $this->p->t("stv", "document_archive") . '"></i>',
+				'children' => [
+					[
+						'title' => $title_ff,
+						'action' => [
+							'url' => site_url($archive_url),
+							'post' => $archive_post_ff,
+							'response' => $archive_response
+						]
+					],
+					[
+						'title' => $title_lv,
+						'children' => [
+							[
+								'title' => $title_ger,
+								'action' => [
+									'url' => site_url($archive_url),
+									'post' => $archive_post_lv_ger,
+									'response' => $archive_response
+								]
+							],
+							[
+								'title' => $title_eng,
+								'action' => [
+									'url' => site_url($archive_url),
+									'post' => $archive_post_lv_eng,
+									'response' => $archive_response
+								]
+							]
+						]
+					]
+				]
+			]
+		];
+
+		return $list;
+	}
+
 	/**
 	 * Sort tab list
 	 *

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

@@ -27,8 +27,7 @@ class Dokumente extends FHCAPI_Controller
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
-		$this->load->library('AkteLib');
-		$this->load->library('DmsLib');
+		$this->load->library('DmsLib', array('who' => getAuthUID()));
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -171,8 +170,6 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$nachgereicht_am =  $this->input->post('nachgereicht_am') == '' ? null : $this->input->post('nachgereicht_am');
-
 		$uid = getAuthUID();
 
 		$result = $this->AkteModel->update(
@@ -183,9 +180,9 @@ class Dokumente extends FHCAPI_Controller
 				'dokument_kurzbz' => $this->input->post('dokument_kurzbz'),
 				'anmerkung_intern' => $this->input->post('anmerkung_intern'),
 				'titel_intern' => $this->input->post('titel_intern'),
-				'nachgereicht_am' => $nachgereicht_am,
+				'nachgereicht_am' => $this->input->post('nachgereicht_am'),
 				'updateamum' => date('c'),
-				'updatevon' => getAuthUID(),
+				'updatevon' => $uid,
 			]
 		);
 
@@ -202,6 +199,8 @@ class Dokumente extends FHCAPI_Controller
 		if(!$dokument_kurzbz)
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Dokument_kurzbz']), self::ERROR_TYPE_GENERAL);
 
+		$uid = getAuthUid();
+
 		//check if more than 1 dokumentkurzbz
 		//if()
 
@@ -209,10 +208,10 @@ class Dokumente extends FHCAPI_Controller
 			[
 				'prestudent_id' => $prestudent_id,
 				'dokument_kurzbz' => $dokument_kurzbz,
-				'mitarbeiter_uid' => getAuthUID(),
+				'mitarbeiter_uid' => $uid,
 				'datum' => date('c'),
 				'insertamum' => date('c'),
-				'insertvon' =>  getAuthUID(),
+				'insertvon' =>  $uid,
 			]
 		);
 
@@ -235,6 +234,7 @@ class Dokumente extends FHCAPI_Controller
 		$nachgereicht = current($dataAkte)->nachgereicht;
 		$inhalt = current($dataAkte)->inhalt;
 		$inhaltVorhanden = $inhalt != '';
+		$uid = getAuthUid();
 
 		$this->db->trans_start();
 
@@ -248,15 +248,16 @@ class Dokumente extends FHCAPI_Controller
 			$logdata_dms = "Logdata: " . var_export($logdata_dms, true);
 
 			//delete from dmsLib
+			$this->load->library('DmsLib');
 			$person_id = current($dataAkte)->person_id;
-			$result = $this->aktelib->removeByPersonIdAndDmsId($person_id, $dms_id);
+			$result = $this->dmslib->delete($person_id, $dms_id);
 			$this->getDataOrTerminateWithError($result);
 
 			//LOGGING Dms ID
 			$this->load->model('system/Log_model', 'LogModel');
 			$result = $this->LogModel->insert([
 				'executetime' => date('c'),
-				'mitarbeiter_uid' => getAuthUID(),
+				'mitarbeiter_uid' => $uid,
 				'beschreibung' => "Löschen der DMS_ID ". $dms_id,
 				'sql' => $logdata_dms
 			]);
@@ -273,7 +274,7 @@ class Dokumente extends FHCAPI_Controller
 			//Logging Deletion Akte
 			$result = $this->LogModel->insert([
 				'executetime' => date('c'),
-				'mitarbeiter_uid' => getAuthUID(),
+				'mitarbeiter_uid' => $uid,
 				'beschreibung' => "Löschen der Akte ". $akte_id,
 				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
 			]);
@@ -292,7 +293,7 @@ class Dokumente extends FHCAPI_Controller
 
 			$result = $this->LogModel->insert([
 				'executetime' => date('c'),
-				'mitarbeiter_uid' => getAuthUID(),
+				'mitarbeiter_uid' => $uid,
 				'beschreibung' => "Löschen der Akte ". $akte_id,
 				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
 			]);
@@ -307,6 +308,7 @@ class Dokumente extends FHCAPI_Controller
 
 	public function uploadDokument()
 	{
+		$this->load->library('DmsLib');
 		$prestudent_id = $this->input->post('prestudent_id');
 		$anmerkung_intern = $this->input->post('anmerkung_intern');
 		$titel_intern = $this->input->post('titel_intern');
@@ -329,44 +331,34 @@ class Dokumente extends FHCAPI_Controller
 		}
 
 		$this->db->trans_start();
+		$uid = getAuthUID();
 
-		$uploadDataResult = $this->uploadFile('anhang', array('jpg', 'png', 'pdf'));
-		if (isError($uploadDataResult))
+		$dms = array(
+			'kategorie_kurzbz'  => 'Akte',
+			'version'           => 0,
+			'name'              => $_FILES['anhang']['name'],
+			'mimetype'          => $_FILES['anhang']['type'],
+			'insertamum'        => date('c'),
+			'insertvon'         => $uid
+		);
+
+		$result = $this->dmslib->upload($dms, 'anhang', array("jpg", "png", "pdf"));
+
+		if (isError($result))
 		{
-			return $this->terminateWithError(getError($uploadDataResult), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-
-		// If data exists
-		if (hasData($uploadDataResult))
-		{
-			// Add file to the DMS (DB + file system)
-			$dms_res = $this->dmslib->add(
-				getData($uploadDataResult)['file_name'],
-				getData($uploadDataResult)['file_type'],
-				fopen(getData($uploadDataResult)['full_path'], 'r'),
-				'Akte', // kategorie_kurzbz
-				null, // dokument_kurzbz
-				null, // beschreibung
-				false, // cis_suche
-				null, // schlagworte
-				getAuthUID() // insertvon
-			);
-		}
-
-		// Error occurred or data not found
-		if (isError($dms_res) || !hasData($dms_res)) $this->terminateWithError(getError($dms_res), self::ERROR_TYPE_GENERAL);
-
-		$dms_id = getData($dms_res)->dms_id;
+		$dms_id = $result->retval['dms_id'];
 
 		$person_id = $this->_getPersonId($prestudent_id);
 
-		$dokumentResult = $this->DokumentModel->load($dokument_kurzbz);
-		$data = $this->getDataOrTerminateWithError($dokumentResult);
+		$result = $this->DokumentModel->load($dokument_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
 
 		$bezeichnung = current($data)->bezeichnung;
 
-		// Save entry in akte
-		if ($dms_id)
+		//save entry in akte
+		if($dms_id)
 		{
 			$result = $this->AkteModel->insert([
 				'person_id' => $person_id,
@@ -375,7 +367,7 @@ class Dokumente extends FHCAPI_Controller
 				'mimetype' => $_FILES['anhang']['type'],
 				'insertamum' => date('c'),
 				'erstelltam' => date('c'),
-				'insertvon' => getAuthUID(),
+				'insertvon' => $uid,
 				'anmerkung_intern' => $anmerkung_intern,
 				'titel_intern' => $titel_intern,
 				'bezeichnung' => $bezeichnung,
@@ -422,26 +414,28 @@ class Dokumente extends FHCAPI_Controller
 		$filecontentbase64 = $data->inhalt;
 		$filename = $data->titel;
 
-		if (intval($data->dms_id) > 0)
+		if(intval($data->dms_id) > 0)
 		{
-			$file = $this->dmslib->getOutputFileInfo($data->dms_id, $filename);
+			$dmsdokres = $this->dmslib->read($data->dms_id);
+			if (!hasData($dmsdokres)) $this->terminateWithError('DMS File not found');
+			$dmsdok = getData($dmsdokres)[0];
 
-			$this->terminateWithFileOutput(getData($file)->mimetype, file_get_contents(getData($file)->file), $filename);
+			$mimetype = $dmsdok->mimetype;
+			$filecontentbase64 = $dmsdok->file_content;
+			$filename = $dmsdok->name;
 		}
-		else
-		{
-			$filecontent = '';
 
-			if (!empty($filecontentbase64)) {
-				$filecontent = base64_decode($filecontentbase64, true);
+		$filecontent = '';
 
-				if ($filecontent === false) {
-					$this->terminateWithError('Base64-Dekodierung failed.');
-				}
+		if (!empty($filecontentbase64)) {
+			$filecontent = base64_decode($filecontentbase64, true);
+
+			if ($filecontent === false) {
+				$this->terminateWithError('Base64-Dekodierung failed.');
 			}
-
-			$this->terminateWithFileOutput($mimetype, $filecontent, $filename);
 		}
+
+		$this->terminateWithFileOutput($mimetype, $filecontent, $filename);
 	}
 
 	private function _getMissingDocuments($studiengang_kz, $prestudent_id)
@@ -757,7 +751,10 @@ class Dokumente extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		return hasData($data) ? getData($data)[0]->prestudent_id : null;
+		$student = current($data);
+
+
+		return $student->prestudent_id;
 	}
 
 	/**

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

@@ -20,8 +20,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about favorite treemenu entries
- * Listens to ajax post calls to change the favorite treemenu entries
+ * Provides data to the ajax get calls about favorite verbände
+ * Listens to ajax post calls to change the favorite verbände data
  * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
  */
 class Favorites extends FHCAPI_Controller
@@ -29,7 +29,7 @@ class Favorites extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'get' => self::PERM_LOGGED,
+			'index' => self::PERM_LOGGED,
 			'set' => self::PERM_LOGGED
 		]);
 
@@ -37,19 +37,19 @@ class Favorites extends FHCAPI_Controller
 		$this->load->model('system/Variable_model', 'VariableModel');
 	}
 
-	public function get($app)
+	public function index()
 	{
-		$result = $this->VariableModel->getVariables(getAuthUID(), [$app . '_favorites']);
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_favorites']);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
 		if (!$data)
 			$this->terminateWithSuccess(null);
 		else
-			$this->terminateWithSuccess($data[$app . '_favorites'] ?? null);
+			$this->terminateWithSuccess($data['stv_favorites'] ?? null);
 	}
 
-	public function set($app)
+	public function set()
 	{
 		$this->load->library('form_validation');
 
@@ -60,7 +60,7 @@ class Favorites extends FHCAPI_Controller
 
 		$favorites = $this->input->post('favorites');
 
-		$result = $this->VariableModel->setVariable(getAuthUID(), $app . '_favorites', $favorites);
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
 
 		$this->getDataOrTerminateWithError($result);
 		

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

@@ -429,12 +429,9 @@ class Konto extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => getAuthUID()
 		];
-
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
 				$data[$field] = $this->input->post($field);
-			if($data['buchungsdatum'] == '')
-				$data['buchungsdatum'] = null;
 
 		$result = $this->KontoModel->update($id, $data);
 

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

@@ -34,7 +34,7 @@ class LvTermine extends FHCAPI_Controller
 
 	//TODO Build own lib or combine with Controller Stundenplan.php
 	//here use of logic of Stundenplan.php, extended with parameters uid, grouping, and used dbTable
-	public function getStundenplan($uid, $start_date = null, $end_date = null, $dbStundenplanTable = "stundenplan", $groupConsecutiveHours = false)
+	public function getStundenplan($uid, $start_date = null, $end_date = null, $groupConsecutiveHours = false, $dbStundenplanTable = "stundenplan")
 	{
 		$student_uid = $uid;
 		$semester_range = $this->studienSemesterErmitteln($start_date, $end_date);
@@ -80,6 +80,13 @@ class LvTermine extends FHCAPI_Controller
 
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 		$this->terminateWithSuccess($stundenplan_data);
+
+		$this->expand_object_information($stundenplan_data);
+
+		$this->returnObj['$stundenplan_query'] = $stundenplan_query;
+		$this->returnObj['$student_lehrverband'] = $student_lehrverband;
+		$this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
+		$this->terminateWithSuccess($stundenplan_data);
 	}
 
 	public function getStudiensemester()
@@ -370,7 +377,6 @@ class LvTermine extends FHCAPI_Controller
 						$result->semester = $item->semester;
 						$result->verband = $item->verband;
 						$result->gruppe = $item->gruppe;
-						$result->studiensemester_kurzbz = $item->studiensemester_kurzbz;
 						return $result;
 					},
 					$lehrverband_query_result));

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

@@ -237,8 +237,8 @@ class Mobility extends FHCAPI_Controller
 		}
 		$formData = $this->input->post('formData');
 
-		$von = ($formData['von'] ?? '') ?: null;
-		$bis = ($formData['bis'] ?? '') ?: null;
+		$von = $formData['von'] ?? null;
+		$bis = $formData['bis'] ?? null;
 		$nation_code = $formData['nation_code'] ?? null;
 		$mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null;
 		$herkunftsland_code = $formData['herkunftsland_code'] ?? null;

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

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

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

@@ -193,7 +193,7 @@ class Prestudent extends FHCAPI_Controller
 				}
 				elseif (
 					$val === ''
-					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode', 'zgvdatum', 'zgvmadatum'])
+					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode'])
 				)
 				{
 					$val = null;

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

@@ -42,8 +42,6 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->load->model('education/Note_model', 'NoteModel');
 		$this->load->model('education/Projektbetreuer_model', 'BetreuerModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
 		// load libraries
 		$this->load->library('PermissionLib');
@@ -102,16 +100,16 @@ class Projektarbeit extends FHCAPI_Controller
 	private function fetchProjektarbeitById($projektarbeit_id) {
 		$this->ProjektarbeitModel->resetQuery();
 		$this->ProjektarbeitModel->addSelect(
-			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id,
-			tbl_projektarbeit.studiensemester_kurzbz, firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
+			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
+			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
 		);
+		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
 		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
-		
-		
 		return $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);
+
 	}
 
 	/**
@@ -248,38 +246,14 @@ class Projektarbeit extends FHCAPI_Controller
 		$additional_lehrveranstaltung_id = $this->input->get('additional_lehrveranstaltung_id');
 
 		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
-		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemester missing', self::ERROR_TYPE_GENERAL);
+		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemster missing', self::ERROR_TYPE_GENERAL);
 
-		// get prestudent_id from student model
-		$studentRes = $this->StudentModel->load(['student_uid' => $student_uid]);
-		if(hasData($studentRes)) {
-			$student = getData($studentRes);
-		} else {
-			$this->terminateWithError($studentRes, self::ERROR_TYPE_GENERAL);
-		}
-		
-		// to get prestudent_status history
-		$historyRes = $this->PrestudentstatusModel->getHistoryPrestudent($student[0]->prestudent_id);
-		if(hasData($historyRes)) {
-			$history = getData($historyRes);
-		} else {
-			$this->terminateWithError($historyRes, self::ERROR_TYPE_GENERAL);
-		}
-		
-		// query for every lva of a studiengang that has projektarbeit flag true
+		// get Lvs
 		$lvsResult = $this->LehrveranstaltungModel->getLvsForProjektarbeit($student_uid, $studiengang_kz, $additional_lehrveranstaltung_id);
+
 		if (isError($lvsResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
+
 		$lvs = hasData($lvsResult) ? getData($lvsResult) : [];
-		
-		$lvsIDs = array_column($lvs, 'lehrveranstaltung_id');
-		
-		// get current studienplan_id from status history to find out which lva options are actually assigned to the students studienplan 
-		// important so the projektarbeit has the correct lva assigned to be able to find and print the thesis title on the degree documents!
-		$currentStatus = $history[0];
-		$lvByStudienPlanRes = $this->LehrveranstaltungModel->getLvsByStudienplanByLvaIDs($currentStatus->studienplan_id, $lvsIDs);
-		if(hasData($lvByStudienPlanRes)) {
-			$lvs = getData($lvByStudienPlanRes);
-		}
 
 		foreach ($lvs as $lv)
 		{
@@ -346,18 +320,11 @@ class Projektarbeit extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
 		]);
 
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'is_natural', [
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|is_natural', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
 			'is_natural' =>  $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
 		]);
 
-		$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrveranstaltung', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung'])
-		]);
-
-		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studiensemester'])
-		]);
-
 		$this->form_validation->set_rules('beginn', 'Beginn', 'is_valid_date', [
 			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Beginn'])
 		]);
@@ -387,8 +354,6 @@ class Projektarbeit extends FHCAPI_Controller
 			'projekttyp_kurzbz' => $formData['projekttyp_kurzbz'],
 			'firma_id' => $formData['firma_id'] ?? null,
 			'lehreinheit_id' => $formData['lehreinheit_id'],
-			'lehrveranstaltung_id' => $formData['lehrveranstaltung_id'],
-			'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
 			'beginn' => isset($formData['beginn']) && !isEmptyString($formData['beginn']) ? $formData['beginn'] : null,
 			'ende' => isset($formData['ende']) && !isEmptyString($formData['ende']) ? $formData['ende'] : null,
 			'note' => $formData['note'] ?? null,

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

@@ -448,10 +448,8 @@ class Pruefung extends FHCAPI_Controller
 			}
 		}
 
-		$datum = $this->input->post('datum') == '' ? null : $this->input->post('datum');
 		if(intval($pruefung_id) > 0)
 		{
-
 			$result = $this->PruefungModel->update(
 				[
 					'pruefung_id' => $pruefung_id
@@ -461,7 +459,7 @@ class Pruefung extends FHCAPI_Controller
 					'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
 					'note' => $this->input->post('note'),
 					'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-					'datum' => $datum,
+					'datum' => $this->input->post('datum'),
 					'anmerkung' => $this->input->post('anmerkung'),
 					'updatevon' => $authUID,
 					'updateamum' => date('c'),
@@ -474,7 +472,7 @@ class Pruefung extends FHCAPI_Controller
 				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
 				'student_uid' => $this->input->post('student_uid'),
 				'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-				'datum' => $datum,
+				'datum' => $this->input->post('datum'),
 				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
 				'note' => $this->input->post('note'),
 				'anmerkung' => $this->input->post('anmerkung'),
@@ -522,7 +520,7 @@ class Pruefung extends FHCAPI_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'note' => $this->input->post('note'),
 				'uebernahmedatum' => date('c'),
-				'benotungsdatum' => $datum,
+				'benotungsdatum' => $this->input->post('datum'),
 				'insertamum' => date('c'),
 				'insertvon' =>  $authUID,
 				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
@@ -557,7 +555,7 @@ class Pruefung extends FHCAPI_Controller
 		], [
 			'note' => $this->input->post('note'),
 			'uebernahmedatum' => date('c'),
-			'benotungsdatum' => $datum,
+			'benotungsdatum' => $this->input->post('datum'),
 			'updateamum' => date('c'),
 			'updatevon' =>  $authUID,
 			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null

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

@@ -144,7 +144,6 @@ class Student extends FHCAPI_Controller
 				. $this->PrestudentModel->escape($studiensemester_kurzbz)
 				. ")  AS statusofsemester"
 		);
-		$this->PrestudentModel->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz');
 
 		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT');
@@ -297,10 +296,6 @@ class Student extends FHCAPI_Controller
 				$fotoval = ($val == '') ? null : str_replace('data:image/jpeg;base64,', '', $val);
 				$update_person[$prop] = $fotoval;
 			}
-			else if ($prop == 'gebdatum')
-			{
-				$update_person[$prop] = ($val == '') ? null : $val;
-			}
 			else
 			{
 				$update_person[$prop] = $val;

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

@@ -108,7 +108,6 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
 		$this->studentlistlib->addJoin(
 			"(
@@ -139,7 +138,7 @@ class Students extends FHCAPI_Controller
 		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->decodeTagsJsonInResult($data);
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -154,8 +153,7 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_params', [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
-
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);		
+		
 
 		$this->studentlistlib->addJoin(
 			"(
@@ -192,14 +190,14 @@ class Students extends FHCAPI_Controller
 		) AS semester", false);
 		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
 		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
-
+		
 
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->decodeTagsJsonInResult($data);
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -215,7 +213,6 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
 		$this->studentlistlib->addJoin(
 			"(
@@ -238,66 +235,59 @@ class Students extends FHCAPI_Controller
 		) AS semester", false);
 		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
 		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
-
+		
 
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->decodeTagsJsonInResult($data);
+
 		$this->terminateWithSuccess($data);
 	}
 
 	public function getPrestudents(
-		$studiengang_typ_kurzbz,
+		$studiengang_kz,
 		$studiensemester_kurzbz = null,
 		$filter = null
 	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
-			'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'filter' => $filter
 		));
 		
-		$this->fetchPrestudents($studiengang_typ_kurzbz, $studiensemester_kurzbz, $filter);
+		$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter);
 	}
 
 	public function getPrestudentsOrgform(
-		$studiengang_typ_kurzbz,
+		$studiengang_kz,
 		$orgform_kurzbz,
 		$studiensemester_kurzbz = null,
 		$filter = null
 	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
-			'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'filter' => $filter,
 			'orgform_kurzbz' => $orgform_kurzbz
 		));
 		
-		$this->fetchPrestudents($studiengang_typ_kurzbz, $studiensemester_kurzbz, $filter, $orgform_kurzbz);
+		$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter, $orgform_kurzbz);
 	}
 
 	/**
-	 * @param string		$studiengang_typ_kurzbz
+	 * @param integer		$studiengang_kz
 	 * @param string		$studiensemester_kurzbz			(optional)
 	 * @param string		$filter							(optional)
 	 * @param string		$orgform_kurzbz					(optional)
 	 *
 	 * @return void
 	 */
-	protected function fetchPrestudents($studiengang_typ_kurzbz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
+	protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
-		$studiengang_kz = $this->getStudiengangKz($studiengang_typ_kurzbz);
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-		$orgform_kurzbz = $this->getOrgformKurzbz($orgform_kurzbz);
-
-		if ($studiengang_kz === null)
-			show_404();
-
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$selectRT = "
@@ -449,21 +439,19 @@ class Students extends FHCAPI_Controller
 		$this->studentlistlib->addSelect("'' AS verband");
 		$this->studentlistlib->addSelect("'' AS gruppe");
 
-		$query_studiensemester_kurzbz = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : '\'NULL\'';
-		$this->studentlistlib->addSelect($query_studiensemester_kurzbz . ' as query_studiensemester_kurzbz');
 
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->decodeTagsJsonInResult($data);
+
 		$this->terminateWithSuccess($data);
 	}
 
 	public function getStudents(
 		$studiensemester_kurzbz,
-		$studiengang_typ_kurzbz,
+		$studiengang_kz,
 		$semester = null,
 		$verband = null,
 		$gruppe = null
@@ -471,18 +459,18 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
 			'semester' => $semester,
 			'verband' => $verband,
 			'gruppe' => $gruppe
 		));
 		
-		$this->fetchStudents($studiensemester_kurzbz, $studiengang_typ_kurzbz, $semester, $verband, $gruppe, null, null);
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, null);
 	}
 
 	public function getStudentsOrgform(
 		$studiensemester_kurzbz,
-		$studiengang_typ_kurzbz,
+		$studiengang_kz,
 		$orgform_kurzbz,
 		$semester = null,
 		$verband = null,
@@ -491,37 +479,37 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
 			'orgform_kurzbz' => $orgform_kurzbz,
 			'semester' => $semester,
 			'verband' => $verband,
 			'gruppe' => $gruppe
 		));
 		
-		$this->fetchStudents($studiensemester_kurzbz, $studiengang_typ_kurzbz, $semester, $verband, $gruppe, null, $orgform_kurzbz);
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, $orgform_kurzbz);
 	}
 
 	public function getStudentsSpezialgruppe(
 		$studiensemester_kurzbz,
-		$studiengang_typ_kurzbz,
+		$studiengang_kz,
 		$semester,
 		$gruppe_kurzbz
 	) {
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
 			'semester' => $semester,
 			'gruppe_kurzbz' => $gruppe_kurzbz
 		));
 		
-		$this->fetchStudents($studiensemester_kurzbz, $studiengang_typ_kurzbz, $semester, null, null, $gruppe_kurzbz, null);
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, null);
 	}
 
 	public function getStudentsOrgformSpezialgruppe(
 		$studiensemester_kurzbz,
 		$orgform_kurzbz,
-		$studiengang_typ_kurzbz,
+		$studiengang_kz,
 		$semester,
 		$gruppe_kurzbz
 	) {
@@ -529,17 +517,17 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'orgform_kurzbz' => $orgform_kurzbz,
-			'studiengang_typ_kurzbz' => $studiengang_typ_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
 			'semester' => $semester,
 			'gruppe_kurzbz' => $gruppe_kurzbz
 		));
 		
-		$this->fetchStudents($studiensemester_kurzbz, $studiengang_typ_kurzbz, $semester, null, null, $gruppe_kurzbz, $orgform_kurzbz);
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, $orgform_kurzbz);
 	}
 
 	/**
+	 * @param integer		$studiengang_kz
 	 * @param string		$studiensemester_kurzbz
-	 * @param string		$studiengang_typ_kurzbz
 	 * @param integer		$semester						(optional)
 	 * @param string		$verband						(optional)
 	 * @param integer		$gruppe							(optional)
@@ -550,20 +538,13 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function fetchStudents(
 		$studiensemester_kurzbz,
-		$studiengang_typ_kurzbz,
+		$studiengang_kz,
 		$semester = null,
 		$verband = null,
 		$gruppe = null,
 		$gruppe_kurzbz = null,
 		$orgform_kurzbz = null
 	) {
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-		$studiengang_kz = $this->getStudiengangKz($studiengang_typ_kurzbz);
-		$orgform_kurzbz = $this->getOrgformKurzbz($orgform_kurzbz);
-
-		if ($studiengang_kz === null)
-			show_404();
-
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -575,7 +556,6 @@ class Students extends FHCAPI_Controller
 		$this->studentlistlib->addJoin("public.tbl_student s", "prestudent_id");
 
 		$this->studentlistlib->addSelect("'' AS priorisierung_relativ");
-		$this->studentlistlib->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz');
 
 		if ($gruppe_kurzbz !== null) {
 			$this->studentlistlib->addJoin('public.tbl_benutzergruppe g', 'uid', '', 'after_b');
@@ -614,20 +594,8 @@ class Students extends FHCAPI_Controller
 		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->decodeTagsJsonInResult($data);
-		$this->terminateWithSuccess($data);
-	}
 
-	protected function decodeTagsJsonInResult(&$data)
-	{
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED) {
-			array_walk($data, function($item, $key) {
-				if(isset($item->tags))
-				{
-					$item->tags = json_decode($item->tags);
-				}
-			});
-		}
+		$this->terminateWithSuccess($data);
 	}
 
 	/**
@@ -643,8 +611,6 @@ class Students extends FHCAPI_Controller
 			'prestudent_id' => $prestudent_id,
 		));
 
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -652,7 +618,7 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-
+		
 		$this->studentlistlib->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
@@ -672,7 +638,7 @@ class Students extends FHCAPI_Controller
 		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->decodeTagsJsonInResult($data);
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -689,8 +655,6 @@ class Students extends FHCAPI_Controller
 			'student_uid' => $student_uid,
 		));
 
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -700,14 +664,14 @@ class Students extends FHCAPI_Controller
 
 
 		$this->studentlistlib->addWhere('s.student_uid', $student_uid);
-
+		
 
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 		
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->decodeTagsJsonInResult($data);
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -725,8 +689,6 @@ class Students extends FHCAPI_Controller
 			'person_id' => $person_id,
 		));
 
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -737,13 +699,13 @@ class Students extends FHCAPI_Controller
 
 		$this->studentlistlib->addWhere('p.person_id', $person_id);
 
-
+		
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 		
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->decodeTagsJsonInResult($data);
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -759,8 +721,6 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		));
 
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
 		$this->load->library('SearchLib', [ 'config' => 'searchstv' ]);
 		$this->load->library('form_validation');
 
@@ -795,7 +755,6 @@ class Students extends FHCAPI_Controller
 			END
 		) AS semester", false);
 
-		$this->studentlistlib->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz');
 
 		if ($prestudent_ids && $student_uids) {
 			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
@@ -814,7 +773,7 @@ class Students extends FHCAPI_Controller
 		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->decodeTagsJsonInResult($data);
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -843,55 +802,4 @@ class Students extends FHCAPI_Controller
 			}
 		}
 	}
-
-	protected function getStudiengangKz($studiengang_typ_kurzbz)
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$result = $this->StudiengangModel->loadWhere([
-			'LOWER(CONCAT(typ, kurzbz)) =' => strtolower($studiengang_typ_kurzbz)
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			return null;
-
-		return current($data)->studiengang_kz;
-	}
-
-	protected function getStudiensemesterKurzbz($studiensemester_kurzbz)
-	{
-		if ($studiensemester_kurzbz === null)
-			return null;
-
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$result = $this->StudiensemesterModel->loadWhere([
-			'LOWER(studiensemester_kurzbz) =' => strtolower($studiensemester_kurzbz)
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			return $studiensemester_kurzbz;
-
-		return current($data)->studiensemester_kurzbz;
-	}
-
-	protected function getOrgformKurzbz($orgform_kurzbz)
-	{
-		if ($orgform_kurzbz === null)
-			return null;
-
-		$this->load->model('codex/Orgform_model', 'OrgformModel');
-		$result = $this->OrgformModel->loadWhere([
-			'LOWER(orgform_kurzbz) =' => strtolower($orgform_kurzbz)
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			return $orgform_kurzbz;
-
-		return current($data)->orgform_kurzbz;
-	}
 }

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

@@ -15,9 +15,7 @@ class Tags extends Tag_Controller
 			'addTag' => self::BERECHTIGUNG_KURZBZ,
 			'updateTag' => self::BERECHTIGUNG_KURZBZ,
 			'doneTag' => self::BERECHTIGUNG_KURZBZ,
-			'deleteTag' => self::BERECHTIGUNG_KURZBZ,
-			'getAllTags' => self::BERECHTIGUNG_KURZBZ,
-			'rebuildTagsForTypeId' => self::BERECHTIGUNG_KURZBZ,
+			'deleteTag' => self::BERECHTIGUNG_KURZBZ
 		]);
 
 	$this->config->load('stv');
@@ -47,5 +45,4 @@ class Tags extends Tag_Controller
 	{
 		parent::doneTag($this->config->item('stv_prestudent_tags'));
 	}
-
 }

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

@@ -0,0 +1,513 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about verbände
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Verband extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		// Load Models
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+	
+	/**
+	 * Remap calls:
+	 * /
+	 * /(studiengang_kz)									=> getStudiengang
+	 * /(studiengang_kz)/(semester)							=> getSemester
+	 * /(studiengang_kz)/(semester)/(verband)				=> getVerband
+	 * /(studiengang_kz)/(org_form)							=> getStudiengang
+	 * /(studiengang_kz)/(org_form)/(semester)				=> getSemester
+	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getVerband
+	 *
+	 * @param string		$method
+	 * @param array			$params				(optional)
+	 *
+	 * @return void
+	 */
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->getBase();
+
+		// NOTE(chris): Test if access is allowed ($method is the Studiengang)
+		if (!$this->permissionlib->isBerechtigt('assistenz', 's', $method)
+			&& !$this->permissionlib->isBerechtigt('admin', 's', $method)
+		) {
+			return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
+		}
+
+		$count = count($params);
+		if (!$count)
+			return $this->getStudiengang($method);
+
+		if ($count == 1) {
+			if (is_numeric($params[0]))
+				return $this->getSemester($method, $params[0]);
+			elseif ($params[0] == 'prestudent')
+				return $this->terminateWithSuccess($this->getStdSem($method . '/prestudent/', $method));
+			else
+				return $this->getStudiengang($method, $params[0]);
+		}
+		if ($count == 2) {
+			if (is_numeric($params[0]))
+				return $this->getVerband($method, $params[0], $params[1]);
+			elseif ($params[1] == 'prestudent')
+				return $this->terminateWithSuccess($this->getStdSem($method . '/' . $params[0] . '/prestudent/', $method));
+			else
+				return $this->getSemester($method, $params[1], $params[0]);
+		}
+		if ($count == 3 && !is_numeric($params[0]) && is_numeric($params[1]) && !is_numeric($params[2]))
+			return $this->getVerband($method, $params[1], $params[2], $params[0]);
+
+		show_404();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function getBase()
+	{
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("v.studiengang_kz AS link");
+		$this->StudiengangModel->addSelect(
+			"CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
+			false
+		);
+		$this->StudiengangModel->addSelect('erhalter_kz');
+		$this->StudiengangModel->addSelect('typ');
+		$this->StudiengangModel->addSelect('kurzbz');
+		$this->StudiengangModel->addSelect('studiengang_kz');
+		$this->StudiengangModel->addSelect('studiengang_kz AS stg_kz');
+		
+		$this->StudiengangModel->addOrder('erhalter_kz');
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$stgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$stgs = array_merge($stgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+
+		if (!$stgs)
+			$this->terminateWithSuccess([]);
+
+		$this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
+
+		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		if ($this->permissionlib->isBerechtigt('inout/uebersicht'))
+			$list[] = [
+				'name' => 'International',
+				'link' => 'inout',
+				'children' => [
+					[
+						'name' => 'Incoming',
+						'link' => 'inout/incoming',
+						'leaf' => true
+					],
+					[
+						'name' => 'Outgoing',
+						'link' => 'inout/outgoing',
+						'leaf' => true
+					],
+					[
+						'name' => 'Gemeinsame Studien',
+						'link' => 'inout/gemeinsamestudien',
+						'leaf' => true
+					]
+				]
+			];
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param string		$orgform			(optional)
+	 *
+	 * @return void
+	 */
+	protected function getStudiengang($studiengang_kz, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(
+			UPPER(CONCAT(typ, kurzbz)), 
+			'-', 
+			semester, 
+			(
+				SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END 
+				FROM public.tbl_lehrverband 
+				WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester 
+				ORDER BY verband, gruppe LIMIT 1
+			)
+		) AS name", false);
+
+		$this->StudiengangModel->addSelect('semester');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+		
+		$this->StudiengangModel->addOrder('semester');
+
+		if ($org_form !== null) {
+			$this->StudiengangModel->addSelect("v.orgform_kurzbz");
+			$this->StudiengangModel->db->group_start();
+			$this->StudiengangModel->db->where('v.semester', 0);
+			$this->StudiengangModel->db->or_where('v.orgform_kurzbz', $org_form);
+			$this->StudiengangModel->db->group_end();
+		}
+
+		$result = $this->StudiengangModel->loadWhere([
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.aktiv' => true
+		]);
+		$list = $this->getDataOrTerminateWithError($result);
+
+		array_unshift($list, [
+			'name' => 'PreStudent',
+			'link' => $link . 'prestudent',
+			'no_sem_reload' => true,
+			'stg_kz' => (int)$studiengang_kz,
+			'children' => $this->getStdSem($link . 'prestudent/', $studiengang_kz)
+		]);
+
+		if ($org_form === null) {
+			// NOTE(chris): if mischform show orgforms
+			$result = $this->StudiengangModel->load($studiengang_kz);
+			$result = $this->getDataOrTerminateWithError($result);
+			if ($result) {
+				if (current($result)->mischform) {
+					$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
+
+					$this->StudienordnungModel->addDistinct();
+					$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
+					$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+					$this->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
+
+					$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
+
+					$result = $this->StudienordnungModel->loadWhere([
+						'aktiv' => true,
+						'studiengang_kz' => $studiengang_kz,
+						'p.orgform_kurzbz !=' => 'DDP'
+					]);
+					$result = $this->getDataOrTerminateWithError($result);
+
+					$list = array_merge($list, $result);
+				}
+			}
+		}
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester
+	 * @param string		$orgform
+	 *
+	 * @return void
+	 */
+	protected function getSemester($studiengang_kz, $semester, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/';
+
+
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+
+		$this->GruppeModel->addDistinct();
+		$this->GruppeModel->addSelect("CONCAT(" . $this->GruppeModel->escape($link . 'grp/') . ", gruppe_kurzbz) AS link", false);
+		$this->GruppeModel->addSelect("CONCAT(gruppe_kurzbz, ' (', bezeichnung, ')') AS name", false);
+		$this->GruppeModel->addSelect("TRUE AS leaf", false);
+
+		$this->GruppeModel->addSelect('sort');
+		$this->GruppeModel->addSelect('gruppe_kurzbz');
+		$this->GruppeModel->addSelect($this->GruppeModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->GruppeModel->addOrder('sort');
+		$this->GruppeModel->addOrder('gruppe_kurzbz');
+
+		$where = [
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'lehre' => true,
+			'sichtbar' => true,
+			'aktiv' => true,
+			'direktinskription' => false
+		];
+
+		if ($org_form !== null)
+			$where['orgform_kurzbz'] = $org_form;
+
+		$result = $this->GruppeModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", verband) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
+
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($semester) . ' AS semester');
+		$this->StudiengangModel->addSelect('verband');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+		
+		$this->StudiengangModel->addOrder('verband');
+
+		$this->StudiengangModel->addGroupBy('link, name, verband');
+		
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		$list = array_merge($list, $result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param integer		$studiengang_kz
+	 * @param integer		$semester
+	 * @param integer		$verband
+	 * @param string		$orgform
+	 *
+	 * @return void
+	 */
+	protected function getVerband($studiengang_kz, $semester, $verband, $org_form = null)
+	{
+		$link = $studiengang_kz . '/';
+		if ($org_form !== null)
+			$link .= $org_form . '/';
+		$link .= $semester . '/'. $verband . '/';
+
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+		
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", gruppe) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, gruppe, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband AND gruppe=v.gruppe ORDER BY gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
+
+		$this->StudiengangModel->addSelect('v.semester');
+		$this->StudiengangModel->addSelect('v.verband');
+		$this->StudiengangModel->addSelect('gruppe');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+		
+		$this->StudiengangModel->addOrder('gruppe');
+
+		$where = [
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.semester' => $semester,
+			'v.verband' => $verband,
+			'v.gruppe !=' => '',
+			'v.aktiv' => true
+		];
+
+		if ($org_form !== null && $semester) // NOTE(chris): on semester 0 show all?
+			$where['v.orgform_kurzbz'] = $org_form;
+
+		$result = $this->StudiengangModel->loadWhere($where);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	/**
+	 * @param string		$link
+	 * @param integer		$studiengang_kz
+	 *
+	 * @return array
+	 */
+	protected function getStdSem($link, $studiengang_kz)
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->load->config('stv');
+		$number_displayed_past_studiensemester_default = $this->config->item('number_displayed_past_studiensemester_default');
+
+		$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'] ?? $number_displayed_past_studiensemester_default;
+
+		$this->StudiensemesterModel->addPlusMinus(null, $number_displayed_past_studiensemester);
+		$this->StudiensemesterModel->addOrder('ende');
+		$result = $this->StudiensemesterModel->load();
+
+		$studiensemester = $this->getDataOrTerminateWithError($result);
+		$result = [];
+
+		$studiengang_kz = (int)$studiengang_kz;
+
+		foreach ($studiensemester as $sem) {
+			$semlink = $link . $sem->studiensemester_kurzbz;
+			$intlink = $semlink . '/interessenten';
+			$result[] = [
+				'name' => $sem->studiensemester_kurzbz,
+				'link' => $semlink,
+				'stg_kz' => $studiengang_kz,
+				'children' => [
+					[
+						'name' => 'Interessenten',
+						'link' => $intlink,
+						'stg_kz' => $studiengang_kz,
+						'children' => [
+							[
+								'name' => 'Bewerbung nicht abgeschickt',
+								'link' => $intlink . '/bewerbungnichtabgeschickt',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Bewerbung abgeschickt, Status unbestätigt',
+								'link' => $intlink . '/bewerbungabgeschickt',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'ZGV erfüllt',
+								'link' => $intlink . '/zgv',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Status bestätigt',
+								'link' => $intlink . '/statusbestaetigt',
+								'stg_kz' => $studiengang_kz,
+								'children' => [
+									[
+										'name' => 'Nicht zum Reihungstest angemeldet',
+										'link' => $intlink . '/statusbestaetigtrtnichtangemeldet',
+										'leaf' => true
+									],
+									[
+										'name' => 'Reihungstest angemeldet',
+										'link' => $intlink . '/statusbestaetigtrtangemeldet',
+										'leaf' => true
+									]
+								]
+							],
+							[
+								'name' => 'Nicht zum Reihungstest angemeldet',
+								'link' => $intlink . '/reihungstestnichtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Reihungstest angemeldet',
+								'link' => $intlink . '/reihungstestangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							]
+						]
+					],
+					[
+						'name' => 'Bewerber',
+						'link' => $semlink . '/bewerber',
+						'stg_kz' => $studiengang_kz,
+						'children' => [
+							[
+								'name' => 'Nicht zum Reihungstest angemeldet',
+								'link' => $intlink . '/bewerberrtnichtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'leaf' => true
+							],
+							[
+								'name' => 'Reihungstest angemeldet',
+								'link' => $intlink . '/bewerberrtangemeldet',
+								'stg_kz' => $studiengang_kz,
+								'children' => [
+									[
+										'name' => 'Teilgenommen',
+										'link' => $intlink . '/bewerberrtangemeldetteilgenommen',
+										'stg_kz' => $studiengang_kz,
+										'leaf' => true
+									],
+									[
+										'name' => 'Nicht teilgenommen',
+										'link' => $intlink . '/bewerberrtangemeldetnichtteilgenommen',
+										'stg_kz' => $studiengang_kz,
+										'leaf' => true
+									]
+								]
+							]
+						]
+					],
+					[
+						'name' => 'Aufgenommen',
+						'link' => $semlink . '/aufgenommen',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					],
+					[
+						'name' => 'Warteliste',
+						'link' => $semlink . '/warteliste',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					],
+					[
+						'name' => 'Absage',
+						'link' => $semlink . '/absage',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					],
+					[
+						'name' => 'Incoming',
+						'link' => $semlink . '/incoming',
+						'stg_kz' => $studiengang_kz,
+						'leaf' => true
+					]
+				]
+			];
+		}
+
+		return $result;
+	}
+}

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

@@ -0,0 +1,133 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+
+class Config extends FHCAPI_Controller
+{
+	private $_ci;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'getHeader' => ['admin:r', 'assistenz:r'],
+			'set' => ['admin:r', 'assistenz:r'],
+			'updateCollision' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
+		$this->_ci->load->model('system/Variable_model', 'VariableModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+	}
+
+	public function get()
+	{
+		$config = [];
+
+		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), ['ignore_kollision', 'kollision_student', 'ignore_reservierung', 'ignore_zeitsperre', 'ignore_resources_collisions']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$config['ignore_kollision'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_kollision'),
+			"value" => ($data['ignore_kollision'] ?? 'false') === 'true'
+
+		];
+
+		$config['kollision_student'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'kollision_student'),
+			"value" => ($data['kollision_student'] ?? 'false') === 'true'
+		];
+
+		$config['ignore_reservierung'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_reservierung'),
+			"value" => ($data['ignore_reservierung'] ?? 'false') === 'true'
+
+		];
+
+		$config['ignore_zeitsperre'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_zeitsperre'),
+			"value" => ($data['ignore_zeitsperre'] ?? 'false') === 'true'
+		];
+
+		$config['ignore_resources_collisions'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_resources_collisions'),
+			"value" => ($data['ignore_resources_collisions'] ?? 'false') === 'true'
+		];
+
+		$this->terminateWithSuccess($config);
+	}
+	public function getHeader()
+	{
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+
+		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS status');
+		$this->_ci->KalenderStatusModel->addOrder('sort');
+		$this->_ci->KalenderStatusModel->db->where_not_in('status_kurzbz', array('archived', 'deleted'));
+		$visible_status = $this->_ci->KalenderStatusModel->load();
+
+		$visible_status = getData($visible_status);
+
+		$config['visible_status']['all'] = 'Alle';
+
+		foreach ($visible_status as $status)
+		{
+			$config['visible_status'][$status->status_kurzbz] = $status->status;
+		}
+
+		$this->terminateWithSuccess($config);
+	}
+
+	public function set()
+	{
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_kollision',
+			$this->input->post('ignore_kollision') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'kollision_student',
+			$this->input->post('kollision_student') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_reservierung',
+			$this->input->post('ignore_reservierung') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_zeitsperre',
+			$this->input->post('ignore_zeitsperre') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_resources_collisions',
+			$this->input->post('ignore_resources_collisions') === true ? 'true' : 'false'
+		);
+		$this->terminateWithSuccess();
+	}
+
+	public function updateCollision()
+	{
+		$original_ignore = $this->_ci->variablelib->getVar('ignore_kollision');
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_kollision',
+			$original_ignore === 'true' ? 'false' : 'true'
+		);
+	}
+
+}

application/controllers/api/frontend/v1/tempus/Coursepicker.php

@@ -0,0 +1,300 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Coursepicker extends FHCAPI_Controller
+{
+	private $_ci;
+	public function __construct()
+	{
+		parent::__construct([
+			'search' => self::PERM_LOGGED,
+			'getByStg' => self::PERM_LOGGED
+		]);
+
+		$this->_ci = &get_instance();
+		$this->load->library('form_validation');
+
+		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+
+		$this->loadPhrases(['ui']);
+	}
+
+	public function search()
+	{
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', $query);
+
+		//TODO Where weiter anpassen z.B. Fachbereich
+		$this->_ci->LehreinheitModel->addSelect('tbl_lehreinheit.lehreinheit_id,
+												tbl_lehreinheit.lvnr,
+												tbl_lehreinheit.lehrfach_id,
+												lehrfach.kurzbz AS lehrfach,
+												lehrfach.bezeichnung AS lehrfach_bez,
+												lehrfach.farbe AS lehrfach_farbe,
+												tbl_lehreinheit.lehrform_kurzbz AS lehrform,
+												lema.mitarbeiter_uid AS lektor_uid,
+												tbl_mitarbeiter.kurzbz AS lektor,
+												tbl_studiengang.studiengang_kz,
+												upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
+												lvb.semester,
+												lvb.verband,
+												lvb.gruppe,
+												lvb.gruppe_kurzbz,
+												tbl_lehreinheit.raumtyp,
+												tbl_lehreinheit.raumtypalternativ,
+												tbl_lehreinheit.stundenblockung,
+												tbl_lehreinheit.wochenrythmus,
+												lema.semesterstunden,
+												lema.planstunden,
+												tbl_lehreinheit.start_kw,
+												tbl_lehreinheit.anmerkung,
+												tbl_lehreinheit.studiensemester_kurzbz');
+
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter', 'lema.mitarbeiter_uid = tbl_mitarbeiter.mitarbeiter_uid');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
+
+		$this->_ci->MitarbeiterModel->db->group_start();
+
+		foreach ($query_words as $word)
+		{
+			$this->_ci->LehreinheitModel->db->group_start();
+			$this->_ci->LehreinheitModel->db->where('lema.mitarbeiter_uid ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.kurzbzlang ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lvb.verband ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lehrfach.bezeichnung ILIKE', "%" . $word . "%");
+
+			if (is_numeric($word))
+			{
+				$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.studiengang_kz', $word);
+				$this->_ci->LehreinheitModel->db->or_where('lvb.semester', $word);
+			}
+			$this->_ci->LehreinheitModel->db->group_end();
+
+		}
+		$this->_ci->LehreinheitModel->db->group_end();
+		$this->_ci->LehreinheitModel->db->where('tbl_lehreinheit.studiensemester_kurzbz = \'SS2025\'');
+		$this->_ci->LehreinheitModel->db->where(array('tbl_lehrform.verplanen' => true));
+
+		$result = $this->_ci->LehreinheitModel->load();
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+	}
+
+	public function getByStg()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('studiengaenge[]',"studiengaenge","required");
+		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$studiengaenge = $this->input->post('studiengaenge');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+		$this->_ci->LehreinheitModel->addSelect('
+			tbl_lehreinheit.lehreinheit_id,
+			tbl_lehreinheit.lvnr,
+			tbl_lehreinheit.lehrfach_id,
+			lehrfach.kurzbz AS lehrfach,
+			lehrfach.bezeichnung AS lehrfach_bez,
+			lehrfach.farbe AS lehrfach_farbe,
+			tbl_lehreinheit.lehrform_kurzbz AS lehrform,
+			lema.mitarbeiter_uid AS lektor_uid,
+			ma.kurzbz AS lektor,
+			tbl_person.vorname,
+			tbl_person.nachname,
+			tbl_studiengang.studiengang_kz,
+			upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
+			lvb.semester,
+			lvb.verband,
+			lvb.gruppe,
+			lvb.gruppe_kurzbz,
+			tbl_lehreinheit.raumtyp,
+			tbl_lehreinheit.raumtypalternativ,
+			tbl_lehreinheit.stundenblockung,
+			tbl_lehreinheit.wochenrythmus,
+			lema.semesterstunden,
+			lema.planstunden,
+			tbl_lehreinheit.start_kw,
+			tbl_lehreinheit.anmerkung,
+			tbl_lehreinheit.studiensemester_kurzbz
+		');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung', 'tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter ma', 'lema.mitarbeiter_uid = ma.mitarbeiter_uid');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_benutzer', 'ma.mitarbeiter_uid = tbl_benutzer.uid');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_person', 'tbl_benutzer.person_id = tbl_person.person_id');
+
+		$this->_ci->LehreinheitModel->db->group_start();
+		$first = true;
+		foreach ($studiengaenge as $studiengang)
+		{
+			if ($first)
+				$this->_ci->LehreinheitModel->db->group_start();
+			else
+			{
+				$this->_ci->LehreinheitModel->db->or_group_start();
+			}
+			$first = false;
+
+			$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.studiengang_kz', $studiengang['studiengang_kz']);
+
+			if (isset($studiengang['semester']))
+				$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.semester', $studiengang['semester']);
+
+			if (isset($studiengang['orgform_kurzbz']))
+				$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.orgform_kurzbz', $studiengang['orgform_kurzbz']);
+
+			$this->_ci->LehreinheitModel->db->group_end();
+		}
+		$this->_ci->LehreinheitModel->db->group_end();
+
+		$result = $this->_ci->LehreinheitModel->loadWhere(array(
+			'tbl_lehrform.verplanen' => true,
+			'tbl_lehreinheit.studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+
+		$result = hasData($result) ? getData($result) : array();
+
+		$lehreinheit_ids = array_values(array_unique(array_column($result, 'lehreinheit_id')));
+
+		$offen_map = array();
+		if (!empty($lehreinheit_ids))
+		{
+			$offen_result = $this->_ci->LehreinheitModel->getOffeneStunden($lehreinheit_ids);
+			if (hasData($offen_result))
+			{
+				foreach (getData($offen_result) as $row)
+				{
+					$offen_map[$row->lehreinheit_id . '_' . $row->mitarbeiter_uid] = $row;
+				}
+			}
+		}
+
+		$grouped = array();
+
+		foreach ($result as $row)
+		{
+			$lehreinheit_id = $row->lehreinheit_id;
+			if (!isset($grouped[$lehreinheit_id]))
+			{
+				$grouped[$lehreinheit_id] = (object)array(
+					'lehrfach_id' => $row->lehrfach_id,
+					'lehrfach_bez' => $row->lehrfach_bez,
+					'lehrfach_farbe' => $row->lehrfach_farbe,
+					'studiengang_kz' => $row->studiengang_kz,
+					'studiengang' => $row->studiengang,
+					'semester' => $row->semester,
+					'verband' => $row->verband,
+					'gruppe' => $row->gruppe,
+					'gruppe_kurzbz' => $row->gruppe_kurzbz,
+					'raumtyp' => $row->raumtyp,
+					'raumtypalternativ' => $row->raumtypalternativ,
+					'anmerkung' => $row->anmerkung,
+					'studiensemester_kurzbz' => $row->studiensemester_kurzbz,
+					'fachbereich_kurzbz' => isset($row->fachbereich_kurzbz) ? $row->fachbereich_kurzbz : null,
+					'lektoren' => array(),
+					'lehreinheit_id' => $lehreinheit_id,
+					'lvnr' => array(),
+					'lehrfach' => array(),
+					'lehrform' => array(),
+					'stundenblockung' => array(),
+					'wochenrythmus' => array(),
+					'planstunden' => array(),
+					'start_kw' => array(),
+					'verplant' => array(),
+					'offenestunden' => array(),
+					'lehrverband' => array(),
+					'lem' => array(),
+					'verplant_gesamt' => 0,
+				);
+			}
+
+			$group = $grouped[$lehreinheit_id];
+
+			$group->lektoren[$row->lektor_uid] = (object)array(
+				'uid' => $row->lektor_uid,
+				'kurzbz' => trim($row->lektor),
+				'name' => $row->vorname . ' ' . $row->nachname,
+			);
+
+			$group->lvnr[] = $row->lvnr;
+			$group->lehrfach[] = $row->lehrfach;
+			$group->lehrform[] = $row->lehrform;
+			$group->stundenblockung[] = $row->stundenblockung;
+			$group->wochenrythmus[] = $row->wochenrythmus;
+			$group->planstunden[] = $row->planstunden;
+			$group->start_kw[] = $row->start_kw;
+
+			$offen_key = $lehreinheit_id . '_' . $row->lektor_uid;
+			$offen = isset($offen_map[$offen_key]) ? $offen_map[$offen_key] : null;
+			$verplant_wert = $offen ? $offen->verplant : 0;
+			$offenestunden_wert = $offen ? $offen->offenestunden : 0;
+
+			$group->verplant[] = $verplant_wert;
+			$group->offenestunden[] = $offenestunden_wert;
+			$group->verplant_gesamt += $verplant_wert;
+
+			$lvb = $row->studiengang . '-' . $row->semester;
+
+			if ($row->verband != '' && $row->verband != ' ' && $row->verband != '0' && $row->verband != null)
+				$lvb .= $row->verband;
+
+			if ($row->gruppe != '' && $row->gruppe != ' ' && $row->gruppe != '0' && $row->gruppe != null)
+				$lvb .= $row->gruppe;
+
+			$group->lehrverband[] = ($row->gruppe_kurzbz != '' && $row->gruppe_kurzbz != null) ? $row->gruppe_kurzbz : $lvb;
+
+			$group->lem[] = array(
+				'lehreinheit_id' => $row->lehreinheit_id,
+				'mitarbeiter_uid' => $row->lektor_uid,
+			);
+		}
+
+		foreach ($grouped as $group)
+		{
+			$group->lektoren = array_values($group->lektoren);
+			$group->lehrverband = array_values(array_unique($group->lehrverband));
+			$group->lehrfach = $this->_formatArr($group->lehrfach);
+			$group->lehrform = $this->_formatArr($group->lehrform);
+			$group->stundenblockung = $this->_formatArr($group->stundenblockung);
+			$group->wochenrythmus = $this->_formatArr($group->wochenrythmus);
+			$group->planstunden = $this->_formatArr($group->planstunden);
+			$group->start_kw = $this->_formatArr($group->start_kw);
+			$group->verplant = $this->_formatArr($group->verplant);
+			$group->offenestunden = $this->_formatArr($group->offenestunden);
+		}
+
+		$this->terminateWithSuccess(array_values($grouped));
+	}
+
+	private function _formatArr($arr)
+	{
+		$values = array_values(array_unique($arr));
+		$formatted = implode(' ', $values);
+
+		if (count($values) > 1)
+			$formatted .= ' ?';
+
+		return $formatted;
+	}
+
+
+}

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

@@ -0,0 +1,47 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Favorites extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+	}
+
+	public function index()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['tempus_favorites']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if (!$data)
+			$this->terminateWithSuccess(null);
+		else
+			$this->terminateWithSuccess(isset($data['tempus_favorites']) ? $data['tempus_favorites'] : null);
+	}
+
+	public function set()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$favorites = $this->input->post('favorites');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'tempus_favorites', $favorites);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess(true);
+	}
+}

application/controllers/api/frontend/v1/tempus/Info.php

@@ -0,0 +1,37 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Info extends FHCAPI_Controller
+{
+
+	private $_ci;
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudiengaenge' => self::PERM_LOGGED,
+		]);
+
+		$this->_ci =& get_instance();
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$this->loadPhrases([
+			'ui'
+		]);
+
+	}
+
+	public function getStudiengaenge()
+	{
+		$this->_ci->StudiengangModel->addDistinct();
+		$this->_ci->StudiengangModel->addSelect('studiengang_kz');
+		$this->_ci->StudiengangModel->addSelect("CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name");
+
+		$result = $this->getDataOrTerminateWithError($this->_ci->StudiengangModel->load());
+		$this->terminateWithSuccess($result);
+	}
+}

application/controllers/api/frontend/v1/tempus/Kalender.php

@@ -0,0 +1,437 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Kalender extends FHCAPI_Controller
+{
+
+	private $_ci;
+	const ALLOWED_PLAN_FILTER = ['ort', 'uid', 'stg'];
+	const ALLOWED_ROOM_FILTER = ['lehreinheit_id', 'kalender_id'];
+
+	const ALLOWED_TO_UPDATE = ['start_time', 'end_time', 'ort_kurzbz'];
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStunden' => self::PERM_LOGGED,
+			'getCalendarHours' => self::PERM_LOGGED,
+			'getPlan' => self::PERM_LOGGED,
+			'getPlanByOrt' => self::PERM_LOGGED,
+			'getRaumvorschlag' => self::PERM_LOGGED,
+			'getHistory' => 'lehre/lvplan:rw',
+			'deleteEntry' => 'lehre/lvplan:rw',
+			'syncToLecturer' => 'lehre/lvplan:rw',
+			'syncToStudent' => 'lehre/lvplan:rw',
+			'getPlanLecturer' =>'lehre/lvplan:rw',
+			'getPlanStudent' => 'lehre/lvplan:rw',
+			'getZeitwuensche' => self::PERM_LOGGED,
+			'getZeitsperren' => self::PERM_LOGGED,
+			'updateKalenderEvent' => 'lehre/lvplan:rw',
+			'addKalenderEvent' => 'lehre/lvplan:rw',
+			'calculateMultiWeekPlan' => 'lehre/lvplan:rw',
+			'confirmMultiWeekPlan' => 'lehre/lvplan:rw',
+			'addToKalenderEvent' => 'lehre/lvplan:rw',
+			'sync' => 'lehre/lvplan:rw',
+		]);
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->library('LogLib');
+		$this->_ci->load->library('form_validation');
+		$this->_ci->load->library('KalenderLib', ["uid" => getAuthUID()]);
+		$this->_ci->load->library('RaumvorschlagLib', ["uid" => getAuthUID()]);
+		$this->loadPhrases([
+			'ui'
+		]);
+		$this->_ci->load->config('tempus');
+
+
+		$this->_ci->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+	/**
+	 * fetches Stunden layout from database
+	 * @access public
+	 *
+	 */
+	public function getStunden()
+	{
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$this->_ci->StundeModel->addOrder('stunde', 'ASC');
+		$stunden = $this->_ci->StundeModel->load();
+
+		$stunden = $this->getDataOrTerminateWithError($stunden);
+
+		$this->terminateWithSuccess($stunden);
+	}
+
+	public function getCalendarHours()
+	{
+		$calender_start = $this->_ci->config->item('calendar_start') ?? 7;
+		$calender_end = $this->_ci->config->item('calendar_end') ?? 23;
+
+		$this->terminateWithSuccess(array(
+			'start' => $calender_start,
+			'end' => $calender_end
+		));
+	}
+
+	public function getPlan()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+
+		$filter = $this->_checkFilter(self::ALLOWED_PLAN_FILTER);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getPlanForPlanner(
+			$start_date,
+			$end_date,
+			isset($filter->ort) ? $filter->ort : null,
+			isset($filter->uid) ? $filter->uid : null,
+			isset($filter->stg) ? $filter->stg : null
+		);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getPlanStudent()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getPlanForStudent(
+			$start_date,
+			$end_date
+		);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getPlanLecturer()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getPlanForLecturer(
+			$start_date,
+			$end_date
+		);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getPlanByOrt($start_date = null, $end_date = null, $ort = null)
+	{
+		if (!isset($start_date) || !isset($end_date) || !isset($ort))
+		{
+			$this->_ci->form_validation->set_data($_GET);
+			$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+			$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+			$this->_ci->form_validation->set_rules('ort',"ort","required");
+			if($this->_ci->form_validation->run() === FALSE)
+				$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+			$start_date = $this->_ci->input->get('start_date', TRUE);
+			$end_date = $this->_ci->input->get('end_date', TRUE);
+			$ort = $this->_ci->input->get('ort', TRUE);
+		}
+
+		$this->terminateWithSuccess($this->_ci->kalenderlib->getPlanByOrt($start_date, $end_date, $ort));
+	}
+
+	public function getZeitsperren()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+		$this->_ci->form_validation->set_rules('emp',"emp","required");
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+		$emp = $this->_ci->input->get('emp', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getZeitsperren($start_date, $end_date, $emp);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getZeitwuensche()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+		$this->_ci->form_validation->set_rules('emp',"emp","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+		$emp = $this->_ci->input->get('emp', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getZeitwuensche($start_date, $end_date, $emp);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function updateKalenderEvent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$updateFields = $this->_checkUpdate($this->_ci->input->post('updatedInfos', TRUE));
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->updateKalenderEvent($kalender_id, $updateFields->ort_kurzbz ?? null,  $updateFields->start_time ?? null,  $updateFields->end_time ?? null);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result),  $result->code);
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function getRaumvorschlag()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+
+		$filter = $this->_checkFilter(self::ALLOWED_ROOM_FILTER);
+		$this->terminateWithSuccess($this->_ci->raumvorschlaglib->getVorschlaege($filter->kalender_id));
+	}
+
+	public function getHistory()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->getHistory($kalender_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function deleteEntry()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->deleteEntry($kalender_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function sync()
+	{
+		$result = $this->_ci->kalenderlib->sync();
+		$this->terminateWithSuccess(getData($result));
+	}
+	public function syncToLecturer()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_preview');
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+	public function syncToStudent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_live');
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+	public function addKalenderEvent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
+		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+		$result = $this->_ci->kalenderlib->addKalenderEvent($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function calculateMultiWeekPlan()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
+		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+
+		$result = $this->_ci->kalenderlib->calculateMultiWeekPlan($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function confirmMultiWeekPlan()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('plan[]',"plan","required");
+		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$plan = $this->_ci->input->post('plan', TRUE);
+		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->confirmMultiWeekPlan($plan, $lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function addToKalenderEvent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('target_kalender_id',"target_kalender_id","required");
+		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$target_kalender_id = $this->_ci->input->post('target_kalender_id', TRUE);
+		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->addToKalenderEvent($target_kalender_id, $lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+
+	private function _checkFilter($filters)
+	{
+		$filter_valid = true;
+		$filter_object = new stdClass();
+		foreach ($filters as $filter)
+		{
+			if ($this->_ci->input->post($filter))
+			{
+				$filter_valid = true;
+				$filter_object->$filter = $this->_ci->input->post($filter);
+			}
+		}
+
+		if (!$filter_valid)
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		return $filter_object;
+	}
+
+	private function _checkUpdate($updateInfos)
+	{
+		$update_valid = false;
+		$update_object = new stdClass();
+		foreach (self::ALLOWED_TO_UPDATE as $filter)
+		{
+			if (isset($updateInfos[$filter]))
+			{
+				$update_valid = true;
+				$update_object->$filter = $updateInfos[$filter];
+			}
+		}
+
+		if (!$update_valid)
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+
+		return $update_object;
+	}
+}

application/controllers/api/frontend/v1/tempus/OperationalResourceToCalenderAPI.php

@@ -0,0 +1,84 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class OperationalResourceToCalenderAPI extends FHCAPI_Controller
+{
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getAssignedResourcesByCalender' => ['admin:r', 'assistenz:r'],
+			'storeResourcesToCalendarRelationship' => ['admin:w', 'assistenz:w'],
+			'getSchedulableResourcesByCalendar' => ['admin:r', 'assistenz:r'],
+		]);
+
+		$this->load->model('ressource/BetriebsmittelKalender_model', 'BetriebsmittelKalenderModel');
+		$this->load->model('ressource/Betriebsmittel_model', 'BetriebsmittelModel');
+		$this->load->model('ressource/Kalender_model', 'KalenderModel');
+
+		$this->load->library('CollisionChecker', ["uid" => getAuthUID()]);
+		$this->load->library('KalenderLib', ["uid" => getAuthUID()]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function getSchedulableResourcesByCalendar($calenderID)
+	{ 
+		if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'");
+
+		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
+		if (isError($result)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
+ 
+		$calender = $this->getDataOrTerminateWithError($result)[0];
+		if (!isset($calender)) $this->terminateWithError("Calendar with id '$calenderID' not found");
+
+		$result = $this->BetriebsmittelModel->getSchedulableEntriesByDatetimeInterval($calender->von, $calender->bis);
+		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
+	}
+
+	public function getAssignedResourcesByCalender($calenderID)
+	{
+		if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'");
+
+		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
+		if (empty($result)) $this->terminateWithError("Calendar with id '$calenderID' not found");
+ 
+		$calenderGroupID = $this->getDataOrTerminateWithError($result)[0]->eindeutige_kalender_gruppen_id;
+		if (!isset($calenderGroupID)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
+
+
+		$this->BetriebsmittelKalenderModel->addSelect(['tbl_betriebsmittel_kalender.*', 'tbl_betriebsmittel.beschreibung', 'tbl_betriebsmittel.verplanen']);
+		$this->BetriebsmittelKalenderModel->addJoin('wawi.tbl_betriebsmittel', 'betriebsmittel_id');
+		$result = $this->BetriebsmittelKalenderModel->loadWhere([
+			'eindeutige_kalender_gruppen_id' => $calenderGroupID,
+			'tbl_betriebsmittel.verplanen' => true,
+		]);
+
+		$this->terminateWithSuccess($this->getDataOrTerminateWithError($result));
+	}
+
+	public function storeResourcesToCalendarRelationship()
+	{
+		$calenderID = $this->input->post('kalender_id');
+		$assignedResources = $this->input->post('assignedResources');
+
+		if (!isset($calenderID)) $this->terminateWithError("Missing required parameter 'kalender_id'", 'general');
+		if (!isset($assignedResources)) $this->terminateWithError("Missing required parameter 'assignedResources'", 'general');
+
+		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
+		if (empty($result)) $this->terminateWithError("Calendar with id '$calenderID' not found");
+
+		$calendar = $this->getDataOrTerminateWithError($result)[0];
+		
+		$calenderGroupID = $calendar->eindeutige_kalender_gruppen_id;
+		if (!isset($calenderGroupID)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
+
+		$result = $this->kalenderlib->addOperationalResourcesToKalenderEvent($calendar, $assignedResources);
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(['message' => 'Resources assigned successfully']);
+	}
+}

application/controllers/api/frontend/v1/tempus/Reservierung.php

@@ -0,0 +1,231 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Reservierung extends FHCAPI_Controller
+{
+	private $_ci;
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'addReservierung' => 'lehre/lvplan:rw',
+			'getRollen' => 'lehre/lvplan:rw',
+			'getInformation' => 'lehre/lvplan:rw',
+			'getLektor' => 'lehre/lvplan:rw',
+			'searchGroup' => 'lehre/lvplan:rw',
+		]);
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->library('LogLib');
+		$this->_ci->load->library('form_validation');
+		$this->_ci->load->library('KalenderLib', ["uid" => getAuthUID()]);
+
+		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
+		$this->_ci->load->model('ressource/Kalender_Event_Rolle_model', 'KalenderEventRolleModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->_ci->load->model('organisation/gruppe_model', 'GruppeModel');
+
+
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getInformation()
+	{
+		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
+
+		$this->_ci->OrtModel->db->join("
+					(select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort", "standort_id", "LEFT", false);
+
+		$raeume = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
+		$return_array['raeume'] = hasData($raeume) ? getData($raeume) : [];
+
+		if (!$this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
+			$this->terminateWithSuccess($return_array);
+
+		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess($return_array);
+
+		$this->_ci->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
+		$this->_ci->StudiengangModel->addOrder('typ, kurzbz');
+		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
+		$studiengaenge = $this->_ci->StudiengangModel->loadWhere(array('aktiv' => true));
+
+		if (isError($studiengaenge))
+			$this->terminateWithError(getError($studiengaenge));
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+		$this->_ci->KalenderEventRolleModel->addOrder('sort');
+		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
+
+		$rollen = $this->_ci->KalenderEventRolleModel->load();
+
+		$this->_ci->StudiensemesterModel->addOrder('start', 'DESC');
+		$studiensemester = $this->_ci->StudiensemesterModel->load();
+
+		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
+		$return_array['berechtigt'] = true;
+		$return_array['rollen'] = hasData($rollen) ? getData($rollen) : [];
+		$return_array['studiensemester'] = hasData($studiensemester) ? getData($studiensemester) : [];
+
+
+		$this->terminateWithSuccess($return_array);
+	}
+	public function getRaeume()
+	{
+
+		$this->_ci->OrtModel->db->join("
+					(select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort", "standort_id", "LEFT", false);
+
+		$result = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	public function searchGroup()
+	{
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->_ci->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess([]);
+
+
+		$query_words = explode(' ', urldecode($query));
+
+		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
+
+		if (isError($gruppen_result))
+			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
+
+		$gruppen_array = array();
+
+		if (hasData($gruppen_result))
+			$gruppen_array = getData($gruppen_result);
+
+		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
+
+		$lehrverband_array = array();
+
+		if (isError($lehrverband_result))
+			$this->terminateWithError(getError($lehrverband_result), self::ERROR_TYPE_GENERAL);
+
+		if (hasData($lehrverband_result))
+			$lehrverband_array = getData($lehrverband_result);
+
+		$all_gruppen = array_merge($gruppen_array, $lehrverband_array);
+
+		$gefilterte_gruppen = array_filter($all_gruppen, function($gruppe) use ($stg_berechtigungen)
+		{
+			return in_array($gruppe->studiengang_kz, $stg_berechtigungen);
+		});
+
+		$this->terminateWithSuccess($gefilterte_gruppen);
+	}
+
+	public function getRollen()
+	{
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+
+		$this->_ci->KalenderEventRolleModel->addOrder('sort');
+		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
+
+		$result = $this->_ci->KalenderEventRolleModel->load();
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+	public function addReservierung()
+	{
+
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('titel',"titel","required");
+		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
+		$this->_ci->form_validation->set_rules('ort_kurzbz[]',"ort_kurzbz","required");
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$titel = $this->_ci->input->post('titel', TRUE);
+		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
+		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+		$teilnehmer = $this->_ci->input->post('teilnehmer', TRUE);
+		$specialGroups = $this->_ci->input->post('specialGroups', TRUE);
+		$specialFinalGroups = $this->_ci->input->post('specialFinalGroups', TRUE);
+		$groups = $this->_ci->input->post('groups', TRUE);
+
+		if ($this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
+		{
+			if (empty($teilnehmer) || !is_array($teilnehmer))
+			{
+				$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
+			}
+		}
+		else
+			$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
+
+
+		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date, $teilnehmer, $specialFinalGroups, $specialGroups, $groups);
+
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+
+
+	public function getLektor()
+	{
+		$query = $this->input->get('query');
+
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', $query);
+
+		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
+		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
+		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
+
+		$this->_ci->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
+
+		$this->_ci->MitarbeiterModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->MitarbeiterModel->db->group_start();
+			$this->_ci->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->group_end();
+		}
+		$this->_ci->MitarbeiterModel->db->group_end();
+		$this->_ci->MitarbeiterModel->addOrder('nachname');
+		$this->_ci->MitarbeiterModel->addOrder('vorname');
+		$result = $this->_ci->MitarbeiterModel->load();
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+	}
+
+}

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

@@ -0,0 +1,53 @@
+<?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,
+			'getTagsByCalendar' => self::BERECHTIGUNG_KURZBZ,
+			'addTag' => self::BERECHTIGUNG_KURZBZ,
+			'updateTag' => self::BERECHTIGUNG_KURZBZ,
+			'doneTag' => self::BERECHTIGUNG_KURZBZ,
+			'deleteTag' => self::BERECHTIGUNG_KURZBZ
+		]);
+
+	$this->config->load('tempus');
+	}
+
+	public function getTag($readonly_tags = null)
+	{
+		parent::getTag($this->config->item('tempus_tags'));
+	}
+	public function getTags($tags = null)
+	{
+		parent::getTags($this->config->item('tempus_tags'));
+	}
+	public function getTagsByCalendar($eindeutige_kalender_gruppen_id = null)
+	{
+		parent::getTagsByAssignmentTypeValue('eindeutige_kalender_gruppen_id', $eindeutige_kalender_gruppen_id, $this->config->item('tempus_tags'));
+	}
+	public function addTag($withZuordnung = true, $updatable_tags = null)
+	{
+		parent::addTag(true, $this->config->item('tempus_tags'));
+	}
+	public function updateTag($updatable_tags = null)
+	{
+		parent::updateTag($this->config->item('tempus_tags'));
+	}
+	public function deleteTag($withZuordnung = true, $updatable_tags = null)
+	{
+		parent::deleteTag(true, $this->config->item('tempus_tags'));
+	}
+	public function doneTag($updatable_tags = null)
+	{
+		parent::doneTag($this->config->item('tempus_tags'));
+	}
+}

application/controllers/api/v1/system/Tag.php

@@ -37,7 +37,6 @@ class Tag extends API_Controller
 
 		if (isset($tag))
 		{
-			$this->TagModel->addJoin('public.tbl_notiz_typ', 'typ_kurzbz', 'typ_kurzbz');
 			$result = $this->TagModel->load($tag);
 
 			$this->response($result, REST_Controller::HTTP_OK);

application/controllers/components/Cis/Mylv.php

@@ -14,11 +14,11 @@ class Mylv extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'Student' => self::PERM_LOGGED,
-			'Studiensemester' => self::PERM_LOGGED,
-			'Lvs' => self::PERM_LOGGED,
-			'Info' => self::PERM_LOGGED,
-			'Pruefungen' => self::PERM_LOGGED
+			'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?
 		]);
 	}
 

application/controllers/components/stv/Studiensemester.php

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

application/controllers/jobs/AntragJob.php

@@ -125,7 +125,7 @@ class AntragJob extends JOB_Controller
 					$stgLeitungen[$leitung->uid]['stgs'][] = $antrag->studiengang_kz;
 				}
 
-				$result = $this->StudierendenantragModel->getStgAndDetails($antrag->studierendenantrag_id);
+				$result = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 				if (isError($result))
 				{
 					$this->logError(getError($result));

application/controllers/jobs/ReihungstestJob.php

@@ -803,7 +803,7 @@ class ReihungstestJob extends JOB_Controller
 	{
 		if (!isset($studiensemester) || isEmptyString($studiensemester))
 		{
-			$this->logError("Studiensemester not passed as parameter");
+			$this->logError("Studiensemster not passed as parameter");
 			return;
 		}
 

application/controllers/jobs/TagJob.php

@@ -1,110 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-use \DateTime as DateTime;
-
-class TagJob extends JOB_Controller
-{
-	/**
-	 * API constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Configs
-		$this->load->config('stv');
-
-		// Library
-		$this->load->library('TagLib');
-
-		// Load Models
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
-
-		$this->loadPhrases([
-			'lehre'
-		]);
-	}
-
-	public function rebuildAutomatedTags()
-	{
-		$automatedTagsRes = $this->NotiztypModel->loadWhere(array('automatisiert' => true, 'taglib IS NOT NULL' => null));
-		$automatedTags = hasData($automatedTagsRes) ? getData($automatedTagsRes) : [];
-
-
-		$result = $this->StudiensemesterModel->getAktOrNextSemester();
-		if (isError($result))
-		{
-			$this->logInfo('Start Job rebuild Automated Tags');
-			$this->logError('Error occurred during retrieving studiensemester');
-			return $this->logInfo('End Job rebuild Automated Tags');
-		}
-
-		if (empty($result->retval) || !isset($result->retval[0])) {
-			$this->logInfo('Start Job rebuild Automated Tags');
-			$this->logError('No Studiensemester found');
-			return $this->logInfo('End Job rebuild Automated Tags');
-		}
-		$studiensemester_kurzbz = $result->retval[0]->studiensemester_kurzbz ?? null;
-		$params = array(
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		);
-
-		$this->logInfo('Start Job rebuild Automated Tags ' . $studiensemester_kurzbz);
-		foreach($automatedTags as $autoTag)
-		{
-			// getPath: must not be lost
-			$filePath = APPPATH . 'libraries/' . $autoTag->taglib . '.php'; // APPPATH = application/
-
-			if(file_exists($filePath)) {
-				require_once($filePath);
-			} else {
-				$this->logInfo("File not found: " . $filePath);
-				continue;
-			}
-
-			$kurz_bz = $autoTag->typ_kurzbz;
-			// className without PATH (basename)
-			$className = basename($autoTag->taglib);
-
-			$obj = new $className();
-
-			$outputArray = $obj->getZuordnungIds($params);
-			$typeId = $outputArray->typeId;
-
-			$paramsTag = array(
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'kurzbz' => $kurz_bz,
-				'data' => $outputArray->data,
-				'typeId' => $typeId
-			);
-
-			$result = $this->taglib->updateAutomatedTags($paramsTag);
-
-			if (isError($result)) {
-				$this->logError('Error occurred during updateAutomatedTags ' . $kurz_bz);
-				continue;
-			}
-
-			$data = is_array($result) ? $result['retval'] : $result->retval;
-
-			//SUMMARY
-			$this->logInfo("Tag " . $result->retval['input']['tag'] . " | type_id " . $typeId . " --"
-			. " Count Recycled: " . $result->retval['summary']['recycled']
-			. " Count Added: ".  $result->retval['summary']['added']
-			. " Count Deleted: ".  $result->retval['summary']['deleted']);
-
-			//DETAILS
-			if($result->retval['results']['newTags'])
-				$this->logInfo("Tag " . $result->retval['input']['tag'] . "New tag(s): " .  implode(', ', $result->retval['results']['newTags']));
-			if($result->retval['results']['deletedTagsIds'])
-				$this->logInfo("Tag " . $result->retval['input']['tag'] . "Deleted tags(s: " . implode(', ', $result->retval['results']['deletedTagsIds']));
-			if ($result->retval['results']['retaggedIds'])
-				$this->logInfo("Tag " . $result->retval['input']['tag'] . "Recycled tag(s): " . implode(', ', $result->retval['results']['retaggedIds']));
-		}
-		$this->logInfo( "End Job rebuild Automated Tags");
-	}
-}

application/controllers/jobs/TempusJob.php

@@ -0,0 +1,27 @@
+<?php
+
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+class TempusJob extends JOB_Controller
+{
+	private $_ci;
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->helper('hlp_sancho_helper');
+		$this->_ci->load->library('KalenderLib', ["uid" => null]);
+	}
+
+
+	public function sync()
+	{
+		$this->_ci->logInfo('Start job FHC-Core->Tempus->sync');
+		$this->_ci->kalenderlib->sync();
+		$this->_ci->logInfo('End job FHC-Core->Tempus->sync');
+	}
+
+}

application/controllers/js/Tabulatorcolumns.php

@@ -1,60 +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 generates javascript from snippets for tabulator columns
- */
-class Tabulatorcolumns extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'stv' => ['admin:r', 'assistenz:r'],
-			'lvverwaltung' => ['admin:r', 'assistenz:r']
-		]);
-	}
-
-	/**
-	 * Render tabulator columns for config
-	 *
-	 * @param string				$config
-	 *
-	 * @return void
-	 */
-	public function _remap($config)
-	{
-		$this->load->config($config);
-		$list_columns = $this->config->item('list_columns') ?: [];
-
-		$snippets = [
-			'jssnippets/tabulatorcolumns/' . $config . '.js'
-		];
-
-		foreach ($list_columns as $col) {
-			$snippets[] = $col['js'];
-		}
-
-		$this->output->set_content_type('application/javascript');
-
-		$this->load->view('jssnippets/tabulatorcolumns.js', [
-			'snippets' => $snippets
-		]);
-	}
-}

application/controllers/lehre/Antrag/Attachment.php

@@ -73,7 +73,7 @@ class Attachment extends FHC_Controller
 			}
 		}
 
-		$result = $this->dmslib->getOutputFileInfo($dms_id);
+		$result = $this->dmslib->download($dms_id);
 		if (isError($result))
 			return show_error(getError($result));
 

application/controllers/lehre/Studierendenantrag.php

@@ -25,8 +25,7 @@ class Studierendenantrag extends FHC_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'studierendenantrag',
-			'ui'
+			'studierendenantrag'
 		]);
 
 		$this->load->config('studierendenantrag');

application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php

@@ -393,7 +393,7 @@ class approveAnrechnungDetail extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
 
 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php

@@ -282,7 +282,7 @@ class approveAnrechnungUebersicht extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
 
 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/lehre/anrechnung/CreateAnrechnung.php

@@ -150,12 +150,15 @@ class CreateAnrechnung extends Auth_Controller
 		}
 	
 		// Upload document
-		$result = $this->_uploadFile();
+		$result = self::_uploadFile();
 		
-		if (isError($result)) $this->terminateWithJsonError(getError($result));
+		if (isError($result))
+		{
+			$this->terminateWithJsonError($result->retval);
+		}
 		
 		// Hold just inserted DMS ID
-		$lastInsert_dms_id = getData($result)->dms_id;
+		$lastInsert_dms_id = $result->retval['dms_id'];
 		
 		// Save Anrechnung and Anrechnungstatus
 		$result = $this->AnrechnungModel->createAnrechnungsantrag(
@@ -224,25 +227,17 @@ class CreateAnrechnung extends Auth_Controller
 	 */
 	private function _uploadFile()
 	{
-		// Upload document
-		$uploadDataResult = $this->uploadFile('uploadfile', array('pdf'));
-
-		// If an error occurred while uploading the file
-		if (isError($uploadDataResult)) return $uploadDataResult;
-		if (!hasData($uploadDataResult)) return error('Upload failed');
-
-		// Add file to the DMS (DB + file system)
-		return $this->_ci->dmslib->add(
-			getData($uploadDataResult)['file_name'],
-			getData($uploadDataResult)['file_type'],
-			fopen(getData($uploadDataResult)['full_path'], 'r'),
-			'anrechnung', // kategorie_kurzbz
-			null, // dokument_kurzbz
-			null, // beschreibung
-			false, // cis_suche
-			null, // schlagworte
-			getAuthUID() // insertvon
+		$dms = array(
+			'kategorie_kurzbz'  => 'anrechnung',
+			'version'           => 0,
+			'name'              => $_FILES['uploadfile']['name'],
+			'mimetype'          => $_FILES['uploadfile']['type'],
+			'insertamum'        => (new DateTime())->format('Y-m-d H:i:s'),
+			'insertvon'         => $this->_uid
 		);
+		
+		// Upload document
+		return $this->dmslib->upload($dms, 'uploadfile', array('pdf'));
 	}
 	
 	private function _LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id, $prestudent_id)
@@ -273,4 +268,4 @@ class CreateAnrechnung extends Auth_Controller
 		return false;
 	}
 	
-}
+}

application/controllers/lehre/anrechnung/RequestAnrechnung.php

@@ -83,7 +83,7 @@ class requestAnrechnung extends Auth_Controller
 		$is_expired = $this->_isExpired($studiensemester_kurzbz);
 		
 		// Check if Lehrveranstaltung was already graded with application blocking grades
-		$is_blocked = $this->_LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id);
+		$is_blocked = self::_LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id);
 		
 		// Get Anrechung data
 		$anrechnungData = $this->anrechnunglib->getAnrechnungDataByLv($lehrveranstaltung_id, $studiensemester_kurzbz, $prestudent_id);
@@ -152,24 +152,27 @@ class requestAnrechnung extends Auth_Controller
 		$prestudent_id = getData($result)[0]->prestudent_id;
 		
 		// Exit if application already exists
-		if ($this->_applicationExists($lehrveranstaltung_id, $studiensemester_kurzbz, $prestudent_id))
+		if (self::_applicationExists($lehrveranstaltung_id, $studiensemester_kurzbz, $prestudent_id))
 		{
 			return $this->outputJsonError($this->p->t('anrechnung', 'antragBereitsGestellt'));
 		}
 		
 		// Exit if application is a past ( < actual ) studysemester
-		if ($this->_applicationIsPastSS($studiensemester_kurzbz))
+		if (self::_applicationIsPastSS($studiensemester_kurzbz))
 		{
 			return $this->outputJsonError($this->p->t('anrechnung', 'antragNichtFuerVerganganeSS'));
 		}
 		
 		// Upload document
-		$result = $this->_uploadFile();
+		$result = self::_uploadFile();
 
-		if (isError($result)) return $this->outputJsonError(getError($result));
+		if (isError($result))
+		{
+			return $this->outputJsonError($result->retval);
+		}
 		
 		// Hold just inserted DMS ID
-		$lastInsert_dms_id = getData($result)->dms_id;
+		$lastInsert_dms_id = $result->retval['dms_id'];
 
 		// Save Anrechnung and Anrechnungstatus
 		$result = $this->AnrechnungModel->createAnrechnungsantrag(
@@ -179,8 +182,8 @@ class requestAnrechnung extends Auth_Controller
 			$begruendung_id,
 			$lastInsert_dms_id,
 			$anmerkung,
-			$begruendung_ects,
-			$begruendung_lvinhalt
+            $begruendung_ects,
+            $begruendung_lvinhalt
 		);
 		
 		if (isError($result))
@@ -212,11 +215,11 @@ class requestAnrechnung extends Auth_Controller
 		$this->_checkIfEntitledToReadDMSDoc($dms_id);
 
 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id);
-		if (isError($download)) return $download;
+        $download = $this->dmslib->download($dms_id);
+        if (isError($download)) return $download;
 
-		// Download file
-		$this->outputFile(getData($download));
+        // Download file
+        $this->outputFile(getData($download));
 	}
 
 	/**
@@ -364,25 +367,16 @@ class requestAnrechnung extends Auth_Controller
 	 */
 	private function _uploadFile()
 	{
-		// Upload document
-		$uploadDataResult = $this->uploadFile('uploadfile', array('pdf'));
-
-		// If an error occurred while uploading the file
-		if (isError($uploadDataResult)) return $uploadDataResult;
-		// If an error occurred while uploading the file
-		if (!hasData($uploadDataResult)) return error('Upload failed');
-
-		// Add file to the DMS (DB + file system)
-		return $this->_ci->dmslib->add(
-			getData($uploadDataResult)['file_name'],
-			getData($uploadDataResult)['file_type'],
-			fopen(getData($uploadDataResult)['full_path'], 'r'),
-			'anrechnung',
-			null, // dokument_kurzbz
-			null, // beschreibung
-			false, // cis_suche
-			null, // schlagworte
-			getAuthUID() // insertvon
+		$dms = array(
+			'kategorie_kurzbz'  => 'anrechnung',
+			'version'           => 0,
+			'name'              => $_FILES['uploadfile']['name'],
+			'mimetype'          => $_FILES['uploadfile']['type'],
+			'insertamum'        => (new DateTime())->format('Y-m-d H:i:s'),
+			'insertvon'         => $this->_uid
 		);
+
+		// Upload document
+		return $this->dmslib->upload($dms, 'uploadfile', array('pdf'));
 	}
 }

application/controllers/lehre/anrechnung/ReviewAnrechnungDetail.php

@@ -237,7 +237,7 @@ class reviewAnrechnungDetail extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
 
 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/lehre/anrechnung/ReviewAnrechnungUebersicht.php

@@ -196,7 +196,7 @@ class reviewAnrechnungUebersicht extends Auth_Controller
 		$filename = $this->anrechnunglib->setFilenameOnDownload($dms_id);
 
 		// Get file to be downloaded from DMS
-		$download = $this->dmslib->getOutputFileInfo($dms_id, $filename);
+		$download = $this->dmslib->download($dms_id, $filename);
 		if (isError($download)) return $download;
 
 		// Download file

application/controllers/person/Gradelist.php

@@ -198,19 +198,7 @@ class Gradelist extends Auth_Controller
 			if (!isset($row_noten->found))
 			{
 				$result_lv = $this->LehrveranstaltungModel->load($row_noten->lehrveranstaltung_id);
-
-				$studiengang_kz = null;
-
-				if (!empty($result_lv->retval) && isset($result_lv->retval[0]) && isset($result_lv->retval[0]->studiengang_kz))
-				{
-					$result_stg = $this->StudiengangModel->load($result_lv->retval[0]->studiengang_kz);
-
-					if (!empty($result_stg->retval) && isset($result_stg->retval[0]) && is_object($result_stg->retval[0]) && isset($result_stg->retval[0]->kurzbzlang))
-					{
-						$studiengang_kz = $result_stg->retval[0]->kurzbzlang;
-					}
-				}
-
+				$result_stg = $this->StudiengangModel->load($result_lv->retval[0]->studiengang_kz);
 				$courses['semester'][$row_noten->studiensemester_kurzbz]['lvs_nonstpl'][] = array(
 					'lehrveranstaltung_id' => $row_noten->lehrveranstaltung_id,
 					'lehrtyp_kurzbz' => $result_lv->retval[0]->lehrtyp_kurzbz,
@@ -224,8 +212,8 @@ class Gradelist extends Auth_Controller
 					'semester' => $result_lv->retval[0]->semester,
 					'note' => $row_noten->note,
 					'datum' => $row_noten->benotungsdatum,
-					'studiengang_kurzbz' => $studiengang_kz,
-					'zugeordnet' => true
+					'zugeordnet' => true,
+					'studiengang_kurzbz' => $result_stg->retval[0]->kurzbzlang
 				);
 				if(!isset($courses['semester'][$row_noten->studiensemester_kurzbz]['data']['ectssumme_nonstpl']))
 					$courses['semester'][$row_noten->studiensemester_kurzbz]['data']['ectssumme_nonstpl'] = 0;

application/controllers/system/MigrateKalender.php

@@ -0,0 +1,865 @@
+<?php
+/*
+ * Job zur einmaligen Migration des Stundenplans
+ *
+ * Aufruf
+ * php index.ci.php system/MigrateKalender
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class MigrateKalender extends CLI_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
+		$this->load->model('ressource/Kalender_Ort_model', 'KalenderOrtModel');
+		$this->load->model('ressource/Stundenplandev_Kalender_model', 'SyncModel');
+		$this->load->model('ressource/Reservierung_Kalender_model', 'SyncReservierungModel');
+		$this->load->model('ressource/Kalender_Event_Teilnehmer_model', 'KalenderEventTeilnehmerModel');
+		$this->load->model('ressource/Kalender_Event_model', 'KalenderEventModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+	}
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function refreshTablesAndFullMigrateOfStundenplanReservierung($von, $bis = null, $studiengang_kz = null, $ort_kurzbz = null)
+	{
+		echo "Refreshing calendar related tables...\n";
+		$this->resetBeforeNewStundenplanReservierungImport();
+		echo "Calendar related tables refreshed successfully.\n\n";
+
+		echo "Starting full migration of Stundenplan and Reservierung from $von to " . ($bis ?? '2100-12-31') . "...\n";
+		$this->fullMigrateOfStundenplanReservierung($von, $bis, $studiengang_kz, $ort_kurzbz);
+		echo "Full migration of Stundenplan and Reservierung completed successfully.\n";
+	}
+
+	public function fullMigrateOfStundenplanReservierung($von, $bis = null, $studiengang_kz = null, $ort_kurzbz = null)
+	{
+		echo "Starting migration of Stundenplan from $von to " . ($bis ?? '2100-12-31') . "...\n";
+		$this->migrateStundenplan($von, $bis, $studiengang_kz);
+		echo "Stundenplan migration completed successfully.\n\n";
+
+		echo "Starting migration of Reservierung from $von to " . ($bis ?? '2100-12-31') . "...\n";
+		$this->migrateReservierung($von, $bis, $ort_kurzbz);
+		echo "Reservierung migration completed successfully.\n\n";
+
+		echo "Starting migration of Stundenplan Betriebsmittel entries...\n";
+		$this->migrateStundenplanBetriebsmittelEntries();
+		echo "Stundenplan Betriebsmittel entries migration completed successfully.\n\n";
+
+		echo "Starting to add title values as tags to calendar entries...\n";
+		$this->addTitleValuesAsTagsToKalenderEntries();
+		echo "Adding title values as tags to calendar entries completed successfully.\n\n";
+	}
+
+	public function migrateStundenplan($von, $bis = null, $studiengang_kz = null)
+	{
+		if (is_null($von))
+			return error('Parameter "von" ist erforderlich');
+
+		if (is_null($bis))
+			$bis = '2100-12-31';
+
+		$db = new DB_Model();
+
+		$stpldevsql = '
+			WITH eindeutige_stunden AS (
+				SELECT DISTINCT unr, datum, stunde
+				FROM lehre.tbl_stundenplandev
+				WHERE datum >= ? AND datum <= ?';
+
+		$params = [$von, $bis];
+
+		if (!is_null($studiengang_kz))
+		{
+			$stpldevsql .= ' AND studiengang_kz = ?';
+
+			$params[] = $studiengang_kz;
+		}
+
+		$stpldevsql .= '),
+			
+			block_keys AS (
+				SELECT
+					unr,
+					datum,
+					stunde,
+					stunde - ROW_NUMBER() OVER (PARTITION BY unr, datum ORDER BY stunde) AS block_nr
+				FROM eindeutige_stunden
+			),
+			blocks AS (
+				SELECT
+					bk.unr,
+					bk.datum,
+					bk.block_nr,
+					MIN(bk.stunde) AS stunde_von,
+					MAX(bk.stunde) AS stunde_bis,
+					array_agg(DISTINCT sp.lehreinheit_id) AS lehreinheit_id,
+					array_agg(DISTINCT sp.ort_kurzbz) AS ort_kurzbz,
+					array_agg(sp.stundenplandev_id ORDER BY bk.stunde) AS stundenplandev_ids,
+					MIN(sp.insertamum) AS insertamum,
+					(array_agg(sp.insertvon ORDER BY sp.insertamum ASC))[1] AS insertvon,
+					MAX(sp.updateamum) AS updateamum,
+					(array_agg(sp.updatevon ORDER BY sp.updateamum DESC))[1] AS updatevon
+				FROM block_keys bk JOIN lehre.tbl_stundenplandev sp ON sp.unr = bk.unr AND sp.datum = bk.datum AND sp.stunde = bk.stunde
+				WHERE sp.datum >= ? AND sp.datum <= ?
+				GROUP BY bk.unr, bk.datum, bk.block_nr
+			)
+			SELECT
+				b.stundenplandev_ids,
+				b.unr,
+				b.datum,
+				b.block_nr,
+				b.lehreinheit_id,
+				b.ort_kurzbz,
+				b.datum + stundevon.beginn AS von,
+				b.datum + stundebis.ende AS bis,
+				b.insertamum,
+				b.insertvon,
+				b.updateamum,
+				b.updatevon
+			FROM blocks b
+				JOIN lehre.tbl_stunde stundevon ON stundevon.stunde = b.stunde_von
+				JOIN lehre.tbl_stunde stundebis ON stundebis.stunde = b.stunde_bis
+			ORDER BY b.datum, b.unr, b.block_nr;';
+
+		array_push($params, $von, $bis);
+		$stpldev = $db->execReadOnlyQuery($stpldevsql, $params);
+
+		if (hasData($stpldev))
+		{
+			// Pruefen ob der Eintrag schon in Sync Tabelle vorhanden ist
+			// Wenn neuere Änderungen vorhanden dann Update
+			// Wenn keine Änderungen seit leztem Sync dann Ueberspringen
+			// Wenn noch nicht vorhanden neu anlegen
+			// Danach ggf pruefen welceh Eintraege in der zwischenzeit geloescht wurden und
+			// in der neuen Tabelle auch archivieren oder loeschen
+
+			$data = getData($stpldev);
+			foreach($data as $block)
+			{
+				$ids = is_array($block->stundenplandev_ids) ? $block->stundenplandev_ids : explode(',', $block->stundenplandev_ids);
+				/*$ids = array_map('intval', $ids);*/
+
+				$this->SyncModel->db->where_in('stundenplandev_id', $ids);
+				$sync_result = $this->SyncModel->load();
+
+				if (!hasData($sync_result))
+				{
+					$kalender_id = $this->_insertKalender($block, 'lehreinheit');
+					if ($kalender_id)
+					{
+						$this->_insertSync($block->stundenplandev_ids, $kalender_id);
+					}
+				}
+				else
+				{
+					$syncData = getData($sync_result);
+					$kalender_id = $syncData[0]->kalender_id;
+					$last_sync = $syncData[0]->lastupdate;
+					$synced_ids = array_column($syncData, 'stundenplandev_id');
+
+					if ($block->updateamum > $last_sync)
+					{
+						$this->_updateKalender($kalender_id, $block);
+						$this->_updateSync($synced_ids, $kalender_id);
+					}
+
+					$fehlende = array_diff($block->stundenplandev_ids, $synced_ids);
+					if (!empty($fehlende))
+					{
+						$this->_insertSync($fehlende, $kalender_id);
+					}
+				}
+			}
+		}
+	}
+
+	public function migrateReservierung($von, $bis = null, $ort_kurzbz = null)
+	{
+		if (is_null($von))
+			return error('Parameter "von" ist erforderlich');
+
+		if (is_null($bis))
+			$bis = '2100-12-31';
+
+		$db = new DB_Model();
+
+		$qry = "WITH eindeutige_stunden AS (
+					SELECT DISTINCT titel, beschreibung, datum, stunde
+					FROM campus.tbl_reservierung
+					WHERE datum >= ? AND datum <= ?";
+
+		$params = array($von, $bis);
+
+		if (!is_null($ort_kurzbz))
+		{
+			$qry .= " AND ort_kurzbz = ?";
+			$params[] = $ort_kurzbz;
+		}
+
+		$qry .=	"),
+					block_keys AS (
+						SELECT
+							titel, beschreibung, datum, stunde,
+							stunde - ROW_NUMBER() OVER (PARTITION BY titel, beschreibung, datum ORDER BY stunde) AS block_nr
+						FROM eindeutige_stunden
+					),
+					blocks AS (
+						 SELECT
+							bk.titel,
+							bk.beschreibung,
+							bk.datum,
+							bk.block_nr,
+							MIN(bk.stunde) AS stunde_von,
+							MAX(bk.stunde) AS stunde_bis,
+							array_agg(DISTINCT r.reservierung_id::text) AS reservierung_ids,
+							array_agg(DISTINCT r.uid) AS uids,
+							array_agg(DISTINCT r.gruppe_kurzbz) AS gruppen_kurzbz,
+							array_agg(DISTINCT ROW(r.semester, r.verband, r.gruppe, r.studiengang_kz)::text) AS svg_kombis,
+							array_agg(DISTINCT r.ort_kurzbz) AS ort_kurzbz,
+							MIN(r.studiengang_kz) AS studiengang_kz,
+							MIN(r.reservierung_id) AS reservierung_id,
+							MAX(r.insertamum) AS insertamum,
+							(array_agg(r.insertvon ORDER BY r.insertamum ASC))[1] AS insertvon
+						FROM block_keys bk
+							JOIN campus.tbl_reservierung r
+									ON r.titel = bk.titel AND r.beschreibung = bk.beschreibung AND r.datum = bk.datum AND r.stunde = bk.stunde
+						WHERE r.datum >= ? AND r.datum <= ?
+						GROUP BY bk.titel, bk.beschreibung, bk.datum, bk.block_nr
+					)
+				SELECT
+					b.*,
+					(b.datum + s_von.beginn) AS von,
+					(b.datum + s_bis.ende) AS bis
+				FROM blocks b
+						JOIN lehre.tbl_stunde s_von ON s_von.stunde = b.stunde_von
+						JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = b.stunde_bis
+				ORDER BY b.reservierung_id DESC;";
+
+		array_push($params, $von, $bis);
+		$reservierung_data = $db->execReadOnlyQuery($qry, $params);
+
+
+		if (hasData($reservierung_data))
+		{
+			$data = getData($reservierung_data);
+
+			foreach($data as $block)
+			{
+
+				$ids = is_array($block->reservierung_ids) ? $block->reservierung_ids : explode(',', $block->reservierung_ids);
+
+				$this->SyncReservierungModel->db->where_in('reservierung_id', $ids);
+				$sync_result = $this->SyncReservierungModel->load();
+
+				if (!hasData($sync_result))
+				{
+					$kalender_id = $this->_insertKalender($block, 'reservierung');
+					if ($kalender_id)
+					{
+						$this->_insertReservierungSync($block->reservierung_ids, $kalender_id);
+					}
+				}
+				else
+				{
+					$syncData = getData($sync_result);
+					$kalender_id = $syncData[0]->kalender_id;
+					$last_sync = $syncData[0]->lastupdate;
+					$synced_ids = array_column($syncData, 'reservierung_id');
+
+					if ($block->insertamum > $last_sync)
+					{
+						$this->_updateKalender($kalender_id, $block);
+						$this->_updateReservierungSync($synced_ids, $kalender_id);
+					}
+
+					$fehlende = array_diff($block->reservierung_ids, $synced_ids);
+					if (!empty($fehlende))
+					{
+						$this->_insertReservierungSync($fehlende, $kalender_id);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Removes calendar entries created by the Stundenplan and Reservierung migrations,
+	 * so that both imports can be started from scratch.
+	 */
+	public function resetBeforeNewStundenplanReservierungImport()
+	{
+		
+		$db = new DB_Model();
+
+		$db->db->trans_start();
+
+		$db->db->query('DELETE FROM sync.tbl_stundenplandev_kalender');
+		$db->db->query('DELETE FROM sync.tbl_reservierung_kalender');
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender_event_teilnehmer
+			WHERE kalender_id IN (
+				SELECT kalender_id
+				FROM lehre.tbl_kalender
+				WHERE typ = 'reservierung'
+			)");
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender_event
+			WHERE kalender_id IN (
+				SELECT kalender_id
+				FROM lehre.tbl_kalender
+				WHERE typ = 'reservierung'
+			)");
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender_lehreinheit
+			WHERE kalender_id IN (
+				SELECT kalender_id
+				FROM lehre.tbl_kalender
+				WHERE typ = 'lehreinheit' OR typ = 'reservierung'
+			)");
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender_ort
+			WHERE kalender_id IN (
+				SELECT kalender_id
+				FROM lehre.tbl_kalender
+				WHERE typ IN ('lehreinheit', 'reservierung')
+			)");
+
+		$db->db->query("DELETE FROM public.tbl_notiz
+			WHERE notiz_id IN (
+				SELECT notiz_id
+				FROM public.tbl_notizzuordnung
+				WHERE eindeutige_kalender_gruppen_id IN (
+					SELECT eindeutige_kalender_gruppen_id
+					FROM lehre.tbl_kalender
+				)
+			)");
+
+		$db->db->query("DELETE FROM public.tbl_notizzuordnung
+			WHERE eindeutige_kalender_gruppen_id IN (
+				SELECT eindeutige_kalender_gruppen_id
+				FROM lehre.tbl_kalender
+			)");
+		
+		$db->db->query("DELETE FROM public.tbl_betriebsmittel_kalender
+			WHERE eindeutige_kalender_gruppen_id IN (
+				SELECT eindeutige_kalender_gruppen_id
+				FROM lehre.tbl_kalender
+			)");
+
+		$db->db->query("DELETE FROM lehre.tbl_kalender
+			WHERE typ IN ('lehreinheit', 'reservierung')");
+
+		$db->db->trans_complete();
+
+		if ($db->db->trans_status() === false)
+			return error('Reset before new import failed');
+
+		return success('Migration data reset successfully');
+	}
+
+	public function migrateStundenplanBetriebsmittelEntries() {
+		$this->setKalendarEntriesGroupIDs();
+		$this->setKalendarEntriesGroupIDsForChildren();
+
+		$dbModel = new DB_Model();
+
+		$deleteOldImportedTempusEntriesQuery = "DELETE from lehre.tbl_betriebsmittel_kalender WHERE quelle != 'tempus_neu' OR quelle IS NULL;";
+		$createHelperTypeQuery = "DO $$
+			BEGIN
+				IF NOT EXISTS (
+					SELECT 1
+					FROM pg_type
+					WHERE typname = 'betriebsmittel_info'
+				) THEN
+					CREATE TYPE betriebsmittel_info AS (
+						betriebsmittel_id bigint,
+						insertamum timestamp,
+						insertvon text
+					);
+				END IF;
+			END $$;";
+		
+		$query = $deleteOldImportedTempusEntriesQuery . 
+				 $createHelperTypeQuery .
+		"WITH test AS (
+			SELECT 
+				tk.eindeutige_kalender_gruppen_id AS eindeutige_kalender_gruppen_id,
+				array_agg(tk.kalender_id),
+				array_agg(
+					ROW(tsb.betriebsmittel_id, tsb.insertamum, tsb.insertvon)::betriebsmittel_info
+				) AS betriebsmittel_data
+			FROM sync.tbl_stundenplandev_kalender AS sk
+			JOIN lehre.tbl_kalender tk ON tk.kalender_id = sk.kalender_id
+			JOIN lehre.tbl_stundenplan_betriebsmittel tsb ON tsb.stundenplandev_id = sk.stundenplandev_id 
+			GROUP BY tk.eindeutige_kalender_gruppen_id 
+			)
+			INSERT INTO lehre.tbl_betriebsmittel_kalender (
+				eindeutige_kalender_gruppen_id, 
+				betriebsmittel_id,
+				insertamum,
+				insertvon
+				)
+			SELECT
+				t.eindeutige_kalender_gruppen_id,
+				bm.betriebsmittel_id,
+				bm.insertamum,
+				bm.insertvon
+			FROM test t
+			CROSS JOIN LATERAL unnest(t.betriebsmittel_data) AS bm
+			ON CONFLICT (eindeutige_kalender_gruppen_id, betriebsmittel_id) DO NOTHING;
+			;";
+
+		$dbModel->db->query($query);
+	}
+
+	public function addTitleValuesAsTagsToKalenderEntries() {
+		$dbModel = new DB_Model();
+
+		
+		$query = "SELECT 
+				k.eindeutige_kalender_gruppen_id,
+				ARRAY_AGG(DISTINCT(spd.titel) ORDER BY spd.titel) AS titel,
+				MAX(spd.updateamum) AS updateamum
+			FROM lehre.tbl_stundenplandev spd
+			JOIN sync.tbl_stundenplandev_kalender spdk ON spd.stundenplandev_id = spdk.stundenplandev_id
+			JOIN lehre.tbl_kalender k ON k.kalender_id = spdk.kalender_id
+			WHERE k.typ = 'lehreinheit' AND k.eindeutige_kalender_gruppen_id IS NOT NULL AND spd.titel IS NOT NULL
+			GROUP BY k.eindeutige_kalender_gruppen_id";
+
+		$result = $dbModel->execReadOnlyQuery($query);
+
+		if (isError($result)) {
+			error("Error while fetching title values for adding as tags: " . getError($result));
+			return;
+		}
+		if (!hasData($result)) {
+			error("No title values found for adding as tags.");
+			return;
+		}
+
+		$data = getData($result);
+
+		foreach($data as $block) {
+			$eindeutige_kalender_gruppen_id = $block->eindeutige_kalender_gruppen_id;
+			$notizText = implode(' - ', array_filter($block->titel, function($titel) {
+				return !empty(trim($titel));
+			}));
+
+			if (!empty($notizText)) {
+				$this->addTag($eindeutige_kalender_gruppen_id, $notizText, $block->updateamum);
+			}
+		}
+	}
+
+	private function setKalendarEntriesGroupIDs() {
+		$dbModel = new DB_Model();
+
+		$query = "UPDATE lehre.tbl_kalender
+			SET eindeutige_kalender_gruppen_id = gen_random_uuid()
+			WHERE vorgaenger_kalender_id IS NULL
+			AND eindeutige_kalender_gruppen_id IS NULL;";
+
+		$dbModel->db->query($query);
+
+	}
+
+	private function setKalendarEntriesGroupIDsForChildren() {
+		$dbModel = new DB_Model();
+
+		$query = "WITH RECURSIVE tree AS 
+			(
+				SELECT
+					kalender_id,
+					vorgaenger_kalender_id,
+					kalender_id AS root_id,
+					eindeutige_kalender_gruppen_id as root_eindeutige_kalender_gruppen_id
+				FROM lehre.tbl_kalender
+				WHERE vorgaenger_kalender_id IS NULL
+
+				UNION ALL
+
+				SELECT
+					i.kalender_id,
+					i.vorgaenger_kalender_id,
+					t.root_id,
+					t.root_eindeutige_kalender_gruppen_id 
+				FROM lehre.tbl_kalender i
+				JOIN tree t
+				ON i.vorgaenger_kalender_id = t.kalender_id
+				where i.eindeutige_kalender_gruppen_id is NULL
+			
+			)
+			UPDATE lehre.tbl_kalender k
+			SET eindeutige_kalender_gruppen_id = t.root_eindeutige_kalender_gruppen_id
+			FROM tree t
+			WHERE k.kalender_id = t.kalender_id
+			AND k.eindeutige_kalender_gruppen_id IS NULL;";
+
+		$dbModel->db->query($query);
+	}
+	
+	private function _insertKalender($block, $typ)
+	{
+		$result = $this->KalenderModel->insert(
+			array (
+				'von' => $block->von,
+				'bis' => $block->bis,
+				'typ' => $typ,
+				'status_kurzbz'=> 'live',
+				'insertamum' => $block->insertamum,
+				'insertvon' => $block->insertvon,
+				'updateamum' => $block->updateamum ?? null,
+				'updatevon' => $block->updatevon ?? null
+			)
+		);
+		if(!isSuccess($result))
+			return null;
+
+		$kalender_id = getData($result);
+
+		if ($typ === 'lehreinheit')
+		{
+			$lehreinheit_ids = is_array($block->lehreinheit_id) ? $block->lehreinheit_id : explode(',', $block->lehreinheit_id);
+			foreach ($lehreinheit_ids as $lehreinheit_id)
+			{
+				$leResult = $this->KalenderLehreinheitModel->insert(
+					array (
+						'kalender_id' => $kalender_id,
+						'lehreinheit_id'=> $lehreinheit_id
+					)
+				);
+
+				if (!isSuccess($leResult))
+					return null;
+			}
+		}
+		else if ($typ === 'reservierung')
+		{
+			$eventResult = $this->KalenderEventModel->insert(array(
+				'kalender_id' => $kalender_id,
+				'titel' => $block->titel,
+				'beschreibung' => $block->beschreibung
+			));
+
+			if (!isSuccess($eventResult))
+				return null;
+
+			if ($block->insertvon)
+			{
+				$user = $this->BenutzerModel->load(array('uid' => $block->insertvon));
+
+				if (hasData($user))
+				{
+					$this->KalenderEventTeilnehmerModel->insert(array(
+						'kalender_id' => $kalender_id,
+						'uid' => getData($user)[0]->uid,
+						'rolle_kurzbz' => 'organisator'
+					));
+				}
+			}
+
+			$uids = is_array($block->uids) ? $block->uids : explode(',', $block->uids);
+			foreach ($uids as $uid)
+			{
+				$this->KalenderEventTeilnehmerModel->insert(array(
+					'kalender_id' => $kalender_id,
+					'uid' => $uid,
+					'rolle_kurzbz' => 'teilnehmer'
+				));
+			}
+
+			$semester_range = $this->StudiensemesterModel->getByDateRange($block->von, $block->bis);
+
+			if (isError($semester_range))
+				return null;
+
+			$studiensemester_kurzbz = getData($semester_range)[0]->studiensemester_kurzbz ?? null;
+
+			$gruppen = is_array($block->gruppen_kurzbz) ? $block->gruppen_kurzbz : explode(',', $block->gruppen_kurzbz ?? '');
+
+			foreach ($gruppen as $gruppe_kurzbz)
+			{
+				$gruppe_kurzbz = trim($gruppe_kurzbz);
+				if (!empty($gruppe_kurzbz))
+				{
+					$this->KalenderEventTeilnehmerModel->insert(array(
+						'kalender_id' => $kalender_id,
+						'gruppe_kurzbz' => $gruppe_kurzbz,
+						'studiengang_kz' => $block->studiengang_kz,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz,
+						'rolle_kurzbz' => 'teilnehmer'
+					));
+				}
+			}
+
+			foreach ($block->svg_kombis as $kombi_str)
+			{
+				$kombi_str = trim($kombi_str, '()');
+				list($sem, $verb, $grp, $stg_kz) = explode(',', $kombi_str);
+
+				$sem = trim($sem) === '' ? null : trim($sem);
+				$verb = trim($verb) === '' ? null : trim($verb);
+				$grp = trim($grp) === '' ? null : trim($grp);
+				$stg_kz = trim($stg_kz) === '' ? null : trim($stg_kz);
+
+				if (is_null($sem) && is_null($verb) && is_null($grp) && is_null($stg_kz))
+					continue;
+
+				$this->KalenderEventTeilnehmerModel->insert(array(
+					'kalender_id' => $kalender_id,
+					'studiengang_kz' => $stg_kz,
+					'semester' => $sem,
+					'verband' => $verb,
+					'gruppe' => $grp,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz,
+					'rolle_kurzbz' => 'teilnehmer'
+				));
+			}
+		}
+
+		$orte = is_array($block->ort_kurzbz) ? $block->ort_kurzbz : explode(',', $block->ort_kurzbz ?? '');
+
+		foreach ($orte as $ort)
+		{
+			$ort = trim($ort);
+			if (!empty($ort))
+			{
+				$this->KalenderOrtModel->insert(
+					array (
+						'kalender_id' => $kalender_id,
+						'ort_kurzbz' => $ort
+					)
+				);
+			}
+		}
+
+		return $kalender_id;
+	}
+
+	private function _insertSync($ids, $kalender_id)
+	{
+		foreach($ids as $id)
+		{
+			$this->SyncModel->insert(
+				array (
+					'stundenplandev_id' => $id,
+					'kalender_id' => $kalender_id,
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+	private function _insertReservierungSync($ids, $kalender_id)
+	{
+
+		foreach($ids as $id)
+		{
+			$this->SyncReservierungModel->insert(
+				array (
+					'reservierung_id' => $id,
+					'kalender_id' => $kalender_id,
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+
+	private function _updateKalender($kalender_id, $block)
+	{
+		$this->KalenderModel->update(
+			array (
+				'kalender_id' => $kalender_id
+			),
+			array (
+				'von' => $block->von,
+				'bis' => $block->bis,
+				'updateamum'=> $block->updateamum,
+				'updatevon' => $block->updatevon
+			)
+		);
+
+		$orte = is_array($block->ort_kurzbz) ? $block->ort_kurzbz : explode(',', $block->ort_kurzbz ?? '');
+		$orte = array_filter(array_map('trim', $orte));
+
+		$this->KalenderOrtModel->delete(array('kalender_id' => $kalender_id));
+
+		foreach ($orte as $ort)
+		{
+			$this->KalenderOrtModel->insert(
+				array (
+					'kalender_id' => $kalender_id,
+					'ort_kurzbz' => $ort
+				)
+			);
+		}
+	}
+
+	private function _updateSync($ids, $kalender_id)
+	{
+		foreach($ids as $id)
+		{
+			$this->SyncModel->update(
+				array (
+					'stundenplandev_id' => $id,
+					'kalender_id' => $kalender_id
+				),
+				array (
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+
+	private function _updateReservierungSync($ids, $kalender_id)
+	{
+		foreach($ids as $id)
+		{
+			$this->SyncReservierungModel->update(
+				array (
+					'reservierung_id' => $id,
+					'kalender_id' => $kalender_id
+				),
+				array (
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+
+	private function addTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem): bool
+	{
+		$notizType = 'hinweis';
+		$insertvonMockUser = 'oldToNewTempusMigration';
+		
+		if (is_null($eindeutige_kalender_gruppen_id) || empty($eindeutige_kalender_gruppen_id)) {
+			var_dump("Error: eindeutige_kalender_gruppen_id is null or empty.");
+			return false;
+		}
+
+		$this->load->model('person/Notiz_model', 'NotizModel');
+		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
+		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		$checkTyp = $this->NotiztypModel->loadWhere(array('typ_kurzbz' => $notizType));
+
+		if (isError($checkTyp))
+		{
+			error("Error occurred while checking Notiztyp: " . $checkTyp->message);
+			return false;
+		}
+
+		if (!hasData($checkTyp))
+		{
+			error("Notiztyp 'hinweis' does not exist. Please create it before adding tags.");
+			return false;
+		}
+		 
+
+		$this->NotizzuordnungModel->addJoin('tbl_notiz', 'tbl_notiz.notiz_id = tbl_notizzuordnung.notiz_id', 'LEFT');
+		$this->NotizzuordnungModel->db->where('tbl_notiz.typ', $notizType);
+		$this->NotizzuordnungModel->db->where('tbl_notiz.insertvon', $insertvonMockUser);
+		$oldNotizZuordnung = $this->NotizzuordnungModel->loadWhere(array('eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
+		if (isError($oldNotizZuordnung))
+		{
+			error("Error occurred while checking Notizzuordnung: " . $oldNotizZuordnung->message);
+			return false;
+		}
+		if (hasData($oldNotizZuordnung))
+		{
+			return $this->updateTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem);
+		}
+
+		
+		$insertResult = $this->NotizModel->insert(array(
+			'titel' => 'TAG',
+			'text' => $notizText,
+			'verfasser_uid' => null,
+			'erledigt' => false,
+			'insertamum' => date('Y-m-d H:i:s'),
+			'insertvon' => $insertvonMockUser,
+			'typ' => $notizType
+		));
+
+		if (isError($insertResult))
+		{
+			error("Error occurred while inserting Notiz: " . $insertResult->message);
+			return false;
+		}
+
+		$insertZuordnung = $this->NotizzuordnungModel->insert(array(
+			'notiz_id' => $insertResult->retval,
+			'eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id
+		));
+
+		if (isError($insertZuordnung)) 
+		{
+			error("Error occurred while inserting Notizzuordnung: " . $insertZuordnung->message);
+			return false;
+		}
+
+		return true;
+	}
+
+	private function updateTag($eindeutige_kalender_gruppen_id, $notizText, $lastUpdatedInOldSystem)
+	{
+		$notizType = 'hinweis';
+		$insertvonMockUser = 'oldToNewTempusMigration';
+		
+		$this->NotizzuordnungModel->addJoin('tbl_notiz', 'tbl_notiz.notiz_id = tbl_notizzuordnung.notiz_id', 'LEFT');
+		$this->NotizzuordnungModel->db->where('tbl_notiz.typ', $notizType);
+		$this->NotizzuordnungModel->db->where('tbl_notiz.insertvon', $insertvonMockUser);
+		$notizZuordnungRes = $this->NotizzuordnungModel->loadWhere(array('eindeutige_kalender_gruppen_id' => $eindeutige_kalender_gruppen_id));
+		if (isError($notizZuordnungRes))
+		{
+			error("Error occurred while loading Notizzuordnung: " . $notizZuordnungRes->message);
+			return false;
+		}
+
+
+		$tag = $this->NotizModel->loadWhere(array('notiz_id' => $notizZuordnungRes->retval[0]->notiz_id));
+		if (isError($tag))
+		{
+			error("Error occurred while loading Notiz: " . $tag->message);
+			return false;
+		}
+
+		if (!hasData($tag))
+		{
+			error("Error occurred while loading Notiz: " . $tag->message);
+			return false;
+		}
+
+		$adjustedLastUpdatedInOldSystem = date('Y-m-d H:i:s', strtotime($lastUpdatedInOldSystem) + 5);
+		if ($tag->retval[0]->updateamum >= $adjustedLastUpdatedInOldSystem)
+		{
+			return true;
+		}
+
+		$updateData = $this->NotizModel->update(array('notiz_id' => $tag->retval[0]->notiz_id),
+			array('text' => $notizText,
+				'updateamum' => date('Y-m-d H:i:s'),
+				'updatevon' => $insertvonMockUser,
+				'bearbeiter_uid' => null,
+			)
+		);
+		if (isError($updateData))
+		{
+			error("Error occurred while updating Notiz: " . $updateData->message);
+			return false;
+		}
+
+		return true;
+	}
+}

application/controllers/system/infocenter/InfoCenter.php

@@ -34,9 +34,6 @@ class InfoCenter extends Auth_Controller
 	const PREV_FILTER_ID = 'prev_filter_id';
 	const KEEP_TABLESORTER_FILTER = 'keepTsFilter';
 
-	const ONBOARDING_INSERTVON = 'onboarding';
-	const ONBOARDING_KENNZEICHENTYP = 'eobRegistrierungsId';
-
 	private $_uid; // contains the UID of the logged user
 
 	// Used to log with PersonLogLib
@@ -178,12 +175,10 @@ class InfoCenter extends Auth_Controller
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
 		$this->load->model('person/adresse_model', 'AdresseModel');
-		$this->load->model('person/Kennzeichen_model', 'KennzeichenModel');
 
 		// Loads libraries
 		$this->load->library('PersonLogLib');
 		$this->load->library('WidgetLib');
-		$this->load->library('AkteLib');
 
 		$this->load->config('infocenter');
 
@@ -457,7 +452,8 @@ class InfoCenter extends Auth_Controller
 
 		if (isset($akte_id) && isset($person_id))
 		{
-			$akte = $this->aktelib->getByAkteId($akte_id);
+			$this->load->library('AkteLib');
+			$akte = $this->aktelib->get($akte_id);
 
 			if (hasData($akte))
 			{
@@ -1173,6 +1169,8 @@ class InfoCenter extends Auth_Controller
 	 */
 	public function outputAkteContent($akte_id)
 	{
+		$this->load->library('DmsLib');
+
 		$akte = $this->AkteModel->load($akte_id);
 
 		if (isError($akte))
@@ -1180,7 +1178,7 @@ class InfoCenter extends Auth_Controller
 			show_error(getError($akte));
 		}
 
-		$aktecontent = $this->aktelib->getByAkteId($akte_id);
+		$aktecontent = $this->dmslib->getAkteContent($akte_id);
 
 		if (isError($aktecontent))
 		{
@@ -1454,100 +1452,6 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Done!");
 	}
-
-	public function getAbsageData()
-	{
-		$stg_typ = $this->getStudienArtBerechtigung(['b', 'm']);
-
-		if (!is_null($stg_typ))
-		{
-			$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
-			$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
-			$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(array_column($stg_typ, 'typ'), $studienSemester);
-
-			$data = array (
-				'statusgruende' => $statusgruende,
-				'studiengaenge' => $studiengaenge->retval
-			);
-
-			$this->outputJsonSuccess($data);
-		}
-		else
-			$this->outputJsonSuccess(null);
-	}
-
-	public function getStudienArtBerechtigung($typ = null)
-	{
-		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
-		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, $typ);
-		return getData($stg_typ);
-	}
-
-	public function getStudienartData()
-	{
-		$this->outputJsonSuccess($this->getStudienArtBerechtigung(['b', 'm', 'l']));
-	}
-
-	public function saveAbsageForAll()
-	{
-		$statusgrund = $this->input->post('statusgrund');
-		$studiengang = $this->input->post('studiengang');
-		$abgeschickt = $this->input->post('abgeschickt');
-		$personen = $this->input->post('personen');
-		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
-
-		if ($statusgrund === 'null' || $studiengang === 'null' || $abgeschickt === 'null' || empty($personen))
-			$this->terminateWithJsonError("Bitte füllen Sie alle Felder aus");
-
-		if ($studiengang === 'all' && $abgeschickt === 'all')
-		{
-			foreach($personen as $person)
-			{
-				$prestudenten = $this->PrestudentModel->getByPersonWithoutLehrgang($person, $studienSemester);
-
-				if (!hasData($prestudenten))
-					continue;
-
-				$prestudentenData = getData($prestudenten);
-
-				foreach ($prestudentenData as $prestudent)
-				{
-					$this->saveAbsage($prestudent->prestudent_id, $statusgrund);
-				}
-			}
-		}
-		else
-		{
-			$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-
-			$this->StudienplanModel->addSelect('1');
-			$this->StudienplanModel->addJoin('lehre.tbl_studienordnung so', 'studienordnung_id');
-			$escaped = $this->StudienplanModel->db->escape(strtoupper($studiengang));
-			$this->StudienplanModel->db->where("UPPER(so.studiengangkurzbzlang || ':' || tbl_studienplan.orgform_kurzbz) = $escaped");
-			$this->StudienplanModel->addLimit(1);
-			$studiengangResult = $this->StudienplanModel->load();
-
-			if (hasData($studiengangResult))
-			{
-				foreach($personen as $person)
-				{
-					$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt, $abgeschickt === 'all');
-
-					if (!hasData($prestudent))
-						continue;
-
-					$prestudentData = getData($prestudent);
-					$this->saveAbsage($prestudentData[0]->prestudent_id, $statusgrund);
-				}
-			}
-			else
-				$this->terminateWithJsonError("Falschen Studiengang übergeben!");
-
-		}
-
-		$this->outputJsonSuccess("Success");
-	}
-
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -2042,17 +1946,6 @@ class InfoCenter extends Auth_Controller
 			show_error(getError($user_person));
 		}
 
-		// add info about first electronig onboarding login
-		$this->KennzeichenModel->addSelect('insertamum');
-		$onboarding_first_login = $this->KennzeichenModel->loadWhere(
-			array('person_id' => $person_id, 'kennzeichentyp_kurzbz' => self::ONBOARDING_KENNZEICHENTYP)
-		);
-
-		if (isError($onboarding_first_login))
-		{
-			show_error(getError($onboarding_first_login));
-		}
-
 		$data = array (
 			'lockedby' => $lockedby,
 			'lockedbyother' => $lockedbyother,
@@ -2062,9 +1955,7 @@ class InfoCenter extends Auth_Controller
 			'messages' => $messages->retval,
 			'logs' => $logs,
 			'notizen' => $notizen->retval,
-			'notizenbewerbung' => $notizen_bewerbung->retval,
-			'created_by_onboarding' => $stammdaten->retval->insertvon == self::ONBOARDING_INSERTVON,
-			'onboarding_first_login' => hasData($onboarding_first_login) ? getData($onboarding_first_login)[0]->insertamum : null
+			'notizenbewerbung' => $notizen_bewerbung->retval
 		);
 
 		return $data;
@@ -2484,5 +2375,97 @@ class InfoCenter extends Auth_Controller
 			$this->loglib->logError('Studiengang has no mail for sending Freigabe mail');
 		}
 	}
-}
 
+	public function getAbsageData()
+	{
+		$stg_typ = $this->getStudienArtBerechtigung(['b', 'm']);
+
+		if (!is_null($stg_typ))
+		{
+			$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
+			$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
+			$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(array_column($stg_typ, 'typ'), $studienSemester);
+
+			$data = array (
+				'statusgruende' => $statusgruende,
+				'studiengaenge' => $studiengaenge->retval
+			);
+
+			$this->outputJsonSuccess($data);
+		}
+		else
+			$this->outputJsonSuccess(null);
+	}
+
+	public function getStudienArtBerechtigung($typ = null)
+	{
+		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
+		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, $typ);
+		return getData($stg_typ);
+	}
+
+	public function getStudienartData()
+	{
+		$this->outputJsonSuccess($this->getStudienArtBerechtigung(['b', 'm', 'l']));
+	}
+
+	public function saveAbsageForAll()
+	{
+		$statusgrund = $this->input->post('statusgrund');
+		$studiengang = $this->input->post('studiengang');
+		$abgeschickt = $this->input->post('abgeschickt');
+		$personen = $this->input->post('personen');
+		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
+
+		if ($statusgrund === 'null' || $studiengang === 'null' || $abgeschickt === 'null' || empty($personen))
+			$this->terminateWithJsonError("Bitte füllen Sie alle Felder aus");
+
+		if ($studiengang === 'all' && $abgeschickt === 'all')
+		{
+			foreach($personen as $person)
+			{
+				$prestudenten = $this->PrestudentModel->getByPersonWithoutLehrgang($person, $studienSemester);
+
+				if (!hasData($prestudenten))
+					continue;
+
+				$prestudentenData = getData($prestudenten);
+
+				foreach ($prestudentenData as $prestudent)
+				{
+					$this->saveAbsage($prestudent->prestudent_id, $statusgrund);
+				}
+			}
+		}
+		else
+		{
+			$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+			$this->StudienplanModel->addSelect('1');
+			$this->StudienplanModel->addJoin('lehre.tbl_studienordnung so', 'studienordnung_id');
+			$escaped = $this->StudienplanModel->db->escape(strtoupper($studiengang));
+			$this->StudienplanModel->db->where("UPPER(so.studiengangkurzbzlang || ':' || tbl_studienplan.orgform_kurzbz) = $escaped");
+			$this->StudienplanModel->addLimit(1);
+			$studiengangResult = $this->StudienplanModel->load();
+
+			if (hasData($studiengangResult))
+			{
+				foreach($personen as $person)
+				{
+					$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt, $abgeschickt === 'all');
+
+					if (!hasData($prestudent))
+						continue;
+
+					$prestudentData = getData($prestudent);
+					$this->saveAbsage($prestudentData[0]->prestudent_id, $statusgrund);
+				}
+			}
+			else
+				$this->terminateWithJsonError("Falschen Studiengang übergeben!");
+
+		}
+
+		$this->outputJsonSuccess("Success");
+	}
+}

application/controllers/system/infocenter/Rueckstellung.php

@@ -7,8 +7,6 @@ class Rueckstellung extends Auth_Controller
 	private $_ci; // Code igniter instance
 	private $_uid;
 
-	const ZGV_UEBERPRUEFUNG_MAIL_VORLAGE = 'ZGVUEP';
-
 	public function __construct()
 	{
 		parent::__construct(
@@ -25,7 +23,6 @@ class Rueckstellung extends Auth_Controller
 		$this->load->model('crm/RueckstellungStatus_model', 'RueckstellungStatusModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->library('PersonLogLib');
-		$this->load->library('MessageLib');
 
 		$this->_setAuthUID(); // sets property uid
 		
@@ -81,8 +78,6 @@ class Rueckstellung extends Auth_Controller
 		
 		$this->_log($person_id, $status_kurzbz);
 
-		if  ($status_kurzbz === 'onhold_zgv')
-			$this->sendRueckstellungMessage($person_id);
 		$this->outputJson($result);
 	}
 
@@ -109,10 +104,6 @@ class Rueckstellung extends Auth_Controller
 			if (isError($result))
 				$this->terminateWithJsonError(getError($result));
 			$this->_log($person, $status_kurzbz);
-
-			if  ($status_kurzbz === 'onhold_zgv')
-				$this->sendRueckstellungMessage($person);
-
 		}
 		$this->outputJsonSuccess("Erfolgreich gespeichert!");
 	}
@@ -169,26 +160,4 @@ class Rueckstellung extends Auth_Controller
 			$this->_uid
 		);
 	}
-
-	private function sendRueckstellungMessage($person_id)
-	{
-		$person = $this->_ci->PersonModel->load($person_id);
-
-		if (hasData($person))
-		{
-			$person = getData($person)[0];
-
-			return $this->messagelib->sendMessageUserTemplate(
-				$person_id,
-				self::ZGV_UEBERPRUEFUNG_MAIL_VORLAGE,
-				array(
-					'anrede' => $person->anrede,
-					'nachname' => $person->nachname
-				),
-				null,
-				getAuthPersonId(),
-				'infocenter'
-			);
-		}
-	}
 }

application/core/FHC_Controller.php

@@ -136,77 +136,37 @@ abstract class FHC_Controller extends CI_Controller
 	/**
 	 * To download the given file represented by the fileObj parameter.
 	 * fileObj has the following structure:
-	 * 	$fileObj->file OR $fileObj->file_content
+	 * 	$fileObj->filename
+	 * 	$fileObj->file
 	 * 	$fileObj->name
 	 * 	$fileObj->mimetype
-	 * 	$fileObj->disposition (inline OR attachment)
+	 * 	$fileObj->disposition
 	 */
 	protected function outputFile($fileObj)
 	{
 		// If the file exists
-		if ((isset($fileObj->file) && !isEmptyString($fileObj->file) && file_exists($fileObj->file))
-		|| (isset($fileObj->file_content) && !isEmptyString($fileObj->file_content)))
+		if (isset($fileObj->file) && !isEmptyString($fileObj->file) && file_exists($fileObj->file))
 		{
-			$content_length = 0;
-
-			// If file content has been provided
-			if (isset($fileObj->file_content) && !isEmptyString($fileObj->file_content))
-			{
-				$content_length = strlen($fileObj->file_content);
-			}
-			else // otherwise the path + name of the file
-			{
-				$content_length = filesize($fileObj->file);
-			}
-
 			header('Content-Description: File Transfer');
 			header('Content-Type: '. $fileObj->mimetype);
-			header('Content-Length: ' . $content_length);
-			header('Content-Transfer-Encoding: binary');
-			header('Content-Disposition: '. $fileObj->disposition. '; filename="'. $fileObj->name. '"');
-			header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
-			header('Expires: ' . date("D, d M Y H:i:s", time()));
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
 			header('Pragma: public');
+			header('Content-Length: ' . filesize($fileObj->file));
 
-			// Clean the output buffer
-			flush();
-
-			// If file content has been provided
-			if (isset($fileObj->file_content) && !isEmptyString($fileObj->file_content))
+			if (isset($fileObj->disposition)
+				&& ($fileObj->disposition == 'inline' || $fileObj->disposition == 'attachment'))
 			{
-				echo $fileObj->file_content;
-			}
-			else // otherwise get the content from file system
-			{
-				readfile($fileObj->file);
+				header('Content-Disposition: '. $fileObj->disposition. '; filename="'. $fileObj->name. '"');
 			}
 
-			// Terminate the execution
-			exit();
+			readfile($fileObj->file); // reads the file content to the output buffer
+		}
+		else
+		{
+			// Otherwise print an error
+			show_error('The provided file does not exist: '.(isset($fileObj->file) ? $fileObj->file : 'file not given'));
 		}
-
-		// Otherwise return an error
-		show_error('The provided file does not exist or file content is empty');
-	}
-
-	/**
-	 *
-	 */
-	protected function outputImageByContent($mimetype, $file_content)
-	{
-		if (isEmptyString($file_content)) show_error('The provided file content is not valid');
-
-		$this->_outputImage($mimetype, $file_content);
-	}
-
-	/**
-	 *
-	 */
-	protected function outputImageByFile($mimetype, $file_name)
-	{
-		if (!file_exists($file_name)) show_error('The provided file does not exist');
-
-		$this->_outputImage($mimetype, null, $file_name);
 	}
 
 	/**
@@ -218,29 +178,6 @@ abstract class FHC_Controller extends CI_Controller
 		return json_decode($this->input->raw_input_stream);
 	}
 
-	/**
-	 * Utility function to upload a file
-	 * - post_field_name: the name of the field in the HTTP POST payload, this is also the index in the super global $_FILES array
-	 * - allowed_types: a list of file extensions that are allowed to be uploaded (ex. array('pdf', 'odt') or array('jpg', 'jpeg', 'gif')
-	 */
-	protected function uploadFile($post_field_name, $allowed_types = array('*'))
-	{
-		$this->load->library(
-			'upload',
-			array(
-				'upload_path' => sys_get_temp_dir(),
-				'allowed_types' => $allowed_types,
-				'overwrite' => true
-			)
-		);
-
-		// If the upload was a success then return the uploaded file info
-		if ($this->upload->do_upload($post_field_name)) return success($this->upload->data());
-
-		// If an error occurred then return it without tags
-		return error($this->upload->display_errors('', ''));
-	}
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -256,44 +193,5 @@ abstract class FHC_Controller extends CI_Controller
 			show_error('This web site cannot work correctly without the HTTPS protocol enabled');
 		}
 	}
-
-	/**
-	 *
-	 */
-	private function _outputImage($mimetype, $file_content = null, $file_name = null)
-	{
-		$content_length = 0;
-
-		// If file content has been provided
-		if ($file_content != null)
-		{
-			$content_length = strlen($file_content);
-		}
-		else // otherwise the path + name of the file
-		{
-			$content_length = filesize($file_name);
-		}
-
-		header('Content-Type: '. $mimetype);
-		header('Content-Length: ' . $content_length);
-		header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
-		header('Expires: ' . date("D, d M Y H:i:s", time()));
-
-		// Clean the output buffer
-		flush();
-
-		// If file content has been provided
-		if ($file_content != null)
-		{
-			echo $file_content;
-		}
-		else // otherwise get the content from file system
-		{
-			readfile($file_name);
-		}
-
-		// Terminate the execution
-		exit();
-	}
 }
 

application/core/ICollisionCheck.php

@@ -0,0 +1,10 @@
+<?php
+interface ICollisionCheck
+{
+	public function getName();
+
+	public function check($data);
+
+	public function checkAll($kalender_ids);
+
+}

application/core/Notiz_Controller.php

@@ -196,39 +196,26 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$dms_id_arr = [];
 		foreach ($_FILES as $k => $file)
 		{
+			$dms = array(
+				'kategorie_kurzbz'  => 'notiz',
+				'version'           => 0,
+				'name'              => $file["name"],
+				'mimetype'          => $file["type"],
+				'insertamum'        => date('c'),
+				'insertvon'         => $uid
+			);
+
 			//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
 			//Todo(manu)check name files: nicht gleiches file 2mal hochladen
 			//Todo define in dms component: readFile, downloadFile
-			$uploadDataResult = $this->uploadFile($k);
-			if (isError($uploadDataResult))
+			$result = $this->dmslib->upload($dms, $k, ['*']);
+			/*			$result = $this->dmslib->upload($dms, $k, ['application/pdf','application/x.fhc-dms+json']);*/
+			if (isError($result))
 			{
 				$this->db->trans_rollback();
-				$this->terminateWithError(getError($uploadDataResult), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
-			if (!hasData($uploadDataResult))
-			{
-				$this->db->trans_rollback();
-				$this->terminateWithError('Upload failed', self::ERROR_TYPE_GENERAL);
-			}
-
-			// Add file to the DMS (DB + file system)
-			$addResult = $this->dmslib->add(
-				getData($uploadDataResult)['file_name'],
-				getData($uploadDataResult)['file_type'],
-				fopen(getData($uploadDataResult)['full_path'], 'r'),
-				'notiz', // kategorie_kurzbz
-				null, // dokument_kurzbz
-				null, // beschreibung
-				false, // cis_suche
-				null, // schlagworte
-				getAuthUID() // insertvon
-			);
-
-			// If error occurred
-			if (isError($addResult) || !hasData($addResult))
-				$this->terminateWithError(getError($addResult), self::ERROR_TYPE_GENERAL);
-
-			$dms_id_arr[] = getData($addResult)->dms_id;
+			$dms_id_arr[] = $result->retval['dms_id'];
 		}
 
 		//save entry in Notizdokument
@@ -332,40 +319,22 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			}
 			else
 			{
+				$dms = array(
+					'kategorie_kurzbz'  => 'notiz',
+					'version'           => 0,
+					'name'              => $file["name"],
+					'mimetype'          => $file["type"],
+					'insertamum'        => date('c'),
+					'insertvon'         => $uid
+				);
+
 				//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
 				//Todo(manu)check name files: nicht gleiches file 2mal hochladen
 				//Todo define in dms component: readFile, downloadFile
-				$uploadDataResult = $this->uploadFile($k);
-				if (isError($uploadDataResult))
-				{
-					$this->db->trans_rollback();
-					$this->terminateWithError(getError($uploadDataResult), self::ERROR_TYPE_GENERAL);
-				}
-				if (!hasData($uploadDataResult))
-				{
-					$this->db->trans_rollback();
-					$this->terminateWithError('Upload failed', self::ERROR_TYPE_GENERAL);
-				}
+				$result = $this->dmslib->upload($dms, $k, array('*'));
 
-				// Add file to the DMS (DB + file system)
-				$addResult = $this->dmslib->add(
-					getData($uploadDataResult)['file_name'],
-					getData($uploadDataResult)['file_type'],
-					fopen(getData($uploadDataResult)['full_path'], 'r'),
-					'notiz', // kategorie_kurzbz
-					null, // dokument_kurzbz
-					null, // beschreibung
-					false, // cis_suche
-					null, // schlagworte
-					getAuthUID() // insertvon
-				);
-
-				// If error occurred
-				if (isError($addResult) || !hasData($addResult))
-					$this->terminateWithError(getError($addResult), self::ERROR_TYPE_GENERAL);
-
-				$addResult = $this->getDataOrTerminateWithError($addResult);
-				$dms_id = $addResult['dms_id'];
+				$result = $this->getDataOrTerminateWithError($result);
+				$dms_id = $result['dms_id'];
 
 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $post_data['notiz_id'], 'dms_id' => $dms_id));
 

application/core/Tag_Controller.php

@@ -7,7 +7,7 @@ class Tag_Controller extends FHCAPI_Controller
 {
 	private $_uid;
 
-	const BERECHTIGUNG_KURZBZ = ['admin:rw'];
+	const BERECHTIGUNG_KURZBZ = 'admin:rw';
 
 	public function __construct($permissions)
 	{
@@ -15,11 +15,10 @@ class Tag_Controller extends FHCAPI_Controller
 			'getTag' => self::BERECHTIGUNG_KURZBZ,
 			'getTags' => self::BERECHTIGUNG_KURZBZ,
 			'addTag' => self::BERECHTIGUNG_KURZBZ,
+
 			'updateTag' => self::BERECHTIGUNG_KURZBZ,
 			'doneTag' => self::BERECHTIGUNG_KURZBZ,
 			'deleteTag' => self::BERECHTIGUNG_KURZBZ,
-			'getAllTags' => self::BERECHTIGUNG_KURZBZ,
-			'rebuildTagsForTypeId' => self::BERECHTIGUNG_KURZBZ,
 		];
 
 		$merged_permissions = array_merge($default_permissions, $permissions);
@@ -27,10 +26,6 @@ class Tag_Controller extends FHCAPI_Controller
 		parent::__construct($merged_permissions);
 
 		$this->_setAuthUID();
-
-		// Library
-		$this->load->library('TagLib');
-
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -44,7 +39,7 @@ class Tag_Controller extends FHCAPI_Controller
 	{
 		$language = $this->_getLanguageIndex();
 		$index_bezeichnung_mehrsprachig = $language - 1;
-
+		
 		$id = $this->input->get('id');
 
 		if (is_array($readonly_tags) && !isEmptyArray($readonly_tags))
@@ -69,18 +64,14 @@ class Tag_Controller extends FHCAPI_Controller
 		$this->NotizModel->addSelect(
 			"tbl_notiz.titel, 
 			tbl_notiz.text, 
-			array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $index_bezeichnung_mehrsprachig . " as bezeichnung,
+			array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $index_bezeichnung_mehrsprachig. " as bezeichnung,
 			tbl_notiz.notiz_id,
 			tbl_notiz_typ.style,
-			tbl_notiz_typ.automatisiert,
-			tbl_notiz_typ.prioritaet,
 			tbl_notiz.erledigt as done,
 			tbl_notiz.insertamum,
 			tbl_notiz.updateamum,
 			(verfasserperson.vorname || ' ' || verfasserperson.nachname || ' ' || '(' || verfasserbenutzer.uid || ')') as verfasser,
-			(bearbeiterperson.vorname || ' ' || bearbeiterperson.nachname || ' ' || '(' || bearbeiterbenutzer.uid || ')') as bearbeiter,
-			tbl_notiz.start,
-			tbl_notiz.ende
+			(bearbeiterperson.vorname || ' ' || bearbeiterperson.nachname || ' ' || '(' || bearbeiterbenutzer.uid || ')') as bearbeiter
 			"
 		);
 		$this->NotizModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
@@ -93,7 +84,6 @@ class Tag_Controller extends FHCAPI_Controller
 
 		$notiz = $this->NotizModel->loadWhere(array('notiz_id' => $id));
 
-
 		$this->terminateWithSuccess(hasData($notiz) ? getData($notiz)[0] : array());
 	}
 
@@ -103,14 +93,12 @@ class Tag_Controller extends FHCAPI_Controller
 		$index_bezeichnung_mehrsprachig = $language - 1;
 
 		$this->NotiztypModel->addSelect(
-			"typ_kurzbz as tag_typ_kurzbz,
-			array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $index_bezeichnung_mehrsprachig . " as bezeichnung,
+			'typ_kurzbz as tag_typ_kurzbz,
+			array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $index_bezeichnung_mehrsprachig. ' as bezeichnung,
 			style,
 			beschreibung,
-			tag,
-			automatisiert,
-			prioritaet
-			"
+			tag
+			'
 		);
 		$this->NotiztypModel->addOrder('prioritaet');
 
@@ -123,7 +111,36 @@ class Tag_Controller extends FHCAPI_Controller
 		$notiztypen = $this->NotiztypModel->loadWhere(array('aktiv' => true));
 		$this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
 	}
+	public function getTagsByAssignmentTypeValue($zuordnung_typ, $zuordnung_id, $tags = null)
+	{
+		$language = $this->_getLanguageIndex();
+		$index_bezeichnung_mehrsprachig = $language - 1;
 
+		$this->NotizzuordnungModel->addSelect(
+			'tbl_notizzuordnung.notiz_id as notiz_id,
+			typ_kurzbz as tag_typ_kurzbz,
+			array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $index_bezeichnung_mehrsprachig. ' as bezeichnung,
+			style,
+			beschreibung,
+			tag,
+			tbl_notiz.erledigt as done
+			'
+		);
+		
+		if (is_array($tags) && !isEmptyArray($tags))
+		{
+			$tags = $this->_filterTag($tags, false);
+			$this->NotizzuordnungModel->db->where_in('tbl_notiz_typ.typ_kurzbz', $tags);
+		}
+
+		$this->NotizzuordnungModel->addJoin('public.tbl_notiz', 'public.tbl_notizzuordnung.notiz_id = public.tbl_notiz.notiz_id');
+		$this->NotizzuordnungModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
+
+		$this->NotizzuordnungModel->addOrder('prioritaet');
+
+		$notiztypen = $this->NotizzuordnungModel->loadWhere(array('aktiv' => true, $zuordnung_typ => $zuordnung_id));
+		$this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
+	}
 	public function addTag($withZuordnung = true, $updatable_tags = null)
 	{
 		$postData = $this->getPostJson();
@@ -143,7 +160,7 @@ class Tag_Controller extends FHCAPI_Controller
 			if (!in_array($postData->tag_typ_kurzbz, $tags))
 				$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
 		}
-
+		
 		if ($withZuordnung)
 		{
 			$return = array();
@@ -152,7 +169,7 @@ class Tag_Controller extends FHCAPI_Controller
 				$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
 
 			$values = array_unique($postData->values);
-
+			
 			foreach ($values as $value)
 			{
 				$insertResult = $this->addNotiz($postData);
@@ -288,90 +305,6 @@ class Tag_Controller extends FHCAPI_Controller
 		$this->terminateWithSuccess($deleteNotiz);
 	}
 
-	public function getAllTags($readonly_tags = false)
-	{
-		$language = $this->_getLanguageIndex();
-		$index_bezeichnung_mehrsprachig = $language - 1;
-		$prestudent_id = $this->input->get('prestudent_id');
-
-		if (is_array($readonly_tags) && !isEmptyArray($readonly_tags))
-		{
-			$readonly_tags = $this->_filterTag($readonly_tags, true);
-
-			foreach ($readonly_tags as $key => $tag)
-			{
-				$readonly_tags[$key] = $this->NotizModel->db->escape($tag);
-			}
-			$tags = '(' . implode(',', $readonly_tags) . ')';
-
-			$this->NotizModel->addSelect("
-						CASE
-							WHEN tbl_notiz_typ.typ_kurzbz IN $tags
-							THEN TRUE
-							ELSE FALSE
-						END as readonly
-					");
-		}
-		$this->NotizModel->addSelect(
-			"tbl_notiz.titel,
-			tbl_notiz.text,
-			array_to_json(bezeichnung_mehrsprachig::varchar[])->>". $index_bezeichnung_mehrsprachig . " as bezeichnung,
-			tbl_notiz.notiz_id,
-			tbl_notiz_typ.style,
-			tbl_notiz_typ.automatisiert,
-			tbl_notiz_typ.prioritaet,
-			tbl_notiz.erledigt as done,
-			tbl_notiz.insertamum,
-			tbl_notiz.updateamum,
-			(verfasserperson.vorname || ' ' || verfasserperson.nachname || ' ' || '(' || verfasserbenutzer.uid || ')') as verfasser,
-			(bearbeiterperson.vorname || ' ' || bearbeiterperson.nachname || ' ' || '(' || bearbeiterbenutzer.uid || ')') as bearbeiter,
-			tbl_notiz.start,
-			tbl_notiz.ende
-			"
-		);
-		$this->NotizModel->addJoin('public.tbl_notiz_typ', 'public.tbl_notiz.typ = public.tbl_notiz_typ.typ_kurzbz');
-
-		$this->NotizModel->addJoin('public.tbl_benutzer verfasserbenutzer', 'tbl_notiz.verfasser_uid = verfasserbenutzer.uid', 'LEFT');
-		$this->NotizModel->addJoin('public.tbl_person verfasserperson', 'verfasserbenutzer.person_id = verfasserperson.person_id', 'LEFT');
-
-		$this->NotizModel->addJoin('public.tbl_benutzer bearbeiterbenutzer', 'tbl_notiz.bearbeiter_uid = bearbeiterbenutzer.uid', 'LEFT');
-		$this->NotizModel->addJoin('public.tbl_person bearbeiterperson', 'bearbeiterbenutzer.person_id = bearbeiterperson.person_id', 'LEFT');
-
-		$this->NotizModel->addJoin('public.tbl_notizzuordnung notizzuordnung', 'tbl_notiz.notiz_id = notizzuordnung.notiz_id');
-
-		$this->NotizModel->addOrder('done');
-		$this->NotizModel->addOrder('tbl_notiz_typ.prioritaet');
-		$notiz = $this->NotizModel->loadWhere(array('prestudent_id' => $prestudent_id));
-
-
-		$this->terminateWithSuccess(hasData($notiz) ? getData($notiz) : array());
-	}
-
-	public function rebuildTagsForTypeId()
-	{
-		$ids = $this->input->post('ids');
-		$typeId = $this->input->post('typeId');
-		$semester = $this->input->post('sem');
-
-		$idsSuccess = [];
-		$idsError = [];
-		$outputResult = [];
-
-		foreach ($ids as $id)
-		{
-			$result = $this->taglib->rebuildTagsForTypeId($typeId, $id, $semester);
-
-			if (isError($result))
-				$idsError[] = $id;
-			else
-				$idsSuccess[] = $id;
-
-			$outputResult[] = $result;
-		}
-
-		$this->terminateWithSuccess([$outputResult, $idsSuccess, $idsError]);
-	}
-
 	private function _setAuthUID()
 	{
 		$this->_uid = getAuthUID();
@@ -412,4 +345,4 @@ class Tag_Controller extends FHCAPI_Controller
 		));
 	}
 
-}
+}

application/helpers/hlp_common_helper.php

@@ -418,10 +418,10 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
 if (!function_exists('array_is_list')) {
     function array_is_list(array $arr)
     {
-	if ($arr === []) {
-	    return true;
-	}
-	return array_keys($arr) === range(0, count($arr) - 1);
+        if ($arr === []) {
+            return true;
+        }
+        return array_keys($arr) === range(0, count($arr) - 1);
     }
 }
 
@@ -570,3 +570,13 @@ function buildDropdownEntryPrintArray($id, $name, $parameterurl, $uid=null, $ord
 		];
 
 }
+
+function generateUUID()
+{
+	$data = openssl_random_pseudo_bytes(16);
+
+	$data[6] = chr(ord($data[6]) & 0x0f | 0x40);
+	$data[8] = chr(ord($data[8]) & 0x3f | 0x80);
+
+	return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
+}

application/helpers/hlp_document_helper.php

@@ -1,188 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Helper function to generate the default documentslist config for the
- * grades tab.
- *
- * The resulting array consists of elements which are associative arrays
- * that can have the following entries:
- * title			(required) on the first level this can be HTML code.
- * permissioncheck	(optional) an URL to an FHCAPI endpoint which returns
- * 						true or false.
- * link				(optional) an URL that will be called if "action" and
- * 						"children" are not defined.
- * action			(optional) an associative array that describes an
- * 						POST action that will be called if "children" is
- * 						not defined.
- * 						It can have the following entries:
- * - url			(required) an URL to an FHCAPI endpoint.
- * - post			(optional) an associative array with the POST data to
- * 						be sent.
- * - response		(optional) a string that will be displayed on success.
- * children			(optional) an array of child elements
- *
- * All strings that start with { and end with } in the URLs and the
- * actions post parameter will be replaced with the corresponding
- * attribute of the current dataset (e.G: {uid} will be replaced with the
- * uid of the current dataset)
- *
- * @return array
- */
-function gradesDocumentsList()
-{
-	$ci =& get_instance();
-	$ci->load->library('PhrasesLib', array('stv'), 'p');
-
-	$permissioncheck = site_url("api/frontend/v1/documents/permissionAlternativeFormat/{studiengang_kz}");
-
-	$title_ger = $ci->p->t("global", "deutsch");
-	$title_eng = $ci->p->t("global", "englisch");
-	$title_ff = $ci->p->t("stv", "document_certificate");
-	$title_lv = $ci->p->t("stv", "document_coursecertificate");
-
-	$link_ff = "documents/export/" .
-		"zertifikat.rdf.php/" .
-		"Zertifikat" .
-		"?stg_kz={studiengang_kz_lv}" .
-		"&uid={uid}" .
-		"&ss={studiensemester_kurzbz}" .
-		"&lvid={lehrveranstaltung_id}";
-	$link_lv_ger = "documents/export/" .
-		"lehrveranstaltungszeugnis.rdf.php/" .
-		"LVZeugnis" .
-		"?stg_kz={studiengang_kz}" .
-		"&uid={uid}" .
-		"&ss={studiensemester_kurzbz}" .
-		"&lvid={lehrveranstaltung_id}";
-	$link_lv_eng = "documents/export/" .
-		"lehrveranstaltungszeugnis.rdf.php/" .
-		"LVZeugnisEng" .
-		"?stg_kz={studiengang_kz}" .
-		"&uid={uid}" .
-		"&ss={studiensemester_kurzbz}" .
-		"&lvid={lehrveranstaltung_id}";
-
-	$archive_url = "api/frontend/v1/documents/archiveSigned";
-	$archive_response = $ci->p->t("stv", "document_signed_and_archived");
-	$archive_post_ff = [
-		"xml" => "zertifikat.rdf.php",
-		"xsl" => "Zertifikat",
-		"stg_kz" => "{studiengang_kz_lv}",
-		"uid" => "{uid}",
-		"ss" => "{studiensemester_kurzbz}",
-		"lvid" => "{lehrveranstaltung_id}"
-	];
-	$archive_post_lv_ger = [
-		"xml" => "lehrveranstaltungszeugnis.rdf.php",
-		"xsl" => "LVZeugnis",
-		"stg_kz" => "{studiengang_kz}",
-		"uid" => "{uid}",
-		"ss" => "{studiensemester_kurzbz}",
-		"lvid" => "{lehrveranstaltung_id}"
-	];
-	$archive_post_lv_eng = [
-		"xml" => "lehrveranstaltungszeugnis.rdf.php",
-		"xsl" => "LVZeugnisEng",
-		"stg_kz" => "{studiengang_kz}",
-		"uid" => "{uid}",
-		"ss" => "{studiensemester_kurzbz}",
-		"lvid" => "{lehrveranstaltung_id}"
-	];
-
-	$list = [
-		[
-			'title' => '<i class="fa fa-download" title="' . $ci->p->t("stv", "document_download") . '"></i>',
-			'children' => [
-				[
-					'title' => $title_ff,
-					'link' => site_url($link_ff)
-				],
-				[
-					'title' => $title_lv,
-					'children' => [
-						[
-							'title' => $title_ger,
-							'link' => site_url($link_lv_ger),
-							'children' => [
-								[
-									'title' => 'PDF',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_ger)
-								],
-								[
-									'title' => 'DOC',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_ger . "&output=doc")
-								],
-								[
-									'title' => 'ODT',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_ger . "&output=odt")
-								]
-							]
-						],
-						[
-							'title' => $title_eng,
-							'link' => site_url($link_lv_eng),
-							'children' => [
-								[
-									'title' => 'PDF',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_eng)
-								],
-								[
-									'title' => 'DOC',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_eng . "&output=doc")
-								],
-								[
-									'title' => 'ODT',
-									'permissioncheck' => $permissioncheck,
-									'link' => site_url($link_lv_eng . "&output=odt")
-								]
-							]
-						]
-					]
-				]
-			]
-		],
-		[
-			'title' => '<i class="fas fa-archive" title="' . $ci->p->t("stv", "document_archive") . '"></i>',
-			'children' => [
-				[
-					'title' => $title_ff,
-					'action' => [
-						'url' => site_url($archive_url),
-						'post' => $archive_post_ff,
-						'response' => $archive_response
-					]
-				],
-				[
-					'title' => $title_lv,
-					'children' => [
-						[
-							'title' => $title_ger,
-							'action' => [
-								'url' => site_url($archive_url),
-								'post' => $archive_post_lv_ger,
-								'response' => $archive_response
-							]
-						],
-						[
-							'title' => $title_eng,
-							'action' => [
-								'url' => site_url($archive_url),
-								'post' => $archive_post_lv_eng,
-								'response' => $archive_response
-							]
-						]
-					]
-				]
-			]
-		]
-	];
-
-	return $list;
-}

application/helpers/hlp_header_helper.php

@@ -111,8 +111,7 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 		'theme' => [
 			'name'=>$ci->config->item('theme_name'),
 			'modes'=>$ci->config->item('theme_modes'),
-		],
-		'domain' => DOMAIN
+		]
 	);
 
 	$toPrint = "\n";
@@ -271,28 +270,6 @@ function absoluteJsImportUrl($relurl)
 	return $url;
 }
 
-/*
- * Generate Css File Include if Extension contains file
- *
- * @param $relativeFilePath path relative to Extension public/css dir
- */
-function generateCSSsIncludeIfExtensionCssExists($relativeFilePath)
-{
-	$fsiterator = new FilesystemIterator(FHCPATH . 'application/extensions');
-	foreach ($fsiterator as $fsitem)
-	{
-		if(preg_match('/^FHC-Core-/', $fsitem->getBasename()))
-		{
-			$extensionfile = 'public/extensions/' . $fsitem->getBasename() 
-				. '/css/' . $relativeFilePath;
-			if(is_readable(FHCPATH . $extensionfile))
-			{
-				generateCSSsInclude($extensionfile);
-			}
-		}
-	}
-}
-
 /*
  * Manipulate CI views includes Array to load
  *   - public/js/FhcApps.js via customJSs and

application/libraries/AkteLib.php

@@ -1,21 +1,12 @@
 <?php
 
-/* Copyright (C) 2025 fhcomplete.net
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+/**
+ * FH-Complete
  *
+ * @package             FHC-Helper
+ * @author              FHC-Team
+ * @copyright           Copyright (c) 2022 fhcomplete.net
+ * @license             GPLv3
  */
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
@@ -130,32 +121,90 @@ class AkteLib
 	 * Gets akte data and associated dms data by akte Id
 	 * Returns success with akte and dms data or error
 	 */
-	public function getByAkteId($akte_id, $dokument_kurzbz = null, $archiv = null, $signiert = null, $stud_selfservice = null)
+	public function get($akte_id)
 	{
-		return $this->_get(
-			$akte_id,
-			null, // person_id
-			$dokument_kurzbz,
-			$archiv,
-			$signiert,
-			$stud_selfservice
-		);
+		// get Akte data
+		$this->_ci->AkteModel->addSelect('person_id, dokument_kurzbz, mimetype, erstelltam, titel, bezeichnung,
+											gedruckt, uid, dms_id, nachgereicht, nachgereicht_am, anmerkung,
+											ausstellungsnation, formal_geprueft_amum, archiv, signiert,
+											stud_selfservice, akzeptiertamum, insertvon, insertamum, updatevon, updateamum');
+		$this->_ci->AkteModel->load($akte_id);
+		$akteResult = $this->_ci->AkteModel->load($akte_id);
+
+		if (isError($akteResult)) return $akteResult;
+
+		if (!hasData($akteResult)) return error("Akte not found");
+
+		$resultObject = getData($akteResult)[0];
+
+		// set properties with same name in Akte and Dms table
+		$resultObject->akte_mimetype = $resultObject->mimetype;
+
+		// get dms data
+		$dmsResult = $this->_ci->dmslib->getLastVersion($resultObject->dms_id);
+
+		if (isError($dmsResult)) return $dmsResult;
+
+		// properties to retrieve from dms
+		$dmsProperties = array('version', 'filename', 'mimetype', 'name', 'beschreibung', 'cis_suche', 'schlagworte', DmsLib::FILE_CONTENT_PROPERTY);
+
+		// set dms properties
+		if (hasData($dmsResult))
+		{
+			$dmsData = getData($dmsResult);
+
+			foreach ($dmsProperties as $dmsProperty)
+			{
+				$resultObject->{$dmsProperty} = $dmsData->{$dmsProperty};
+			}
+		}
+		else
+		{
+			// set null if no dms result found
+			foreach ($dmsProperties as $dmsProperty)
+			{
+				$resultObject->{$dmsProperty} = null;
+			}
+		}
+
+		// return the object containing akte and dms data
+		return success($resultObject);
 	}
 
 	/**
 	 * Gets Akte data and associated dms data by person Id and dokument_kurzbz
 	 * Returns success with result array with akte and dms data or error
 	 */
-	public function getByPersonId($person_id, $dokument_kurzbz = null, $archiv = null, $signiert = null, $stud_selfservice = null)
+	public function getByPersonIdAndDocumentType($person_id, $dokument_kurzbz)
 	{
-		return $this->_get(
-			null, // akte_id
-			$person_id,
-			$dokument_kurzbz,
-			$archiv,
-			$signiert,
-			$stud_selfservice
+		// load all Akte entries for given person and dokument_kurzbz
+		$this->_ci->AkteModel->addSelect('akte_id');
+		$akteResult = $this->_ci->AkteModel->loadWhere(
+			array(
+				'person_id' => $person_id,
+				'dokument_kurzbz' => $dokument_kurzbz
+			)
 		);
+
+		if (!hasData($akteResult)) return error("Akte not found");
+
+		$akteData = getData($akteResult);
+
+		$resultArr = array();
+
+		// for each found akte entry
+		foreach ($akteData as $akte)
+		{
+			// get dms and akte data from akte Id
+			$getAkteDmsResult = $this->get($akte->akte_id);
+
+			if (isError($getAkteDmsResult)) return $getAkteDmsResult;
+
+			$resultArr[] = getData($getAkteDmsResult);
+		}
+
+		// return all found entries
+		return success($resultArr);
 	}
 
 	/**
@@ -164,184 +213,56 @@ class AkteLib
 	 */
 	public function remove($akte_id)
 	{
-		return $this->_remove($akte_id, null, null);
-	}
-
-	/**
-	 * Removes Akte by $person_id and $dms_id, removes all associated dms entries and versions, and deletes all associated files
-	 * Returns success with removed version numbers or error
-	 */
-	public function removeByPersonIdAndDmsId($person_id, $dms_id)
-	{
-		return $this->_remove(null, $person_id, $dms_id);
-	}
-
-	/**
-	 *
-	 */
-	private function _get($akte_id = null, $person_id = null, $dokument_kurzbz = null, $archiv = null, $signiert = null, $stud_selfservice = null)
-	{
-		$dbModel = new DB_Model();
-
-		$query = 'SELECT akte_id,
-				person_id,
-				dokument_kurzbz,
-				inhalt,
-				CASE WHEN inhalt is not null THEN true ELSE false END as inhalt_vorhanden,
-				mimetype,
-				erstelltam,
-				gedruckt,
-				titel,
-				bezeichnung,
-				updateamum,
-				updatevon,
-				insertamum,
-				insertvon,
-				uid,
-				dms_id,
-				nachgereicht,
-				anmerkung,
-				titel_intern,
-				anmerkung_intern,
-				nachgereicht_am,
-				ausstellungsnation,
-				formal_geprueft_amum,
-				archiv,
-				signiert,
-				stud_selfservice,
-				akzeptiertamum
-			FROM public.tbl_akte
-			WHERE TRUE';
-
-		// Query parameters
-		$paramArray = array();
-
-		// akte_id
-		if (is_numeric($akte_id) || is_array($akte_id))
-		{
-			$paramArray[] = $akte_id;
-			if (is_numeric($akte_id)) $query .= ' AND akte_id = ?';
-			if (is_array($akte_id)) $query .= ' AND akte_id IN ?';
-		}
-
-		// person_id
-		if (is_numeric($person_id) || is_array($person_id))
-		{
-			$paramArray[] = $person_id;
-			if (is_numeric($person_id)) $query .= ' AND person_id = ?';
-			if (is_array($person_id)) $query .= ' AND person_id IN ?';
-		}
-
-		// dokument_kurzbz
-		if (!isEmptyString($dokument_kurzbz))
-		{
-			$paramArray[] = $dokument_kurzbz;
-			$query .= ' AND dokument_kurzbz = ?';
-		}
-
-		// archiv
-		if (is_bool($archiv))
-		{
-			$paramArray[] = $archiv;
-			$query .= ' AND archiv = ?';
-		}
-
-		// signiert
-		if (is_bool($signiert))
-		{
-			$paramArray[] = $signiert;
-			$query .= ' AND signiert = ?';
-		}
-
-		// stud_selfservice
-		if (is_bool($stud_selfservice))
-		{
-			$paramArray[] = $stud_selfservice;
-			$query .= ' AND stud_selfservice = ?';
-		}
-
-		// If no parameters has been provided exit
-		if (isEmptyArray($paramArray)) return error('Called without giving any parameter');
-
-		// Loads data from DB
-		$akteResult = $dbModel->execReadOnlyQuery($query, $paramArray);
-
-		// If error or data not found then exit
-		if (isError($akteResult)) return $akteResult;
-		if (!hasData($akteResult)) return error('Akte not found');
-
-		// For each record from the akte
-		foreach (getData($akteResult) as $resultObject)
-		{
-			// get dms data
-			$dmsResult = $this->_ci->dmslib->getLastVersion($resultObject->dms_id);
-
-			if (isError($dmsResult)) return $dmsResult;
-
-			// properties to retrieve from dms
-			$dmsProperties = array('version', 'filename', 'mimetype', 'name', 'beschreibung', 'cis_suche', 'schlagworte');
-
-			// set dms properties
-			if (hasData($dmsResult))
-			{
-				$dmsData = getData($dmsResult)[0];
-
-				foreach ($dmsProperties as $dmsProperty)
-				{
-					// If the property is _not_ 'mimetype' _or_
-					// If the mimetype from the akte table is null then overwrite it with the one from the DMS
-					if ($dmsProperty != 'mimetype' || ($dmsProperty == 'mimetype' && $resultObject->{$dmsProperty} == null))
-					{
-						$resultObject->{$dmsProperty} = $dmsData->{$dmsProperty};
-					}
-				}
-			}
-			else
-			{
-				// Set null if no dms result found
-				foreach ($dmsProperties as $dmsProperty)
-				{
-					if ($dmsProperty != 'mimetype') $resultObject->{$dmsProperty} = null;
-				}
-			}
-		}
-
-		// return the object containing akte and dms data
-		return success(getData($akteResult));
-	}
-
-	/**
-	 * Removes Akte by akte Id, person id and/or dms id
-	 * Removes all associated dms entries and versions, and deletes all associated files
-	 * Returns success with removed version numbers or error
-	 */
-	private function _remove($akte_id = null, $person_id = null, $dms_id = null)
-	{
-		// Get dms_id for akte
-		$this->_ci->AkteModel->addSelect('akte_id');
+		// get dms_id for akte
 		$this->_ci->AkteModel->addSelect('dms_id');
-
-		$paramArray = array();
-
-		if (is_numeric($akte_id)) $paramArray['akte_id'] = $akte_id;
-		if (is_numeric($person_id)) $paramArray['person_id'] = $person_id;
-		if (is_numeric($dms_id)) $paramArray['dms_id'] = $dms_id;
-
-		$akteResult = $this->_ci->AkteModel->loadWhere($paramArray);
+		$akteResult = $this->_ci->AkteModel->load($akte_id);
 
 		if (isError($akteResult)) return $akteResult;
 
-		if (!hasData($akteResult)) return error('Akte not found');
+		if (!hasData($akteResult)) return error("Akte not found");
 
-		// Delete Akte
-		$deleteResult = $this->_ci->AkteModel->delete(getData($akteResult)[0]->akte_id);
+		$dms_id = getData($akteResult)[0]->dms_id;
+		$error = null;
 
-		if (isError($deleteResult)) return $deleteResult;
+		// Start DB transaction to avoid deleting only part of the data
+		$this->_ci->db->trans_begin();
 
-		// Remove all dms entry for dms of the akte
-		$removeAllResult = $this->_ci->dmslib->removeAll(getData($akteResult)[0]->dms_id);
+		// delete Akte
+		$deleteResult = $this->_ci->AkteModel->delete($akte_id);
 
-		return $removeAllResult;
+		if (isError($deleteResult))
+		{
+			$error = $deleteResult;
+		}
+		else
+		{
+			// remove all dms entry for dms of the akte
+			$removeAllResult = $this->_ci->dmslib->removeAll($dms_id);
+
+			if (isError($removeAllResult))
+				$error = $removeAllResult;
+		}
+
+		// Transaction complete!
+		$this->_ci->db->trans_complete();
+
+		// Check if everything went ok during the transaction
+		if ($this->_ci->db->trans_status() === false || isset($error))
+		{
+			$this->_ci->db->trans_rollback();
+
+			// return occured error
+			if (isset($error))
+				return $error;
+			else
+				return error("Error occured when deleting, rolled back");
+		}
+		else
+		{
+			$this->_ci->db->trans_commit();
+
+			// return removed dms entry data
+			return $removeAllResult;
+		}
 	}
 }
-

application/libraries/AnrechnungLib.php

@@ -741,7 +741,7 @@ class AnrechnungLib
 		$fullname = hasData($result) ? $result->retval[0]->vorname. $result->retval[0]->nachname : '';
 		
 		// Return filename
-		return 'Anrechnungsantrag'. $orgform_kurzbz .'_LV-'. $lehrveranstaltung_id. '_'. $fullname . '.pdf';
+		return 'Anrechnungsantrag'. $orgform_kurzbz .'_LV-'. $lehrveranstaltung_id. '_'. $fullname;
 	}
 	
 	public function LVhasLector($anrechnung_id)