refactor

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/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,65 +72,52 @@ $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'] = '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'] = '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'];

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,32 +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;
-

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' => [

application/config/treemenu.php

@@ -1,29 +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"]
-];

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/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/config/treemenu/stv_menu.php

@@ -0,0 +1,47 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['stv_menu'] = array(
+	'library' => 'treemenu/TreeMenuLib',
+	'children' => array(
+		'stg' => array(
+			'library' => 'treemenu/StgLib',
+			'children' => array(
+/*
+				'pre' => array(
+					'library' => 'treemenu/PrestudentLib'
+				),
+				'sem' => array(
+					'library' => 'treemenu/AusbSemesterLib',
+					'children' => array(
+						'vbd' => array(
+							'library' => 'treemenu/VerbandLib'
+						)
+					)
+				),
+*/
+				'orgform' => array(
+					'library' => 'treemenu/OrgFormLib',
+					'children' => array(
+/*
+						'pre' => array(
+							'library' => 'treemenu/PrestudentLib'
+						),
+						'sem' => array(
+							'library' => 'treemenu/AusbSemesterLib',
+							'children' => array(
+								'vbd' => array(
+									'library' => 'treemenu/VerbandLib'
+								)
+							)
+						)
+*/
+					)
+				)
+			)
+		),
+		'inout' => array(
+			'library' => 'treemenu/InOutLib'
+		),
+	)
+);

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

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

@@ -1,76 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
-class OtherLvPlan extends FHCAPI_Controller
-{
-
-    /**
-     * Object initialization
-     */
-    public function __construct()
-    {
-        parent::__construct([
-            'otherLvPlanViewData' => ['basis/other_lv_plan:r'],
-        ]);
-
-        $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
-        $this->load->model('person/Benutzer_model', 'BenutzerModel');
-
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-     * retrieves viewData for other lv plan view
-     * @access public
-     * @param  $uid the userID for which the other lv plan is being viewed
-     */
-    public function otherLvPlanViewData($uid)
-    {
-        $isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid);
-        $isMitarbeiter = getData($isMitarbeiterResult);
-        $isStudent = !$isMitarbeiter;
-
-        $this->BenutzerModel->addSelect(["foto", "vorname", "nachname"]);
-        $this->BenutzerModel->addJoin("tbl_person", "person_id");
-        $personResult = $this->BenutzerModel->load([$uid]);
-        $person = hasData($personResult) ? getData($personResult) : null;
-
-        $viewData = [
-            "user_data" => [
-                "username" => $uid,
-                "is_student" => $isStudent,
-                "is_mitarbeiter" => $isMitarbeiter,
-                "foto" => $person[0]->foto,
-                "vorname" => $person[0]->vorname,
-                "nachname" => $person[0]->nachname,
-            ],
-        ];
-
-        $this->terminateWithSuccess($viewData);
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-}
-

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

@@ -0,0 +1,103 @@
+<?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 TreeMenu extends FHCAPI_Controller
+{
+	protected $treemenuconfig;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'fullMenu' => ['admin:r', 'assistenz:r'],
+			'partMenu' => ['admin:r', 'assistenz:r'],
+		]);
+	}
+
+	public function fullMenu($treemenu=null)
+	{
+		$includeSubMenu = true;
+		$this->getMenu($treemenu, $includeSubMenu);
+	}
+
+	public function partMenu($treemenu=null)
+	{
+		$includeSubMenu = false;
+		$this->getMenu($treemenu, $includeSubMenu);
+	}
+
+	protected function getMenu($treemenu=null, $includeSubMenu=false)
+	{
+		if(is_null($treemenu))
+		{
+			$this->terminateWithError('missing parameter treemenu.');
+		}
+
+		$this->loadMenuConfig($treemenu);
+
+		$uri = $this->uri->uri_to_assoc(7);
+		$startconfig = $this->findStartLib($this->treemenuconfig, array_keys($uri));
+
+		$libpath = $startconfig['library'];
+		$children = isset($startconfig['children']) ? $startconfig['children'] : array();
+		$libname = basename($startconfig['library']);
+
+		$this->load->library(
+			$libpath,
+			$children,
+			$libname
+		);
+
+		$bhdebug = (object) array(
+			'treemenu' => $treemenu,
+			'treemenuconfig' => $this->treemenuconfig,
+			'uri' => $uri,
+			'libpath' => $libpath,
+			'libname' => $libname,
+			'children' => $children,
+			'startconfig' => $startconfig
+		);
+		$this->addMeta('bhdebug', $bhdebug);
+		//$this->addMeta('bhci', $this);
+
+		$this->$libname->init($uri, $includeSubMenu);
+		$data = $this->$libname->getSubMenu();
+		$this->terminateWithSuccess($data);
+	}
+
+	protected function findStartLib($config, $uri)
+	{
+		$level = array_shift($uri);
+		if(is_null($level)) {
+			return $config;
+		}
+		return $this->findStartLib($config['children'][$level], $uri);
+	}
+
+	protected function loadMenuConfig($treemenu)
+	{
+		$this->config->load('treemenu/' . $treemenu . '.php');
+		$this->treemenuconfig = $this->config->item($treemenu);
+	}
+}

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

@@ -40,32 +40,11 @@ class Board extends FHCAPI_Controller
 
 	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);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function create()
@@ -103,7 +82,7 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function delete()
@@ -137,6 +116,6 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 }

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

@@ -120,7 +120,10 @@ class Preset extends FHCAPI_Controller
 			$conf = $this->dashboardlib->getPreset($db, $funktion);
 			if ($conf) {
 				$preset = json_decode($conf->preset, true);
-				$result[$funktion] = $preset;
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
 			} else {
 				$result[$funktion] = [];
 			}
@@ -151,7 +154,7 @@ class Preset extends FHCAPI_Controller
 
 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$preset_decoded[$widget['widgetid']] = $widget;
+		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);
 
 		$preset->preset = json_encode($preset_decoded);
 
@@ -183,10 +186,8 @@ class Preset extends FHCAPI_Controller
 
 		$preset_decoded = json_decode($preset->preset, true);
 
-		if (!isset($preset_decoded[$widgetid]))
+		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
 			show_404();
-		
-		unset($preset_decoded[$widgetid]);
 
 		$preset->preset = json_encode($preset_decoded);
 

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

@@ -48,9 +48,25 @@ class User extends FHCAPI_Controller
 		
 		$uid = $this->authlib->getAuthObj()->username;
 
-		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
+		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);
 
-		$this->terminateWithSuccess($mergedconfig);
+		$this->terminateWithSuccess([
+			'general' => call_user_func_array(
+				'array_merge_recursive',
+				$mergedconfig
+			)
+		]);*/
+		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
+		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
+
+		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
+		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
+
+		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
+
+		$this->terminateWithSuccess([
+			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
+		]);
 	}
 
 	public function addWidget()
@@ -70,15 +86,26 @@ class User extends FHCAPI_Controller
 		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;
+		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
+			$override_decoded['general'] = [];
 
+		 if (!isset($override_decoded['general']['widgets']))
+				$override_decoded['general']['widgets'] = [];
+
+		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
+
+		// NOTE(chris): remove doubles in other funktionen
+		foreach ($override_decoded as $funktion => $array) {
+			if ($funktion == 'general')
+				continue;
+			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
+				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
+		}
+		
 		$override->override = json_encode($override_decoded);
 				
 		$result = $this->dashboardlib->insertOrUpdateOverride($override);
@@ -108,10 +135,18 @@ class User extends FHCAPI_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 
-		if (!isset($override_decoded[$widget_id]))
-			show_404();
-		
-		unset($override_decoded[$widget_id]);
+		foreach (array_keys($override_decoded) as $k) {
+			if (!isset($override_decoded[$k]["widgets"])) {
+				unset($override_decoded[$k]);
+				continue;
+			}
+			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
+				unset($override_decoded[$k]["widgets"][$widget_id]);
+			}
+			if (!$override_decoded[$k]["widgets"]) {
+				unset($override_decoded[$k]);
+			}
+		}
 
 		$override->override = json_encode($override_decoded);
 				

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

@@ -9,9 +9,9 @@ class Detailheader extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 	}
 

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

@@ -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/Dokumente.php

@@ -170,8 +170,6 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$nachgereicht_am =  $this->input->post('nachgereicht_am') == '' ? null : $this->input->post('nachgereicht_am');
-
 		$uid = getAuthUID();
 
 		$result = $this->AkteModel->update(
@@ -182,7 +180,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

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

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

@@ -296,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/components/stv/Studiensemester.php

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

application/controllers/jobs/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))
@@ -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/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

@@ -28,9 +28,7 @@ class Studierendenantrag extends FHC_Controller
 			'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']
         	]);
@@ -56,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;
@@ -99,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/libraries/AntragLib.php

@@ -1657,7 +1657,7 @@ class AntragLib
 
 		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where);
 		if (isError($result))
-			return $result;
+		return $result;
 
 		if (!hasData($result))
 			return error($this->_ci->p->t('studierendenantrag', "error_no_antrag_found", ['id' => $studierendenantrag_id]));
@@ -1709,7 +1709,6 @@ class AntragLib
 		$result->statustyp = $antrag->statustyp;
 		$result->status_insertvon = $antrag->status_insertvon;
 		$result->grund = $antrag->grund;
-		$result->status_grund = $antrag->status_grund;
 		$result->studierendenantrag_id = $antrag->studierendenantrag_id;
 		$result->typ = $antrag->typ;
 		$result->datum = $antrag->datum;

application/libraries/ProfilLib.php

@@ -263,59 +263,6 @@ class ProfilLib{
 			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
 			return $element;
 		}, $mailverteiler_res);
-
-		$this->ci->load->model("crm/Student_model", "StudentModel");
-		$this->ci->StudentModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_student.student_uid");
-		$this->ci->StudentModel->addJoin("tbl_person", "tbl_benutzer.person_id = tbl_person.person_id");
-		$this->ci->StudentModel->addJoin("tbl_studiengang", "tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz");
-		$this->ci->StudentModel->addSelect("matr_nr, semester, verband, gruppe, kurzbzlang");
-
-		$studentResult = $this->ci->StudentModel->loadWhere(["student_uid" => $uid]);
-		if (isError($studentResult)) {
-			return error(getData($studentResult));
-		}
-
-		$studentResultData = getData($studentResult);
-		$studentData = null;
-		if (is_array($studentResultData) && count($studentResultData)) {
-			$studentData = $studentResultData[0];
-		}
-
-		if ($studentData && $studentData->matr_nr) {
-			$this->ci->load->library("phrasesLib", ["profil"], "phrases");
-			$standardCourseVerteiler = trim($studentData->kurzbzlang) . "_STD";
-			$mailverteiler_res[] = [
-				"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $standardCourseVerteiler,
-				"gruppe_kurzbz" => $standardCourseVerteiler,
-				"mailto" => "mailto:" . strtolower($standardCourseVerteiler) . "@" . DOMAIN,
-			];
-
-			$semesterVerteiler = trim($studentData->kurzbzlang) . trim($studentData->semester);
-			$mailverteiler_res[] = [
-				"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $semesterVerteiler,
-				"gruppe_kurzbz" => $semesterVerteiler,
-				"mailto" => "mailto:" . strtolower($semesterVerteiler) . "@" . DOMAIN,
-			];
-
-			if ($studentData->verband && strlen(trim($studentData->verband))) {
-				$verbandVerteiler = $semesterVerteiler . trim($studentData->verband);
-				$mailverteiler_res[] = [
-					"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $verbandVerteiler,
-					"gruppe_kurzbz" => $verbandVerteiler,
-					"mailto" => "mailto:" . strtolower($verbandVerteiler) . "@" . DOMAIN,
-				];
-
-				if ($studentData->gruppe && strlen(trim($studentData->gruppe))) {
-					$gruppeVerteiler = $verbandVerteiler . trim($studentData->gruppe);
-					$mailverteiler_res[] = [
-						"beschreibung" => $this->ci->phrases->t('profil', 'alleStudentenVon') . " " . $gruppeVerteiler,
-						"gruppe_kurzbz" => $gruppeVerteiler,
-						"mailto" => "mailto:" . strtolower($gruppeVerteiler) . "@" . DOMAIN,
-					];
-				}
-			}
-		}
-
 		return $mailverteiler_res;
 	}
 

application/libraries/StundenplanLib.php

@@ -40,16 +40,13 @@ class StundenplanLib
 	 * @return stdClass
 	 * @access public
 	 */
-	public function getEventsUser($start, $end, $uid = null)
+	public function getEventsUser($start, $end)
 	{
 		$this->_ci =& get_instance();
 
 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		if (!$uid) {
-			$uid = getAuthUID();
-		}
-		
+		$uid = getAuthUID();
 		if (is_null($uid))
 			return error("No UID");
 		
@@ -220,7 +217,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
 	{
 		$this->_ci =& get_instance();
 
@@ -231,14 +228,14 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? getAuthUID()));
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
 
 		if ($is_mitarbeiter && empty($ort_kurzbz)) {
 			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 		}
 		
 		if (isError($reservierungen))
@@ -360,10 +357,7 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object_data = getData($ort_content_object);
-				$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
-					? $ort_content_object_data[0]
-					: null;
+				$ort_content_object = getData($ort_content_object)[0];
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}
@@ -451,24 +445,6 @@ class StundenplanLib
 		return success($ferienEventsFlattened);
 	}
 
-	public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
-		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
-		if (isError($stundenplan_data))
-			return $stundenplan_data;
-		$stundenplan_data = getData($stundenplan_data) ?? [];
-
-		$function_error = $this->expandObjectInformation($stundenplan_data);
-		if ($function_error)
-			return $function_error;
-
-		return success($stundenplan_data);
-	}
-
 	// start of the private functions ########################################################################################################
 
 	// function used to sort an array of studiensemester strings

application/libraries/dashboard/DashboardLib.php

@@ -37,9 +37,7 @@ class DashboardLib
 	
 	public function getDashboardByKurzbz($dashboard_kurzbz)
 	{
-		$result = $this->_ci->DashboardModel->loadWhere([
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
+		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
 
 		if (hasData($result))
 		{
@@ -49,21 +47,17 @@ class DashboardLib
 		return null;
 	}
 	
-	public function getMergedUserConfig($dashboard_id, $uid)
+	public function getMergedConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getUserBaseConfig($dashboard_id);
-		$userconfig = $this->getUserOverrideConfig($dashboard_id, $uid);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id);
+		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
-		$sourceconfig = array_map(function ($value) {
-			return ['source' => $value['source']];
-		}, $defaultconfig);
-		
-		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig, $sourceconfig);
+		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
 		
 		return $mergedconfig;
 	}
 	
-	protected function getUserBaseConfig($dashboard_id)
+	public function getDefaultConfig($dashboard_id)
 	{
 		$funktion_kurzbzs = [];
 		$rights = $this->_ci->permissionlib->getAccessRights();
@@ -93,11 +87,7 @@ class DashboardLib
 				$preset = json_decode($presetobj->preset, true);
 				if (null !== $preset)
 				{
-					$preset = array_map(function ($value) use ($presetobj) {
-						$value['source'] = $presetobj->funktion_kurzbz ?: self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-						return $value;
-					}, $preset);
-					$defaultconfig = array_merge_recursive($defaultconfig, $preset);
+					$defaultconfig = array_replace_recursive($defaultconfig, $preset);
 				}
 			}
 		}
@@ -105,7 +95,7 @@ class DashboardLib
 		return $defaultconfig;
 	}
 	
-	protected function getUserOverrideConfig($dashboard_id, $uid)
+	public function getUserConfig($dashboard_id, $uid)
 	{
 		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
 		
@@ -134,7 +124,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '[]';
+		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
 		
 		return $emptyoverride;
 	}
