use new api for getUri

.gitignore

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

application/config/Events.php

@@ -33,27 +33,5 @@ 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/abgabe.php

@@ -29,7 +29,7 @@ $config['ALLOWED_NOTEN_ABGABETOOL'] = [10, 14]; // tbl_note pk
 // benotete projektarbeiten sperren weitere terminanlage & bearbeitung, diese noten sind ausnahmen dieser Regel
 // wie zB "Nicht beurteilt" & "Noch nicht eingetragen"
 $config['NONFINAL_NOTEN_ABGABETOOL'] = [9];
-$config['beurteilung_link_fallback'] = 'cis/private/lehre/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
+$config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
 
 $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
 $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ZWEITBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
@@ -38,19 +38,8 @@ $config['SIGNATUR_CHECK_PAABGABETYPEN'] = ['end'];
 
 // to be used as "https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" for stg specific moodle routing
 $config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?idnumber=dl';
-// TODO: check if these links change if the file changes and how to better retrieve the link?
-$config['SIGNATUR_INFO_LINK_GERMAN'] = 'https://cis.technikum-wien.at/cms/dms.php?id=214779'; 
-$config['SIGNATUR_INFO_LINK_ENGLISH'] = 'https://cis.technikum-wien.at/cms/dms.php?id=264256';
 
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT'] = true;
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER'] = true;
 
 $config['BETREUER_SAMMELMAIL_BUTTON_STUDENT'] = true;
-
-$config['MULTIEDIT_TABLE'] = true;
-
-$config['STUDENT_EDIT_PROJEKTARBEIT_TITLE'] = true;
-
-$config['CONFETTI_ON_ENDUPLOAD'] = true;
-
-

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']
 				)
 			)
 		),
@@ -215,14 +208,7 @@ $config['navigation_header'] = array(
                     'expand' => true,
                     'sort' => 30,
                     'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                ),
-				'dashboardadmin' => array(
-					'link' => site_url('dashboard/Admin'),
-					'description' => 'Dashboard Admin',
-					'expand' => true,
-					'sort' => 40,
-					'requiredPermissions' => 'dashboard/admin:r'
-				)
+                )
 			)
 		)
 	)
@@ -385,7 +371,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

@@ -64,9 +64,6 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
-$route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
-//Route for LV Plan Stg/Semester/Verband/Gruppe
-$route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
 
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
@@ -75,73 +72,56 @@ $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';
-
-$route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/student/(:any)'] = 'api/frontend/v1/stv/students/getStudent/$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';
+// (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';
 
+// // (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';
 
 // 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/searchcis.php

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

application/config/studierendenantrag.php

@@ -168,40 +168,3 @@ $config['stgkz_blacklist_wiederholung'] = [];
  * @var array           An array of noten ids
  */
 $config['note_blacklist_wiederholung'] = [];
-
-/**
- *  Enable/disable the Abmeldung StG process
- *
- * @var bool
- */
-$config['abmeldung_stg_enabled'] = true;
-
-/**
- *  Enable/disable the Abmeldung process
- *
- * @var bool
- */
-$config['abmeldung_enabled'] = true;
-
-/**
- *  Enable/disable the Unterbrecher process
- *
- * @var bool
- */
-$config['unterbrechung_enabled'] = true;
-
-/**
- *  Enable/disable the Wiederholer process
- *
- * @var bool
- */
-$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

@@ -1,12 +0,0 @@
-<?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.php

@@ -1,34 +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['stv'] = [
-	"library" => "treemenu/StudVwLib",
-	"permissions" => ["admin:r", "assistenz:r"]
-];
-$config['lvv'] = [
-	"library" => "treemenu/LvVwLib",
-	"permissions" => ["admin:r", "assistenz:r"]
-];
-
-$config['tempus'] = [
-	"library" => "treemenu/TempusLib",
-	"permissions" => ["admin:r", "assistenz:r", "lehre/lvplan:r"]
-];

application/config/treemenu/custom/lvvw.php

@@ -1,32 +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' => [
-		'semester' => [
-			'group',
-			'verband' => [
-				'group'
-			]
-		],
-		'orgform'
-	]
-];

application/config/treemenu/custom/tempus.php

@@ -1,32 +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' => [
-		'semester' => [
-			'group',
-			'verband' => [
-				'group'
-			]
-		],
-		'orgform'
-	]
-];

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

@@ -31,8 +31,12 @@ class Abgabetool extends Auth_Controller
 	{
 		// TODO: routing from index based on berechtigung?
 
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Abgabetool']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'Abgabetool']);
 		}
@@ -40,8 +44,12 @@ class Abgabetool extends Auth_Controller
 
 	public function Student($student_uid_prop = '')
 	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+		
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolStudent']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolStudent', 'student_uid_prop' => $student_uid_prop]);
 		}
@@ -49,8 +57,12 @@ class Abgabetool extends Auth_Controller
 
 	public function Mitarbeiter()
 	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolMitarbeiter']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolMitarbeiter']);
 		}
@@ -58,8 +70,13 @@ class Abgabetool extends Auth_Controller
 
 	public function Assistenz($stg_kz_prop = '')
 	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolAssistenz']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolAssistenz']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz', 'stg_kz_prop' => $stg_kz_prop]);
 		}
@@ -67,8 +84,12 @@ class Abgabetool extends Auth_Controller
 	
 	public function Deadlines()
 	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'DeadlinesOverview']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'DeadlinesOverview']);
 		}

application/controllers/Cis/Auth.php

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

application/controllers/Cis/LvPlan.php

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

application/controllers/Cis/MyLv.php

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

application/controllers/Cis/MyLvPlan.php

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

application/controllers/Cis/OtherLvPlan.php

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

application/controllers/Cis/Profil.php

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

application/controllers/Cis/Raumsuche.php

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

application/controllers/Cis/StgOrgLvPlan.php

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

application/controllers/Cis/Studium.php

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

application/controllers/Cis4.php

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