@@ -153,7 +143,8 @@ class DashboardLib
 		$emptypreset = new stdClass();
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
-		$emptypreset->preset = '[]';
+		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
 		
 		return $emptypreset;
 	}
@@ -218,4 +209,44 @@ class DashboardLib
 		
 		return $result;
 	}
+
+	public function addWidgetsToWidgets(&$widgets, $dashboard_kurzbz, $section, $addwigets)
+	{
+		foreach ($addwigets as $widget)
+		{
+			if(!isset($widget['widgetid']))
+			{
+				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
+			}
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
+		}
+	}
+	
+	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if (!isset($widgets[$section]) || !isset($widgets[$section]["widgets"]) || !is_array($widgets[$section]))
+		{
+			$widgets[$section] = array();
+			$widgets[$section]["widgets"] = array();
+		}
+		
+		$widgets[$section]["widgets"][$widgetid] = $widget;
+	}
+	
+	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if (isset($widgets[$section]) && isset($widgets[$section]["widgets"][$widgetid]))
+		{
+			unset($widgets[$section]["widgets"][$widgetid]);
+			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
+				unset($widgets[$section]);
+			}
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 }

application/libraries/stv/StudentListLib.php

@@ -1,381 +0,0 @@
-<?php
-/**
- * Copyright (C) 2025 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 generates a list of students and or prestudents used for Studierendenverwaltung
- */
-class StudentListLib
-{
-	private $_ci; // Code igniter instance
-
-	private $_allowedStgs = [];
-	private $_selects = [];
-	private $_joins = [];
-	private $_wheres = [];
-	
-	/**
-	 * Gets the CI instance, loads model and prepares default values
-	 *
-	 * @param array		$params
-	 *
-	 * @return void
-	 */
-	public function __construct($params = null)
-	{
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->config('stv');
-
-		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		if (isset($params['allowedStgs']))
-			$this->_allowedStgs = $params['allowedStgs'];
-
-		// Add default SELECTs
-		$this->addSelect("b.uid");
-		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-			$this->addSelect('tag_data_agg.tags');
-		$this->addSelect('titelpre');
-		$this->addSelect('nachname');
-		$this->addSelect('vorname');
-		$this->addSelect('wahlname');
-		$this->addSelect('vornamen');
-		$this->addSelect('titelpost');
-		$this->addSelect('ersatzkennzeichen');
-		$this->addSelect('gebdatum');
-		$this->addSelect('geschlecht');
-		$this->addSelect('foto');
-		$this->addSelect('foto_sperre');
-		$this->addSelect('v.semester');
-		$this->addSelect('v.verband');
-		$this->addSelect('v.gruppe');
-		$this->addSelect("statusofsemester"); // Will be replaced later
-		$this->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
-		$this->addSelect('tbl_prestudent.studiengang_kz');
-		$this->addSelect('stg.bezeichnung AS stg_bezeichnung');
-		$this->addSelect("s.matrikelnr");
-		$this->addSelect('p.person_id');
-		$this->addSelect('pls.status_kurzbz AS status');
-		$this->addSelect('pls.datum AS status_datum');
-		$this->addSelect('pls.bestaetigtam AS status_bestaetigung');
-		$this->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
-			false
-		);
-		$this->addSelect("
-			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
-			THEN CONCAT(b.uid, '@', " . $this->_ci->PrestudentModel->escape(DOMAIN) . ")
-			ELSE '' END AS mail_intern", false);
-		$this->addSelect('p.anmerkung AS anmerkungen');
-		$this->addSelect('tbl_prestudent.anmerkung');
-		$this->addSelect('pls.orgform_kurzbz');
-		$this->addSelect('aufmerksamdurch_kurzbz');
-		$this->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
-			false
-		);
-		$this->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->addSelect('tbl_prestudent.dual');
-		$this->addSelect('p.matr_nr');
-		$this->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
-		$this->addSelect('tbl_prestudent.prestudent_id');
-		$this->addSelect("(
-			SELECT count(*)
-			FROM (
-				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
-				FROM public.tbl_prestudent pss
-				JOIN public.tbl_prestudentstatus USING (prestudent_id)
-				WHERE person_id = p.person_id
-				AND studiensemester_kurzbz = (
-					SELECT studiensemester_kurzbz
-					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id = tbl_prestudent.prestudent_id
-					AND status_kurzbz = 'Interessent'
-					LIMIT 1
-				)
-				AND status_kurzbz = 'Interessent'
-			) prest
-			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
-			AND priorisierung <= tbl_prestudent.priorisierung
-		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
-		$this->addSelect('mentor');
-		$this->addSelect('b.aktiv AS bnaktiv');
-		$this->addSelect('unruly');
-		
-		// Add default JOINs
-		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
-		$this->addJoin('public.tbl_person p', 'person_id');
-		$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
-		$this->addJoin('public.tbl_prestudentstatus pls', '
-			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
-			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
-			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
-			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
-		$this->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
-		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
-		$this->addJoin("v", "", ""); // Will be replaced later
-		$this->addJoin("ps", "", ""); // Will be replaced later
-		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED) {
-			$this->_ci->load->config('stv');
-			$tags = $this->_ci->config->item('stv_prestudent_tags');
-
-			$whereTags = '';
-			if (is_array($tags) && !isEmptyArray($tags)) {
-				$tags = array_keys($tags);
-
-				foreach ($tags as $key => $tag) {
-					$tags[$key] = $this->_ci->PrestudentModel->escape($tag);
-				}
-				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
-			}
-			$subQueryTag = "(
-				SELECT
-					tag.prestudent_id,
-					COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-				FROM (
-					SELECT DISTINCT ON (n.notiz_id)
-						n.notiz_id AS id,
-						nt.typ_kurzbz,
-						array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-						n.text AS notiz,
-						nt.style,
-						n.erledigt AS done,
-						nz.prestudent_id
-					FROM public.tbl_notizzuordnung AS nz
-					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz " . $whereTags . "
-				) AS tag
-				GROUP BY tag.prestudent_id
-			) AS tag_data_agg";
-
-			$this->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-		}
-
-		// Add SELECTs and JOINs from config
-		$config = $this->_ci->config->item('list_columns') ?: [];
-		foreach ($config as $conf) {
-			$this->addSelect($conf['default']);
-			if (isset($conf['joins']))
-				foreach ($conf['joins'] as $join)
-					call_user_func_array([$this, 'addJoin'], $join);
-		}
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Adds a SELECT statement to the query.
-	 *
-	 * @param string|array	$select
-	 * @param boolean		$escape (optional)
-	 *
-	 * @return void
-	 */
-	public function addSelect($select, $escape = true)
-	{
-		if (is_array($select)) {
-			foreach ($select as $s)
-				$this->addSelect($s, $escape);
-			return;
-		}
-		$alias = $this->getAliasFromSelect($select);
-		$this->_selects[$alias] = [$select, $escape];
-	}
-
-	/**
-	 * Joins a table to the query.
-	 *
-	 * @param string		$table
-	 * @param string		$cond
-	 * @param string		$type (optional)
-	 * @param string		$position (optional)
-	 *
-	 * @return void
-	 */
-	public function addJoin($table, $cond, $type = '', $position = 'end')
-	{
-		$alias = $this->getAliasFromTable($table);
-
-		if ($position == 'end') {
-			return $this->_joins[$alias] = [$table, $cond, $type];
-		}
-
-		if ($position == 'start') {
-			return $this->_joins = [$alias => [$table, $cond, $type]] + $this->_joins;
-		}
-
-		if (substr($position, 0, 7) == 'before_') {
-			$ref = substr($position, 7);
-			$index = 0;
-		} elseif (substr($position, 0, 6) == 'after_') {
-			$ref = substr($position, 6);
-			$index = 1;
-		} else {
-			return $this->addJoin($table, $cond, $type);
-		}
-		if (!isset($this->_joins[$ref]))
-			return $this->addJoin($table, $cond, $type);
-
-		$key_indeces = array_flip(array_keys($this->_joins));
-		$index += $key_indeces[$ref];
-
-		if (!$index)
-			return $this->addJoin($table, $cond, $type, 'start');
-
-		$front_part = array_slice($this->_joins, 0, $index, true);
-		$back_part = array_slice($this->_joins, $index, null, true);
-
-		if (isset($front_part[$alias])) {
-			unset($front_part[$alias]);
-		}
-
-		$this->_joins = $front_part + [$alias => [$table, $cond, $type]] + $back_part;
-	}
-
-	/**
-	 * Adds a WHERE clause to the query.
-	 *
-	 * @param string|array	$key
-	 * @param string|array	$value
-	 * @param boolean		$escape
-	 *
-	 * @return void
-	 */
-	public function addWhere($key, $value = null, $escape = true)
-	{
-		$this->_wheres[] = [$key, $value, $escape, false];
-	}
-
-	/**
-	 * Adds a OR WHERE clause to the query.
-	 *
-	 * @param string|array	$key
-	 * @param string|array	$value
-	 * @param boolean		$escape
-	 *
-	 * @return void
-	 */
-	public function addOrWhere($key, $value = null, $escape = true)
-	{
-		$this->_wheres[] = [$key, $value, $escape, true];
-	}
-
-	/**
-	 * Generates the query and executes it.
-	 *
-	 * @param string|null	$studiensemester_kurzbz
-	 *
-	 * @return stdClass		result of the query
-	 */
-	public function execute($studiensemester_kurzbz)
-	{
-		$stdsemEsc = $studiensemester_kurzbz ? $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
-
-
-		$this->addSelect(
-			"public.get_rolle_prestudent(
-				public.tbl_prestudent.prestudent_id, 
-				" . $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) . "
-			)  AS statusofsemester"
-		);
-		$this->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
-			'LEFT'
-		);
-		$this->addJoin(
-			'public.tbl_prestudentstatus ps',
-			'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
-				AND ps.prestudent_id=tbl_prestudent.prestudent_id 
-				AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
-				AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')
-			',
-			'LEFT'
-		);
-
-		$this->addWhere('tbl_prestudent.studiengang_kz', $this->_allowedStgs);
-
-		foreach ($this->_joins as $join)
-			$this->_ci->PrestudentModel->addJoin($join[0], $join[1], $join[2]);
-
-		foreach ($this->_selects as $select)
-			$this->_ci->PrestudentModel->addSelect($select[0], $select[1]);
-
-		foreach ($this->_wheres as $where) {
-			if (!is_array($where[0]) && is_array($where[1])) {
-				if ($where[3])
-					$this->_ci->PrestudentModel->db->or_where_in($where[0], $where[1], $where[2]);
-				else
-					$this->_ci->PrestudentModel->db->where_in($where[0], $where[1], $where[2]);
-			} else {
-				if ($where[3])
-					$this->_ci->PrestudentModel->db->or_where($where[0], $where[1], $where[2]);
-				else
-					$this->_ci->PrestudentModel->db->where($where[0], $where[1], $where[2]);
-			}
-		}
-
-		$this->_ci->PrestudentModel->addOrder('nachname');
-		$this->_ci->PrestudentModel->addOrder('vorname');
-
-		return $this->_ci->PrestudentModel->load();
-	}
-
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Protected methods
-
-	/**
-	 * Get alias of a table or select statement
-	 *
-	 * @param string		$select
-	 *
-	 * @return string
-	 */
-	final protected function getAliasFromSelect($select)
-	{
-		if (strpos($select, ' ') !== false) {
-			return trim(strrchr($select, ' '));
-		}
-
-		if (strpos($select, '.') !== false) {
-			return substr(strrchr($select, '.'), 1);
-		}
-
-		return $select;
-	}
-
-	/**
-	 * Get alias of a table or select statement
-	 *
-	 * @param string|array	$table
-	 *
-	 * @return string|array
-	 */
-	final protected function getAliasFromTable($table)
-	{
-		if (strpos($table, ' ') !== false) {
-			return trim(strrchr($table, ' '));
-		}
-
-		return $table;
-	}
-}

application/libraries/treemenu/InOutLib.php

@@ -0,0 +1,37 @@
+<?php
+require_once APPPATH . 'libraries/treemenu/TreeMenuLib.php';
+
+/**
+ * Description of InOutLib
+ *
+ * @author bambi
+ */
+class InOutLib extends TreeMenuLib
+{
+	public function getNodes($params=array(), $includeSubMenu=false)
+	{
+		return [
+			[
+				'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
+					]
+				]
+			]
+		];
+	}
+}

application/libraries/treemenu/LvVwLib.php

@@ -1,192 +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');
-
-/**
- * LvVw Menu library
- */
-class LvVwLib
-{
-	protected $_ci = null;
-
-	public $config = [];
-
-	public function __construct()
-	{
-		// Get code igniter instance
-		$this->_ci =& get_instance();
-
-		// Load Tree-config
-		$this->_ci->load->config('treemenu/custom/lvvw');
-		$this->config = $this->_ci->config->item('root');
-
-		// Load Libraries
-		$this->_ci->load->library('treemenu/base/StgLib');
-
-		// Load Model
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-	}
-
-	public function stg($path_template)
-	{
-		$permittedStgs = $this->getPermittedStudiengangKzs();
-
-		if (!$permittedStgs)
-			return [];
-
-		$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
-			'"type": "verband",' .
-			'"id": "lv/%1$s",' .
-			'"gruppe_kurzbz": null,' .
-			'"semester": null,' .
-			'"verband": null,' .
-			'"gruppe": null,' .
-			'"lehrverband": true,' .
-			'"stg_kz": "%1$s"' .
-		"}', studiengang_kz)] AS draggable", false);
-
-		return $this->_ci->stglib->studiengang($path_template, $permittedStgs);
-	}
-
-	public function semester($path_template, $has_children, $stg)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if (!$has_children)
-			$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-		$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
-			'"type": "verband",' .
-			'"id": "lv/%1$s/%2$s",' .
-			'"gruppe_kurzbz": null,' .
-			'"semester": "%2$s",' .
-			'"verband": null,' .
-			'"gruppe": null,' .
-			'"lehrverband": true,' .
-			'"stg_kz": "%1$s"' .
-		"}', v.studiengang_kz, v.semester)] AS draggable", false);
-
-		return $this->_ci->stglib->semester($path_template, $stg->studiengang_kz);
-	}
-
-	public function verband($path_template, $stg, $semester)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		$this->_ci->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
-		$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
-			'"type": "verband",' .
-			'"id": "lv/%1$s/%2$s/%3$s",' .
-			'"gruppe_kurzbz": null,' .
-			'"semester": "%2$s",' .
-			'"verband": "%3$s",' .
-			'"gruppe": null,' .
-			'"lehrverband": true,' .
-			'"stg_kz": "%1$s"' .
-		"}', v.studiengang_kz, v.semester, v.verband)] AS draggable", false);
-		$this->_ci->StudiengangModel->addGroupBy('v.studiengang_kz, v.semester');
-
-		return $this->_ci->stglib->verband($path_template, $stg->studiengang_kz, $semester);
-	}
-
-	public function group($path_template, $stg, $semester, $verband)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-		
-		if ($verband === null) {
-			$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
-				'"type": "verband",' .
-				'"id": "grp/%1$s/%2$s/%3$s",' .
-				'"gruppe_kurzbz": "%3$s",' .
-				'"semester": "%2$s",' .
-				'"verband": null,' .
-				'"gruppe": null,' .
-				'"lehrverband": false,' .
-				'"stg_kz": "%1$s"' .
-			"}', studiengang_kz, semester, gruppe_kurzbz)] AS draggable", false);
-
-			return $this->_ci->stglib->group($path_template, $stg->studiengang_kz, $semester);
-		}
-
-		$this->_ci->StudiengangModel->addSelect("ARRAY['link', FORMAT('{" .
-			'"type": "verband",' .
-			'"id": "lv/%1$s/%2$s/%3$s/%4$s",' .
-			'"gruppe_kurzbz": null,' .
-			'"semester": "%2$s",' .
-			'"verband": "%3$s",' .
-			'"gruppe": "%4$s",' .
-			'"lehrverband": true,' .
-			'"stg_kz": "%1$s"' .
-		"}', v.studiengang_kz, v.semester, v.verband, v.gruppe)] AS draggable", false);
-
-		return $this->_ci->stglib->verbandsgroup($path_template, $stg->studiengang_kz, $semester, $verband);
-	}
-
-	public function orgform($path_template, $stg)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if (!$stg->mischform)
-			return [];
-		
-		$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-
-		return $this->_ci->stglib->orgform($path_template, $stg->studiengang_kz);
-	}
-
-	protected function getPermittedStudiengangKzs()
-	{
-		$permittedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$permittedStgs = array_merge($permittedStgs, $this->_ci->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
-
-		return $permittedStgs;
-	}
-
-	protected function getStgFromUrl($stg)
-	{
-		$permittedStgs = $this->getPermittedStudiengangKzs();
-
-		if (!$permittedStgs)
-			return null;
-
-		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $permittedStgs);
-		$stg = $this->_ci->StudiengangModel->loadWhere([
-			'LOWER(CONCAT(typ, kurzbz)) =' => $stg
-		]);
-
-		if (!hasData($stg))
-			return null;
-
-		return current(getData($stg));
-	}
-}

application/libraries/treemenu/OrgFormLib.php

@@ -0,0 +1,64 @@
+<?php
+require_once APPPATH . 'libraries/treemenu/TreeMenuLib.php';
+
+/**
+ * Description of OrgFormLib
+ *
+ * @author bambi
+ */
+class OrgFormLib extends TreeMenuLib
+{
+	public function getData()
+	{
+		if(!isset($this->params['stg']))
+		{
+			throw new Exception(self::class . ' Missing Parameter stg.');
+		}
+
+		$this->ci->load->model('codex/Orgform_model', 'OrgFormModel');
+
+		$sql = <<<EOSQL
+		select 
+			o.*
+		from
+			bis.tbl_orgform o
+		join (
+			SELECT 
+				tl.orgform_kurzbz 
+			FROM 
+				public.tbl_lehrverband AS tl
+			WHERE 
+				studiengang_kz = {$this->ci->OrgFormModel->escape($this->params['stg'])}
+				and 
+				orgform_kurzbz IS NOT null 
+			group by 
+				orgform_kurzbz
+		) v on o.orgform_kurzbz = v.orgform_kurzbz
+		order by
+			o.orgform_kurzbz
+EOSQL;
+
+		$res = $this->ci->OrgFormModel->execReadonlyQuery($sql);
+		$orgforms = hasData($res) ? getData($res) : array();
+
+		$this->ci->addMeta('bhorgform_' . $this->params['stg'] , $orgforms);
+
+		return $orgforms;
+	}
+
+	protected function getParamsForNextLevel($element=null)
+	{
+		if($element)
+		{
+			$paramsstg = array_merge($this->params, array('orgform' => $element->orgform_kurzbz));
+			return $paramsstg;
+		}
+		return $this->params;
+	}
+
+	protected function getName($element)
+	{
+		$name = $element->orgform_kurzbz . ' ' . $element->bezeichnung;
+		return $name;
+	}
+}

application/libraries/treemenu/PreStudentLib.php

@@ -0,0 +1,37 @@
+<?php
+require_once APPPATH . 'libraries/treemenu/TreeMenuLib.php';
+
+/**
+ * Description of PreStudentLib
+ *
+ * @author bambi
+ */
+class PreStudentLib extends TreeMenuLib
+{
+	public function getNodes($params=array())
+	{
+		return [
+			[
+				'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
+					]
+				]
+			]
+		];
+	}
+}

application/libraries/treemenu/StgLib.php

@@ -0,0 +1,39 @@
+<?php
+require_once APPPATH . 'libraries/treemenu/TreeMenuLib.php';
+
+/**
+ * Description of InOutLib
+ *
+ * @author bambi
+ */
+class StgLib extends TreeMenuLib
+{
+	protected function getData()
+	{
+		$this->ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->ci->StudiengangModel->addOrder('typ');
+		$this->ci->StudiengangModel->addOrder('kurzbz');
+		$res = $this->ci->StudiengangModel->loadWhere(array('aktiv' => true));
+		$stgs = hasData($res) ? getData($res) : array();
+
+		$this->ci->addMeta('bhstg', $stgs);
+
+		return $stgs;
+	}
+
+	protected function getParamsForNextLevel($element=null)
+	{
+		if($element)
+		{
+			$paramsstg = array_merge($this->params, array('stg' => $element->studiengang_kz));
+			return $paramsstg;
+		}
+		return $this->params;
+	}
+
+	protected function getName($element)
+	{
+		$name = strtoupper($element->typ . $element->kurzbz) . ' ' . $element->bezeichnung;
+		return $name;
+	}
+}

application/libraries/treemenu/StudVwLib.php

@@ -1,257 +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');
-
-/**
- * StudVw Menu library
- */
-class StudVwLib
-{
-	protected $_ci = null;
-
-	public $config = [];
-
-	public $redirect_method = [
-		'interessenten' => 'filter',
-		'bewerbungnichtabgeschickt' => 'filter',
-		'bewerbungabgeschickt' => 'filter',
-		'zgv' => 'filter',
-		'statusbestaetigt' => 'filter',
-		'statusbestaetigtrtnichtangemeldet' => 'filter',
-		'statusbestaetigtrtangemeldet' => 'filter',
-		'reihungstestnichtangemeldet' => 'filter',
-		'reihungstestangemeldet' => 'filter',
-		'bewerber' => 'filter',
-		'bewerberrtnichtangemeldet' => 'filter',
-		'bewerberrtangemeldet' => 'filter',
-		'bewerberrtangemeldetteilgenommen' => 'filter',
-		'bewerberrtangemeldetnichtteilgenommen' => 'filter',
-		'aufgenommen' => 'filter',
-		'warteliste' => 'filter',
-		'absage' => 'filter',
-		'outgoing' => 'inout',
-		'shared_studies' => 'inout'
-	];
-
-	public function __construct()
-	{
-		// Get code igniter instance
-		$this->_ci =& get_instance();
-
-		// Load Tree-config
-		$this->_ci->load->config('treemenu/stg_base');
-		$this->config = $this->_ci->config->item('root');
-
-		// Load Libraries
-		$this->_ci->load->library('treemenu/base/StgLib');
-
-		// Load Model
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-	}
-
-	public function stg($path_template)
-	{
-		$permittedStgs = $this->getPermittedStudiengangKzs();
-
-		if (!$permittedStgs)
-			return [];
-
-		return $this->_ci->stglib->studiengang($path_template, $permittedStgs);
-	}
-
-	public function prestudent($path_template, $stg)
-	{
-		// Check permission
-		if ($this->getStgFromUrl($stg) === null)
-			return [];
-
-		return [
-			[
-				'path' => sprintf($path_template, '1'),
-				'name' => ['lehre', 'prestudent'],
-				'no_sem_reload' => true
-			]
-		];
-	}
-
-	public function stdsem($path_template, $stg)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		return $this->_ci->stglib->studiensemester($path_template, $stg->studiengang_kz);
-	}
-
-	public function semester($path_template, $stg, $orgform)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if ($orgform !== null) {
-			$orgform = $this->getOrgform($orgform);
-			if ($orgform === null)
-				return [];
-			$orgform = $orgform->orgform_kurzbz;
-		}
-
-		return $this->_ci->stglib->semester($path_template, $stg->studiengang_kz, $orgform);
-	}
-
-	public function verband($path_template, $stg, $semester, $orgform)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if ($orgform !== null) {
-			$orgform = $this->getOrgform($orgform);
-			if ($orgform === null)
-				return [];
-			$orgform = $orgform->orgform_kurzbz;
-		}
-
-		$this->_ci->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
-
-		return $this->_ci->stglib->verband($path_template, $stg->studiengang_kz, $semester, $orgform);
-	}
-
-	public function group($path_template, $stg, $semester, $verband, $orgform)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if ($orgform !== null) {
-			$orgform = $this->getOrgform($orgform);
-			if ($orgform === null)
-				return [];
-			$orgform = $orgform->orgform_kurzbz;
-		}
-
-		$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
-		
-		if ($verband === null)
-			return $this->_ci->stglib->group($path_template, $stg->studiengang_kz, $semester, $orgform);
-
-		return $this->_ci->stglib->verbandsgroup($path_template, $stg->studiengang_kz, $semester, $verband, $orgform);
-	}
-
-	public function orgform($path_template, $stg)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		if (!$stg->mischform)
-			return [];
-
-		return $this->_ci->stglib->orgform($path_template, $stg->studiengang_kz);
-	}
-
-	public function incoming($has_children, $path_template, $stg)
-	{
-		if ($stg === null)
-			return $this->inout('incoming', $has_children, $path_template);
-		
-		return $this->filter('incoming', $has_children, $path_template, $stg);
-	}
-
-	public function filter($original_method, $has_children, $path_template, $stg)
-	{
-		$stg = $this->getStgFromUrl($stg);
-
-		if ($stg === null)
-			return [];
-
-		// TODO(chris): phrasen
-		$item = [
-			'path' => sprintf($path_template, '1'),
-			'name' => ['treemenu', 'filter_' . $original_method]
-		];
-
-		if (!$has_children)
-			$item['leaf'] = true;
-
-		return [ $item ];
-	}
-
-	public function inout($original_method, $has_children, $path_template)
-	{
-		if (!$this->_ci->permissionlib->isBerechtigt('inout/uebersicht'))
-			return [];
-
-		// TODO(chris): phrasen
-		$item = [
-			'path' => sprintf($path_template, '1'),
-			'name' => ['treemenu', 'inout_' . $original_method]
-		];
-
-		if (!$has_children)
-			$item['leaf'] = true;
-
-		return [ $item ];
-	}
-
-	protected function getOrgform($orgform)
-	{
-		$this->_ci->load->model('codex/Orgform_model', 'OrgformModel');
-		$orgform = $this->_ci->OrgformModel->loadWhere([
-			'LOWER(orgform_kurzbz) =' => $orgform
-		]);
-
-		if (!hasData($orgform))
-			return null;
-
-		return current(getData($orgform));
-	}
-
-	protected function getPermittedStudiengangKzs()
-	{
-		$permittedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$permittedStgs = array_merge($permittedStgs, $this->_ci->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
-
-		return $permittedStgs;
-	}
-
-	protected function getStgFromUrl($stg)
-	{
-		$permittedStgs = $this->getPermittedStudiengangKzs();
-
-		if (!$permittedStgs)
-			return null;
-
-		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $permittedStgs);
-		$stg = $this->_ci->StudiengangModel->loadWhere([
-			'LOWER(CONCAT(typ, kurzbz)) =' => $stg
-		]);
-
-		if (!hasData($stg))
-			return null;
-
-		return current(getData($stg));
-	}
-}

application/libraries/treemenu/StvMenuLib.php

@@ -0,0 +1,14 @@
+<?php
+require_once APPPATH . 'libraries/treemenu/TreeMenuLib.php';
+/**
+ * Description of StvMenuLib
+ *
+ * @author bambi
+ */
+class StvMenuLib extends TreeMenuLib
+{
+	public function getNodes($params=array(), $includeSubMenu=false)
+	{
+		return [];
+	}
+}

application/libraries/treemenu/TreeMenuLib.php

@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Scripting/PHPClass.php to edit this template
+ */
+
+/**
+ * Description of InOutLib
+ *
+ * @author bambi
+ */
+class TreeMenuLib
+{
+	protected $ci;
+	protected $children_config;
+	protected $params;
+	protected $includeSubMenu;
+
+	public function __construct($children_config)
+	{
+		$this->ci =& get_instance();
+		$this->children_config = $children_config;
+		$this->params = array();
+		$this->includeSubMenu = false;
+
+		foreach($this->children_config as $child_config)
+		{
+			$grandchildren_config = isset($child_config['children']) ? $child_config['children'] : [];
+			$this->ci->load->library($child_config['library'], $grandchildren_config, basename($child_config['library']));
+		}
+	}
+
+	public function init($params=array(), $includeSubMenu=false)
+	{
+		$this->params = $params;
+		$this->includeSubMenu = $includeSubMenu;
+	}
+
+	public function getNodes()
+	{
+		$data = $this->getData();
+
+		$nodes = array();
+		foreach($data as $element)
+		{
+			$node = array(
+					'name' => $this->getName($element),
+					'link' => $this->getLink($element),
+					'leaf' => $this->isLeaf()
+			);
+			if($this->includeSubMenu)
+			{
+				$node['children'] = $this->getSubMenu($element);
+			}
+			$nodes[] = $node;
+		};
+
+		return $nodes;
+	}
+
+	public function getSubMenu($element=null)
+	{
+		$nodes = array();
+
+		foreach($this->children_config as $childconfig)
+		{
+			$childlib = basename($childconfig['library']);
+			$this->ci->$childlib->init(
+				$this->getParamsForNextLevel($element),
+				$this->includeSubMenu
+			);
+			$childnodes = $this->ci->$childlib->getNodes();
+			$nodes = array_merge($nodes, $childnodes);
+		}
+
+		return $nodes;
+	}
+
+	protected function getData()
+	{
+		return array();
+	}
+
+	protected function getParamsForNextLevel($element=null)
+	{
+		return $this->params;
+	}
+
+	protected function getName($element)
+	{
+		return __METHOD__ . 'NOT IMPLEMENTED';
+	}
+
+	protected function getLink($element)
+	{
+		$link = $this->ci->uri->assoc_to_uri($this->getParamsForNextLevel($element));
+		return $link;
+	}
+
+	protected function isLeaf()
+	{
+		if(count($this->children_config) === 0) {
+			return true;
+		}
+		return false;
+	}
+}

application/libraries/treemenu/base/StgLib.php