application/controllers/CisVue/Dashboard.php

@@ -0,0 +1,43 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Dashboard extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'dashboard/benutzer:r'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		$this->load->model('person/Person_model','PersonModel');
+		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+
+		$viewData = array(
+			'uid' => getAuthUID(),
+			'name' => $personData->vorname,
+			'person_id' => $personData->person_id
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData]);
+
+	}
+}

application/controllers/Redirect.php

@@ -1,44 +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 redirects urls to another location. This is mainly used
- * with the $routes config
- */
-class Redirect extends CI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	/**
-	 * Main function to handle all redirects.
-	 *
-	 * @param string				$method - the redirect code (30x)
-	 * @param array					$params - the url to redirect to
-	 *
-	 * @return void
-	 */
-	public function _remap($method, $params)
-	{
-		redirect($params, 'location', $method);
-	}
-}

application/controllers/Tempus.php

@@ -1,69 +0,0 @@
-<?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');
-	}
-
-	public function index()
-	{
-		$this->_loadView();
-	}
-
-	public function sync()
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-		$this->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-
-		$this->OrganisationseinheitModel->addJoin('tbl_studiengang', 'oe_kurzbz', 'LEFT');
-
-		$this->OrganisationseinheitModel->addSelect('public.tbl_organisationseinheit.organisationseinheittyp_kurzbz,
-															public.tbl_organisationseinheit.bezeichnung,
-															public.tbl_studiengang.studiengang_kz,
-															public.tbl_organisationseinheit.oe_kurzbz,
-															tbl_studiengang.typ,
-															COALESCE(public.tbl_studiengang.bezeichnung, \'\') as stgbezeichnung');
-		$this->OrganisationseinheitModel->addOrder('tbl_organisationseinheit.aktiv', 'DESC');
-		$this->OrganisationseinheitModel->addOrder('tbl_organisationseinheit.organisationseinheittyp_kurzbz');
-		$organisationen = getData($this->OrganisationseinheitModel->loadWhere(array("tbl_organisationseinheit.aktiv" => true)));
-
-
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
-		$studiensemestern = getData($this->StudiensemesterModel->load());
-
-		$this->_loadView(array('organisationen' => $organisationen, 'studiensemestern' => $studiensemestern));
-	}
-
-	private function _loadView($extraVariables = [])
-	{
-		$this->load->view('Tempus', [
-			'permissions' => [
-				'admin' => $this->permissionlib->isBerechtigt('admin'),
-				'stundenraster' => $this->permissionlib->isBerechtigt('basis/tempus_stundenraster'),
-			],
-			'variables' => array_merge([
-				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
-				'timezone' => $this->config->item('timezone')
-			], $extraVariables)
-		]);
-	}
-}

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

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

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

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

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

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

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

@@ -38,8 +38,7 @@ class Lehre extends FHCAPI_Controller
 		parent::__construct([
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
-			'Pruefungen' => self::PERM_LOGGED,
-			'semesterAverageGrade' => self::PERM_LOGGED,
+			'Pruefungen' => self::PERM_LOGGED
 		]);
 		
 	}
@@ -101,49 +100,5 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($result);
 	}
-
-	/**
-	 * calculates and returns the grade average and weighted average for a specific semester
-	 * @param string $studiensemester_kurzbz
-	 * @return void
-	 */
-
-	public function semesterAverageGrade($studiensemester_kurzbz)
-	{
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$semesterLvs = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
-
-		if (isError($semesterLvs))
-			return $this->outputJsonError(getError($semesterLvs));
-
-		$semesterLvsData = getData($semesterLvs);
-
-		$doGradesExist = false;
-		$sum = 0;
-		$count = 0;
-		$sumWeighted = 0;
-		$sumEcts = 0;
-
-		foreach ($semesterLvsData as $lv) {
-			if (!$lv->znote || $lv->znote < 1 || $lv->znote > 5)
-				continue;
-
-			$doGradesExist = true;
-
-			$sum += $lv->znote;
-			$count++;
-			$sumWeighted += $lv->znote * floatval($lv->ects);
-			$sumEcts += floatval($lv->ects);
-		}
-
-		$averageGrade = null;
-		$weightedAverageGrade = null;
-		if ($doGradesExist) {
-			$averageGrade = $sum/$count;
-			$weightedAverageGrade = $sumWeighted/$sumEcts;
-		}
-
-		$this->terminateWithSuccess(['average_grade' => $averageGrade, 'weighted_average_grade' => $weightedAverageGrade]);
-	}
 }
 

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]*$/", (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

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

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

@@ -1,77 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class OtherLvPlan extends FHCAPI_Controller
-{
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'otherLvPlanViewData' => ['basis/other_lv_plan:r'],
-		]);
-
-		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->library('ProfilLib');
-
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// 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;
-
-		$resProfileData = $this->profillib->getView($uid);
-		$profileData = hasData($resProfileData) ? getData($resProfileData) : 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,
-			],
-		];
-
-		$this->terminateWithSuccess($viewData);
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-}
-

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

@@ -32,8 +32,6 @@ class Phrasen extends FHCAPI_Controller
 			'setLanguage' => self::PERM_ANONYMOUS,
 			'getLanguage' => self::PERM_ANONYMOUS,
 			'getAllLanguages' => self::PERM_ANONYMOUS,
-			'getPhrases' => self::PERM_ANONYMOUS,
-			'getTabulatorPhrases' => self::PERM_ANONYMOUS,
 		]);
 
 		$this->load->helper('hlp_language');
@@ -94,59 +92,4 @@ class Phrasen extends FHCAPI_Controller
 		$this->terminateWithSuccess($langs);
 	}
 