@@ -1,313 +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');
-
-/**
- * Stg Base library
- */
-class StgLib
-{
-	protected $_ci = null;
-
-	public function __construct()
-	{
-		// Get code igniter instance
-		$this->_ci =& get_instance();
-	}
-
-	public function studiengang($path_template, $permittedStgs = [])
-	{
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->_ci->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
-		
-		$this->_ci->StudiengangModel->addDistinct();
-		$this->_ci->StudiengangModel->addSelect("FORMAT(" . $this->_ci->StudiengangModel->escape($path_template) . ", LOWER(CONCAT(typ, kurzbz))) AS path");
-		$this->_ci->StudiengangModel->addSelect(
-			"CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
-			false
-		);
-		$this->_ci->StudiengangModel->addSelect("studiengang_kz AS title");
-		$this->_ci->StudiengangModel->addSelect("studiengang_kz AS search");
-		$this->_ci->StudiengangModel->addSelect('erhalter_kz');
-		$this->_ci->StudiengangModel->addSelect('typ');
-		$this->_ci->StudiengangModel->addSelect('kurzbz');
-		$this->_ci->StudiengangModel->addSelect('studiengang_kz');
-		$this->_ci->StudiengangModel->addSelect('studiengang_kz AS stg_kz');
-		
-		$this->_ci->StudiengangModel->addOrder('erhalter_kz');
-		$this->_ci->StudiengangModel->addOrder('typ');
-		$this->_ci->StudiengangModel->addOrder('kurzbz');
-
-		if ($permittedStgs)
-			$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $permittedStgs);
-
-		$result = $this->_ci->StudiengangModel->loadWhere(['v.aktiv' => true]);
-
-		return getData($result) ?: [];
-	}
-
-	public function semester($path_template, $studiengang_kz, $orgform_kurzbz = null)
-	{
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->_ci->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
-		
-		$this->_ci->StudiengangModel->addDistinct();
-		$this->_ci->StudiengangModel->addSelect("FORMAT(" . $this->_ci->StudiengangModel->escape($path_template) . ", semester) AS path", false);
-		$this->_ci->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->_ci->StudiengangModel->addSelect('semester');
-		$this->_ci->StudiengangModel->addSelect('v.studiengang_kz AS stg_kz');
-		$this->_ci->StudiengangModel->addSelect("ARRAY['link-strict', 'student-collection'] AS droplink");
-		
-		$this->_ci->StudiengangModel->addOrder('semester');
-
-		if ($orgform_kurzbz !== null) {
-			$this->_ci->StudiengangModel->addSelect($this->_ci->StudiengangModel->escape($orgform_kurzbz) . " AS orgform_kurzbz", false);
-			$this->_ci->StudiengangModel->addDistinct();
-			$this->_ci->StudiengangModel->db->group_start();
-			$this->_ci->StudiengangModel->db->where('v.semester', 0);
-			$this->_ci->StudiengangModel->db->or_where('v.orgform_kurzbz', $orgform_kurzbz);
-			$this->_ci->StudiengangModel->db->group_end();
-		}
-
-		$result = $this->_ci->StudiengangModel->loadWhere([
-			'studiengang_kz' => $studiengang_kz,
-			'v.aktiv' => true
-		]);
-
-
-		return getData($result) ?: [];
-	}
-
-	public function group($path_template, $studiengang_kz, $semester, $orgform_kurzbz = null)
-	{
-		$this->_ci->load->model('organisation/Gruppe_model', 'GruppeModel');
-
-		$this->_ci->GruppeModel->addDistinct();
-		$this->_ci->GruppeModel->addSelect("FORMAT(" . $this->_ci->GruppeModel->escape($path_template) . ", gruppe_kurzbz) AS path", false);
-		$this->_ci->GruppeModel->addSelect("CONCAT(gruppe_kurzbz, ' (', bezeichnung, ')') AS name", false);
-
-		$this->_ci->GruppeModel->addSelect('sort');
-		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz');
-		$this->_ci->GruppeModel->addSelect($this->_ci->GruppeModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
-		$this->_ci->GruppeModel->addSelect("ARRAY['link-strict', 'student-collection'] AS droplink");
-
-		$this->_ci->GruppeModel->addOrder('sort');
-		$this->_ci->GruppeModel->addOrder('gruppe_kurzbz');
-
-		$where = [
-			'studiengang_kz' => $studiengang_kz,
-			'semester' => $semester,
-			'lehre' => true,
-			'sichtbar' => true,
-			'aktiv' => true,
-			'direktinskription' => false
-		];
-
-		if ($orgform_kurzbz !== null)
-			$where['orgform_kurzbz'] = $orgform_kurzbz;
-
-		$result = $this->_ci->GruppeModel->loadWhere($where);
-
-		return getData($result) ?: [];
-	}
-
-	public function verband($path_template, $studiengang_kz, $semester, $orgform_kurzbz = null)
-	{
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		
-		$this->_ci->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
-		
-		$this->_ci->StudiengangModel->addSelect("FORMAT(" . $this->_ci->StudiengangModel->escape($path_template) . ", verband) AS path", false);
-		$this->_ci->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->_ci->StudiengangModel->addSelect($this->_ci->StudiengangModel->escape($semester) . ' AS semester');
-		$this->_ci->StudiengangModel->addSelect('verband');
-		$this->_ci->StudiengangModel->addSelect($this->_ci->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
-		$this->_ci->StudiengangModel->addSelect("ARRAY['link-strict', 'student-collection'] AS droplink");
-		
-		$this->_ci->StudiengangModel->addOrder('verband');
-
-		$this->_ci->StudiengangModel->addGroupBy('path, name, verband');
-		
-		$where = [
-			'v.studiengang_kz' => $studiengang_kz,
-			'v.semester' => $semester,
-			'v.verband !=' => '',
-			'v.aktiv' => true
-		];
-
-		if ($orgform_kurzbz !== null && $semester) // NOTE(chris): on semester 0 show all?
-			$where['v.orgform_kurzbz'] = $orgform_kurzbz;
-
-		$result = $this->_ci->StudiengangModel->loadWhere($where);
-
-		return getData($result) ?: [];
-	}
-
-	public function verbandsgroup($path_template, $studiengang_kz, $semester, $verband, $orgform_kurzbz = null)
-	{
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->_ci->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
-		
-		$this->_ci->StudiengangModel->addDistinct();
-		$this->_ci->StudiengangModel->addSelect("FORMAT(
-			" . $this->_ci->StudiengangModel->escape($path_template) . ", 
-			gruppe
-		) AS path", false);
-		$this->_ci->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->_ci->StudiengangModel->addSelect('v.semester');
-		$this->_ci->StudiengangModel->addSelect('v.verband');
-		$this->_ci->StudiengangModel->addSelect('gruppe');
-		$this->_ci->StudiengangModel->addSelect($this->_ci->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
-		$this->_ci->StudiengangModel->addSelect("ARRAY['link-strict', 'student-collection'] AS droplink");
-		
-		$this->_ci->StudiengangModel->addOrder('gruppe');
-
-		$where = [
-			'v.studiengang_kz' => $studiengang_kz,
-			'v.semester' => $semester,
-			'v.verband' => $verband,
-			'v.gruppe !=' => '',
-			'v.aktiv' => true
-		];
-
-		if ($orgform_kurzbz !== null && $semester) // NOTE(chris): on semester 0 show all?
-			$where['v.orgform_kurzbz'] = $orgform_kurzbz;
-
-		$result = $this->_ci->StudiengangModel->loadWhere($where);
-
-		return getData($result) ?: [];
-	}
-
-	public function orgform($path_template, $studiengang_kz)
-	{
-		$this->_ci->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
-
-		$this->_ci->StudienordnungModel->addDistinct();
-		$this->_ci->StudienordnungModel->addSelect("FORMAT(
-			" . $this->_ci->StudienordnungModel->escape($path_template) . ", 
-			LOWER(p.orgform_kurzbz)
-		) AS path");
-		$this->_ci->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
-		$this->_ci->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
-
-		$this->_ci->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
-
-		$result = $this->_ci->StudienordnungModel->loadWhere([
-			'aktiv' => true,
-			'studiengang_kz' => $studiengang_kz,
-			'p.orgform_kurzbz !=' => 'DDP'
-		]);
-
-
-		return getData($result) ?: [];
-	}
-
-	public function studiensemester($path_template, $studiengang_kz)
-	{
-		$number_displayed_past_studiensemester = null;
-		
-		$this->_ci->load->model('system/Variable_model', 'VariableModel');
-		
-		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
-		if (isError($result))
-			return [];
-
-		$data = getData($result);
-		if ($data && isset($data['number_displayed_past_studiensemester'])) {
-			$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'];
-		} else {
-			$this->_ci->load->config('stv');
-			$number_displayed_past_studiensemester = $this->_ci->config->item('number_displayed_past_studiensemester_default');
-		}
-
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$this->_ci->StudiensemesterModel->addPlusMinus(null, $number_displayed_past_studiensemester);
-		
-		$this->_ci->StudiensemesterModel->addSelect("studiensemester_kurzbz AS name");
-		$this->_ci->StudiensemesterModel->addSelect("FORMAT(
-			" . $this->_ci->StudiensemesterModel->escape($path_template) . ", 
-			LOWER(studiensemester_kurzbz)
-		) AS path", false);
-		$this->_ci->StudiensemesterModel->addSelect($this->_ci->StudiensemesterModel->escape($studiengang_kz) . " AS stg_kz", false);
-		
-		$this->_ci->StudiensemesterModel->addOrder('ende');
-
-		$result = $this->_ci->StudiensemesterModel->load();
-
-		return getData($result) ?: [];
-	}
-}

application/models/content/Content_model.php

@@ -234,9 +234,9 @@ class Content_model extends DB_Model
 							FROM
 								campus.tbl_content c1
 							LEFT JOIN
-								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=? AND sichtbar=true
+								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=?
 							WHERE
-								c1.aktiv = true
+								sichtbar=true
 						) s2
 						LEFT JOIN
 							campus.tbl_contentsprache s3 USING(content_id, sprache)
@@ -277,7 +277,7 @@ class Content_model extends DB_Model
 			JOIN 
 				campus.tbl_contentsprache s USING(contentsprache_id)
 			LEFT JOIN 
-				campus.tbl_contentchild k ON(m.content_id=k.content_id) and c.aktiv = true
+				campus.tbl_contentchild k ON(m.content_id=k.content_id)
 			WHERE EXISTS (
 				SELECT 1 
 				FROM campus.tbl_contentgruppe 

application/models/dashboard/Bookmark_model.php

@@ -11,4 +11,8 @@ class Bookmark_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_bookmark';
 		$this->pk = 'bookmark_id';
 	}
+
+
+	
+
 }

application/models/dashboard/Dashboard_model.php

@@ -11,4 +11,15 @@ class Dashboard_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard';
 		$this->pk = 'dashboard_id';
 	}
+
+
+	/**
+	 * Get Dashboard by kurzbz.
+	 * @param string dashboard_kurzbz
+	 * @return array
+	 */
+	public function getDashboardByKurzbz($dashboard_kurzbz)
+	{
+		return $this->loadWhere(array('dashboard_kurzbz' => $dashboard_kurzbz));
+	}
 }

application/models/education/Projektarbeit_model.php

@@ -187,10 +187,7 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabetyp.benotbar, 
 					campus.tbl_paabgabe.abgabedatum,
-					campus.tbl_paabgabe.insertvon,
-					campus.tbl_paabgabe.insertamum,
-					campus.tbl_paabgabe.updatevon,
-					campus.tbl_paabgabe.updateamum
+					campus.tbl_paabgabe.insertvon
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
 				ORDER BY campus.tbl_paabgabe.datum";
@@ -210,18 +207,7 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabe.abgabedatum,
-					campus.tbl_paabgabe.insertvon,
-					campus.tbl_paabgabe.updatevon,
-					campus.tbl_paabgabe.insertamum,
-					campus.tbl_paabgabe.updateamum,
-					(SELECT p.vorname || ' ' || p.nachname
-						FROM public.tbl_benutzer b
-						JOIN public.tbl_person p USING(person_id)
-						WHERE b.uid = campus.tbl_paabgabe.insertvon) AS insertvon_fullname,
-					(SELECT p.vorname || ' ' || p.nachname
-					FROM public.tbl_benutzer b
-						JOIN public.tbl_person p USING(person_id)
-						WHERE b.uid = campus.tbl_paabgabe.updatevon) AS updatevon_fullname
+					campus.tbl_paabgabe.insertvon
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE campus.tbl_paabgabe.projektarbeit_id IN ?
 				ORDER BY campus.tbl_paabgabe.datum";
@@ -254,8 +240,7 @@ class Projektarbeit_model extends DB_Model
 				 LEFT JOIN public.tbl_benutzer ben USING (person_id)
 				 LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid = ma.mitarbeiter_uid
 		WHERE (ben.aktiv OR ben.aktiv IS NULL)
-				AND projektarbeit_id = ?
-				AND lehre.tbl_projektbetreuer.betreuerart_kurzbz = ANY('{Begutachter, Betreuer, Erstbetreuer,Erstbegutachter,Senatsvorsitz}')";
+		  AND projektarbeit_id = ?";
 
 		return $this->execReadOnlyQuery($qry, [$projektarbeit_id]);
 	}
@@ -309,142 +294,34 @@ class Projektarbeit_model extends DB_Model
 	 * Get a List of Projektarbeiten of a mitarbeiter with zuordnung
 	 * used by the mitarbeiter cis4 abgabetool.
 	 */
-	public function getMitarbeiterProjektarbeiten($person_id, $showAll){
-		$qry = "WITH secondary_betreuer AS (
-				SELECT DISTINCT ON (pb.projektarbeit_id)
-					pb.projektarbeit_id,
-					pb.person_id                  AS zweitbetreuer_person_id,
-					b.uid						  AS zweitbetreuer_benutzer_uid,
-					pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
-					ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
-					p.titelpre                    AS zweitbetreuer_titelpre,
-					p.vorname                     AS zweitbetreuer_vorname,
-					p.nachname                    AS zweitbetreuer_nachname,
-					p.titelpost                   AS zweitbetreuer_titelpost,
-					trim(
-							COALESCE(p.titelpre, '')  || ' ' ||
-							COALESCE(p.vorname, '')   || ' ' ||
-							COALESCE(p.nachname, '')  || ' ' ||
-							COALESCE(p.titelpost, '')
-					)                             AS zweitbetreuer_full_name
-				FROM lehre.tbl_projektbetreuer pb
-						 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
-						 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
-						 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
-				WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
-				ORDER BY pb.projektarbeit_id
-			),
-			primary_betreuer AS (
-				SELECT DISTINCT ON (pb.projektarbeit_id)
-				pb.projektarbeit_id,
-				pb.person_id                  AS betreuer_person_id,
-				pb.betreuerart_kurzbz         AS betreuer_betreuerart_kurzbz,
-				ba.beschreibung               AS betreuer_betreuerart_beschreibung,
-				p.titelpre                    AS betreuer_titelpre,
-				p.vorname                     AS betreuer_vorname,
-				p.nachname                    AS betreuer_nachname,
-				p.titelpost                   AS betreuer_titelpost,
-				trim(
-					COALESCE(p.titelpre, '')  || ' ' ||
-					COALESCE(p.vorname, '')   || ' ' ||
-					COALESCE(p.nachname, '')  || ' ' ||
-					COALESCE(p.titelpost, '')
-				)  							  AS betreuer_full_name
-				FROM lehre.tbl_projektbetreuer pb
-				JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
-				LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
-				LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
-				WHERE pb.betreuerart_kurzbz = ANY('{Begutachter, Betreuer, Erstbetreuer,Erstbegutachter,Senatsvorsitz}')
-				ORDER BY pb.projektarbeit_id
-		)
-	
-		SELECT
-			*
-		FROM
-			(SELECT DISTINCT ON (tbl_projektarbeit.projektarbeit_id) 
-				 student_person.vorname, student_person.nachname, 
-					tbl_studiengang.typ, tbl_studiengang.kurzbz,
-					tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, 
-					tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
-					student_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid,
-		
-					lehre.tbl_projektarbeit.sprache,
-					 lehre.tbl_projektarbeit.seitenanzahl,
-					 lehre.tbl_projektarbeit.kontrollschlagwoerter,
-					 lehre.tbl_projektarbeit.schlagwoerter,
-					 lehre.tbl_projektarbeit.schlagwoerter_en,
-					 lehre.tbl_projektarbeit.abstract,
-					 lehre.tbl_projektarbeit.abstract_en,
-					 lehre.tbl_projektarbeit.insertamum,
-					 
-					 (
-						 SELECT orgform_kurzbz
-						 FROM public.tbl_prestudentstatus
-						 WHERE prestudent_id = (
-							 SELECT prestudent_id FROM public.tbl_student
-							 WHERE student_uid = student_benutzer.uid LIMIT 1
-						 )
-						 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-						 LIMIT 1
-					 ) AS organisationsform,
-					 (
-						 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
-										 tbl_prestudentstatus.orgform_kurzbz,
-										 tbl_studiengang.orgform_kurzbz)
-						 FROM public.tbl_prestudent
-							JOIN       public.tbl_prestudentstatus USING (prestudent_id)
-							JOIN       public.tbl_studiensemester  USING (studiensemester_kurzbz)
-							JOIN       public.tbl_studiengang      USING (studiengang_kz)
-							LEFT JOIN  lehre.tbl_studienplan        USING (studienplan_id)
-						 WHERE prestudent_id = public.tbl_student.prestudent_id
-						 ORDER BY tbl_prestudentstatus.datum DESC
-						 LIMIT 1
-					 ) AS orgform,
-					 (
-						 SELECT status_kurzbz
-						 FROM public.tbl_prestudentstatus
-						 WHERE prestudent_id = public.tbl_student.prestudent_id
-						 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-						 LIMIT 1
-					 ) AS studienstatus,
-		
-					pb.betreuer_person_id,
-					pb.betreuer_betreuerart_kurzbz,
-					pb.betreuer_betreuerart_beschreibung,
-					pb.betreuer_titelpre,
-					pb.betreuer_vorname,
-					pb.betreuer_nachname,
-					pb.betreuer_titelpost,
-					pb.betreuer_full_name,
-					
-					sb.zweitbetreuer_person_id,
-					sb.zweitbetreuer_benutzer_uid,
-					sb.zweitbetreuer_betreuerart_kurzbz,
-					sb.zweitbetreuer_betreuerart_beschreibung,
-					sb.zweitbetreuer_titelpre,
-					sb.zweitbetreuer_vorname,
-					sb.zweitbetreuer_nachname,
-					sb.zweitbetreuer_titelpost,
-					sb.zweitbetreuer_full_name
-			FROM lehre.tbl_projektarbeit
-					LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
-					LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
-					LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-					LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
-					LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
-					LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
-					LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
-					LEFT JOIN  lehre.tbl_projektbetreuer              USING (projektarbeit_id)
-					LEFT JOIN  primary_betreuer      pb               ON pb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
-					LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
-			WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-	    AND (pb.betreuer_person_id = ? OR sb.zweitbetreuer_person_id = ?)
-						".($showAll?'':' AND student_benutzer.aktiv AND lehre.tbl_projektarbeit.note IS NULL ')."
+	public function getMitarbeiterProjektarbeiten($uid, $showAll){
+		$qry = "SELECT
+					*
+				FROM
+					(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
+							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
+							tbl_projektbetreuer.person_id as betreuer_person_id, tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid
+					 FROM lehre.tbl_projektarbeit
+							  LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
+							  LEFT JOIN lehre.tbl_betreuerart using(betreuerart_kurzbz)
+							  LEFT JOIN public.tbl_benutzer on(uid=student_uid)
+							  LEFT JOIN public.tbl_student on(public.tbl_benutzer.uid=public.tbl_student.student_uid)
+							  LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
+							  LEFT JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
+							  LEFT JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+							  LEFT JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
+							  LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+					 WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+					   AND tbl_projektbetreuer.person_id IN (SELECT person_id FROM public.tbl_benutzer
+															 WHERE public.tbl_benutzer.person_id=lehre.tbl_projektbetreuer.person_id
+															   AND public.tbl_benutzer.uid= ? )
+						 ".($showAll?'':' AND public.tbl_benutzer.aktiv AND lehre.tbl_projektarbeit.note IS NULL ')."
 							AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Zweitbegutachter', 'Erstbetreuer', 'Senatsvorsitz', 'Senatsmitglied')
-					ORDER BY tbl_projektarbeit.projektarbeit_id, betreuerart_kurzbz desc) as xy
+					 ORDER BY tbl_projektarbeit.projektarbeit_id, betreuerart_kurzbz desc) as xy
 				ORDER BY nachname;";
 