-	public function getPhrases()
-	{
-		$postParams = $this->getPostJSON();
-
-		$languages = $postParams->languages;
-		if (!$languages || !count($languages)) {
-			$this->load->model('system/Sprache_model', 'sprachenModel');
-			$activeLanguages = $this->sprachenModel->loadWhere(array('content' => true));
-			$activeLanguagesData = $this->getDataOrTerminateWithError($activeLanguages);
-			$languages = array_map(
-				function ($languageData) {
-					return $languageData->sprache;
-				},
-				$activeLanguagesData
-			);
-		}
-
-		$this->load->model('system/Phrase_model', 'phraseModel');
-		$phrasesGroupedByCategory = $postParams->phrasesGroupedByCategory;
-		$result = [];
-		foreach ($languages as $language) {
-			$phrases = $this->phraseModel->getPhrasesByCategoryAndPhrasesAndLanguage($phrasesGroupedByCategory, $language);
-			$result[$language] = $this->getDataOrTerminateWithError($phrases);
-		}
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function getTabulatorPhrases()
-	{
-		$languages = json_decode($this->input->get('languages'));
-		if (!$languages || !count($languages)) {
-			$this->load->model('system/Sprache_model', 'sprachenModel');
-			$activeLanguages = $this->sprachenModel->loadWhere(array('content' => true));
-			$activeLanguagesData = $this->getDataOrTerminateWithError($activeLanguages);
-			$languages = array_map(
-				function ($languageData) {
-					return $languageData->sprache;
-				},
-				$activeLanguagesData
-			);
-		}
-
-		$this->load->model('system/Phrase_model', 'phraseModel');
-		$result = [];
-		foreach ($languages as $language) {
-			$tabulatorPhrases = $this->phraseModel->getPhrasesByCategoryAndLanguage(['tabulator'], $language);
-			$result[$language] = $this->getDataOrTerminateWithError($tabulatorPhrases);
-		}
-
-		header('Pragma: private');
-		header('Cache-Control: private, max-age=' . (60 * 60 * 24 * 30));
-		$this->terminateWithSuccess($result);
-	}
-
 }

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

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

application/controllers/api/frontend/v1/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,26 +66,6 @@ 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/StgOrgLvPlan.php

@@ -1,64 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
-class StgOrgLvPlan extends FHCAPI_Controller
-{
-
-    /**
-     * Object initialization
-     */
-    public function __construct()
-    {
-        parent::__construct([
-			'stgOrgLvPlanViewData' => self::PERM_LOGGED,
-        ]);
-
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-	 * fetches view data for stg org lv plan
-	 * @access public
-	 */
-	public function stgOrgLvPlanViewData()
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$result = $this->StudiengangModel->loadWhere([
-			'aktiv' => true
-		]);
-		$studiengaenge = $this->getDataOrTerminateWithError($result);
-
-		$viewData = array(
-			'studiengaenge' => $studiengaenge,
-		);
-
-        $this->terminateWithSuccess($viewData);
-	}
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-}
-

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

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

application/controllers/api/frontend/v1/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/Board.php

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

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

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

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

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

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

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

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

@@ -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

@@ -7,8 +7,8 @@ class Favorites extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => 'lehre/lvplan:rw',
-			'set' => 'lehre/lvplan:rw'
+			'index' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
 		]);
 
 		// Load models
@@ -17,14 +17,14 @@ class Favorites extends FHCAPI_Controller
 
 	public function index()
 	{
-		$result = $this->VariableModel->getVariables(getAuthUID(), ['tempus_favorites']);
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['lv_favorites']);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
 		if (!$data)
 			$this->terminateWithSuccess(null);
 		else
-			$this->terminateWithSuccess(isset($data['tempus_favorites']) ? $data['tempus_favorites'] : null);
+			$this->terminateWithSuccess(isset($data['lv_favorites']) ? $data['lv_favorites'] : null);
 	}
 
 	public function set()
@@ -38,7 +38,7 @@ class Favorites extends FHCAPI_Controller
 
 		$favorites = $this->input->post('favorites');
 
-		$result = $this->VariableModel->setVariable(getAuthUID(), 'tempus_favorites', $favorites);
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'lv_favorites', $favorites);
 
 		$this->getDataOrTerminateWithError($result);
 		

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,17 +118,54 @@ class Gruppe extends FHCAPI_Controller
 
 		$query_words = explode(' ', $query);
 
-		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
+		$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();
 
 		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);
+		$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_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,117 @@
+<?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']]);
+		}
+
+		return $this->getStudiengang($method);
+		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)
+	{
+		$link = $studiengang_kz . '/';
+
+		$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("TRUE AS leaf", 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("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);
+	}
+}

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

@@ -42,22 +42,14 @@ class Messages extends FHCAPI_Controller
 		]);
 	}
 
-	public function getMessages($id, $type_id, $size=null, $page=null)
+	public function getMessages($id, $type_id, $size, $page)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}
 
-		if(!(is_null($size) && is_null($page)))
-		{
-			$offset = $size * ($page - 1);
-			$limit = $size;
-		}
-		else
-		{
-			$offset = null;
-			$limit = null;
-		}
+		$offset = $size * ($page - 1);
+		$limit = $size;
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 

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

@@ -26,9 +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
+				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED
 			)
 		);
 		// Load model StudiensemesterModel
@@ -168,39 +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);
-	}
 }

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/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

@@ -78,32 +78,52 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
 
 		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
+
+		$arrayAccepted = [];
 		$person_id = $this->_getPersonId($prestudent_id);
 
-		$mergedArray = [];
+		$docNames = array_map(function ($item) {
+			return $item->dokument_kurzbz;
+		}, $resultPreDoc);
 
-		foreach ($resultPreDoc as $pre)
+		foreach($docNames as $doc)
 		{
-			$result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);
+			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
 
 			if (isError($result))
+			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-
+			}
 			if (hasData($result))
 			{
-				foreach (getData($result) as $doc)
+				$data = getData($result);
+				foreach ($data as $value)
 				{
-					$merged = clone $doc;
-					$merged->docdatum = $pre->docdatum;
-					$merged->insertvonma = $pre->insertvonma;
-					$merged->bezeichnung = $pre->bezeichnung;
-					$mergedArray[] = $merged;
+					array_push($arrayAccepted, $value);
 				}
 			}