-		return $this->execReadOnlyQuery($qry, array($person_id, $person_id));
+		return $this->execReadOnlyQuery($qry, array($uid));
 	}
 
 	/**
@@ -464,257 +341,176 @@ class Projektarbeit_model extends DB_Model
 	
 	
 	public function getProjektarbeitenForStudiengang($studiengang_kz, $benotet) {
-		$new_qry = "WITH secondary_betreuer AS (
-			SELECT DISTINCT ON (pb.projektarbeit_id)
-				pb.projektarbeit_id,
-				pb.person_id                  AS zweitbetreuer_person_id,
-				pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
-				ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
-				p.titelpre                    AS zweitbetreuer_titelpre,
-				p.vorname                     AS zweitbetreuer_vorname,
-				p.nachname                    AS zweitbetreuer_nachname,
-				p.titelpost                   AS zweitbetreuer_titelpost,
-				trim(
-						COALESCE(p.titelpre, '')  || ' ' ||
-						COALESCE(p.vorname, '')   || ' ' ||
-						COALESCE(p.nachname, '')  || ' ' ||
-						COALESCE(p.titelpost, '')
-				)                             AS zweitbetreuer_full_name
-			FROM lehre.tbl_projektbetreuer pb
-					 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
-					 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
-					 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
-			WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
-			ORDER BY pb.projektarbeit_id  -- DISTINCT ON needs this to be deterministic
-		)
+		$new_qry = "SELECT DISTINCT ON(tmp.projektarbeit_id) *, campus.get_betreuer_details(tmp.zweitbetreuer_person_id) as zweitbetreuer_full_name, campus.get_betreuer_details(tmp.betreuer_person_id) as erstbetreuer_full_name
+       		FROM(
+			   SELECT
+				   DISTINCT ON(tbl_projektarbeit.projektarbeit_id)
+				   tbl_projektarbeit.projekttyp_kurzbz,
+				   tbl_projektarbeit.titel,
+				   tbl_projektarbeit.projektarbeit_id,
+				   tbl_studiengang.typ, tbl_studiengang.kurzbz,
+				   student_benutzer.uid as student_uid,
+				   student_person.vorname as student_vorname,
+				   student_person.nachname as student_nachname,
+				   tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
+				   betreuer_benutzer.uid as betreuer_benutzer_uid,
+				   betreuer_person.titelpre as betreuer_titelpre,
+				   betreuer_person.vorname as betreuer_vorname,
+				   betreuer_person.nachname as betreuer_nachname,
+				   betreuer_person.titelpost as betreuer_titelpost,
+				   lehre.tbl_projektbetreuer.betreuerart_kurzbz as betreuerart,
+				   lehre.tbl_projektbetreuer.person_id as betreuer_person_id,
+				   lehre.tbl_projektarbeit.sprache               as sprache,
+				   lehre.tbl_projektarbeit.seitenanzahl          as seitenanzahl,
+				   lehre.tbl_projektarbeit.kontrollschlagwoerter as kontrollschlagwoerter,
+				   lehre.tbl_projektarbeit.schlagwoerter         as schlagwoerter,
+				   lehre.tbl_projektarbeit.schlagwoerter_en      as schlagwoerter_en,
+				   lehre.tbl_projektarbeit.abstract              as abstract,
+				   lehre.tbl_projektarbeit.abstract_en           as abstract_en,
+				   lehre.tbl_projektarbeit.insertamum            as insertamum,
+				   lehre.tbl_projektarbeit.note					 as note,
+				   (
+					   SELECT orgform_kurzbz
+					   FROM tbl_prestudentstatus
+					   WHERE prestudent_id = (SELECT prestudent_id
+											  FROM tbl_student
+											  WHERE student_uid = student_benutzer.uid
+											  LIMIT 1)
+					   ORDER BY datum DESC, insertamum DESC, ext_id DESC
+					   LIMIT 1
+				   )
+					   as organisationsform,
+				   (
+					   SELECT person_id
+					   FROM lehre.tbl_projektbetreuer
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_person_id,
+				   (
+					   SELECT betreuerart_kurzbz
+					   FROM lehre.tbl_projektbetreuer
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_betreuerart_kurzbz,
+				   (
+					   SELECT tbl_betreuerart.beschreibung
+					   FROM lehre.tbl_projektbetreuer
+								JOIN lehre.tbl_betreuerart USING (betreuerart_kurzbz)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_betreuerart_beschreibung,
+				   (
+					   SELECT trim(COALESCE(titelpre, '') || ' ' || COALESCE(vorname, '') || ' ' || COALESCE(nachname, '') || ' ' ||
+								   COALESCE(titelpost, ''))
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_full_name,
+			       (
+					   SELECT titelpre
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_titelpre,
+			       (
+					   SELECT vorname
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_vorname,
+			       (
+					   SELECT nachname
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_nachname,
+			       (
+					   SELECT titelpost
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_titelpost,
+			       (
+					   SELECT
+						   COALESCE(tbl_studienplan.orgform_kurzbz,
+									tbl_prestudentstatus.orgform_kurzbz, tbl_studiengang.orgform_kurzbz) as
+							   orgform
+					   FROM
+						   public.tbl_prestudent
+							   JOIN public.tbl_prestudentstatus USING(prestudent_id)
+							   JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+							   JOIN public.tbl_studiengang USING(studiengang_kz)
+							   LEFT JOIN lehre.tbl_studienplan USING(studienplan_id)
+					   WHERE
+						   prestudent_id=tbl_student.prestudent_id
+					   ORDER BY tbl_prestudentstatus.datum DESC LIMIT 1
+				   ) as orgform,
+				   (SELECT status_kurzbz FROM public.tbl_prestudentstatus
+					WHERE prestudent_id=tbl_student.prestudent_id
+					ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as studienstatus
+			   FROM lehre.tbl_projektarbeit
+						LEFT JOIN public.tbl_benutzer student_benutzer ON (student_benutzer.uid = lehre.tbl_projektarbeit.student_uid)
+						LEFT JOIN public.tbl_person student_person ON (student_benutzer.person_id = student_person.person_id)
+						LEFT JOIN public.tbl_student on(student_benutzer.uid = public.tbl_student.student_uid)
+						LEFT JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
+						LEFT JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+						LEFT JOIN public.tbl_studiengang ON (public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz)
+						LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+						LEFT JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+						LEFT JOIN public.tbl_person betreuer_person ON (betreuer_person.person_id = lehre.tbl_projektbetreuer.person_id)
+						LEFT JOIN public.tbl_benutzer betreuer_benutzer ON (betreuer_person.person_id = betreuer_benutzer.person_id)
+			   WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
+				 AND student_benutzer.aktiv AND (
+				     lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' 
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Betreuer'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbetreuer'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Senatsvorsitz'
+				     )
+				 AND public.tbl_studiengang.studiengang_kz = ?";
 		
-		SELECT DISTINCT ON (tmp.projektarbeit_id)
-			*,
-			campus.get_betreuer_details(tmp.zweitbetreuer_person_id) AS zweitbetreuer_full_name,
-			campus.get_betreuer_details(tmp.betreuer_person_id)      AS erstbetreuer_full_name
-		FROM (
-			 SELECT DISTINCT ON (tbl_projektarbeit.projektarbeit_id)
-				 tbl_projektarbeit.projekttyp_kurzbz,
-				 tbl_projektarbeit.titel,
-				 tbl_projektarbeit.projektarbeit_id,
-				 tbl_studiengang.typ,
-				 tbl_studiengang.kurzbz,
-				 student_benutzer.uid                         AS student_uid,
-				 student_person.vorname                       AS student_vorname,
-				 student_person.nachname                      AS student_nachname,
-				 public.tbl_student.matrikelnr,
-				 tbl_lehreinheit.studiensemester_kurzbz,
-				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
-				 betreuer_person.titelpre                     AS betreuer_titelpre,
-				 betreuer_person.vorname                      AS betreuer_vorname,
-				 betreuer_person.nachname                     AS betreuer_nachname,
-				 betreuer_person.titelpost                    AS betreuer_titelpost,
-				 lehre.tbl_projektbetreuer.betreuerart_kurzbz AS betreuerart,
-				 lehre.tbl_projektbetreuer.person_id          AS betreuer_person_id,
-				 lehre.tbl_projektarbeit.sprache,
-				 lehre.tbl_projektarbeit.seitenanzahl,
-				 lehre.tbl_projektarbeit.kontrollschlagwoerter,
-				 lehre.tbl_projektarbeit.schlagwoerter,
-				 lehre.tbl_projektarbeit.schlagwoerter_en,
-				 lehre.tbl_projektarbeit.abstract,
-				 lehre.tbl_projektarbeit.abstract_en,
-				 lehre.tbl_projektarbeit.insertamum,
-				 lehre.tbl_projektarbeit.note,
-	
-				 sb.zweitbetreuer_person_id,
-				 sb.zweitbetreuer_betreuerart_kurzbz,
-				 sb.zweitbetreuer_betreuerart_beschreibung,
-				 sb.zweitbetreuer_full_name,
-				 sb.zweitbetreuer_titelpre,
-				 sb.zweitbetreuer_vorname,
-				 sb.zweitbetreuer_nachname,
-				 sb.zweitbetreuer_titelpost,
-	
-				 (
-					 SELECT orgform_kurzbz
-					 FROM public.tbl_prestudentstatus
-					 WHERE prestudent_id = (
-						 SELECT prestudent_id FROM public.tbl_student
-						 WHERE student_uid = student_benutzer.uid LIMIT 1
-					 )
-					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					 LIMIT 1
-				 ) AS organisationsform,
-				 (
-					 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
-									 tbl_prestudentstatus.orgform_kurzbz,
-									 tbl_studiengang.orgform_kurzbz)
-					 FROM public.tbl_prestudent
-						JOIN       public.tbl_prestudentstatus USING (prestudent_id)
-						JOIN       public.tbl_studiensemester  USING (studiensemester_kurzbz)
-						JOIN       public.tbl_studiengang      USING (studiengang_kz)
-						LEFT JOIN  lehre.tbl_studienplan        USING (studienplan_id)
-					 WHERE prestudent_id = public.tbl_student.prestudent_id
-					 ORDER BY tbl_prestudentstatus.datum DESC
-					 LIMIT 1
-				 ) AS orgform,
-				 (
-					 SELECT status_kurzbz
-					 FROM public.tbl_prestudentstatus
-					 WHERE prestudent_id = public.tbl_student.prestudent_id
-					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					 LIMIT 1
-				 ) AS studienstatus
-	
-			 FROM lehre.tbl_projektarbeit
-				  LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
-				  LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
-				  LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-				  LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
-				  LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
-				  LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
-				  LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
-				  LEFT JOIN  lehre.tbl_projektbetreuer              USING (projektarbeit_id)
-				  LEFT JOIN  public.tbl_person     betreuer_person  ON betreuer_person.person_id  = lehre.tbl_projektbetreuer.person_id
-				  LEFT JOIN  public.tbl_benutzer   betreuer_benutzer ON betreuer_person.person_id = betreuer_benutzer.person_id
-				  LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
-	
-			 WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
-			 	AND student_benutzer.aktiv
-			 	AND lehre.tbl_projektbetreuer.betreuerart_kurzbz IN (
-																		'Erstbegutachter', 'Begutachter', 'Betreuer', 'Erstbetreuer', 'Senatsvorsitz'
-					 )
-			 	AND public.tbl_studiengang.studiengang_kz = ?";
-		
-					if($benotet == 0) {
-						$new_qry .= " AND lehre.tbl_projektarbeit.note IS NULL ";
-					} else if ($benotet == 1) {
-						$new_qry .= " AND lehre.tbl_projektarbeit.note IS NOT NULL ";
-					}
-					 
-			 	$new_qry .= " ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
+			     if($benotet == 0) {
+					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NULL ";
+				 } else if ($benotet == 1) {
+					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NOT NULL ";
+				 }
+				 
+			   $new_qry .= " ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
 		   ) as tmp";
 		
 		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
 	}
-
-	public function getProjektarbeitenForStudent($student_uid) {
-		$new_qry = "WITH secondary_betreuer AS (
-			SELECT DISTINCT ON (pb.projektarbeit_id)
-				pb.projektarbeit_id,
-				pb.person_id                  AS zweitbetreuer_person_id,
-				pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
-				ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
-				p.titelpre                    AS zweitbetreuer_titelpre,
-				p.vorname                     AS zweitbetreuer_vorname,
-				p.nachname                    AS zweitbetreuer_nachname,
-				p.titelpost                   AS zweitbetreuer_titelpost,
-				trim(
-						COALESCE(p.titelpre, '')  || ' ' ||
-						COALESCE(p.vorname, '')   || ' ' ||
-						COALESCE(p.nachname, '')  || ' ' ||
-						COALESCE(p.titelpost, '')
-				)                             AS zweitbetreuer_full_name
-			FROM lehre.tbl_projektbetreuer pb
-					 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
-					 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
-					 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
-			WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
-			ORDER BY pb.projektarbeit_id  -- DISTINCT ON needs this to be deterministic
-		)
-		
-		SELECT DISTINCT ON (tmp.projektarbeit_id)
-			*,
-			campus.get_betreuer_details(tmp.zweitbetreuer_person_id) AS zweitbetreuer_full_name,
-			campus.get_betreuer_details(tmp.betreuer_person_id)      AS erstbetreuer_full_name
-		FROM (
-			 SELECT DISTINCT ON (tbl_projektarbeit.projektarbeit_id)
-				 tbl_projektarbeit.projekttyp_kurzbz,
-				 tbl_projektarbeit.titel,
-				 tbl_projektarbeit.projektarbeit_id,
-				 tbl_studiengang.typ,
-				 tbl_studiengang.kurzbz,
-				 student_benutzer.uid                         AS student_uid,
-				 student_person.vorname                       AS student_vorname,
-				 student_person.nachname                      AS student_nachname,
-				 public.tbl_student.matrikelnr,
-				 tbl_lehreinheit.studiensemester_kurzbz,
-				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
-				 betreuer_person.titelpre                     AS betreuer_titelpre,
-				 betreuer_person.vorname                      AS betreuer_vorname,
-				 betreuer_person.nachname                     AS betreuer_nachname,
-				 betreuer_person.titelpost                    AS betreuer_titelpost,
-				 lehre.tbl_projektbetreuer.betreuerart_kurzbz AS betreuerart,
-				 lehre.tbl_projektbetreuer.person_id          AS betreuer_person_id,
-				 lehre.tbl_projektarbeit.sprache,
-				 lehre.tbl_projektarbeit.seitenanzahl,
-				 lehre.tbl_projektarbeit.kontrollschlagwoerter,
-				 lehre.tbl_projektarbeit.schlagwoerter,
-				 lehre.tbl_projektarbeit.schlagwoerter_en,
-				 lehre.tbl_projektarbeit.abstract,
-				 lehre.tbl_projektarbeit.abstract_en,
-				 lehre.tbl_projektarbeit.insertamum,
-				 lehre.tbl_projektarbeit.note,
-	
-				 sb.zweitbetreuer_person_id,
-				 sb.zweitbetreuer_betreuerart_kurzbz,
-				 sb.zweitbetreuer_betreuerart_beschreibung,
-				 sb.zweitbetreuer_full_name,
-				 sb.zweitbetreuer_titelpre,
-				 sb.zweitbetreuer_vorname,
-				 sb.zweitbetreuer_nachname,
-				 sb.zweitbetreuer_titelpost,
-	
-				 (
-					 SELECT orgform_kurzbz
-					 FROM public.tbl_prestudentstatus
-					 WHERE prestudent_id = (
-						 SELECT prestudent_id FROM public.tbl_student
-						 WHERE student_uid = student_benutzer.uid LIMIT 1
-					 )
-					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					 LIMIT 1
-				 ) AS organisationsform,
-				 (
-					 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
-									 tbl_prestudentstatus.orgform_kurzbz,
-									 tbl_studiengang.orgform_kurzbz)
-					 FROM public.tbl_prestudent
-						JOIN       public.tbl_prestudentstatus USING (prestudent_id)
-						JOIN       public.tbl_studiensemester  USING (studiensemester_kurzbz)
-						JOIN       public.tbl_studiengang      USING (studiengang_kz)
-						LEFT JOIN  lehre.tbl_studienplan        USING (studienplan_id)
-					 WHERE prestudent_id = public.tbl_student.prestudent_id
-					 ORDER BY tbl_prestudentstatus.datum DESC
-					 LIMIT 1
-				 ) AS orgform,
-				 (
-					 SELECT status_kurzbz
-					 FROM public.tbl_prestudentstatus
-					 WHERE prestudent_id = public.tbl_student.prestudent_id
-					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					 LIMIT 1
-				 ) AS studienstatus
-	
-			 FROM lehre.tbl_projektarbeit
-				  LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
-				  LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
-				  LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-				  LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
-				  LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
-				  LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
-				  LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
-				  LEFT JOIN  lehre.tbl_projektbetreuer              USING (projektarbeit_id)
-				  LEFT JOIN  public.tbl_person     betreuer_person  ON betreuer_person.person_id  = lehre.tbl_projektbetreuer.person_id
-				  LEFT JOIN  public.tbl_benutzer   betreuer_benutzer ON betreuer_person.person_id = betreuer_benutzer.person_id
-				  LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
-	
-			 WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
-			 	AND student_benutzer.aktiv
-			 	AND lehre.tbl_projektbetreuer.betreuerart_kurzbz IN (
-																		'Erstbegutachter', 'Begutachter', 'Betreuer', 'Erstbetreuer', 'Senatsvorsitz'
-					 )
-			 	AND public.tbl_student.student_uid = ?
-			 ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
-		   ) as tmp";
-
-		return $this->execReadOnlyQuery($new_qry, array($student_uid));
-	}
 	
 	/**
 	 *

application/models/education/Studierendenantrag_model.php

@@ -149,7 +149,6 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect($this->dbTable . '.grund AS grund');
 		$this->addSelect('s.studierendenantrag_statustyp_kurzbz status');
 		$this->addSelect('s.insertvon status_insertvon');
-		$this->addSelect('s.grund AS status_grund');
 		$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
 		$this->addSelect('p.unruly AS unruly');
 		$this->addSelect($this->dbTable . '.insertamum AS insertamum');
@@ -270,7 +269,6 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect($this->dbTable . '.grund');
 		$this->addSelect($this->dbTable . '.dms_id');
 		$this->addSelect('s.insertvon AS status_insertvon');
-		$this->addSelect('s.grund AS status_grund');
 		$this->addSelect(
 			"(SELECT count(1) FROM campus.tbl_studierendenantrag_status WHERE studierendenantrag_id = " .
 			$this->dbTable .

application/models/education/Studierendenantragstatus_model.php

@@ -50,7 +50,7 @@ class Studierendenantragstatus_model extends DB_Model
 		$this->addSelect('bezeichnung[(' . $lang . ')] AS typ');
 
 		$this->addJoin('campus.tbl_studierendenantrag_statustyp', 'studierendenantrag_statustyp_kurzbz');
-		$this->addOrder($this->dbTable. '.insertamum', 'DESC');
+
 		return $this->loadWhere($where);
 	}
 

application/models/organisation/Studiensemester_model.php

@@ -122,47 +122,6 @@ class Studiensemester_model extends DB_Model
 		return $this->execQuery($query, array($studiensemester_kurzbz, $limit));
 	}
 
-
-	/**
-	 * Returns the current study semester and the previous semesters of the same type (SS/WS).
-	 *
-	 * Example:
-	 * - SS2026, limit 3:  SS2026, SS2025, SS2024
-	 * - WS2025, limit 2: WS2025, WS2024
-	 *
-	 * @param $studiensemester_kurzbz
-	 * @param $limit
-	 */
-	public function getPreviousSameSemesterFrom($studiensemester_kurzbz, $limit = 1)
-	{
-		$qry = '
-			SELECT 
-			    studiensemester_kurzbz,
-				start,
-				ende
-			FROM 
-			    public.tbl_studiensemester
-			WHERE 
-				SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) = SUBSTRING(? FROM 1 FOR 2)
-			AND start <= (
-				SELECT start
-				FROM public.tbl_studiensemester
-				WHERE studiensemester_kurzbz = ?
-			)
-			ORDER BY 
-				start DESC
-			LIMIT ?
-		';
-
-		return $this->execQuery($qry,
-			[
-				$studiensemester_kurzbz,
-				$studiensemester_kurzbz,
-				$limit
-			]
-		);
-	}
-
 	/**
 	 * getNearest
 	 */

application/models/person/Benutzerfunktion_model.php

@@ -260,6 +260,7 @@ class Benutzerfunktion_model extends DB_Model
         return $this->execQuery($query, $parameters_array);
     }
 
+
 	/**
 	 * Get active Kompetenzfeldleitung bei UID.
 	 *
@@ -295,6 +296,7 @@ class Benutzerfunktion_model extends DB_Model
 		return $this->execQuery($query, $parameters_array);
 	}
 
+
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

application/models/ressource/Reservierung_model.php

@@ -18,10 +18,10 @@ class Reservierung_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null, $uid = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
 	{
-
-		$lvplan_reservierungen_query = "SELECT r.* , stund.beginn, stund.ende,
+		
+		$lvplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
 			CASE
 				WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/')) 
@@ -35,7 +35,7 @@ class Reservierung_model extends DB_Model
 			LEFT JOIN public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz = ss2.studiensemester_kurzbz AND ss2.start <=r.datum AND ss2.ende >= r.datum 
 			WHERE datum >= ? AND datum <= ? AND (ss1.studiensemester_kurzbz IS NOT NULL
 			OR ss2.studiensemester_kurzbz IS NOT NULL)";
-
+		
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
 			CASE
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
@@ -46,9 +46,9 @@ class Reservierung_model extends DB_Model
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
 
-		$subquery = is_null($ort_kurzbz) ? $lvplan_reservierungen_query : $raum_reservierungen_query;
-
-		$query_result = $this->execReadOnlyQuery("
+		$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
+		
+		$query_result= $this->execReadOnlyQuery("
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
@@ -59,15 +59,15 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			" . $subquery . "
+			". $subquery ."
 		) AS subquery
 
 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
-		", is_null($ort_kurzbz) ? [$uid ?? getAuthUID(), $uid ?? getAuthUID(), $start_date, $end_date] : [$ort_kurzbz, $start_date, $end_date]);
-
+		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
 
+		
 		return $query_result;
 	}
 
@@ -76,7 +76,7 @@ class Reservierung_model extends DB_Model
 	 *
 	 * @return stdClass
 	 */
-	public function getReservierungenMitarbeiter($start_date, $end_date, $uid = null)
+	public function getReservierungenMitarbeiter($start_date, $end_date)
 	{
 
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
@@ -91,8 +91,8 @@ class Reservierung_model extends DB_Model
 
 		$subquery = $raum_reservierungen_query;
 
-
-		$query_result = $this->execReadOnlyQuery("
+		
+		$query_result= $this->execReadOnlyQuery("
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
@@ -103,13 +103,13 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			" . $subquery . "
+			". $subquery ."
 		) AS subquery
 
 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
-		", [$uid ?? getAuthUID(), $start_date, $end_date]);
+		", [getAuthUID(), $start_date, $end_date]);
 
 
 		return $query_result;
@@ -129,9 +129,9 @@ class Reservierung_model extends DB_Model
 		$this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=r.datum AND ss2.ende>=r.datum', 'LEFT');
 		$this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
 		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
-
+		
 		$query = $this->db->get_compiled_select('campus.vw_reservierung r');
-
+		
 		return $this->execQuery($query, [$uid, $uid]);
 	}
 

application/models/ressource/Stundenplan_model.php

@@ -388,84 +388,6 @@ class Stundenplan_model extends DB_Model
 		
 		ORDER BY datum, beginn", [$start_date, $end_date, $ma_uid]);
 	}
-
-	/**
-	 * queries Stundenplan and filters by studiengang, semester, verband gruppe
-	 *
-	 * @return void
-	 */
-	public function getStundenplanStudiengang($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe) {
-
-		$qry_params = [$start_date, $end_date, $stg_kz];
-
-		$qry = "
-		SELECT
-			'lehreinheit' as type, beginn, ende, datum,
-			CONCAT(lehrfach,'-',lehrform) as topic,
-			array_agg(DISTINCT lektor) as lektor,
-			array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
-			string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
-			array_agg(DISTINCT lehreinheit_id) as lehreinheit_id,
-			titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
-		FROM
-			(
-				SELECT unr,datum,beginn, ende,
-					   CASE
-						   WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
-						   ELSE sp.lektor
-						   END as lektor,
-					   CASE
-						   WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
-						   ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/'))
-						   END as gruppen_kuerzel,
-					   (SELECT bezeichnung
-						FROM public.tbl_organisationseinheit
-						WHERE oe_kurzbz IN(
-							SELECT oe_kurzbz
-							FROM lehre.tbl_lehrveranstaltung
-							WHERE lehrveranstaltung_id = sp.lehrveranstaltung_id
-						)) as organisationseinheit,
-					   sp.ort_kurzbz, sp.studiengang_kz, sp.titel,sp.lehreinheit_id,sp.lehrfach_id,sp.anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
-				FROM (
-						 SELECT sp.*
-						 FROM lehre.vw_stundenplan sp
-						 WHERE
-							 sp.datum >= ?
-						   AND sp.datum <= ?
-					 ) sp
-						 JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
-						WHERE studiengang_kz = ? ";
-
-		if($sem != NULL)
-		{
-			$qry_params[] = $sem;
-			$qry .= " AND (semester = ? OR semester IS NULL)";
-		}
-		if($verband != NULL)
-		{
-			$qry_params[] = $verband;
-			$qry .= " AND (verband = ? OR verband IS NULL OR verband = '0' OR verband = '')";
-		}
-		if($gruppe != NULL)
-		{
-			$qry_params[] = $gruppe;
-			$qry .= " AND (gruppe = ? OR gruppe IS NULL	OR gruppe = '0' OR gruppe = '')	";
-		}
-		$qry.= " AND (
-			gruppe_kurzbz is null OR EXISTS(
-			   SELECT 1
-			  FROM
-				public.tbl_gruppe WHERE gruppe_kurzbz = sp.gruppe_kurzbz AND direktinskription = false
-			)
-		  )";
-
-		$qry.= "	) as subquery
-
-		GROUP BY unr, datum, beginn, ende,  titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
-		ORDER BY datum, beginn; ";
-
-		return $this->execReadOnlyQuery($qry, $qry_params);
-	}
 	
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.

application/views/Cis/Abgabetool.php