-			else
-			{
-				$mergedArray[] = $pre;
+		}
+
+		//Mapping with document_kurzbz
+		$preDocMap = [];
+		foreach ($resultPreDoc as $pre) {
+			$preDocMap[$pre->dokument_kurzbz] = $pre;
+		}
+
+		$mergedArray = [];
+		foreach ($arrayAccepted as $doc) {
+			$merged = clone $doc;
+
+			if (isset($preDocMap[$doc->dokument_kurzbz])) {
+				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
+				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
+				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
+			} else {
+				$merged->akzeptiertdatum = null;
+				$merged->akzeptiertvon = null;
 			}
+
+			$mergedArray[] = $merged;
 		}
 
 		$this->terminateWithSuccess($mergedArray);
@@ -170,8 +190,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(
@@ -182,7 +200,7 @@ 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' => $uid,
 			]

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

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

application/controllers/api/frontend/v1/stv/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()

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/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

@@ -90,15 +90,6 @@ class Projektarbeit extends FHCAPI_Controller
 
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
 
-		$result = $this->fetchProjektarbeitByID($projektarbeit_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-	
-	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, 
 			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
@@ -106,10 +97,13 @@ class Projektarbeit extends FHCAPI_Controller
 		$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(
+		$result = $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);
 
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
 	}
 
 	/**
@@ -138,8 +132,7 @@ class Projektarbeit extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$data = $this->getDataOrTerminateWithError($this->fetchProjektarbeitById($data));
-		
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -287,7 +280,10 @@ class Projektarbeit extends FHCAPI_Controller
 	 */
 	public function getNoten()
 	{
-		$result = $this->NoteModel->getAllActive();
+		$this->NoteModel->addOrder('notenwert', 'ASC');
+		$this->NoteModel->addOrder('bezeichnung', 'ASC');
+
+		$result = $this->NoteModel->load();
 
 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 

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/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

@@ -1,157 +0,0 @@
-<?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:rw', 'lehre/lvplan:rw'],
-			'getHeader' => ['admin:r', 'assistenz:rw', 'lehre/lvplan:rw'],
-			'set' => ['admin:r', 'assistenz:rw', 'lehre/lvplan:rw'],
-			'updateCollision' => ['admin:r', 'assistenz:rw', 'lehre/lvplan:rw'],
-		]);
-
-		// 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 = [];
-
-		$var_array = array(
-			'ignore_kollision',
-			'kollision_student',
-			'ignore_reservierung',
-			'ignore_zeitsperre',
-			'ignore_resources_collisions',
-			'roomless_planning',
-			'priority_room_planning',
-			'dialog_room_planning'
-		);
-		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), $var_array);
-
-		$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'
-		];
-
-		$config['roomless_planning'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'roomless_planning'),
-			"value" => ($data['roomless_planning'] ?? 'false') === 'true'
-		];
-
-		$config['priority_room_planning'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'priority_room_planning'),
-			"value" => ($data['priority_room_planning'] ?? 'false') === 'true'
-		];
-
-		$config['dialog_room_planning'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'dialog_room_planning'),
-			"value" => ($data['dialog_room_planning'] ?? '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()
-	{
-		$configs = array(
-			'ignore_kollision',
-			'kollision_student',
-			'ignore_reservierung',
-			'ignore_zeitsperre',
-			'ignore_resources_collisions',
-			'roomless_planning',
-			'priority_room_planning',
-			'dialog_room_planning'
-		);
-
-		foreach ($configs as $config)
-		{
-			$this->_ci->VariableModel->setVariable(
-				getAuthUID(),
-				$config,
-				$this->input->post($config) === 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

@@ -1,276 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Coursepicker extends FHCAPI_Controller
-{
-	private $_ci;
-
-	const ALLOWED_COURSE_FILTER = ['uid', 'stg'];
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getCourses' => 'lehre/lvplan:rw',
-		]);
-
-		$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 getCourses()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$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());
-
-		$studiensemester_kurzbz = $this->_ci->input->post('studiensemester_kurzbz', TRUE);
-
-		$filter = $this->_checkFilter(self::ALLOWED_COURSE_FILTER);
-
-		$this->_getBasePlan($studiensemester_kurzbz);
-
-		$this->_ci->LehreinheitModel->db->group_start();
-		if (isset($filter->stg))
-			$this->_addStgWhere($filter->stg);
-
-		if (isset($filter->uid))
-		{
-			$uid_array = (array) $filter->uid;
-			$this->_ci->LehreinheitModel->db->or_where_in('tbl_benutzer.uid', $uid_array);
-		}
-
-		$this->_ci->LehreinheitModel->db->group_end();
-
-		$this->_ci->LehreinheitModel->addOrder('lehreinheit_id');
-		$result = $this->_ci->LehreinheitModel->load();
-		$result = hasData($result) ? getData($result) : array();
-		$this->terminateWithSuccess($this->_mapEvents($result));
-	}
-
-	private function _getBasePlan($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();
-		$this->_ci->LehreinheitModel->db->where('tbl_lehrform.verplanen', true);
-		$this->_ci->LehreinheitModel->db->where('tbl_lehreinheit.studiensemester_kurzbz', $studiensemester_kurzbz);
-		$this->_ci->LehreinheitModel->db->group_end();
-
-	}
-
-	private function _addStgWhere($studiengaenge)
-	{
-		$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['stg_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();
-	}
-
-	private function _mapEvents($result)
-	{
-		$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);
-		}
-		return array_values($grouped);
-	}
-	private function _formatArr($arr)
-	{
-		$values = array_values(array_unique($arr));
-		$formatted = implode(' ', $values);
-
-		if (count($values) > 1)
-			$formatted .= ' ?';
-
-		return $formatted;
-	}
-
-	private function _checkFilter($filters)
-	{
-		$filter_valid = false;
-		$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;
-	}
-
-
-}

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

@@ -1,37 +0,0 @@
-<?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' => 'lehre/lvplan:rw',
-		]);
-
-		$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

@@ -1,514 +0,0 @@
-<?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', 'orte'];
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStunden' => 'lehre/lvplan:rw',
-			'getCalendarHours' => 'lehre/lvplan:rw',
-			'getPlan' => 'lehre/lvplan:rw',
-			'getPlanByOrt' => 'lehre/lvplan:rw',
-			'getRaumvorschlag' => 'lehre/lvplan:rw',
-			'getRaumvorschlagSlots' => 'lehre/lvplan:rw',
-			'getLehreinheiten' => 'lehre/lvplan:rw',
-			'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' => 'lehre/lvplan:rw',
-			'getZeitsperren' => 'lehre/lvplan:rw',
-			'updateKalenderEvent' => 'lehre/lvplan:rw',
-			'deleteOrtEntry' => 'lehre/lvplan:rw',
-			'deleteFromKalenderEvent' => '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');
-		$this->_ci->load->library('KalenderSyncLib');
-		$this->_ci->load->library('RaumvorschlagLib');
-		$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);
-
-		$isCollisionCheckEnabled = $this->_ci->input->post('collisionCheck', TRUE) ?? false;
-		$maxDailyEventLimit = $this->_ci->input->post('maxDailyEventLimit', TRUE) ?? false;
-
-		$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,
-			$isCollisionCheckEnabled,
-			$maxDailyEventLimit
-		);
-
-		$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->orte ?? null,  $updateFields->start_time ?? null,  $updateFields->end_time ?? null, $updateFields->location ?? null);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result),  $result->code);
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function deleteOrtEntry()
-	{
-		$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->updateOrt($kalender_id, []);
-
-		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 getRaumvorschlagSlots()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$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->get('lehreinheit_id', TRUE);
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-		$this->terminateWithSuccess(getData($this->_ci->raumvorschlaglib->getVorschlaegeSlots($lehreinheit_id, $start_date, $end_date)));
-	}
-
-	public function getLehreinheiten()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
-		$result = $this->_ci->kalenderlib->getLehreinheiten($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	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->kalendersynclib->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));
-	}
-
-	public function deleteFromKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-		$this->_ci->form_validation->set_rules('lehreinheit_ids[]',"lehreinheit_ids","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);
-		$lehreinheit_ids = $this->_ci->input->post('lehreinheit_ids', TRUE);
-
-		$result = $this->_ci->kalenderlib->deleteFromKalenderEvent($kalender_id, $lehreinheit_ids);
-
-		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/KalenderSync.php

@@ -1,304 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-
-class KalenderSync extends FHCAPI_Controller
-{
-	private $_ci;
-
-	const ALLOWED_STATUS = ['preview', 'live'];
-	public function __construct()
-	{
-		parent::__construct([
-			'getSyncs' => ['admin:r', 'assistenz:r'],
-			'loadSync' => ['admin:r', 'assistenz:r'],
-			'add' => ['admin:r', 'assistenz:r'],
-			'start' => ['admin:r', 'assistenz:r'],
-			'delete' => ['admin:r', 'assistenz:r'],
-			'updateSync' => ['admin:r', 'assistenz:r'],
-			'getStudienplan' => ['admin:r', 'assistenz:r'],
-			'getSyncStatus' => ['admin:r', 'assistenz:r'],
-		]);
-
-		$this->loadPhrases([
-			'lehre',
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_ci->load->library('form_validation');
-		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->_ci->load->model('ressource/Kalendersyncstatus_model', 'KalendersyncstatusModel');
-		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-		$this->_ci->load->library('KalenderSyncLib');
-	}
-
-	public function getSyncs()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$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());
-		$studiensemester_kurzbz = $this->_ci->input->get('studiensemester_kurzbz', TRUE);
-
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('tbl_kalender_syncstatus.*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS sync_status, tbl_organisationseinheit.bezeichnung as oebezeichnung, tbl_studienplan.bezeichnung as studienplanbezeichnung');
-		$this->_ci->KalenderStatusModel->addJoin('lehre.tbl_kalender_status', 'tbl_kalender_syncstatus.sync_status_kurzbz = tbl_kalender_status.status_kurzbz');
-		$this->_ci->KalenderStatusModel->addJoin('public.tbl_organisationseinheit', 'tbl_kalender_syncstatus.oe_kurzbz = tbl_organisationseinheit.oe_kurzbz');
-		$this->_ci->KalenderStatusModel->addJoin('lehre.tbl_studienplan', 'tbl_kalender_syncstatus.studienplan_id = tbl_studienplan.studienplan_id', 'LEFT');
-		$this->_ci->KalenderStatusModel->addJoin('public.tbl_studiensemester', 'tbl_kalender_syncstatus.studiensemester_kurzbz = tbl_studiensemester.studiensemester_kurzbz');
-		$this->_ci->KalenderStatusModel->addOrder('public.tbl_studiensemester.start', 'DESC');
-
-
-		if ($studiensemester_kurzbz === 'all')
-			$data = $this->_ci->KalendersyncstatusModel->load();
-		else
-			$data = $this->_ci->KalendersyncstatusModel->loadWhere(array('tbl_kalender_syncstatus.studiensemester_kurzbz' => $studiensemester_kurzbz));
-
-		if (isError($data))
-			$this->terminateWithError(getError($data));
-
-		$this->terminateWithSuccess(getData($data));
-	}
-
-	public function delete()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('kalender_syncstatus_id', 'kalender_syncstatus_id', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$kalender_syncstatus_id = $this->input->post('kalender_syncstatus_id');
-
-		$result = $this->_ci->KalendersyncstatusModel->load($kalender_syncstatus_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		if (!hasData($result))
-			$this->terminateWithError($this->p->t('lehre', 'errorDeleting'));
-
-		$del_result = $this->_ci->KalendersyncstatusModel->delete(getData($result)[0]->kalender_syncstatus_id);
-
-		if (isError($del_result))
-			$this->terminateWithError(getError($del_result));
-		$this->terminateWithSuccess($del_result);
-	}
-
-	public function loadSync()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_syncstatus_id',"kalender_syncstatus_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-		$kalender_syncstatus_id = $this->_ci->input->get('kalender_syncstatus_id', TRUE);
-		$data = $this->_ci->KalendersyncstatusModel->loadWhere(array('kalender_syncstatus_id' => $kalender_syncstatus_id));
-		if (isError($data))
-			$this->terminateWithError(getError($data));
-
-		$this->terminateWithSuccess(getData($data)[0]);
-	}
-
-	public function getSyncStatus()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS bezeichnung, status_kurzbz');
-		$this->_ci->KalenderStatusModel->db->where_in('status_kurzbz', self::ALLOWED_STATUS);
-		$data = $this->_ci->KalenderStatusModel->load();
-
-		if (isError($data))
-			$this->terminateWithError(getError($data));
-
-		$this->terminateWithSuccess(getData($data));
-	}
-
-
-	public function add()
-	{
-		$formData = $this->input->post('formData');
-
-		$this->_ci->form_validation->set_data($formData);
-
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$ausbildungssemester = isEmptyString($formData['ausbildungssemester']) ? null : $formData['ausbildungssemester'];
-		$studienplan_id = isEmptyString($formData['studienplan_id']) ? null : $formData['studienplan_id'];
-
-		$existing = $this->_checkIfExist(
-			$formData['oe_kurzbz'],
-			$formData['studiensemester_kurzbz'],
-			$ausbildungssemester,
-			$studienplan_id
-		);
-
-		if (isError($existing))
-			$this->terminateWithError(getError($existing));
-
-		if (hasData($existing))
-		{
-			$this->terminateWithError('Es existiert bereits ein Eintrag.');
-		}
-
-		$result = $this->_ci->KalendersyncstatusModel->insert(
-			array(
-				'oe_kurzbz' => $formData['oe_kurzbz'],
-				'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
-				'datum_bis' => $formData['datum_bis'],
-				'studienplan_id' => $studienplan_id,
-				'ausbildungssemester' => $ausbildungssemester,
-				'sync_status_kurzbz' => $formData['sync_status_kurzbz'],
-				'mail' => $formData['mail'],
-				'insertvon' => getAuthUID()
-			)
-		);
-
-		$this->terminateWithSuccess($result);
-	}
-
-
-	public function start()
-	{
-		$formData = $this->input->post('formData');
-
-		$this->_ci->form_validation->set_data($formData);
-
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$result = $this->_ci->kalendersynclib->runManual($formData['oe_kurzbz'], $formData['studiensemester_kurzbz'], $formData['ausbildungssemester'], $formData['studienplan_id'], $formData['mail'], $formData['datum_bis'], $formData['sync_status_kurzbz']);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-	public function updateSync()
-	{
-		$formData = $this->input->post('formData');
-
-		$this->_ci->form_validation->set_data($formData);
-
-		$this->_ci->form_validation->set_rules('kalender_syncstatus_id',"kalender_syncstatus_id","required");
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$ausbildungssemester = isEmptyString($formData['ausbildungssemester']) ? null : $formData['ausbildungssemester'];
-		$studienplan_id = isEmptyString($formData['studienplan_id']) ? null : $formData['studienplan_id'];
-
-		$existing = $this->_checkIfExist(
-			$formData['oe_kurzbz'],
-			$formData['studiensemester_kurzbz'],
-			$ausbildungssemester,
-			$studienplan_id,
-			$formData['kalender_syncstatus_id']
-		);
-
-		if (isError($existing))
-			$this->terminateWithError(getError($existing));
-
-		if (hasData($existing))
-		{
-			$this->terminateWithError('Es existiert bereits ein Eintrag.');
-		}
-
-		$this->_ci->KalendersyncstatusModel->update(
-			array('kalender_syncstatus_id' => $formData['kalender_syncstatus_id']),
-			array(
-				'oe_kurzbz' => $formData['oe_kurzbz'],
-				'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
-				'datum_bis' => $formData['datum_bis'],
-				'studienplan_id' => $studienplan_id,
-				'ausbildungssemester' => $ausbildungssemester,
-				'sync_status_kurzbz' => $formData['sync_status_kurzbz'],
-				'mail' => $formData['mail'],
-				'updatevon' => getAuthUID(),
-				'updateamum' => date('c'),
-			)
-		);
-	}
-	public function getStudienplan()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$oe_kurzbz = $this->_ci->input->get('oe_kurzbz', TRUE);
-		$studiensemester_kurzbz = $this->_ci->input->get('studiensemester_kurzbz', TRUE);
-		$ausbildungssemester = $this->_ci->input->get('ausbildungssemester', TRUE);
-
-		$this->_ci->StudiengangModel->addJoin('tbl_organisationseinheit', 'oe_kurzbz');
-		$is_studiengang = $this->_ci->StudiengangModel->loadWhere(array('oe_kurzbz' => $oe_kurzbz));
-
-		if (hasData($is_studiengang) && !isEmptyString($studiensemester_kurzbz))
-		{
-			$studiengang = getData($is_studiengang)[0];
-
-			$studienplaene = $this->_ci->StudienplanModel->getStudienplaeneBySemester(
-				$studiengang->studiengang_kz,
-				$studiensemester_kurzbz,
-				isEmptyString($ausbildungssemester) ? null : $ausbildungssemester
-			);
-
-
-			$data = $this->getDataOrTerminateWithError($studienplaene);
-
-			$unique = array();
-			foreach ($data as $row)
-			{
-				$unique[$row->studienplan_id] = (object) array(
-					'studienplan_id' => $row->studienplan_id,
-					'studienordnung_id' => $row->studienordnung_id,
-					'bezeichnung' => $row->bezeichnung,
-					'orgform_kurzbz' => $row->orgform_kurzbz
-				);
-			}
-
-			$this->terminateWithSuccess(array_values($unique));
-		}
-		$this->terminateWithSuccess();
-	}
-
-	private function _checkIfExist($oe_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $studienplan_id, $kalender_syncstatus_id = null)
-	{
-		$this->_ci->KalendersyncstatusModel->db->where('oe_kurzbz', $oe_kurzbz);
-		$this->_ci->KalendersyncstatusModel->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
-
-		if (is_null($ausbildungssemester))
-			$this->_ci->KalendersyncstatusModel->db->where('ausbildungssemester IS NULL', null, false);
-		else
-			$this->_ci->KalendersyncstatusModel->db->where('ausbildungssemester', $ausbildungssemester);
-
-		if (is_null($studienplan_id))
-			$this->_ci->KalendersyncstatusModel->db->where('studienplan_id IS NULL', null, false);
-		else
-			$this->_ci->KalendersyncstatusModel->db->where('studienplan_id', $studienplan_id);
-
-		if (!is_null($kalender_syncstatus_id))
-			$this->_ci->KalendersyncstatusModel->db->where('kalender_syncstatus_id !=', $kalender_syncstatus_id);
-		return $this->_ci->KalendersyncstatusModel->load();
-	}
-
-}

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