@@ -38,7 +38,7 @@ $includesArray = array(
 
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
-<div id="abgabetoolroot" class="h-100" style="max-width: 99%" route=<?php echo json_encode($route) ?> 
+<div id="abgabetoolroot" class="h-100" style="max-width: 95%;" route=<?php echo json_encode($route) ?> 
 	uid=<?php echo $uid ?> 
 	 student_uid_prop="<?php echo $student_uid_prop ?? '' ?>"
 	stg_kz_prop="<?php echo $stg_kz_prop ?? '' ?>"

application/views/CisRouterView/CisRouterView.php

@@ -23,14 +23,12 @@ $includesArray = array(
 		'public/css/components/FormUnderline.css',
 		'public/css/components/abgabetool/abgabe.css',
 		'public/css/Cis4/Cms.css',
-		'public/css/Cis4/Studium.css'
+		'public/css/Cis4/Studium.css',
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.min.js',
 		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
 		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
-		'vendor/npm-asset/primevue/chips/chips.min.js',
-		'vendor/npm-asset/primevue/multiselect/multiselect.min.js',
 		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
 		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
@@ -41,7 +39,7 @@ $includesArray = array(
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
-		'public/js/apps/Cis/Cis.js',
+		'public/js/apps/Dashboard/Fhc.js',
 	),
 
 );
@@ -49,6 +47,8 @@ $includesArray = array(
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 <div id="fhccontent" class="h-100" route=<?php echo $route ?>>
-	<router-view></router-view>
+	<router-view 
+			:view-data='<?php echo json_encode($viewData) ?>'
+	></router-view>
 </div>
 <?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

application/views/jssnippets/tabulatorcolumns.js

@@ -1,19 +0,0 @@
-let result = [];
-let current;
-
-<?php foreach ($snippets as $path) { ?>
-
-current = (tabulatorcolumns => {
-<?php $this->load->view($path); ?>
-})(result);
-
-if (current) {
-	if (Array.isArray(current))
-		result = result.concat(current);
-	else
-		result.push(current);
-}
-
-<?php } ?>
-
-export default result;

application/views/jssnippets/tabulatorcolumns/lvverwaltung.js

@@ -1,266 +0,0 @@
-return [
-	{
-		title: 'kurzbz',
-		titlePhrase: 'lehre/kurzbz',
-		field: "lv_kurzbz",
-		headerFilterFuncParams: { field: 'lv_kurzbz' },
-		headerFilter: true,
-		formatter(cell,
-			formatterParams) {
-			const rowData = cell.getRow().getData();
-			const iconKey = (rowData.lehrtyp_kurzbz || '').toLowerCase();
-			const lvkurzbz = (cell.getValue()).toUpperCase();
-
-			const parentspan = document.createElement('span');
-			const span = document.createElement('span');
-
-			span.classList.add('lv_table_icon', `icon-${iconKey}`);
-			span.title = iconKey || 'LV-Teil';
-
-			parentspan.appendChild(span);
-			parentspan.appendChild(document.createTextNode(` ${lvkurzbz}`));
-
-			return parentspan;
-		},
-		cellClick(e,
-			cell) {
-			cell.getRow().treeToggle();
-		}
-	},
-	{
-		title: 'Tags',
-		field: 'tags',
-		tooltip: false,
-		headerFilter: "input",
-		headerFilterFunc: "tagHeaderFilter",
-		headerFilterFuncParams: { field: 'tags' },
-		formatter: "tagFormatter",
-		width: 150,
-	},
-	{
-		title: 'lehrveranstaltung_id',
-		titlePhrase: 'lehre/lehrveranstaltung_id',
-		field: "lehrveranstaltung_id",
-		headerFilterFuncParams: { field: 'lehrveranstaltung_id' },
-		headerFilter: true,
-		visible: false
-	},
-	{
-		title: 'bezeichnung',
-		titlePhrase: 'ui/bezeichnung',
-		field: "lv_bezeichnung",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'lv_bezeichnung' }
-	},
-	{
-		title: 'bezeichnungeng',
-		titlePhrase: 'lehre/bezeichnungeng',
-		field: "lv_bezeichnung_english",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'lv_bezeichnung_english' },
-		visible: false
-	},
-	{
-		title: 'studiengangskennzahlLehre',
-		titlePhrase: 'lehre/studiengangskennzahlLehre',
-		field: "lv_studiengang_kz",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'lv_studiengang_kz' },
-		visible: false
-	},
-	{
-		title: 'studiengang',
-		titlePhrase: 'lehre/studiengang',
-		field: "studiengang",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'studiengang' },
-		visible: false
-	},
-	{
-		title: 'semester',
-		titlePhrase: 'lehre/semester',
-		field: "semester",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'semester' }
-	},
-	{
-		title: 'sprache',
-		titlePhrase: 'global/sprache',
-		field: "sprache",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'sprache' },
-		visible: false
-	},
-	{
-		title: 'ects',
-		titlePhrase: 'lehre/ects',
-		field: "lv_ects",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'lv_ects' },
-		visible: false
-	},
-	{
-		title: 'semesterstunden',
-		titlePhrase: 'lehre/semesterstunden',
-		field: "semesterstunden",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'semesterstunden' },
-		visible: false
-	},
-	{
-		title: 'anmerkung',
-		titlePhrase: 'global/anmerkung',
-		field: "anmerkung",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'anmerkung' },
-		visible: false
-	},
-	{
-		title: 'lehre',
-		titlePhrase: 'lehre/lehre',
-		field: "lehre",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'lehre' },
-		formatter: 'ja_nein',
-		visible: false
-	},
-	{
-		title: 'aktiv',
-		titlePhrase: 'person/aktiv',
-		field: "aktiv",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'aktiv' },
-		formatter: 'ja_nein',
-		visible: false
-	},
-	{
-		title: 'organisationsform',
-		titlePhrase: 'lehre/organisationsform',
-		field: "orgform_kurzbz",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'orgform_kurzbz' }
-	},
-	{
-		title: 'studienplan_id',
-		titlePhrase: 'ui/studienplan_id',
-		field: "studienplan_id",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'studienplan_id' },
-		visible: false
-	},
-	{
-		title: 'studienplan',
-		titlePhrase: 'lehre/studienplan',
-		field: "studienplan_bezeichnung",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'studienplan_bezeichnung' },
-		visible: false
-	},
-	{
-		title: 'lehrtyp',
-		titlePhrase: 'lehre/lehrtyp',
-		field: "lehrtyp_kurzbz",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'lehrtyp_kurzbz' },
-		visible: false
-	},
-	{
-		title: 'lehrform',
-		titlePhrase: 'lehre/lehrform',
-		field: "lehrform_kurzbz",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'lehrform_kurzbz'} },
-	{
-		title: 'leplanstunden',
-		titlePhrase: 'lehre/leplanstunden',
-		field: "le_planstunden",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'le_planstunden' },
-		visible: false
-	},
-	{
-		title: 'lehreinheit_id',
-		titlePhrase: 'lehre/lehreinheit_id',
-		field: "lehreinheit_id",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'lehreinheit_id' },
-		visible: false
-	},
-	{
-		title: 'studiensemester',
-		titlePhrase: 'lehre/studiensemester',
-		field: "studiensemester_kurzbz",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'studiensemester_kurzbz' },
-		visible: false
-	},
-	{
-		title: 'unr',
-		titlePhrase: 'lehre/unr',
-		field: "unr",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'unr' },
-		visible: false
-	},
-	{
-		title: 'organisationseinheit',
-		titlePhrase: 'lehre/organisationseinheit',
-		field: "fachbereich",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'fachbereich' },
-		visible: false
-	},
-	{
-		title: 'stundenblockung',
-		titlePhrase: 'lehre/stundenblockung',
-		field: "stundenblockung",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'stundenblockung' },
-		visible: false
-	},
-	{
-		title: 'wochenrhythmus',
-		titlePhrase: 'lehre/wochenrhythmus',
-		field: "wochenrythmus",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'wochenrythmus' },
-		visible: false
-	},
-	{
-		title: 'startkw',
-		titlePhrase: 'lehre/startkw',
-		field: "start_kw",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'startkw' },
-		visible: false
-	},
-	{
-		title: 'raumtyp',
-		titlePhrase: 'lehre/raumtyp',
-		field: "raumtyp",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'raumtyp' },
-		visible: false
-	},
-	{
-		title: 'raumtypalternativ',
-		titlePhrase: 'lehre/raumtypalternativ',
-		field: "raumtypalternativ",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'raumtypalternativ' },
-		visible: false
-	},
-	{
-		title: 'gruppen',
-		titlePhrase: 'lehre/gruppen',
-		field: "gruppen",
-		headerFilter: true,
-		headerFilterFuncParams: { field: 'gruppen'} },
-	{
-		title: 'lehrende',
-		titlePhrase: 'lehre/lehrende',
-		field: "lektoren",
-		headerFilter: true,
-		headerFilterFuncParams: { field: ['lektoren', 'vorname', 'nachname'] }
-	},
-];

application/views/jssnippets/tabulatorcolumns/stv.js

@@ -1,343 +0,0 @@
-return [
-	{
-		title: "UID",
-		titlePhrase: 'person/uid',
-		field: "uid",
-		headerFilter: true
-	},
-	{
-		title: "TitelPre",
-		titlePhrase: 'person/titelpre',
-		field: "titelpre",
-		headerFilter: "list",
-		headerFilterParams: {
-			valuesLookup: true,
-			listOnEmpty: true,
-			autocomplete: true,
-			sort: "asc"
-		}
-	},
-	{
-		title: "Nachname",
-		titlePhrase: 'person/nachname',
-		field: "nachname",
-		headerFilter: true
-	},
-	{
-		title: "Vorname",
-		titlePhrase: 'person/vorname',
-		field: "vorname",
-		headerFilter: true
-	},
-	{
-		title: "Wahlname",
-		titlePhrase: 'person/wahlname',
-		field: "wahlname",
-		visible: false,
-		headerFilter: true
-	},
-	{
-		title: "Vornamen",
-		titlePhrase: 'person/vornamen',
-		field: "vornamen",
-		visible: false,
-		headerFilter: true
-	},
-	{
-		title: "TitelPost",
-		titlePhrase: 'person/titelpost',
-		field: "titelpost",
-		headerFilter: "list",
-		headerFilterParams: {
-			valuesLookup: true,
-			listOnEmpty: true,
-			autocomplete: true,
-			sort: "asc"
-		}
-	},
-	{
-		title: "Ersatzkennzeichen",
-		titlePhrase: 'person/ersatzkennzeichen',
-		field: "ersatzkennzeichen",
-		headerFilter: true
-	},
-	{
-		title: "Geburtsdatum",
-		titlePhrase: 'person/geburtsdatum',
-		field: "gebdatum",
-		formatter: 'datetime',
-		formatterParams: {
-			inputFormat: "iso",
-			outputFormat: "dd.MM.yyyy",
-			invalidPlaceholder: " ",
-			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
-		}, 
-		headerFilter: 'input',
-		headerFilterFunc: 'dateinput'
-	},
-	{
-		title: "Geschlecht",
-		titlePhrase: 'person/geschlecht',
-		field: "geschlecht",
-		headerFilter: "list",
-		headerFilterParams: {
-			values: {
-				'm': 'männlich',
-				'w': 'weiblich',
-				'x': 'divers',
-				'u': 'unbekannt'
-			},
-			listOnEmpty: true,
-			autocomplete: true
-		}
-	},
-	{
-		title: "Sem.",
-		titlePhrase: 'lehre/sem',
-		field: "semester",
-		headerFilter: "list",
-		headerFilterParams: {
-			valuesLookup: true,
-			listOnEmpty: true,
-			autocomplete: true,
-			sort: "asc"
-		}
-	},
-	{
-		title: "Verb.",
-		titlePhrase: 'lehre/verb',
-		field: "verband",
-		headerFilter: "list",
-		headerFilterParams: {
-			valuesLookup: true,
-			listOnEmpty: true,
-			autocomplete: true,
-			sort: "asc"
-		}
-	},
-	{
-		title: "Grp.",
-		titlePhrase: 'lehre/grp',
-		field: "gruppe",
-		headerFilter: "list",
-		headerFilterParams: {
-			valuesLookup: true,
-			listOnEmpty: true,
-			autocomplete: true,
-			sort: "asc"
-		}
-	},
-	{
-		title: "Studiengang",
-		titlePhrase: 'lehre/studiengang',
-		field: "studiengang",
-		headerFilter: "list",
-		headerFilterParams: {
-			valuesLookup: true,
-			listOnEmpty: true,
-			autocomplete: true,
-			sort: "asc"
-		}
-	},
-	{
-		title: "Studiengang_kz",
-		titlePhrase: 'lehre/studiengang_kz',
-		field: "studiengang_kz",
-		visible: false,
-		headerFilter: true
-	},
-	{
-		title: "Personenkennzeichen",
-		titlePhrase: 'person/personenkennzeichen',
-		field: "matrikelnr",
-		headerFilter: true
-	},
-	{
-		title: "PersonID",
-		titlePhrase: 'person/person_id',
-		field: "person_id",
-		headerFilter: true
-	},
-	{
-		title: "Status",
-		titlePhrase: 'global/status',
-		field: "status",
-		headerFilter: "list",
-		headerFilterParams: {
-			valuesLookup: true,
-			listOnEmpty: true,
-			autocomplete: true,
-			sort: "asc"
-		}
-	},
-	{
-		title: "Status Datum",
-		titlePhrase: 'profilUpdate/statusDate',
-		field: "status_datum",
-		visible: false,
-		formatter: 'datetime',
-		formatterParams: {
-			inputFormat: "iso",
-			outputFormat: "dd.MM.yyyy",
-			invalidPlaceholder: " ",
-			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
-		}
-	},
-	{
-		title: "Status Bestaetigung",
-		titlePhrase: 'global/status_bestaetigung',
-		field: "status_bestaetigung",
-		visible: false,
-		formatter: 'datetime',
-		formatterParams: {
-			inputFormat: "iso",
-			outputFormat: "dd.MM.yyyy",
-			invalidPlaceholder: " ",
-			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
-		},
-		headerFilter: 'input',
-		headerFilterFunc: 'dateinput'
-	},
-	{
-		title: "EMail (Privat)",
-		titlePhrase: 'person/email_private',
-		field: "mail_privat",
-		visible: false,
-		headerFilter: true
-	},
-	{
-		title: "EMail (Intern)",
-		titlePhrase: 'person/email_intern',
-		field: "mail_intern",
-		visible: false,
-		headerFilter: true
-	},
-	{
-		title: "Anmerkungen",
-		titlePhrase: 'stv/notes_person',
-		field: "anmerkungen",
-		visible: false,
-		headerFilter: true
-	},
-	{
-		title: "AnmerkungPre",
-		titlePhrase: 'stv/notes_prestudent',
-		field: "anmerkung",
-		visible: false,
-		headerFilter: true
-	},
-	{
-		title: "OrgForm",
-		titlePhrase: 'lehre/orgform',
-		field: "orgform_kurzbz",
-		headerFilter: "list",
-		headerFilterParams: {
-			valuesLookup: true,
-			listOnEmpty: true,
-			autocomplete: true,
-			sort: "asc"
-		}
-	},
-	{
-		title: "Aufmerksamdurch",
-		titlePhrase: 'person/aufmerksamDurch',
-		field: "aufmerksamdurch_kurzbz",
-		visible: false
-	},
-	{
-		title: "Gesamtpunkte",
-		titlePhrase: 'admission/gesamtpunkte',
-		field: "punkte",
-		visible: false
-	},
-	{
-		title: "Aufnahmegruppe",
-		titlePhrase: 'stv/aufnahmegruppe_kurzbz',
-		field: "aufnahmegruppe_kurzbz",
-		visible: false
-	},
-	{
-		title: "Dual",
-		titlePhrase: 'lehre/dual_short',
-		field: "dual",
-		visible: false,
-		formatter: 'tickCross',
-		formatterParams: {
-			tickElement: '<i class="fas fa-check text-success"></i>',
-			crossElement: '<i class="fas fa-times text-danger"></i>'
-		},						
-		headerFilter: "tickCross",
-		headerFilterParams: {
-			"tristate": true,
-			elementAttributes: {
-				"value": "true"
-			}
-		},
-		headerFilterEmptyCheck(value) {
-			return value === null
-		}
-	},
-	{
-		title: "Matrikelnummer",
-		titlePhrase: 'person/matrikelnummer',
-		field: "matr_nr",
-		visible: false,
-		headerFilter: true
-	},
-	{
-		title: "Studienplan",
-		titlePhrase: 'lehre/studienplan',
-		field: "studienplan_bezeichnung",
-		headerFilter: "list",
-		headerFilterParams: {
-			valuesLookup: true,
-			listOnEmpty: true,
-			autocomplete: true,
-			sort: "asc"
-		}
-	},
-	{
-		title: "PreStudentInnenID",
-		titlePhrase: 'ui/prestudent_id',
-		field: "prestudent_id",
-		headerFilter: true
-	},
-	{
-		title: "Priorität",
-		titlePhrase: 'lehre/prioritaet',
-		field: "priorisierung_relativ"
-	},
-	{
-		title: "Mentor",
-		titlePhrase: 'stv/mentor',
-		field: "mentor",
-		visible: false
-	},
-	{
-		title: "Aktiv",
-		titlePhrase: 'person/aktiv',
-		field: "bnaktiv",
-		visible: false,
-		formatter: 'tickCross',
-		formatterParams: {
-			allowEmpty: true,
-			tickElement: '<i class="fas fa-check text-success"></i>',
-			crossElement: '<i class="fas fa-times text-danger"></i>'
-		},						
-		headerFilter: "tickCross",
-		headerFilterParams: {
-			"tristate": true,
-			elementAttributes: {
-				"value": "true"
-			}
-		},
-		headerFilterEmptyCheck(value) {
-			return value === null
-		}
-	},
-	{
-		title: "Unruly",
-		field: "unruly",
-		visible: false
-	}
-];

application/views/lehre/Antrag/Leitung/List.php

@@ -44,7 +44,6 @@ $this->load->view(
 			<studierendenantrag-leitung
 				:stg-a="<?= htmlspecialchars(json_encode(array_values($stgA))); ?>"
 				:stg-l="<?= htmlspecialchars(json_encode(array_values($stgL))); ?>"
-				:abmeldung_enabled="<?= htmlspecialchars(json_encode(($abmeldung_enabled))); ?>"
 				>
 			</studierendenantrag-leitung>
 

application/views/system/infocenter/infocenterData.php

@@ -315,15 +315,22 @@
 				 WHERE tpl.app = '.$APP.'
 			) pl USING(person_id)
 	LEFT JOIN (
-				SELECT DISTINCT ON (tbl_rueckstellung.person_id)
+				SELECT
 					tbl_rueckstellung.person_id,
 					tbl_rueckstellung.datum_bis,
 					tbl_rueckstellung.status_kurzbz,
 					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
 				FROM public.tbl_rueckstellung
 				JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
-				WHERE tbl_rueckstellung.datum_bis >= NOW()
-				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
+				JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
+				WHERE tbl_rueckstellung.rueckstellung_id =
+				(
+					SELECT srueck.rueckstellung_id
+					FROM public.tbl_rueckstellung srueck
+					WHERE srueck.person_id = tbl_rueckstellung.person_id
+						AND datum_bis >= NOW()
+					ORDER BY srueck.datum_bis DESC LIMIT 1
+				)
 			) rueck ON rueck.person_id = p.person_id
 		 WHERE
 			EXISTS (

application/views/system/infocenter/onboardingData.php

@@ -24,15 +24,22 @@ $query = '
 					 WHERE tpl.app = '.$APP.'
 				 ) pl ON p.person_id = pl.person_id
 			LEFT JOIN (
-					SELECT DISTINCT ON (tbl_rueckstellung.person_id)
+				SELECT
 					tbl_rueckstellung.person_id,
 					tbl_rueckstellung.datum_bis,
 					tbl_rueckstellung.status_kurzbz,
 					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
 				FROM public.tbl_rueckstellung
-				JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
-				WHERE tbl_rueckstellung.datum_bis >= NOW()
-				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
+					JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
+					JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
+				WHERE tbl_rueckstellung.rueckstellung_id =
+				(
+					SELECT srueck.rueckstellung_id
+					FROM public.tbl_rueckstellung srueck
+					WHERE srueck.person_id = tbl_rueckstellung.person_id
+						AND datum_bis >= NOW()
+					ORDER BY srueck.datum_bis DESC LIMIT 1
+				)
 			) rueck ON rueck.person_id = p.person_id
 		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
 

application/views/templates/CISVUE-Footer.php

@@ -6,7 +6,7 @@ $includesArray = array(
 	'fontawesome6' => true,
 	'axios027' => true,
 	'customJSModules' => array_merge([
-		'public/js/apps/Cis/Menu.js'
+		'public/js/apps/Cis.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css'

application/views/templates/CISVUE-Header.php

@@ -8,7 +8,7 @@ $includesArray = array(
 	'axios027' => true,
 	'primevue3' => true,
 	'customJSModules' => array_merge([
-		'public/js/apps/Cis/Menu.js'
+		'public/js/apps/Cis.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css',

cis/private/lehre/notenliste.xls.php

@@ -36,7 +36,6 @@ require_once('../../../include/notenschluessel.class.php');
 require_once('../../../include/Excel/excel.php');
 require_once('../../../include/phrasen.class.php');
 require_once('../../../include/pruefung.class.php');
-require_once('../../../include/benutzerberechtigung.class.php');
 
 $uid = get_uid();
 
@@ -45,7 +44,7 @@ $uid = get_uid();
 $sprache = getSprache();
 $p = new phrasen($sprache);
 
-if (!check_lektor($uid))
+if(!check_lektor($uid))
 	die('Sie haben keine Berechtigung fuer diese Seite');
 
 if (!$db = new basis_db())
@@ -91,21 +90,6 @@ if(isset($_GET['lehreinheit_id']))
 else
 	$lehreinheit_id = '';
 
-// Permissions
-$berechtigung = new benutzerberechtigung();
-$berechtigung->getBerechtigungen($uid);
-
-// LV load
-$lvobj = new lehrveranstaltung($lvid);
-
-// Check permissions
-if (!$berechtigung->isBerechtigt('admin')
-	&& !$berechtigung->isBerechtigt('assistenz')
-	&& !$berechtigung->isBerechtigt('lehre', $lvobj->oe_kurzbz, 's')
-	&& !check_lektor_lehrveranstaltung($uid, $lvid, $stsem)
-)
-	die('Sie haben keine Berechtigung fuer diese Seite');
-
 /*
  * Create Excel File
  */
@@ -159,6 +143,8 @@ if (!$berechtigung->isBerechtigt('admin')
 	// let's merge
 	$format_title->setAlign('merge');
 
+	$lvobj = new lehrveranstaltung($lvid);
+
 	$worksheet->write(0,0,$p->t('anwesenheitsliste/notenliste')." ".($sprache=='English'?$lvobj->bezeichnung_english:$lvobj->bezeichnung),$format_bold);
 
 	$stg_obj = new studiengang($stg);

cis/testtool/frage.php

@@ -80,17 +80,9 @@ echo '
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
-	<link rel="stylesheet" href="../../vendor/components/jqueryui/themes/base/jquery-ui.min.css" type="text/css" />
 	<link rel="stylesheet" href="../../vendor/twbs/bootstrap3/dist/css/bootstrap.min.css" type="text/css"/>
 	<link href="../../skin/style.css.php" rel="stylesheet" type="text/css" />
-	<style>
-		.ui-dialog-titlebar-close
-		{
-			visibility: hidden !important;
-		}
-	</style>
 	<script type="text/javascript" src="../../vendor/components/jquery/jquery.min.js"></script>
-	<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../vendor/twbs/bootstrap3/dist/js/bootstrap.min.js"></script>
 	<script language="Javascript" type="text/javascript">
 	//<![CDATA[
@@ -139,78 +131,22 @@ echo '
 		}
 	}
 
-	function GebietStarten(bezeichnung, stunde, minute, sekunde, gebiet_id)
+	function GebietStarten(bezeichnung,stunde,minute,sekunde,gebiet_id)
 	{
-		let message = <?php echo "'".$p->t('testtool/okKlickenUmZuStarten')."'"?> + ' ' + stunde + 'h ' + minute + 'm ' + sekunde + 's';
-		let title = <?php echo "'".$p->t('testtool/startGebiet')."'"?>;
-		let abbrechen = <?php echo "'".$p->t('testtool/abbrechen')."'"?>;
-
-		if ($('#gebiet-dialog').length === 0)
-		{
-			$('body').append(
-				'<div id="gebiet-dialog" title="' + title + '">' +
-					'<p id="gebiet-dialog-msg">' + message + '</p>' +
-				'</div>'
-			);
+		var check = confirm(<?php echo "'".$p->t('testtool/okKlickenUmZuStarten')."'"?>+' '+stunde+'h '+minute+'m '+sekunde+'s');
+		if (check == true) {
+			var sprache_user = <?php echo "'".$sprache_user."'"?>;
+			document.location.href = 'frage.php?gebiet_id='+gebiet_id+'&start=true';
+		}
+		else {
+			return false;
 		}
-
-		$('#gebiet-dialog').dialog({
-			modal: true,
-			width: 400,
-			resizable: false,
-			buttons: [
-				{
-					text: 'OK',
-					click: function() {
-						$(this).dialog('close');
-						document.location.href = 'frage.php?gebiet_id=' + gebiet_id + '&start=true';
-					}
-				},
-				{
-					text: abbrechen,
-					click: function() {
-						$(this).dialog('close');
-					}
-				}
-			]
-		});
 	}
 
-	let letzteFrageBestaetigt = false;
-
 	function letzteFrage()
 	{
-		if (letzteFrageBestaetigt)
-			return true;
-
-		let message = <?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>;
-
-		if ($('#fertig-dialog').length === 0)
-		{
-			$('body').append(
-				'<div id="fertig-dialog">' +
-					'<p>' + message + '</p>' +
-				'</div>'
-			);
-		}
-
-		$('#fertig-dialog').dialog({
-			modal: true,
-			width: 400,
-			resizable: false,
-			buttons: [
-				{
-					text: 'OK',
-					click: function() {
-						$(this).dialog('close');
-						letzteFrageBestaetigt = true;
-						$('[name="submitantwort"]').click();
-					}
-				}
-			]
-		});
-
-		return false;
+		alert(<?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>);
+		return true;
 	}
 
 	$(document).ready(function () {
@@ -711,7 +647,7 @@ if($frage->frage_id!='')
 	}
 
 	$letzte = $frage->getNextFrage($gebiet_id, $_SESSION['pruefling_id'], $frage_id, $demo);
-	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"return letzteFrage()\"":"").">";
+	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"letzteFrage()\"":"").">";
 	echo '
 		<div class="row text-center">
 			<table class="table" style="width: 600px; margin-left: auto; margin-right: auto;">

cis/testtool/gebietfertig.php

@@ -44,27 +44,6 @@ if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
 $sprache_user = (isset($_SESSION['sprache_user']) && !empty($_SESSION['sprache_user'])) ? $_SESSION['sprache_user'] : DEFAULT_LANGUAGE;
 $p = new phrasen($sprache_user);
 
-$showInfo = false;
-if (isset($_SESSION['alleGebiete']))
-{
-	$alleGebiete = array_map('intval', $_SESSION['alleGebiete']);
-	$pruefling_id = $_SESSION['pruefling_id'];
-
-	$qry = "SELECT COUNT(DISTINCT gebiet_id)  as anzahl
-			FROM testtool.tbl_pruefling_frage
-			JOIN testtool.tbl_frage USING(frage_id)
-			WHERE gebiet_id IN (". implode(',', $alleGebiete) .")
-			AND pruefling_id = ". $pruefling_id ."
-	";
-
-	$result = $db->db_query($qry);
-	$anzahlGebiete = $db->db_fetch_object($result);
-
-
-	if ((int)$anzahlGebiete->anzahl === count($alleGebiete))
-		$showInfo = true;
-}
-
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -90,7 +69,6 @@ if (isset($_SESSION['alleGebiete']))
 <body>
 <br><br><br><br><br>
 <center><h2><?php echo $p->t('testtool/zeitAbgelaufen');?></h2>
-	<h3><?php echo ($showInfo ? ($p->t('testtool/alleGebietGestartet') . "<br />" . $p->t('testtool/alleGebieteGestartetInfo')) : ''); ?></h3>
 </center>
 </body>
 </html>

cis/testtool/login.php

@@ -142,9 +142,7 @@ if (isset($_REQUEST['prestudent']))
 		}
 		if ($reihungstest_id != '' && $rt->load($reihungstest_id))
 		{
-			$pruefling_exist = new Pruefling();
-			$alreadyInRT = $pruefling_exist->personAlreadyInRT($ps->person_id, $rt->reihungstest_id, $ps->prestudent_id);
-			if ($rt->freigeschaltet && !$alreadyInRT)
+			if ($rt->freigeschaltet)
 			{
 				// regenerate Session ID after Login
 				session_regenerate_id();
@@ -284,14 +282,7 @@ if (isset($_REQUEST['prestudent']))
 			}
 			else
 			{
-				if ($alreadyInRT)
-				{
-					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtRegistriert').'</div>';
-				}
-				else
-				{
-					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</div>';
-				}
+				$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</div>';
 			}
 		}
 		else

cis/testtool/menu.php

@@ -187,7 +187,6 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 
 			$qry .= "
-				AND ps_status.bewerbung_abgeschicktamum IS NOT NULL
 
 		/* Order to get last semester when using distinct on */
 		ORDER BY
@@ -406,29 +405,6 @@ else if (isset($_SESSION['pruefling_id']))
 		echo '</table>';
 	}
 
-	if (isset($_SESSION['pruefling_id']) && !empty($_SESSION['alleGebiete']))
-	{
-		$alleGebiete = array_map('intval', $_SESSION['alleGebiete']);
-		$pruefling_id = (int)$_SESSION['pruefling_id'];
-
-		$qry = "SELECT COUNT(DISTINCT gebiet_id) AS anzahl
-				FROM testtool.tbl_pruefling_frage
-					JOIN testtool.tbl_frage USING(frage_id)
-				WHERE gebiet_id IN (". implode(',', $alleGebiete) .")
-					AND pruefling_id = ". $pruefling_id;
-
-		$result_check = $db->db_query($qry);
-		$row_check = $db->db_fetch_object($result_check);
-
-		if ((int)$row_check->anzahl === count($alleGebiete))
-		{
-			echo '<tr><td>
-					<div class="alert alert-success small" style="margin-left: 20px; width: 170px; margin-top: 3px;" role="alert">
-						<strong>'.$p->t('testtool/alleGebietGestartet').'</strong>
-					</div>
-				</td></tr>';
-		}
-	}
 	// Link zum Logout
 
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>

composer.json

@@ -70,18 +70,6 @@
 				}
 			}
 		},
-		{
-			"type": "package",
-			"package": {
-				"name": "drag-drop-touch-js/dragdroptouch",
-				"version": "2.0.3",
-				"source": {
-					"url": "https://github.com/drag-drop-touch-js/dragdroptouch.git",
-					"type": "git",
-					"reference": "master"
-				}
-			}
-		},
 		{
 			"type": "package",
 			"package": {
@@ -464,8 +452,6 @@
 
 		"easyrdf/easyrdf": "0.9.*",
 
-		"drag-drop-touch-js/dragdroptouch": "*",
-
 		"fgelinas/timepicker": "0.3.3",
 		"fortawesome/font-awesome4": "4.7.*",
 		"fortawesome/font-awesome6": "6.1.*",
@@ -533,9 +519,5 @@
 		"phpmetrics/phpmetrics": "2.*",
 		"sebastian/phpcpd": "3.*",
 		"phpunit/phpunit": "^6"
-	},
-	"scripts": {
-		"post-install-cmd": "@symlink_vendor_to_public",
-		"symlink_vendor_to_public": "ln -sfn ../vendor ./public/"
 	}
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "869cbc35bd1ba90ab90934fcb41b0f51",
+    "content-hash": "f4f0af4586f46f97d8b6092c1ac0fb3a",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -804,16 +804,6 @@
             "abandoned": true,
             "time": "2018-03-09T06:07:41+00:00"
         },
-        {
-            "name": "drag-drop-touch-js/dragdroptouch",
-            "version": "2.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/drag-drop-touch-js/dragdroptouch.git",
-                "reference": "master"
-            },
-            "type": "library"
-        },
         {
             "name": "easyrdf/easyrdf",
             "version": "0.9.1",