@@ -1,84 +0,0 @@
-<?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', 'lehre/lvplan:rw'],
-			'storeResourcesToCalendarRelationship' => ['admin:w', 'assistenz:w', 'lehre/lvplan:rw'],
-			'getSchedulableResourcesByCalendar' => ['admin:r', 'assistenz:r', 'lehre/lvplan:rw'],
-		]);
-
-		$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');
-		$this->load->library('KalenderLib');
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// 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

@@ -1,233 +0,0 @@
-<?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');
-
-		$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_rules('titel', "titel", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-		$this->_ci->form_validation->set_rules('beschreibung', "beschreibung", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-		$this->_ci->form_validation->set_rules('start_date', "start_date", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-		$this->_ci->form_validation->set_rules('end_date', "end_date", "required", ['required' => $this->p->t('ui', 'error_fieldRequired')]);
-
-		if ($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$orte = $this->_ci->input->post('orte', TRUE);
-
-		if (empty($orte) || (empty($orte['ort_kurzbz']) && empty($orte['location'])))
-		{
-			$this->terminateWithValidationErrors(['ort_kurzbz' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Raum'])]);
-		}
-
-		$titel = $this->_ci->input->post('titel', TRUE);
-		$beschreibung = $this->_ci->input->post('beschreibung', 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, $orte, $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

@@ -1,53 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Tags extends Tag_Controller
-{
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getTag' => self::BERECHTIGUNG_KURZBZ,
-			'getTags' => self::BERECHTIGUNG_KURZBZ,
-			'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/dashboard/Admin.php

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

application/controllers/dashboard/Api.php

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

application/controllers/dashboard/Config.php

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

application/controllers/dashboard/Dashboard.php

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

application/controllers/dashboard/DashboardDemo.php

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

application/controllers/dashboard/Widget.php

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

application/controllers/jobs/AbgabetoolJob.php

@@ -358,8 +358,7 @@ class AbgabetoolJob extends JOB_Controller
 		foreach($assistenzMap as $assistenz_person_id => $tupelArr) {
 
 			$abgabenString = '<div style="font-family: Arial, sans-serif; color: #333;">';
-			$hasContent = false;
-			
+
 			foreach($tupelArr as $tupel) {
 				$projektarbeit_id = $tupel[0];
 				$assistenzRow = $tupel[1];
@@ -378,7 +377,6 @@ class AbgabetoolJob extends JOB_Controller
 				if(count($relevantAbgaben) == 0) {
 					continue;
 				}
-				$hasContent = true;
 
 				// Format the Student Name
 				$s = $relevantAbgaben[0];
@@ -449,12 +447,7 @@ class AbgabetoolJob extends JOB_Controller
 			}
 
 			$abgabenString .= '</div>';
-			
-			// skip send entirely
-			if (!$hasContent) { 
-				continue;
-			}
-			
+
 			// done with building the change list, now send it
 			$assistenzRow = $tupelArr[0][1];
 			$anrede = $assistenzRow->anrede;

application/controllers/jobs/AntragJob.php

@@ -40,13 +40,6 @@ class AntragJob extends JOB_Controller
 	 */
 	public function sendStglSammelmail()
 	{
-
-		if ($this->config->item('abmeldung_enabled') !== true &&
-			$this->config->item('abmeldung_stg_enabled') !== true &&
-			$this->config->item('unterbrechung_enabled') !== true &&
-			$this->config->item('wiederholung_enabled') !== true)
-			return $this->logError('Konnte Job nicht starten: Keine der Configs "abmeldung_stg_enabled", "abmeldung_enabled", "unterbrechung_enabled",  "wiederholung_enabled" auf true gesetzt');
-
 		$this->load->model('person/Person_model', 'PersonModel');
 
 		$this->logInfo('Start Job sendStglSammelmail');
@@ -54,38 +47,25 @@ class AntragJob extends JOB_Controller
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
 		$this->StudierendenantragModel->addJoin('public.tbl_prestudent', 'prestudent_id');
+		$this->db->group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();
 
-		if ($this->config->item('abmeldung_enabled') === true)
-		{
-			$this->db->group_start();
-			$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
-			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-			$this->db->group_end();
-		}
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();
 
-		if ($this->config->item('abmeldung_stg_enabled') === true)
-		{
-			$this->db->or_group_start();
-			$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
-			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-			$this->db->group_end();
-		}
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();
 
-		if ($this->config->item('unterbrechung_enabled') === true)
-		{
-			$this->db->or_group_start();
-			$this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
-			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-			$this->db->group_end();
-		}
-
-		if ($this->config->item('wiederholung_enabled') === true)
-		{
-			$this->db->or_group_start();
-			$this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
-			$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
-			$this->db->group_end();
-		}
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
+		$this->db->group_end();
 
 		$result =  $this->StudierendenantragModel->load();
 		if(isError($result))
@@ -125,7 +105,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));
@@ -226,10 +206,6 @@ class AntragJob extends JOB_Controller
 	public function sendReminderWiedereinstieg()
 	{
 		$now = new DateTime();
-
-		if ($this->config->item('unterbrechung_enabled') !== true)
-			return $this->logError('Konnte Job nicht starten: Config "unterbrechung_enabled" nicht auf true gesetzt');
-
 		$modifier = $this->config->item('unterbrechung_job_remind_wiedereinstieg_date_modifier');
 
 		if (!$modifier)
@@ -387,13 +363,6 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job handleWiederholerDeadline');
 
-		if ($this->config->item('wiederholung_enabled') !== true)
-		{
-			$this->logError('Config "wiederholung_enabled" nicht auf true gesetzt');
-			$this->logInfo('Ende Job handleWiederholerDeadline');
-			return;
-		}
-
 		$this->load->library('PrestudentLib');
 
 		$insertvon = $this->config->item('antrag_job_systemuser');
@@ -512,13 +481,6 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job handleAbmeldungenStglDeadline');
 
-		if ($this->config->item('abmeldung_stg_enabled') !== true)
-		{
-			$this->logError('Config "abmeldung_stg_enabled" nicht auf true gesetzt');
-			$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
-			return;
-		}
-
 		$insertvon = $this->config->item('antrag_job_systemuser');
 		if (!$insertvon) {
 			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
@@ -652,13 +614,6 @@ class AntragJob extends JOB_Controller
 	{
 		$this->logInfo('Start Job sendAufforderungWiederholer');
 
-		if ($this->config->item('wiederholung_enabled') !== true)
-		{
-			$this->logError('Config "wiederholung_enabled" nicht auf true gesetzt');
-			$this->logInfo('Ende Job sendAufforderungWiederholer');
-			return;
-		}
-
 		$modifier_request_1 = $this->config->item('wiederholung_job_request_1_date_modifier');
 		$modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier');
 		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');

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

@@ -1,27 +0,0 @@
-<?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');
-	}
-
-
-	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/Studierendenantrag.php

@@ -25,13 +25,10 @@ class Studierendenantrag extends FHC_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'studierendenantrag',
-			'ui'
+			'studierendenantrag'
 		]);
 
-		$this->load->config('studierendenantrag');
-
-		if (strtolower($this->router->method) === 'leitung')
+        if (strtolower($this->router->method) === 'leitung')
         	$this->_isAllowed([
         		'leitung' => ['student/studierendenantrag:r', 'student/antragfreigabe:r']
         	]);
@@ -57,27 +54,18 @@ class Studierendenantrag extends FHC_Controller
 					'bezeichnungStg' => $antrag->bezeichnung,
 					'bezeichnungOrgform' => $antrag->orgform
 				);
+				
+				$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
 
-				if ($this->config->item('wiederholung_enabled') === true)
-				{
-					$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
-					if (getData($result) == 1)
-						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
-				}
+				$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
 
-				if ($this->config->item('unterbrechung_enabled') === true)
-				{
-					$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
-					if (getData($result) == 1)
-						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
-				}
-
-				if ($this->config->item('abmeldung_enabled') === true)
-				{
-					$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
-					if (getData($result) == 1)
-						$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
-				}
+				$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
 			}
 			if ($antrag->studierendenantrag_id == null)
 				continue;
@@ -100,59 +88,45 @@ class Studierendenantrag extends FHC_Controller
 
 		$this->load->view('lehre/Antrag/Leitung/List', [
 			'stgA' => $stgA,
-			'stgL' => $stgL,
-			'abmeldung_enabled' => $this->config->item('abmeldung_stg_enabled')
+			'stgL' => $stgL
 		]);
 	}
 
 	public function abmeldung($prestudent_id, $studierendenantrag_id = null)
 	{
-		if ($this->config->item('abmeldung_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'Abmeldung'
-			]);
-		}
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Abmeldung'
+		]);
 	}
 
 	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
 	{
 
-		if ($this->config->item('abmeldung_stg_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'AbmeldungStgl'
-			]);
-		}
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'AbmeldungStgl'
+		]);
 	}
 
 	public function unterbrechung($prestudent_id, $studierendenantrag_id = null)
 	{
-		if ($this->config->item('unterbrechung_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'Unterbrechung'
-			]);
-		}
-
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Unterbrechung'
+		]);
 	}
 
 	public function wiederholung($prestudent_id, $studierendenantrag_id = null)
 	{
-		if ($this->config->item('wiederholung_enabled') === true)
-		{
-			$this->load->view('lehre/Antrag/Create', [
-				'prestudent_id' => $prestudent_id,
-				'studierendenantrag_id' => $studierendenantrag_id,
-				'antrag_type' => 'Wiederholung'
-			]);
-		}
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Wiederholung'
+		]);
 	}
 
 	/**

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

@@ -1,610 +0,0 @@
-<?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 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->group_start();
-				$where_ids_chunks = array_chunk($ids,25);
-				foreach($where_ids_chunks as $where_ids)
-				{
-					$this->SyncModel->db->or_where_in('stundenplandev_id', $where_ids);
-				}
-				$this->SyncModel->db->group_end();
-
-				$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->group_start();
-				$where_ids_chunks = array_chunk($ids,25);
-				foreach($where_ids_chunks as $where_ids)
-				{
-					$this->SyncReservierungModel->db->or_where_in('reservierung_id', $where_ids);
-				}
-				$this->SyncReservierungModel->db->group_end();
-
-				$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);
-					}
-				}
-			}
-		}
-	}
-
-	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);
-	}
-
-	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')
-				)
-			);
-		}
-	}
-}

application/core/ICollisionCheck.php

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

application/core/Notiz_Controller.php

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