Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning

# Conflicts:
#	system/phrasesupdate.php

application/config/abgabe.php

@@ -38,8 +38,19 @@ $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/navigation.php

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

application/config/routes.php

@@ -64,6 +64,9 @@ $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';

application/config/searchcis.php

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

application/controllers/Cis/Abgabetool.php

@@ -31,12 +31,8 @@ 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', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Abgabetool']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'Abgabetool']);
 		}
@@ -44,12 +40,8 @@ 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', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolStudent']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolStudent', 'student_uid_prop' => $student_uid_prop]);
 		}
@@ -57,12 +49,8 @@ class Abgabetool extends Auth_Controller
 
 	public function Mitarbeiter()
 	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolMitarbeiter']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolMitarbeiter']);
 		}
@@ -70,13 +58,8 @@ 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', ['viewData' => $viewData, 'route' => 'AbgabetoolAssistenz']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolAssistenz']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz', 'stg_kz_prop' => $stg_kz_prop]);
 		}
@@ -84,12 +67,8 @@ class Abgabetool extends Auth_Controller
 	
 	public function Deadlines()
 	{
-		$viewData = array(
-			'uid'=>getAuthUID(),
-		);
-
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['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('/CisVue/Dashboard'));
+			redirect($this->authlib->getLandingPage('/Cis4'));
 		}
 		else
 		{

application/controllers/Cis/LvPlan.php

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

application/controllers/Cis/MyLv.php

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

application/controllers/Cis/MyLvPlan.php

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

application/controllers/Cis/OtherLvPlan.php

@@ -0,0 +1,34 @@
+<?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,15 +55,7 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
-		
-		$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']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilIndex']);
 	}
 
 	/**
@@ -73,23 +65,13 @@ class Profil extends Auth_Controller
 	 */
 	public function View($uid)
 	{
-		$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']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilViewUid']);
 	}
 
 	/**
-	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
+	 * checks whether a specific userID is a student or not (foreword declaration of the function isStudent in Student_model.php)
 	 * @access public
-	 * @param  $uid the userID used to check if it is a mitarbeiter
+	 * @param  $uid the userID used to check if it is a student
 	 * @return boolean 
 	 */
 	public function isStudent($uid)
@@ -119,7 +101,7 @@ class Profil extends Auth_Controller
 	}
 
 	/**
-	 * gets the adressen that are marked as zustell from the currenlty logged in user
+	 * gets the adressen that are marked as zustell from the currently logged in user
 	 * @access public
 	 * @return array a list of adresse_id's 
 	 */
@@ -262,23 +244,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 = 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 = $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"));
+			}
 		} else {
-				echo json_encode(error("Nation was not 'A' (Austria)"));
+			echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
 	}
 
@@ -750,6 +732,4 @@ class Profil extends Auth_Controller
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
-
-
 }

application/controllers/Cis/Raumsuche.php

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

application/controllers/Cis/StgOrgLvPlan.php

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

application/controllers/Cis4.php

@@ -1,6 +1,7 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
 
 /**
  *
@@ -13,9 +14,9 @@ class Cis4 extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct(
-		    array(
-			'index' => 'basis/cis:r'
-		    )
+			array(
+				'index' => 'basis/cis:r'
+			)
 		);
 
 		// Load Config
@@ -30,16 +31,6 @@ class Cis4 extends Auth_Controller
 	 */
 	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,
-			'timezone' => $this->config->item('timezone')
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'FhcDashboard']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'FhcDashboard']);
 	}
 }

application/controllers/CisVue/Dashboard.php

@@ -1,43 +0,0 @@
-<?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/api/frontend/v1/Abgabe.php

@@ -35,9 +35,12 @@ class Abgabe extends FHCAPI_Controller
 			'getStudentProjektabgaben' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw', 'basis/abgabe_lektor:rw'),
 			'postStudentProjektarbeitZwischenabgabe' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw'),
 			'postStudentProjektarbeitEndupload' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw'),
+			'postStudentProjektarbeitTitel' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw'),
 			'getMitarbeiterProjektarbeiten' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
 			'postProjektarbeitAbgabe' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
+			'patchProjektarbeitAbgabeMultiple' => array('basis/abgabe_assistenz:rw'),
 			'deleteProjektarbeitAbgabe' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
+			'deleteProjektarbeitAbgabeMultiple' => array('basis/abgabe_assistenz:rw'),
 			'postSerientermin' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
 			'fetchDeadlines' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
 			'getPaAbgabetypen' => self::PERM_LOGGED,
@@ -90,6 +93,7 @@ class Abgabe extends FHCAPI_Controller
 		$ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT = $this->config->item('ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT');
 		$ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER = $this->config->item('ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER');
 		$BETREUER_SAMMELMAIL_BUTTON_STUDENT = $this->config->item('BETREUER_SAMMELMAIL_BUTTON_STUDENT');
+		$MULTIEDIT_TABLE = $this->config->item('MULTIEDIT_TABLE');
 		
 		$ret = array(
 			'old_abgabe_beurteilung_link' => $old_abgabe_beurteilung_link,
@@ -97,7 +101,7 @@ class Abgabe extends FHCAPI_Controller
 			'abgabetypenBetreuer' => $abgabetypenBetreuer,
 			'ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT' => $ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT,
 			'ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER' => $ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER,
-			'BETREUER_SAMMELMAIL_BUTTON_STUDENT' => $BETREUER_SAMMELMAIL_BUTTON_STUDENT,
+			'MULTIEDIT_TABLE' => $MULTIEDIT_TABLE,
 		);
 		
 		$this->terminateWithSuccess($ret);
@@ -107,10 +111,18 @@ class Abgabe extends FHCAPI_Controller
 	 * loads config related to abgabetool for students to avoid handing out links reserved for employees
 	 */
 	public function getConfigStudent() {
-		$moodle_link =$this->config->item('STG_MOODLE_LINK');
-
+		$moodle_link = $this->config->item('STG_MOODLE_LINK');
+		$title_edit_allowed = $this->config->item('STUDENT_EDIT_PROJEKTARBEIT_TITLE');
+		$confetti_on_endupload = $this->config->item('CONFETTI_ON_ENDUPLOAD');
+		$siginfolink_german = $this->config->item('SIGNATUR_INFO_LINK_GERMAN');
+		$siginfolink_english = $this->config->item('SIGNATUR_INFO_LINK_ENGLISH');
+		
 		$ret = array(
 			'moodle_link' => $moodle_link,
+			'title_edit_allowed' => $title_edit_allowed,
+			'confetti_on_endupload' => $confetti_on_endupload,
+			'siginfolink_german' => $siginfolink_german,
+			'siginfolink_english' => $siginfolink_english
 		);
 
 		$this->terminateWithSuccess($ret);
@@ -188,7 +200,7 @@ class Abgabe extends FHCAPI_Controller
 			$result = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
 		}
 
-		$projektarbeiten = getData($result);
+		$projektarbeiten = hasData($result) ? getData($result) : array();
 		
 		if(count($projektarbeiten)) {
 			foreach($projektarbeiten as $pa) {
@@ -448,7 +460,218 @@ class Abgabe extends FHCAPI_Controller
 		}
 
 	}
-	
+
+	/**
+	 * POST METHOD
+	 * allows a student (or assistenz on their behalf) to update the titel of their own projektarbeit.
+	 * blocked once the projektarbeit has been graded (checkProjektarbeitForFinishedStatus).
+	 */
+	public function postStudentProjektarbeitTitel()
+	{
+		if(!$this->config->item('STUDENT_EDIT_PROJEKTARBEIT_TITLE')) {
+			$this->terminateWithError($this->p->t('global', 'c4studentEditNotAllowed'), 'general');
+		};
+		
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$titel            = $this->input->post('titel');
+
+		if ($projektarbeit_id === NULL || trim((string)$projektarbeit_id) === ''
+			|| $titel === NULL || trim((string)$titel) === '') {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		// strip all HTML tags to prevent XSS in mail bodies, table views and Projektarbeitsbenotung
+		$titel = trim(strip_tags($titel));
+		if ($titel === '') {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		// Reject emojis and pictographs
+		// allows foreign letters, math symbols, accents, and standard punctuation.
+		$emojiPattern = '/[\x{1F300}-\x{1F5FF}\x{1F600}-\x{1F64F}\x{1F680}-\x{1F6FF}\x{1F900}-\x{1FAFF}\x{23E9}-\x{23EF}\x{2b50}\x{2700}-\x{27BF}]/u';
+		
+		// i would like this much more but our server does not recognize this utf-8 character range this way, so hexcodes it is 
+//		if (preg_match('/\p{Extended_Pictographic}/u', $titel)) {
+		if (preg_match($emojiPattern, $titel)) {
+
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+		
+		$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
+
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		// Verify the projektarbeit actually belongs to the supplied student_uid
+		$res = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
+		if (isError($res) || !hasData($res)) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4projektarbeitNichtGefunden'), 'general');
+		}
+		$assignedStudentUid = getData($res)[0]->uid;
+
+		// A student may only update their own title; assistenz is covered by checkZuordnung
+		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		if (getAuthUID() !== $assignedStudentUid && !$zugeordnet) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
+		}
+
+		
+		
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		$data = getData($result);
+		
+		$oldTitle = $data[0]->titel ?? '';
+		
+		$result = $this->ProjektarbeitModel->update(
+			$projektarbeit_id,
+			array(
+				'titel'      => $titel,
+				'updatevon'  => getAuthUID(),
+				'updateamum' => date('Y-m-d H:i:s')
+			)
+		);
+
+		$this->getDataOrTerminateWithError($result, 'general');
+
+		$this->logLib->logInfoDB(array(
+			'titelUpdate',
+			array(
+				'projektarbeit_id' => $projektarbeit_id,
+				'titel'            => $titel,
+				'updatevon'        => getAuthUID(),
+				'updateamum'       => date('Y-m-d H:i:s')
+			),
+			getAuthUID(),
+			getAuthPersonId()
+		));
+
+		$this->sendTitelChangedEmail(
+			$projektarbeit_id,
+			$titel,
+			$oldTitle,
+			$assignedStudentUid
+		);
+		
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		$titel = hasData($result) ? getData($result)[0]->titel : $titel;
+		$this->terminateWithSuccess($titel);
+	}
+
+	/**
+	 * Notifies all betreuer of a projektarbeit and all assistenzen responsible for its studiengang
+	 * when a student updates the titel of their projektarbeit.
+	 *
+	 * Betreuer retrieval mirrors AbgabetoolJob->notifyBetreuerAboutChangedAbgaben.
+	 * Assistenz retrieval mirrors AbgabetoolJob->notifyAssistenzAboutChangedAbgaben.
+	 *
+	 * @param int    $projektarbeit_id
+	 * @param string $new_titel         The titel as it was saved
+	 * @param string $student_uid
+	 */
+	private function sendTitelChangedEmail($projektarbeit_id, $new_titel, $old_titel, $student_uid)
+	{
+		$this->load->model('education/Projektarbeit_model',      'ProjektarbeitModel');
+		$this->load->model('education/Projektbetreuer_model',    'ProjektbetreuerModel');
+		$this->load->model('organisation/Studiengang_model',     'StudiengangModel');
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->load->model('person/Person_model',                     'PersonModel');
+
+		$this->load->model('person/Person_model', 'PersonModel');
+		$studentNameResult = $this->PersonModel->getFullName($student_uid);
+		$studentFullName   = hasData($studentNameResult) ? getData($studentNameResult) : $student_uid;
+
+		$studentInfoResult = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
+		if (isError($studentInfoResult) || !hasData($studentInfoResult)) {
+			$this->logLib->logInfoDB(array('sendTitelChangedEmail: student info not found', $projektarbeit_id));
+			return;
+		}
+		$studentInfo    = getData($studentInfoResult)[0];
+		$studiengang_kz = $studentInfo->studiengang_kz;
+
+		$stgResult = $this->StudiengangModel->load($studiengang_kz);
+		$oe_kurzbz = null;
+		if (!isError($stgResult) && hasData($stgResult)) {
+			$oe_kurzbz = getData($stgResult)[0]->oe_kurzbz ?? null;
+		}
+
+		// build shared mail data
+		$base_mail_data = array(
+			'studentFullName'      => $studentFullName,
+			'new_titel'         => $new_titel,
+			'old_titel'         => $old_titel
+		);
+
+		// notify all betreuer
+		$betreuerResult = $this->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
+		if (!isError($betreuerResult) && hasData($betreuerResult)) {
+
+			$linkAbgabetool = APP_ROOT . $this->config->item('URL_MITARBEITER');
+			
+			foreach (getData($betreuerResult) as $betreuer) {
+				$email = $betreuer->uid ? $betreuer->uid . '@' . DOMAIN : ($betreuer->private_email ?? null);
+				if (!$email) {
+					$this->logLib->logInfoDB(array('sendTitelChangedEmail: no email for betreuer', $betreuer->person_id));
+					continue;
+				}
+
+				$anredeResult = $this->ProjektarbeitModel->getProjektbetreuerAnrede($betreuer->person_id);
+				$anrede       = (!isError($anredeResult) && hasData($anredeResult)) ? getData($anredeResult)[0] : null;
+
+				$mail_data = array_merge($base_mail_data, array(
+					'anredeFillString'        => ($anrede->anrede ?? '') === 'Herr' ? 'r' : '',
+					'anrede'                  => $anrede->anrede  ?? '',
+					'fullFormattedNameString'  => $anrede->first  ?? $email,
+					'linkAbgabetool'           => $linkAbgabetool,
+				));
+
+				sendSanchoMail(
+					'PATitleUpdated',
+					$mail_data,
+					$email,
+					$this->p->t('abgabetool', 'c4PATitleChanged')
+				);
+			}
+		}
+
+		// notify assistenz for the studiengang OE
+		if (!$oe_kurzbz) {
+			$this->logLib->logInfoDB(array('sendTitelChangedEmail: no oe_kurzbz resolved, skipping assistenz', $studiengang_kz));
+			return;
+		}
+
+		$assistenzResult = $this->OrganisationseinheitModel->getAssistenzForOE($oe_kurzbz);
+		if (isError($assistenzResult) || !hasData($assistenzResult)) {
+			return;
+		}
+
+		$linkAbgabetool = APP_ROOT . $this->config->item('URL_ASSISTENZ');
+		
+		// similar pattern as job uses via the assistenzMap
+		$sentTo = [];
+		foreach (getData($assistenzResult) as $assistenz) {
+			if (in_array($assistenz->person_id, $sentTo)) {
+				continue;
+			}
+			$sentTo[] = $assistenz->person_id;
+
+			$email = $assistenz->uid . '@' . DOMAIN;
+
+			$mail_data = array_merge($base_mail_data, array(
+				'anredeFillString'        => $assistenz->anrede === 'Herr' ? 'r' : '',
+				'anrede'                  => $assistenz->anrede ?? '',
+				'fullFormattedNameString'  => $assistenz->first  ?? ($assistenz->uid . '@' . DOMAIN),
+				'linkAbgabetool'           => $linkAbgabetool,
+			));
+			
+			sendSanchoMail(
+				'PATitleUpdated',
+				$mail_data,
+				$email,
+				$this->p->t('abgabetool', 'c4PATitleChanged')
+			);
+		}
+	}
+
+
 	// validate paabgabe deadline against servertime just in case a student spoofs their local clock and thus
 	// unlocks the upload ui
 	private function checkPaabgabeDeadline($paabgabe_id) {
@@ -687,6 +910,99 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess([$paabgabe, $existingPaabgabe]);
 	}
 
+	/**
+	 * called by abgabetool/assistenz when bulk-editing multiple abgabetermine via the flat termine table view
+	 * only fields present in the payload are updated - absent fields are left untouched
+	 */
+	public function patchProjektarbeitAbgabeMultiple() {
+		$paabgabe_ids = $this->input->post('paabgabe_ids');
+
+		if ($paabgabe_ids === NULL || !is_array($paabgabe_ids) || count($paabgabe_ids) === 0) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		// collect only fields that were actually sent
+		$updateFields = [];
+
+		$datum = $this->input->post('datum');
+		if ($datum !== NULL && trim((string)$datum) !== '') {
+			$updateFields['datum'] = $datum;
+		}
+
+		$paabgabetyp_kurzbz = $this->input->post('paabgabetyp_kurzbz');
+		if ($paabgabetyp_kurzbz !== NULL && trim((string)$paabgabetyp_kurzbz) !== '') {
+			$updateFields['paabgabetyp_kurzbz'] = $paabgabetyp_kurzbz;
+		}
+
+		$kurzbz = $this->input->post('kurzbz');
+		if ($kurzbz !== NULL) {
+			$updateFields['kurzbz'] = $kurzbz;
+		}
+
+		// booleans: only include if explicitly posted
+		$upload_allowed = $this->input->post('upload_allowed');
+		if ($upload_allowed !== NULL) {
+			$updateFields['upload_allowed'] = filter_var($upload_allowed, FILTER_VALIDATE_BOOLEAN);
+		}
+
+		$fixtermin = $this->input->post('fixtermin');
+		if ($fixtermin !== NULL) {
+			$updateFields['fixtermin'] = filter_var($fixtermin, FILTER_VALIDATE_BOOLEAN);
+		}
+
+		if (empty($updateFields)) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+
+		$results = [];
+		foreach ($paabgabe_ids as $paabgabe_id) {
+			$paabgabe_id = trim((string)$paabgabe_id);
+
+			if ($paabgabe_id === '') {
+				$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			}
+
+			$projektarbeit_id = $this->getProjektarbeitIDForPaabgabeID($paabgabe_id);
+
+			$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
+
+			$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+			if (!$zugeordnet) {
+				$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
+			}
+
+			$paabgabeResult = $this->PaabgabeModel->load($paabgabe_id);
+			$paabgabeArr = $this->getDataOrTerminateWithError($paabgabeResult, 'general');
+
+			if (count($paabgabeArr) === 0) {
+				$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			}
+
+			$result = $this->PaabgabeModel->update(
+				$paabgabe_id,
+				array_merge($updateFields, [
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				])
+			);
+
+			$this->getDataOrTerminateWithError($result, 'general');
+			$results[] = getData($this->PaabgabeModel->load($paabgabe_id))[0];
+
+			$this->logLib->logInfoDB(array(
+				'paabgabe bulk updated',
+				$paabgabe_id,
+				$updateFields,
+				getAuthUID(),
+				getAuthPersonId()
+			));
+		}
+
+		$this->terminateWithSuccess($results);
+	}
+
 	/**
 	 * called by abgabetool/mitarbeiter in mitarbeiterdetail.js when deleting an abgabetermin
 	 * deletion is only possible if user is assistenz OR betreuer deletes their own custom termin
@@ -719,11 +1035,55 @@ class Abgabe extends FHCAPI_Controller
 		$result = $this->PaabgabeModel->delete($paabgabe_id);
 		$result = $this->getDataOrTerminateWithError($result, 'general');
 
-		// TODO: consider this in nightly email job
 		$this->logLib->logInfoDB(array($paabgabeArr[0], getAuthUID(), getAuthPersonId()));
 		$this->terminateWithSuccess($result);
 	}
 
+	/**
+	 * called by abgabetool/assistenz when deleting multiple abgabetermine via the flat termine table view
+	 */
+	public function deleteProjektarbeitAbgabeMultiple() {
+		$paabgabe_ids = $this->input->post('paabgabe_ids');
+
+		if ($paabgabe_ids === NULL || !is_array($paabgabe_ids) || count($paabgabe_ids) === 0) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		
+		$results = [];
+		foreach ($paabgabe_ids as $paabgabe_id) {
+			$paabgabe_id = trim((string)$paabgabe_id);
+
+			if ($paabgabe_id === '') {
+				$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			}
+
+			$this->checkProjektarbeitForFinishedStatus($this->getProjektarbeitIDForPaabgabeID($paabgabe_id));
+
+			$zugeordnet = $this->checkZuordnungByPaabgabe($paabgabe_id, getAuthUID());
+
+			if (!$zugeordnet) {
+				$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
+			}
+
+			$paabgabeResult = $this->PaabgabeModel->load($paabgabe_id);
+			$paabgabeArr = $this->getDataOrTerminateWithError($paabgabeResult, 'general');
+
+			if (count($paabgabeArr) == 0) {
+				$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			}
+
+			$result = $this->PaabgabeModel->delete($paabgabe_id);
+			$result = $this->getDataOrTerminateWithError($result, 'general');
+			$results[] = $result;
+			
+			$this->logLib->logInfoDB(array($paabgabeArr[0], getAuthUID(), getAuthPersonId()));
+		}
+
+		$this->terminateWithSuccess($results);
+	}
+
 	/**
 	 * endpoint for adding the same paabgabe for multiple projektarbeiten
 	 * can be slow for large n since it queries twice per projektarbeit_id
@@ -1206,7 +1566,7 @@ class Abgabe extends FHCAPI_Controller
 		};
 		Events::trigger('projektarbeit_is_current', $projektarbeit_id, $returnFunc);
 		if(!$projektarbeitIsCurrent) {
-			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
+			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeitv2'), 'general');
 		}
 
 		// Link to Abgabetool
@@ -1411,8 +1771,14 @@ class Abgabe extends FHCAPI_Controller
 
 		$data = getData($res)[0];
 		if($data->note !== NULL) {
-			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
+			// hardcode this error msg cause phrasen arent reliable and people keep bugging why the cant edit old entries they definitely shouldnt update
+			$message = $this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeitv2');
+			if(strpos($message, "<<") === 0) { // phrase could not be loaded
+				$this->terminateWithError('Die Projektarbeit wurde bereits benotet, Sie dürfen deshalb keine weiteren Termine anlegen oder bearbeiten.', 'general');
+			} else {
+				$this->terminateWithError($message);
+			}
 		}
 	}
 
-}
+}

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

@@ -18,6 +18,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
+
 class Bookmark extends FHCAPI_Controller
 {
 
@@ -28,111 +30,162 @@ 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("bookmark_id");
+		$this->BookmarkModel->addOrder("sort");
 		$bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]);
 
-        $bookmarks = $this->getDataOrTerminateWithError($bookmarks);
+		$bookmarks = $this->getDataOrTerminateWithError($bookmarks);
 
-        $this->terminateWithSuccess($bookmarks);
-    }
-
-    /**
-	 * deletes bookmark from associated user 
-	 * @access public
-	 * @return void
-	 */
-    public function delete($bookmark_id)
-	{
-        $bookmark = $this->BookmarkModel->load($bookmark_id);
-
-        $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);
-
-            $delete_result = $this->getDataOrTerminateWithError($delete_result);
-
-            $this->terminateWithSuccess($delete_result);
-        }else{
-            $this->_outputAuthError(['delete' => ['admin:rw']]);
-        }
-    }
-
-    /**
-	 * inserts new bookmark into the bookmark table 
-	 * @access public
-	 * @return void
-	 */
-    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() == 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);
-
-        $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);
-
-        $this->terminateWithSuccess($insert_into_result);
-
-    }
+		$this->terminateWithSuccess($bookmarks);
+	}
 
 	/**
-	 * updates bookmark in the bookmark table 
+	 * deletes bookmark from associated user
 	 * @access public
 	 * @return void
 	 */
-    public function update($bookmark_id)
+	public function delete($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() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+		$bookmark = $this->BookmarkModel->load($bookmark_id);
 
-        $url = $this->input->post('url',true);
-        $title = $this->input->post('title',true);
+		$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);
+
+			$delete_result = $this->getDataOrTerminateWithError($delete_result);
+
+			$this->terminateWithSuccess($delete_result);
+		} else {
+			$this->_outputAuthError(['delete' => ['admin:rw']]);
+		}
+	}
+
+	/**
+	 * inserts new bookmark into the bookmark table
+	 * @access public
+	 * @return void
+	 */
+	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());
+
+		$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);
+
+		$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->getDataOrTerminateWithError($insert_into_result);
+
+		$this->terminateWithSuccess($insert_into_result);
+	}
+
+	/**
+	 * updates bookmark in the bookmark table
+	 * @access public
+	 * @return void
+	 */
+	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());
+
+		$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);
+		}
 
 		$now = new DateTime();
 		$now = $now->format('Y-m-d H:i:s');
 
-        $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title,'updateamum'=>$now]);
+		$update_result = $this->BookmarkModel->update($bookmark_id, [
+			'url' => $url,
+			'title' => $title,
+			'tag' => $tag,
+			'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([
-			'getViewData' => self::PERM_LOGGED,
+			'dashboardViewData' => self::PERM_LOGGED,
 		]);
 		
 	}
@@ -36,17 +36,22 @@ class Cis4FhcApi extends FHCAPI_Controller
 	// Public methods
 
 	/**
-	 * fetches ViewData
-	 */
-	public function getViewData()
+     * 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()
 	{
 		$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
+			'person_id' => $personData->person_id,
+			'timezone' => $this->config->item('timezone'),
 		);
 
 		$this->terminateWithSuccess($viewData);

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

@@ -16,12 +16,13 @@
  * 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
 	 */
@@ -31,28 +32,95 @@ 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 ?? [];
-		$this->terminateWithSuccess($menu);
-    }
 
-	
-	
+		$menu = $this->generateUrlsForMenuItems($menu);
+		$this->terminateWithSuccess($menu);
+	}
+
+	private function generateUrlsForMenuItems($menuItems)
+	{
+		return array_map(
+			function ($menuItem) {
+				return $this->generateUrlForMenuItem($menuItem);
+			},
+			$menuItems
+		);
+	}
+
+	private function generateUrlForMenuItem($menuItem)
+	{
+		$menuItem->url = $this->menuItemUrlHelper($menuItem);
+		unset($menuItem->content);
+
+		if ($menuItem->childs && count($menuItem->childs)) {
+			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
+		}
+
+		return $menuItem;
+	}
+
+	private function menuItemUrlHelper($menuItem)
+	{
+		if ($menuItem->template_kurzbz !== 'redirect') {
+			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
+		}
+
+		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
+			return '';
+		}
+
+		$doc = new DOMDocument();
+		$doc->loadXML($menuItem->content);
+		$urlElem = $doc->getElementsByTagName('url')->item(0);
+
+		if (!$urlElem) {
+			return '';
+		}
+
+		$url = $urlElem->textContent;
+
+		if (strpos($url, '../cms/news.php') !== false) {
+			$newsRegex = '/^\.\.\/cms\/news\.php/';
+			$url = preg_replace($newsRegex, site_url("/CisVue/Cms/news"), $url);
+		}
+
+		if (strpos($url, '../cms/content.php?') !== false) {
+			$contentRegex = '/^\.\.\/cms\/content\.php\?content_id=([0-9]+)/';
+			$matches = [];
+			preg_match($contentRegex, $url, $matches);
+			$url = site_url('/CisVue/Cms/content/' . $matches[1]);
+		}
+
+		if (strpos($url, '../index.ci.php') !== false) {
+			$indexRegex = '/^\.\.\/index\.ci\.php/';
+			$url = preg_replace($indexRegex, site_url(), $url);
+		}
+
+		if (strpos($url, '../') !== false) {
+			$relativeRegex = '/^\.\.\//';
+			$url = preg_replace($relativeRegex, base_url(), $url);
+		}
+
+		return $url;
+	}
+
 }
 

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

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

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

@@ -38,7 +38,8 @@ class Lehre extends FHCAPI_Controller
 		parent::__construct([
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
-			'Pruefungen' => self::PERM_LOGGED
+			'Pruefungen' => self::PERM_LOGGED,
+			'semesterAverageGrade' => self::PERM_LOGGED,
 		]);
 		
 	}
@@ -100,5 +101,49 @@ 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/LvPlan.php

@@ -16,7 +16,8 @@
  * 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;
@@ -33,19 +34,25 @@ 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
+			'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,
 		]);
 
-        $this->load->library('LogLib');
-        $this->loglib->setConfigs(array(
+		$this->load->library('LogLib');
+		$this->loglib->setConfigs(array(
 			'classIndex' => 5,
 			'functionIndex' => 5,
 			'lineIndex' => 4,
@@ -53,17 +60,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');
@@ -83,24 +90,30 @@ 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);
+		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events
-		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date);
+		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date, $uid);
 
 		// fetching ferien events
-		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
-		
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date, $uid);
+
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -109,6 +122,45 @@ 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
 	 *
@@ -122,7 +174,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());
 
@@ -137,7 +189,6 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
-		
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -146,40 +197,42 @@ 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);
 	}
@@ -210,10 +263,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
@@ -226,25 +279,32 @@ 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);
+		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
 
 		$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);
@@ -287,6 +347,68 @@ 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
 	 *
@@ -294,30 +416,30 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchMoodleEvents($start_date, $end_date)
+	private function fetchMoodleEvents($start_date, $end_date, $uid = null)
 	{
 		$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' => getAuthUID()
+				'username' => $uid ?? getAuthUID()
 			]
 		);
 
@@ -331,23 +453,23 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchFerienEvents($start_date, $end_date)
+	private function fetchFerienEvents($start_date, $end_date, $uid = null)
 	{
 		$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" => getAuthUID(),
+				"student_uid" => $uid ?? getAuthUID(),
 				"studiensemester_kurzbz" => $studentsemester_kurzbz
 			]);
 			$studiengang = $this->getDataOrTerminateWithError($studiengang);
-			
+
 			if ($studiengang)
 				$studiengang_kz = current($studiengang)->studiengang_kz;
 			else
@@ -357,7 +479,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

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

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

@@ -16,7 +16,8 @@
  * 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
 {
@@ -27,13 +28,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');
@@ -48,28 +49,37 @@ class Profil extends FHCAPI_Controller
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
-	public function profilViewData($uid=null){
+
+	/**
+     * 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;
+
 		$this->load->library('ProfilLib');
-		$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());
+		$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();
 		}
-		
-		$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
@@ -77,9 +87,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)) {
@@ -87,10 +97,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));
 	}
 
 	/**
@@ -109,7 +119,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);
@@ -117,30 +127,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
@@ -150,23 +160,48 @@ 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

@@ -0,0 +1,64 @@
+<?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,21 +62,36 @@ 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]);
-			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
-			
-			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
-			$student_studiengang = $studentLehrverband->studiengang_kz;
-			$student_semester = $studentLehrverband->semester;
+
+			//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));
+
 			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
 			
-			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_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_studienplan))
-			$parameter_studienplan = $student_studienplan;
+				$parameter_studienplan = $student_studienplan;
+
 		}  
 
 		if(isset($parameter_studiensemester)){
@@ -96,8 +111,7 @@ 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;
 		}))){
@@ -216,6 +230,8 @@ 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/dashboard/Board.php

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

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

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

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

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

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

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

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

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

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

@@ -24,6 +24,7 @@ class NotizPerson extends Notiz_Controller
 		//Load Models
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
 		//Permission checks for allowed Oes
 		if ($this->router->method == 'addNewNotiz')
@@ -38,7 +39,7 @@ class NotizPerson extends Notiz_Controller
 			{
 				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 			}
-			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
 		}
 
 		if ( $this->router->method == 'updateNotiz')
@@ -59,7 +60,7 @@ class NotizPerson extends Notiz_Controller
 			$person_id = current($data)->person_id;
 
 			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
 		}
 
 		if ($this->router->method == 'deleteNotiz' )
@@ -78,7 +79,7 @@ class NotizPerson extends Notiz_Controller
 			}
 
 			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
 		}
 	}
 
@@ -99,44 +100,20 @@ class NotizPerson extends Notiz_Controller
 	}
 
 	//stv: if person has permission of one studiengang of person -> permission to add/update/delete Note
-	private function _checkIfBerechtigungForOneUidExists($person_id, $allowedStgs)
+	private function _checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs)
 	{
-		//get all studentUids of person_id
-		$result = $this->BenutzerModel->loadWhere(['person_id' => $person_id]);
+		$result = $this->PrestudentModel->loadWhere(['person_id' => $person_id]);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$checkarray = [];
 		foreach ($data as $item)
 		{
-			//check if isStudent
-			$result = $this->StudentModel->isStudent($item->uid);
-
-			$isStudent = $this->getDataOrTerminateWithError($result);
-			if($isStudent)
+			if(in_array($item->studiengang_kz, $allowedStgs))
 			{
-				$checkarray[]  = $this->_checkAllowedStgsFromUid($item->uid, $allowedStgs);
+				return true;
 			}
-
 		}
-		if (!in_array(1, $checkarray))
-			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
-	}
 
-	private function _checkAllowedStgsFromUid($student_uid, $allowedStgs)
-	{
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->loadWhere(['student_uid' => $student_uid]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$studiengang_kz = current($data)->studiengang_kz;
-
-		if (!in_array($studiengang_kz, $allowedStgs))
-		{
-			return 0;
-		}
-		else
-		{
-			return 1;
-		}
+		$this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
 	}
 }

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

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

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

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

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

@@ -90,6 +90,15 @@ 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'
@@ -97,13 +106,10 @@ 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');
-		$result = $this->ProjektarbeitModel->loadWhere(
+		return $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);
 
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
 	}
 
 	/**
@@ -132,7 +138,8 @@ class Projektarbeit extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-
+		$data = $this->getDataOrTerminateWithError($this->fetchProjektarbeitById($data));
+		
 		$this->terminateWithSuccess($data);
 	}
 

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

@@ -626,7 +626,7 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
-		
+
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -851,40 +851,44 @@ class Students extends FHCAPI_Controller
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$this->load->config('stv');
-		$tags = $this->config->item('stv_prestudent_tags');
 
-		$whereTags = '';
-		if (is_array($tags) && !isEmptyArray($tags)) {
-			$tags = array_keys($tags);
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$tags = $this->config->item('stv_prestudent_tags');
 
-			foreach ($tags as $key => $tag) {
-				$tags[$key] = $this->db->escape($tag);
+			$whereTags = '';
+			if (is_array($tags) && !isEmptyArray($tags)) {
+				$tags = array_keys($tags);
+
+				foreach ($tags as $key => $tag) {
+					$tags[$key] = $this->db->escape($tag);
+				}
+				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
 			}
-			$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
+			";
 		}
-		$subQueryTag = "
-		  (
-			SELECT
-			  tag.prestudent_id,
-			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-			FROM (
-			  SELECT DISTINCT ON (n.notiz_id)
-				n.notiz_id AS id,
-				nt.typ_kurzbz,
-				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-				n.text AS notiz,
-				nt.style,
-				n.erledigt AS done,
-				nz.prestudent_id
-			  FROM public.tbl_notizzuordnung AS nz
-				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-			. $whereTags .
-			"
-			) AS tag
-			GROUP BY tag.prestudent_id
-		  ) AS tag_data_agg
-		";
 
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -907,11 +911,17 @@ class Students extends FHCAPI_Controller
 			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
 			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
 
-		$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		}
 
 
 		$this->PrestudentModel->addSelect("b.uid");
-		$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		}
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');

application/controllers/dashboard/Admin.php

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

application/controllers/dashboard/Api.php

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

application/controllers/dashboard/Config.php

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

application/controllers/dashboard/Dashboard.php

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

application/controllers/dashboard/DashboardDemo.php

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

application/controllers/dashboard/Widget.php

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

application/controllers/jobs/AbgabetoolJob.php

@@ -358,7 +358,8 @@ 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];
@@ -377,6 +378,7 @@ class AbgabetoolJob extends JOB_Controller
 				if(count($relevantAbgaben) == 0) {
 					continue;
 				}
+				$hasContent = true;
 
 				// Format the Student Name
 				$s = $relevantAbgaben[0];
@@ -447,7 +449,12 @@ 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/core/Notiz_Controller.php

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

application/libraries/AntragLib.php

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

application/libraries/PermissionLib.php

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

application/libraries/StundenplanLib.php

@@ -40,13 +40,16 @@ class StundenplanLib
 	 * @return stdClass
 	 * @access public
 	 */
-	public function getEventsUser($start, $end)
+	public function getEventsUser($start, $end, $uid = null)
 	{
 		$this->_ci =& get_instance();
 
 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$uid = getAuthUID();
+		if (!$uid) {
+			$uid = getAuthUID();
+		}
+		
 		if (is_null($uid))
 			return error("No UID");
 		
@@ -217,7 +220,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
 	{
 		$this->_ci =& get_instance();
 
@@ -228,14 +231,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(getAuthUID()));
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? 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);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $uid);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
 		}
 		
 		if (isError($reservierungen))
@@ -357,7 +360,10 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object = getData($ort_content_object)[0];
+				$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;
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}
@@ -445,6 +451,24 @@ 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,7 +37,9 @@ class DashboardLib
 	
 	public function getDashboardByKurzbz($dashboard_kurzbz)
 	{
-		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
+		$result = $this->_ci->DashboardModel->loadWhere([
+			'dashboard_kurzbz' => $dashboard_kurzbz
+		]);
 
 		if (hasData($result))
 		{
@@ -47,30 +49,55 @@ class DashboardLib
 		return null;
 	}
 	
-	public function getMergedConfig($dashboard_id, $uid)
+	public function getMergedUserConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
-		$userconfig = $this->getUserConfig($dashboard_id, $uid);
+		$defaultconfig = $this->getUserBaseConfig($dashboard_id);
+		$userconfig = $this->getUserOverrideConfig($dashboard_id, $uid);
 		
-		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
+		$sourceconfig = array_map(function ($value) {
+			return ['source' => $value['source']];
+		}, $defaultconfig);
+		
+		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig, $sourceconfig);
 		
 		return $mergedconfig;
 	}
 	
-	public function getDefaultConfig($dashboard_id, $uid)
+	protected function getUserBaseConfig($dashboard_id)
 	{
-		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
+		$funktion_kurzbzs = [];
+		$rights = $this->_ci->permissionlib->getAccessRights();
+		if ($rights)
+			$funktion_kurzbzs = array_unique(array_map(function ($right) {
+				return $right->funktion_kurzbz;
+			}, $rights));
+		
+		$this->_ci->DashboardPresetModel->db
+			->group_start()
+				->where_in('funktion_kurzbz', $funktion_kurzbzs)
+				->or_where('funktion_kurzbz IS NULL')
+			->group_end();
+
+		$this->_ci->DashboardPresetModel->addOrder('funktion_kurzbz', 'DESC');
+		
+		$result = $this->_ci->DashboardPresetModel->loadWhere([
+			'dashboard_id' => $dashboard_id
+		]);
 		$defaultconfig = array();
 		
-		if (hasData($res_presets))
+		if (hasData($result))
 		{
-			$presets = getData($res_presets);
+			$presets = getData($result);
 			foreach ($presets as $presetobj)
 			{
 				$preset = json_decode($presetobj->preset, true);
 				if (null !== $preset)
 				{
-					$defaultconfig = array_replace_recursive($defaultconfig, $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);
 				}
 			}
 		}
@@ -78,7 +105,7 @@ class DashboardLib
 		return $defaultconfig;
 	}
 	
-	public function getUserConfig($dashboard_id, $uid)
+	protected function getUserOverrideConfig($dashboard_id, $uid)
 	{
 		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
 		
@@ -107,7 +134,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
+		$emptyoverride->override = '[]';
 		
 		return $emptyoverride;
 	}
@@ -126,8 +153,7 @@ class DashboardLib
 		$emptypreset = new stdClass();
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
-		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
+		$emptypreset->preset = '[]';
 		
 		return $emptypreset;
 	}
@@ -137,8 +163,10 @@ class DashboardLib
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
 		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
-		$result = $this->_ci->DashboardPresetModel
-			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
+		$result = $this->_ci->DashboardPresetModel->loadWhere([
+			'dashboard_id' => $dashboard->dashboard_id,
+			'funktion_kurzbz' => $funktion_kurzbz
+		]);
 		
 		if (hasData($result))
 		{
@@ -190,44 +218,4 @@ 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/vertragsbestandteil/AbstractBestandteil.php

@@ -40,7 +40,9 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {		
+		} else if(is_null($old_value) xor is_null($new_value)) {
+			$this->modifiedcolumns[$columnname] = $columnname;
+		} else if($old_value != $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

@@ -3,6 +3,7 @@ namespace vertragsbestandteil;
 
 use Exception;
 use vertragsbestandteil\VertragsbestandteilStunden;
+use vertragsbestandteil\VertragsbestandteilLohnguide;
 
 /**
  * Description of VertragsbestandteilFactory
@@ -22,6 +23,7 @@ class VertragsbestandteilFactory
 	const VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH = 'urlaubsanspruch';
 	const VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG = 'zeitaufzeichnung';
 	const VERTRAGSBESTANDTEIL_LEHRE = 'lehre';
+	const VERTRAGSBESTANDTEIL_LOHNGUIDE = 'lohnguide';
 	
 	public static function getVertragsbestandteil($data, $fromdb=false)
 	{
@@ -69,6 +71,11 @@ class VertragsbestandteilFactory
 				$vertragsbestandteil = new VertragsbestandteilZeitaufzeichnung();
 				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
 				break;
+
+			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
+				$vertragsbestandteil = new VertragsbestandteilLohnguide();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
 			
 			default:
 				throw new Exception('Unknown vertragsbestandteiltyp_kurzbz ' 
@@ -127,6 +134,12 @@ class VertragsbestandteilFactory
 				$vertragsbestandteildbmodel = $CI->VertragsbestandteilZeitaufzeichnung_model;
 				break;
 
+			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilLohnguide_model',
+					'VertragsbestandteilLohnguide_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilLohnguide_model;
+				break;
+
 			default:
 				throw new Exception('Unknown vertragsbestandteil_kurzbz '
 					. $vertragsbestandteil_kurzbz);

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -10,6 +10,7 @@ require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
 require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
 require_once __DIR__ . '/VertragsbestandteilFreitext.php';
 require_once __DIR__ . '/VertragsbestandteilKarenz.php';
+require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';
 

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

@@ -0,0 +1,161 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilLohnguide extends Vertragsbestandteil
+{
+	protected $stellenbezeichnung;
+	protected $vordienstzeit;
+	protected $fachrichtung_kurzbz;
+	protected $modellstelle_kurzbz;
+	protected $kommentar_person;
+	protected $kommentar_modellstelle;
+
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
+	}
+
+	public function getStellenbezeichnung()
+	{
+		return $this->stellenbezeichnung;
+	}
+
+	public function setStellenbezeichnung($stellenbezeichnung): self
+	{
+		$this->markDirty('stellenbezeichnung', $this->stellenbezeichnung, $stellenbezeichnung);
+		$this->stellenbezeichnung = $stellenbezeichnung;
+		return $this;
+	}
+
+	public function getVordienstzeit()
+	{
+		return $this->vordienstzeit;
+	}
+
+	public function setVordienstzeit($vordienstzeit): self
+	{
+		$this->markDirty('vordienstzeit', $this->vordienstzeit, $vordienstzeit);
+		$this->vordienstzeit = $vordienstzeit;
+		return $this;
+	}
+
+	public function getFachrichtung_kurzbz()
+	{
+		return $this->fachrichtung_kurzbz;
+	}
+
+	public function setFachrichtung_kurzbz($fachrichtung_kurzbz): self
+	{
+		$this->markDirty('fachrichtung_kurzbz', $this->fachrichtung_kurzbz, $fachrichtung_kurzbz);
+		$this->fachrichtung_kurzbz = $fachrichtung_kurzbz;
+		return $this;
+	}
+
+	public function getModellstelle_kurzbz()
+	{
+		return $this->modellstelle_kurzbz;
+	}
+
+	public function setModellstelle_kurzbz($modellstelle_kurzbz): self
+	{
+		$this->markDirty('modellstelle_kurzbz', $this->modellstelle_kurzbz, $modellstelle_kurzbz);
+		$this->modellstelle_kurzbz = $modellstelle_kurzbz;
+		return $this;
+	}
+
+	public function getKommentar_person()
+	{
+		return $this->kommentar_person;
+	}
+
+	public function setKommentar_person($kommentar_person): self
+	{
+		$this->markDirty('kommentar_person', $this->kommentar_person, $kommentar_person);
+		$this->kommentar_person = $kommentar_person;
+		return $this;
+	}
+
+	public function getKommentar_modellstelle()
+	{
+		return $this->kommentar_modellstelle;
+	}
+
+	public function setKommentar_modellstelle($kommentar_modellstelle): self
+	{
+		$this->markDirty('kommentar_modellstelle', $this->kommentar_modellstelle, $kommentar_modellstelle);
+		$this->kommentar_modellstelle = $kommentar_modellstelle;
+		return $this;
+	}
+
+	
+	
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->fachrichtung_kurzbz) && $this->setFachrichtung_kurzbz($data->fachrichtung_kurzbz);
+		isset($data->stellenbezeichnung) && $this->setStellenbezeichnung($data->stellenbezeichnung);
+		isset($data->vordienstzeit) && $this->setVordienstzeit($data->vordienstzeit);
+		isset($data->modellstelle_kurzbz) && $this->setModellstelle_kurzbz($data->modellstelle_kurzbz);
+		isset($data->kommentar_person) && $this->setKommentar_person($data->kommentar_person);
+		isset($data->kommentar_modellstelle) && $this->setKommentar_modellstelle($data->kommentar_modellstelle);
+		$this->fromdb = false;
+	}
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'stellenbezeichnung' => $this->getStellenbezeichnung(),
+			'vordienstzeit' => $this->getVordienstzeit(),
+			'fachrichtung_kurzbz' => $this->getFachrichtung_kurzbz(),
+			'modellstelle_kurzbz' => $this->getModellstelle_kurzbz(),
+			'kommentar_person' => $this->getKommentar_person(),
+			'kommentar_modellstelle' => $this->getKommentar_modellstelle(),
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		modellstelle_kurzbz: {$this->getModellstelle_kurzbz()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	public function validate()
+	{
+		$value = $this->vordienstzeit;
+
+		if ($value === null || $value === '') {
+			$result = null;   // allow null value 
+		} else {
+			$result = filter_var($value, FILTER_VALIDATE_INT, [
+				'options' => [
+					'min_range' => 0,
+					'max_range' => 100
+				]
+			]);
+
+			if ($result === false) {				
+				$this->validationerrors[] = 'Vordienstjahre muss eine ganze Zahl (0 bis 100) enthalten oder leer sein.';
+			}
+		}
+		
+		return parent::validate();
+	} 
+}

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=?
+								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=? AND sichtbar=true
 							WHERE
-								sichtbar=true
+								c1.aktiv = 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)
+				campus.tbl_contentchild k ON(m.content_id=k.content_id) and c.aktiv = true
 			WHERE EXISTS (
 				SELECT 1 
 				FROM campus.tbl_contentgruppe 

application/models/dashboard/Bookmark_model.php

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

application/models/dashboard/Dashboard_Preset_model.php

@@ -11,57 +11,4 @@ class Dashboard_Preset_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard_preset';
 		$this->pk = 'preset_id';
 	}
-
-	/**
-	 * Get Presets of given uid.
-	 * @param integer dashboard_id
-	 * @param string $uid
-	 * @return array
-	 */
-	public function getPresets($dashboard_id, $uid)
-	{
-		// TODO: get Funktionen for uid and load all preset for all funktionen for uid
-		//return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
-		$sql = <<<EOSQL
-			SELECT 
-				* 
-			FROM 
-				dashboard.tbl_dashboard_preset 
-			WHERE 
-				dashboard_id = ? 
-			AND (
-					funktion_kurzbz IN (
-						SELECT 
-							DISTINCT funktion_kurzbz 
-						FROM 
-							public.tbl_benutzerfunktion 
-						WHERE 
-							uid = ? 
-						AND 
-							NOW()::date 
-						BETWEEN 
-							COALESCE(datum_von, '1970-01-01') 
-						AND 
-							COALESCE(datum_bis, '2170-12-31')
-					) 
-					OR 
-						funktion_kurzbz IS NULL
-				) 
-			ORDER BY 
-				funktion_kurzbz DESC
-EOSQL;
-		
-		return $this->execQuery($sql, array($dashboard_id, $uid));
-	}
-	
-	/**
-	 * Get Preset by Dashboard and Funktion
-	 * @param integer dashboard_id
-	 * @param string funktion_kurzbz
-	 * @return array
-	 */
-	public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
-	{
-		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
-	}
 }

application/models/dashboard/Dashboard_model.php

@@ -11,15 +11,4 @@ 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/Lehrveranstaltung_model.php

@@ -402,14 +402,17 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit
+				lehre.tbl_lehreinheit le
 				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
 				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
 				JOIN public.tbl_person p using (person_id) 
 			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id= ?
-				AND tbl_lehreinheit.studiensemester_kurzbz = ?
+				le.lehrveranstaltung_id= ?
+				AND le.studiensemester_kurzbz = ?
 				AND lehrfunktion_kurzbz = 'LV-Leitung'
+				AND lema.mitarbeiter_uid NOT like '_Dummy%' 
+			  	AND b.aktiv = TRUE 
+			  	AND p.aktiv = TRUE
             ORDER BY 
                 lema.insertamum DESC
 			LIMIT 1

application/models/education/Paabgabe_model.php

@@ -79,10 +79,10 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
-		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
-		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-
+		WHERE (campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
+			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
+			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+		
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
@@ -108,7 +108,7 @@ class Paabgabe_model extends DB_Model
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";

application/models/education/Projektarbeit_model.php

@@ -341,172 +341,130 @@ class Projektarbeit_model extends DB_Model
 	
 	
 	public function getProjektarbeitenForStudiengang($studiengang_kz, $benotet) {
-		$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 = ?";
+		$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
+		)
 		
-			     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           
+		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  -- ← THE NEW LINE
+	
+			 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           
 		   ) as tmp";
 		
 		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));

application/models/organisation/Studiengang_model.php

@@ -594,7 +594,10 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
+			. $this->dbTable . ".bezeichnung, ', ', "
+			. "UPPER(" . $this->dbTable . ".typ), "
+			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(

application/models/person/Benutzerfunktion_model.php

@@ -261,6 +261,42 @@ class Benutzerfunktion_model extends DB_Model
     }
 
 
+	/**
+	 * Get active Kompetenzfeldleitung bei UID.
+	 *
+	 * @param $uid
+	 * @return array|stdClass|null
+	 */
+	public function getKFLByUID($uid)
+	{
+		$query = '
+            SELECT
+			  	bf.uid,
+				bf.oe_kurzbz,
+  				oe.organisationseinheittyp_kurzbz
+            FROM
+			  	public.tbl_benutzerfunktion bf
+				JOIN public.tbl_organisationseinheit oe USING (oe_kurzbz)
+  				JOIN public.tbl_benutzer b USING (uid)
+            WHERE
+                b.uid = ?
+              	AND b.aktiv = TRUE
+                AND funktion_kurzbz = \'Leitung\'
+               	AND organisationseinheittyp_kurzbz = \'Kompetenzfeld\'
+              	AND (datum_von IS NULL OR datum_von <= now())
+              	AND (datum_bis IS NULL OR datum_bis >= now())
+        ';
+
+		$parameters_array = array();
+		if (is_string($uid))
+		{
+			$parameters_array[] = $uid;
+		}
+
+		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)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null, $uid = 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) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
+		", is_null($ort_kurzbz) ? [$uid ?? getAuthUID(), $uid ?? 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)
+	public function getReservierungenMitarbeiter($start_date, $end_date, $uid = null)
 	{
 
 		$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
-		", [getAuthUID(), $start_date, $end_date]);
+		", [$uid ?? 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,6 +388,84 @@ 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/models/system/Message_model.php

@@ -242,6 +242,7 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
+		$limitoffset = (!is_null($offset) && !is_null($limit)) ? 'limit ? offset ?' : '';
 		$sql = <<<EOSQL
 			with filtered_messages as (
 				select
@@ -310,11 +311,12 @@ class Message_model extends DB_Model
 				public.tbl_person pr on pr.person_id = fm.recipient_id
 			order by
 				m.insertamum DESC
-			limit ?
-			offset ?;
+			{$limitoffset}
 EOSQL;
 
-		$parametersArray = array($person_id, $person_id, $limit, $offset);
+		$parametersArray = $limitoffset
+			? array($person_id, $person_id, $limit, $offset)
+			: array($person_id, $person_id);
 
 		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
@@ -325,7 +327,7 @@ EOSQL;
 		$data = getData($data);
 		if($data)
 		{
-			$count = ceil($data[0]->total_msgs / $limit);
+			$count = is_null($limit) ? 1 : ceil($data[0]->total_msgs / $limit);
 		}
 
 		return success(['data' => $data, 'count' => $count]);

application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php

@@ -0,0 +1,11 @@
+<?php
+
+class VertragsbestandteilLohnguide_model extends DB_Model
+{
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'hr.tbl_vertragsbestandteil_lohnguide';
+		$this->pk = 'vertragsbestandteil_id';
+	}
+}

application/models/vertragsbestandteil/Vertragsbestandteil_model.php

@@ -37,7 +37,8 @@ class Vertragsbestandteil_model extends DB_Model
 				kf.arbeitgeber_frist, kf.arbeitnehmer_frist,
 				s.wochenstunden, s.teilzeittyp_kurzbz,
 				u.tage,
-				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice
+				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice,
+				lg.stellenbezeichnung, lg.vordienstzeit, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
 			FROM
 				hr.tbl_vertragsbestandteil v
 			LEFT JOIN
@@ -63,6 +64,8 @@ class Vertragsbestandteil_model extends DB_Model
 				hr.tbl_vertragsbestandteil_urlaubsanspruch u USING(vertragsbestandteil_id)
 			LEFT JOIN
 				hr.tbl_vertragsbestandteil_zeitaufzeichnung z USING(vertragsbestandteil_id)
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil_lohnguide lg USING(vertragsbestandteil_id)
 EOSQL;
 		return $sql;
 	}

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: 95%;" route=<?php echo json_encode($route) ?> 
+<div id="abgabetoolroot" class="h-100" style="max-width: 99%" 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,12 +23,14 @@ $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',
@@ -39,7 +41,7 @@ $includesArray = array(
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
-		'public/js/apps/Dashboard/Fhc.js',
+		'public/js/apps/Cis/Cis.js',
 	),
 
 );
@@ -47,8 +49,6 @@ $includesArray = array(
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
 <div id="fhccontent" class="h-100" route=<?php echo $route ?>>
-	<router-view 
-			:view-data='<?php echo json_encode($viewData) ?>'
-	></router-view>
+	<router-view></router-view>
 </div>
 <?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

application/views/dashboard/admin.php

@@ -8,9 +8,15 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'customJSModules' => ['public/js/apps/DashboardAdmin.js'],
+		'primevue3' => true,
+		'vuedatepicker11' => true,
+		'customJSs' => [
+			'vendor/moment/luxonjs/luxon.min.js'
+		],
+		'customJSModules' => ['public/js/apps/Dashboard/Admin.js'],
 		'customCSSs' => [
-			'public/css/components/dashboard.css'
+			'public/css/components/dashboard.css',
+			'public/css/components/primevue.css',
 		],
 		'navigationcomponent' => true
 	)
@@ -25,7 +31,7 @@ $this->load->view(
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
 				<h1 class="h2">Dashboard</h1>
 			</div>
-			<dashboard-admin dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></dashboard-admin>
+			<dashboard-admin></dashboard-admin>
 		</div>
 	</div>
 

application/views/dashboard/preview.php

@@ -8,7 +8,12 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'customJSModules' => ['public/js/apps/Dashboard.js'],
+		'vuedatepicker11' => true,
+		'primevue3' => true,
+		'customJSs' => [
+			'vendor/moment/luxonjs/luxon.min.js'
+		],
+		'customJSModules' => ['public/js/apps/Dashboard/Preview.js'],
 		'customCSSs' => [
 			'public/css/components/dashboard.css'
 		],
@@ -23,9 +28,9 @@ $this->load->view(
 
 		<div id="content">
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-				<h1 class="h2">Dashboard</h1>
+				<h1 class="h2">Dashboard <?= $dashboard_kurzbz ?></h1>
 			</div>
-			<core-dashboard dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></core-dashboard>
+			<core-dashboard dashboard="<?= $dashboard_kurzbz ?>"></core-dashboard>
 		</div>
 	</div>
 

application/views/templates/CISVUE-Footer.php

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

cis/private/info/service_uebersicht.php

@@ -46,12 +46,13 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
 	<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
 	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
-	<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
-	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
 	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 	<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>';
 
+	include('../../../include/meta/jquery.php');
+	include('../../../include/meta/jquery-tablesorter.php');
+
 const MOODLE_ADDON_KURZBZ = 'moodle';
 
 // Load Addons to get Moodle_Path
@@ -71,7 +72,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\']
+					widgets: [\'zebra\',\'filter\']
 				});
 			}
 		);
@@ -151,8 +152,9 @@ foreach($service->result as $row)
 		$person = new person();
 		$person->getPersonFromBenutzer($row->operativ_uid);
 		$operativ = $person->nachname.' '.$person->vorname;
+		$oeBez = new organisationseinheit($row->oe_kurzbz);
 		echo '<tr>';
-		echo '<td>',$row->oe_kurzbz,'</td>';
+		echo '<td>',$oeBez->bezeichnung,'</td>';
 		echo '<td><b>'.$row->bezeichnung.'</b></td>';
 		echo '<td>',$row->beschreibung,'</td>';
 		echo '<td><nobr><a href="../profile/index.php?uid='.$row->design_uid.'">',$design,'</a></nobr></td>';

cis/testtool/menu.php

@@ -293,7 +293,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px;">';
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
 			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}
 

composer.json

@@ -70,6 +70,18 @@
 				}
 			}
 		},
+		{
+			"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": {
@@ -452,6 +464,8 @@
 
 		"easyrdf/easyrdf": "0.9.*",
 
+		"drag-drop-touch-js/dragdroptouch": "*",
+
 		"fgelinas/timepicker": "0.3.3",
 		"fortawesome/font-awesome4": "4.7.*",
 		"fortawesome/font-awesome6": "6.1.*",
@@ -519,5 +533,9 @@
 		"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": "f4f0af4586f46f97d8b6092c1ac0fb3a",
+    "content-hash": "869cbc35bd1ba90ab90934fcb41b0f51",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -804,6 +804,16 @@
             "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",

content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php

@@ -342,6 +342,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 		<vbox>
 			<checkbox id="mitarbeiter-entwicklungsteam-detail-checkbox-neu" checked="true" hidden="true" />
 			<textbox id="mitarbeiter-entwicklungsteam-detail-textbox-studiengang" hidden="true" />
+			<textbox id="mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id" hidden="true" />
+
 			<groupbox id="mitarbeiter-entwicklungsteam-detail-groupbox" flex="1">
 				<caption label="Details" />
 				<grid id="mitarbeiter-entwicklungsteam-detail-grid" style="margin:4px;" flex="1">

content/mitarbeiter/mitarbeiteroverlay.js.php

@@ -1708,6 +1708,7 @@ function MitarbeiterEntwicklungsteamSelect()
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value=studiengang_kz;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value=beginn;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value=ende;
+	document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value=entwicklungsteam_id;
 	MitarbeiterEntwicklungsteamDetailDisableFields(false);
 }
 
@@ -1725,6 +1726,7 @@ function MitarbeiterEntwicklungsteamSpeichern()
 	studiengang_kz_old = document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value;
 	beginn = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value;
 	ende = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value;
+	entwicklungsteam_id = document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value;
 
 	if(studiengang_kz=='')
 	{

content/student/studentdetailoverlay.xul.php

@@ -802,6 +802,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									class="sortDirectionIndicator"
 									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm" />
 								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-faktiv" label="F-Aktiv" flex="1" hidden="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv" />
+								<splitter class="tree-splitter"/>
 							</treecols>
 
 							<template>
@@ -828,6 +832,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv"/>
 											</treerow>
 										</treeitem>
 									</treechildren>

content/student/studentoverlay.js.php

@@ -3550,9 +3550,19 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredentialzertifikat_1':
 		case 'microcredentialzertifikat_2':
 		case 'microcredentialzertifikat_3':
+		case 'microcredentialzertifikat_4':
 		case 'microcredential_1':
 		case 'microcredential_2':
 		case 'microcredential_3':
+		case 'microcredential_4':
+		case 'microdegree_1':
+		case 'microdegree_2':
+		case 'microdegree_3':
+		case 'microdegree_4':
+		case 'microdegreeabschluss_1':
+		case 'microdegreeabschluss_2':
+		case 'microdegreeabschluss_3':
+		case 'microdegreeabschluss_4':
 			xml = 'microcredential.xml.php';
 			break;
 			

include/entwicklungsteam.class.php

@@ -364,9 +364,10 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');
 
 		//laden des Datensatzes
-			$qry = "SELECT *
+			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
 					FROM bis.tbl_entwicklungsteam
 					JOIN bis.tbl_besqual USING(besqualcode)
+					JOIN public.tbl_studiengang USING(studiengang_kz)
 					WHERE mitarbeiter_uid=".$this->db_add_param($mitarbeiter_uid)."
 					AND (beginn is NULL OR beginn <= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 12, 31))
 					AND (ende is NULL OR ende >= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 1, 1))";
@@ -394,6 +395,7 @@ class entwicklungsteam extends basis_db
 				$obj->insertvon = $row->insertvon;
 				$obj->ext_id = $row->ext_id;
 				$obj->besqual = $row->besqualbez;
+				$obj->melderelevant = $this->db_parse_bool($row->melderelevant);
 
 				$this->result[] = $obj;
 			}

include/konto.class.php

@@ -25,6 +25,7 @@
  */
 require_once(dirname(__FILE__).'/basis_db.class.php');
 require_once(dirname(__FILE__).'/'.EXT_FKT_PATH.'/generateZahlungsreferenz.inc.php');
+require_once(dirname(__FILE__).'/variable.class.php');
 
 class konto extends basis_db
 {
@@ -432,6 +433,8 @@ class konto extends basis_db
 
 		$qry.=" ORDER BY beschreibung";
 
+		$oehBeitrag = $this->_getOEHBeitrag();
+
 		if($this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object())
@@ -440,7 +443,15 @@ class konto extends basis_db
 
 				$typ->buchungstyp_kurzbz = $row->buchungstyp_kurzbz;
 				$typ->beschreibung = $row->beschreibung;
-				$typ->standardbetrag = $row->standardbetrag;
+				if (strtolower($typ->buchungstyp_kurzbz) === 'oeh' && $oehBeitrag)
+				{
+					$typ->standardbetrag = $oehBeitrag;
+				}
+				else
+				{
+					$typ->standardbetrag = $row->standardbetrag;
+				}
+
 				$typ->standardtext = $row->standardtext;
 				$typ->credit_points = $row->credit_points;
 				$typ->aktiv = $this->db_parse_bool($row->aktiv);
@@ -990,6 +1001,43 @@ class konto extends basis_db
 			return false;
 		}
 	}
+
+	private function _getOEHBeitrag()
+	{
+		if(!is_user_logged_in())
+		{
+			return false;
+		}
+
+		$variablen_obj = new variable();
+		$variablen_obj->loadVariables(get_uid());
+
+		$qry = "WITH semstart AS (
+					SELECT start FROM public.tbl_studiensemester
+					WHERE studiensemester_kurzbz = '". $this->db_escape($variablen_obj->variable->semester_aktuell) . "'
+				)
+				SELECT * FROM bis.tbl_oehbeitrag oehb
+				JOIN public.tbl_studiensemester semvon ON oehb.von_studiensemester_kurzbz = semvon.studiensemester_kurzbz
+				LEFT JOIN public.tbl_studiensemester sembis ON oehb.bis_studiensemester_kurzbz = sembis.studiensemester_kurzbz
+				JOIN semstart ON semstart.start::date >= semvon.start::date AND (sembis.studiensemester_kurzbz IS NULL OR semstart.start::date <= sembis.start::date)
+				ORDER BY semvon.start
+				LIMIT 1";
+
+		if ($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$summe = ($row->studierendenbeitrag + $row->versicherung) * -1;
+				return number_format((float)$summe, 2, '.', '');
+			}
+			return false;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+			return false;
+		}
+	}
 }
 
 ?>

include/lehreinheitmitarbeiter.class.php

@@ -552,9 +552,41 @@ class lehreinheitmitarbeiter extends basis_db
 		$beginn = new DateTime($beginn);
 		$ende = new DateTime($ende);
 
+		// get relevant Studiensemester
+		$studiensemester_kurzbz_arr = [];
+
+		$qry = '
+			SELECT
+				studiensemester_kurzbz
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				start BETWEEN
+				'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
+				'. $this->db_add_param($ende->format('Y-m-d'));
+
+		if ($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$studiensemester_kurzbz_arr[] = $row->studiensemester_kurzbz;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Datenbankabfrage';
+			return false;
+		}
+
+		$lehrgaengeDistr = $this->_getLehrgaengeForDistribution($studiensemester_kurzbz_arr);
+
+		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return true;
+
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden, stg.studiengang_kz
+				SELECT
+					DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
+					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode, stg.melderelevant
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -564,38 +596,104 @@ class lehreinheitmitarbeiter extends basis_db
 					JOIN public.tbl_studiengang stg ON stg.studiengang_kz = sto.studiengang_kz
 					JOIN public.tbl_studiensemester ss USING (studiensemester_kurzbz)
 				WHERE mitarbeiter_uid =  '. $this->db_add_param($uid). '
-					 AND (
-					 	ss.start BETWEEN
-					 	'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
-					 	'. $this->db_add_param($ende->format('Y-m-d')). ')
+					AND ss.studiensemester_kurzbz IN ('.$this->implode4SQL($studiensemester_kurzbz_arr).')
 				-- nur lehre, die bisgemeldet wird
 					AND lema.bismelden
+					AND stg.melderelevant
 				-- keine lehreinheiten ohne semesterstunden
-				AND lema.semesterstunden != 0
+					AND lema.semesterstunden != 0
 			)
 
 			SELECT
 				studiengang_kz,
 				studiensemester_kurzbz,
+				melde_studiengang_kz,
+				lgartcode,
 				sum(semesterstunden)				AS summe,
 				round(sum(semesterstunden) / 15, 2)	AS sws
 			FROM
 				semester_sws_tbl
 			GROUP BY
 				studiengang_kz,
-				studiensemester_kurzbz
+				studiensemester_kurzbz,
+				melde_studiengang_kz,
+				lgartcode
 			ORDER BY
 				studiengang_kz;
 		';
 
 		if ($this->db_query($qry))
 		{
+			$additionalLehrgaenge = [];
+
 			while($row = $this->db_fetch_object())
 			{
 				$obj = new StdClass();
 				$obj->studiengang_kz = $row->studiengang_kz;
 				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$obj->melde_studiengang_kz = $row->melde_studiengang_kz;
+				$obj->lgartcode = $row->lgartcode;
 				$obj->sws = $row->sws;
+
+				if (isset($lehrgaengeDistr[$uid][$row->studiensemester_kurzbz]))
+				{
+					$lehrgaenge = $lehrgaengeDistr[$uid][$row->studiensemester_kurzbz];
+
+					foreach ($lehrgaenge as $lehreinheit_id => $lehrgangKzArr)
+					{
+						// wenn lehrgang gefunden, zusammenhängende Lehrgaenge holen und sws aufteilen
+						if (array_key_exists($row->studiengang_kz, $lehrgangKzArr))
+						{
+							foreach ($lehrgangKzArr as $studiengang_kz => $lehrgang)
+							{
+								// check: nur eine Studiengangsverknüpfung pro Mitarbeiter, Semester, und Referenzstudiengang
+								if (
+									$studiengang_kz == $row->studiengang_kz
+									|| isset(
+										$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz]
+									)
+								) continue;
+
+								// Lehrgang erstellen
+								$lg = new StdClass();
+								$lg->mitarbeiter_uid = $uid;
+								$lg->melde_studiengang_kz = $lehrgang->melde_studiengang_kz;
+								$lg->lgartcode = $lehrgang->lgartcode;
+								$lg->studiengang_kz = $lehrgang->studiengang_kz;
+								$lg->studiensemester_kurzbz = $lehrgang->studiensemester_kurzbz;
+								$lg->summe = $row->summe;
+								$lg->sws = $row->sws;
+								// Lehrgang, der mit Ursprungsstudiengang aufgrund lehreinheit "verknüpft" ist, hinzufügen
+								$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz] = $lg;
+							}
+						}
+					}
+
+					// ignorieren, wenn für den Studiengang keine verknüpften Lehrgaenge hat
+					if (isset($additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz]))
+					{
+						$addLehrgaenge = $additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz];
+
+						// sws Durchschnitt über alle verknuepften Lehrgaenge berechnet
+						$summeSws = $row->summe/(count($addLehrgaenge) + 1);
+						$sws = $row->sws/(count($addLehrgaenge) + 1);
+
+						// neue sws zuweisen
+						$obj->summe = $summeSws;
+						$obj->sws = $sws;
+
+						foreach ($addLehrgaenge as $conn_ws_studiengang_kz => $lehrgang)
+						{
+							// sws fuer jeden verknuepften Lehrgang zuweisen
+							$lehrgang->summe = $summeSws;
+							$lehrgang->sws = $sws;
+
+							// neue lehrgang sws hinzufuegen
+							$this->result [] = $lehrgang;
+						}
+					}
+				}
+
 				$this->result []= $obj;
 			}
 			return true;
@@ -655,4 +753,63 @@ class lehreinheitmitarbeiter extends basis_db
 		return false;
 	}
 
+	/**
+	 * Get "connected" Lehrgaenge for equal sws distribution.
+	 * @param $studiensemester_kurzbz_arr all semester for which Lehrgaenge should be retrieved
+	 * @return object success or error
+	 */
+	private function _getLehrgaengeForDistribution($studiensemester_kurzbz_arr)
+	{
+		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return [];
+
+		$qry = "
+			WITH gruppen AS (
+				SELECT
+					mitarbeiter_uid, lehreinheit_id, lehrveranstaltung_id, studiensemester_kurzbz, sem.start, sem.ende,
+					lehreinheitgruppe_id, studiengang_kz, melde_studiengang_kz, lgartcode
+				FROM
+					lehre.tbl_lehreinheitmitarbeiter lema
+					JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
+					JOIN lehre.tbl_lehreinheitgruppe legr USING (lehreinheit_id)
+					JOIN public.tbl_studiengang stg USING (studiengang_kz)
+					JOIN public.tbl_studiensemester sem USING (studiensemester_kurzbz)
+				WHERE
+					bismelden
+					AND stg.melderelevant
+					AND stg.typ = 'l'
+					AND le.studiensemester_kurzbz IN (".$this->implode4SQL($studiensemester_kurzbz_arr).")
+			)
+			SELECT
+				DISTINCT mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
+			FROM
+				gruppen gr
+			GROUP BY
+				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
+			ORDER BY
+				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode";
+
+		$lehrgaengeDistributions = [];
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				// group by properties
+				$lehrgaengeDistributions
+					[$row->mitarbeiter_uid]
+					[$row->studiensemester_kurzbz]
+					[$row->lehreinheit_id]
+					[$row->studiengang_kz]
+					= $row;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Datenbankabfrage';
+			return false;
+		}
+
+		return $lehrgaengeDistributions;
+	}
+
 }

include/lehrelisthelper.class.php

@@ -270,6 +270,8 @@ class LehreListHelper
 					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von > $stsemdatumvon || $row->von == '')) {
 						// if bis datum is not yet known but von is available already
 						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
+					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von <= $stsemdatumvon || $row->von == '') && ($row->bis == '' || $row->bis > date('Y-m-d'))){
+						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
 					}
 						
 

include/prestudent.class.php

@@ -706,6 +706,7 @@ class prestudent extends person
 				$rolle->bestaetigtam = $row->bestaetigtam;
 				$rolle->bestaetigtvon = $row->bestaetigtvon;
 				$rolle->fgm = $row->fgm;
+				$rolle->faktiv = $this->db_parse_bool($row->faktiv);
 				$rolle->anmerkung_status = $row->anmerkung;
 				$rolle->bewerbung_abgeschicktamum = $row->bewerbung_abgeschicktamum;
 				$rolle->rt_stufe = $row->rt_stufe;

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "FHC-Core",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

public/css/Cis4/Cis.css

@@ -147,6 +147,8 @@ html {
 	--fhc-cis-menu-lvl-5-color-hover: var(--fhc-text);
 	--fhc-cis-grade-positive: var(--fhc-success);
 	--fhc-cis-grade-negative: var(--fhc-danger);
+
+  --fhc-offcanvas-zindex: 1045;
 }
 
 #themeSwitch i{
@@ -375,7 +377,7 @@ html {
 /* searchbar */
 #nav-search {
   background-color: var(--fhc-primary);
-  z-index: 1;
+ 	z-index: calc(var(--fhc-offcanvas-zindex) + 1) !important;
 }
 #nav-search.me-3 {
   margin: 0 !important;
@@ -386,12 +388,6 @@ html {
 #nav-search > .input-group > * {
   border-radius: 0 !important;
 }
-#nav-search .searchbar_results {
-  top: 100% !important;
-  left: 0;
-  right: 0 !important;
-  width: 100% !important;
-}
 
 /* frame */
 .in-frame {
@@ -413,10 +409,18 @@ html {
 	color: var(--fhc-link) !important;
 }
 
+#nav-main {
+   	z-index: var(--fhc-offcanvas-zindex);
+}
+
 #nav-main-sticky {
 	max-height: calc(100vh - var(--fhc-cis-header-height));
 }
 
+#nav-user-menu {
+   	z-index: calc(var(--fhc-offcanvas-zindex) + 1);
+}
+
 #nav-user-menu img {
   object-fit: cover;
   height: calc( 3 * var(--fhc-cis-header-py));
@@ -457,7 +461,14 @@ html {
     /* overflow: visible !important; */
   }
   #cis-header {
-    z-index: 10;
+	z-index: 10;
+  }
+  #cis-header-bar {
+	position: fixed;
+	top: 0;
+	height: var(--fhc-cis-header-height);
+	width: 100%;
+    background-color: var(--fhc-primary);
   }
   #cis-header nav {
     position: initial;
@@ -473,12 +484,7 @@ html {
     display: none;
   }
   #nav-logo {
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: var(--fhc-cis-header-height);
     width: var(--fhc-cis-menu-width);
-    background-color: var(--fhc-primary);
     padding: var(--fhc-cis-header-py) var(--fhc-cis-header-px);
     z-index: 2;
   }
@@ -493,37 +499,27 @@ html {
   	top: var(--fhc-cis-header-height);
 	display: flex;
 	flex-direction: column;
-  }
-  #nav-main-sticky > :not(#nav-main-toggle) {
-	overflow: auto;
+	height: 100%;
   }
   #nav-main-toggle {
-    width: 0;
     z-index: 1;
   }
-  #nav-main-toggle .btn,
-  #nav-main-toggle .fa-arrow-circle-left {
+  #nav-main-toggle:hover {
+	background-color: var(--fhc-secondary-highlight);
+  }
+  #nav-main-toggle .div,
+  #nav-main-toggle .fa-chevron-left {
     transition: all 0.5s ease-in-out;
   }
   #nav-main-toggle .collapsed.btn {
     background-color: transparent !important;
   }
-  #nav-main-toggle .collapsed .fa-arrow-circle-left {
+  #nav-main-toggle .collapsed .fa-chevron-left {
     transform: scaleX(-1);
     color: var(--fhc-black-40);
   }
   #nav-search {
-    position: fixed;
-    top: 0;
-    left: var(--fhc-cis-menu-width);
-    height: var(--fhc-cis-header-height);
-    right: calc(var(--fhc-cis-header-height) + 2 * var(--fhc-cis-header-px) - 2 * var(--fhc-cis-header-py));
-    width: auto !important;
-  }
-  #nav-user {
-	position: fixed;
-	top: 0;
-	right: 0;
+	position: relative;
   }
   #nav-user-btn {
     border-width: 0;
@@ -558,7 +554,7 @@ html {
 
   #nav-main-menu {
     height: 100%;
-    background-color: var(--fhc-cis-menu-bg);
+    background-color: var(--fhc-primary);
   }
   #nav-main-menu > div {
     width: var(--fhc-cis-menu-width);
@@ -600,9 +596,6 @@ html {
   }
   #nav-user{
 	position: relative;
-  }
-  #nav-user-btn {
-
   }
   #nav-user-btn img {
     object-fit: cover;

public/css/Studentenverwaltung.css

@@ -197,10 +197,6 @@ html.fs_huge {
 	margin-bottom: -1px;
 }
 
-.tiny-90 div.tox.tox-tinymce {
-	height: 90% !important;
-}
-
 /* slim begin */
 .stv .form-label {
 	margin-bottom: .15rem;
@@ -281,3 +277,7 @@ html.fs_huge {
 }
 */
 /* slim ende */
+
+.fhc-xxl-modal {
+	min-width: 80vw;
+}

public/css/components/abgabetool/abgabe.css

@@ -305,4 +305,94 @@
 /* If you use hover rows, you need to ensure the sticky cell matches the hover color */
 #abgabetable .tabulator-row:hover .tabulator-cell.sticky-col {
 	background-color: #ccc; /* Match your existing hover color */
-}
+}
+
+.tabulator-cell {
+	container-type: inline-size;
+}
+
+.tabulator-col-title {
+	container-type: inline-size;
+}
+
+@container (max-width: 100px) {
+	.full-text {
+		display: none !important;
+	}
+
+	.short-text {
+		display: inline-block !important;
+		width: 100%;
+	}
+}
+
+/*conditional tooltips fix*/
+.p-tooltip.custom-tooltip {
+	z-index: 8001 !important;
+}
+
+ /* Shrinks font and table rows for desktop users who have zoomed in their browser (150%+).
+   Does not affect mobile/touchscreen devices, which use touch input instead of a mouse. */
+@media (pointer: fine) and (min-resolution: 1.5dppx) {
+
+	html.abgabetool {
+		font-size: 0.5rem;
+	}
+
+	.abgabetool .tabulator-cell,
+	.abgabetool .tabulator-row {
+		 height: 20px;
+		 max-height: 20px;
+	 }
+	
+}
+
+/*confetti celebration on endupload - impossible to miss*/
+#confetti-container {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100vw;
+	height: 100vh;
+	pointer-events: none;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+.confetti-piece {
+	position: absolute;
+	opacity: 0;
+	will-change: top, transform, opacity;
+}
+
+/* Background Rain */
+@keyframes fallAndSpin {
+	0% {
+		top: var(--start-y);
+		transform: translate3d(0, 0, 0) rotateX(0deg) rotateY(0deg);
+		opacity: 1;
+	}
+	100% {
+		top: 105vh;
+		transform: translate3d(var(--drift), 0, 0) rotateX(720deg) rotateY(360deg);
+		opacity: 0.3;
+	}
+}
+
+/* Corner Cannons*/
+@keyframes cannonBlast {
+	0% {
+		transform: translate3d(0, 0, 0) scale(0.3) rotate(0deg);
+		opacity: 1;
+		animation-timing-function: cubic-bezier(0.1, 0.8, 0.2, 1);
+	}
+	30% {
+		transform: translate3d(var(--blast-x), var(--blast-y), 0) scale(1.2) rotate(270deg);
+		opacity: 1;
+		animation-timing-function: linear;
+	}
+	100% {
+		transform: translate3d(calc(var(--blast-x) * 1.4), 15vh, 0) scale(0.4) rotate(630deg);
+		opacity: 0;
+	}
+}

public/css/components/dashboard.css

@@ -2,7 +2,7 @@
 @import './dashboard/news.css';
 @import './dashboard/LvPlan.css';
 
-:root{
+:root {
 	--fhc-dashboard-danger: var(--fhc-danger, #842029);
 	--fhc-dashboard-grid-size: 4;
 	--fhc-dashboard-link: var(--fhc-link, #0a57ca);
@@ -17,22 +17,16 @@
 	--fhc-dashboard-section-info-color-hover: var(--fhc-primary-highlight, #005585);
 }
 
-@media(max-width: 577px) {
-	:root {
-		--fhc-dashboard-grid-size: 1;
-	}
-}
-
-.core-dashboard a{
+.core-dashboard a {
 	color: var(--fhc-dashboard-link);
 }
 
-@media (max-width: 576px){
+@media (max-width: 576px) {
 	.widget-icon {
 		max-height: 250px;
 		object-fit: cover;
 	}
-	.widget-icon-container{
+	.widget-icon-container {
 		max-width: 250px;
 		margin-left: auto;
 		margin-right: auto;
@@ -46,27 +40,36 @@
 	background-repeat: no-repeat;
 	background-position: center;
 	background-size: cover;
-	cursor:pointer;
+	cursor: pointer;
 }
 
-.dashboard-section > .newGridRow{
-	position:absolute;
-	width:20px;
-	height:20px;
-	padding:0;
-	bottom:0;
-	left:50%;
-	transform:translate(-50%, 50%);
+.dashboard-section.edit-active {
+	/**
+	 * replaces margin for extra row
+	 * 10% equals 0.1 of 100%
+	 * 1rem equals the padding of pb-3 that is overwritten here
+	 */
+	padding-bottom: calc(10% / var(--fhc-dashboard-grid-size) + 1rem) !important;
+}
+
+.dashboard-section > .newGridRow {
+	position: absolute;
+	width: 20px;
+	height: 20px;
+	padding: 0;
+	bottom: 0;
+	left: 50%;
+	transform: translate(-50%, 50%);
 	background-color: var(--fhc-dashboard-gridrow-background);
 }
 
 .newGridRow:hover {
-	color:white;
+	color: white;
 	background-color: var(--fhc-dashboard-gridrow-background-highlight);
 }
 
 .empty-tile-hover:hover {
-		background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
+	background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
 }
 
 .alert-danger .form-check-input:checked {
@@ -74,16 +77,6 @@
 	background-color: var(--fhc-dashboard-danger);
 }
 
-:root {
-	--fhc-dashboard-grid-size: 4;
-}
-
-@media(max-width: 1400px) {
-	:root {
-		--fhc-dashboard-grid-size: 4;
-	}
-}
-
 @media(max-width: 1200px) {
 	:root {
 		--fhc-dashboard-grid-size: 3;
@@ -105,6 +98,7 @@
 @media(max-width: 577px) {
 	:root {
 		--fhc-dashboard-grid-size: 1;
+		--fhc-dg-item-py: .75rem;
 	}
 }
 
@@ -132,50 +126,64 @@
 	cursor: move !important;
 }
 
-.draggedItem {
+.drop-grid-item-resize > .dashboard-item,
+.drop-grid-item-move > .dashboard-item {
 	height: 100%;
 	width: 100%;
 	background-color: var(--fhc-dashboard-draggeditem-background);
 	position: relative;
 }
 
-.dashboard-item-overlay{
+.drop-grid-item-resize > .dashboard-item > *,
+.drop-grid-item-move > .dashboard-item > * {
+	display: none;
+}
+
+.drop-grid-item-sizechanged > .dashboard-item,
+.drop-grid-item-move > .dashboard-item {
 	background-color: var(--fhc-dashboard-item-overlay-background);
 }
 
-.dashboard-item-overlay::before{
-	position:absolute;
-	content:"";
-	top:0.25rem;
-	left:0.25rem;
-	right:0.25rem;
-	bottom:0.25rem;
-	border:4px dashed var(--fhc-dashboard-item-overly-border-color);
-	opacity: 0.5;
+.drop-grid-item-sizechanged > .dashboard-item::before,
+.drop-grid-item-move > .dashboard-item::before {
+	position: absolute;
+	content: "";
+	top: .25rem;
+	left: .25rem;
+	right: .25rem;
+	bottom: .25rem;
+	border: 4px dashed var(--fhc-dashboard-item-overly-border-color);
+	opacity: .5;
 }
 
-#deleteBookmark i{
+.drop-grid-item-oversized > .dashboard-item {
+	/* Bootstrap: border-danger */
+	--bs-border-opacity: 1;
+	border-color: rgba(var(--bs-danger-rgb), var(--bs-border-opacity)) !important;
+}
+
+#deleteBookmark i {
 	color: var(--fhc-dashboard-danger);
 }
 
-.pin:hover{
+.pin:hover {
 	cursor: pointer;
 }
 
-.pin[pinned]:hover{
+.pin[pinned]:hover {
 	color: var(--fhc-dashboard-pin-pinned-hover-color);
 }
 
-.section-info{
+.section-info {
 	color: var(--fhc-dashboard-section-info-color);
-	cursor:pointer;
+	cursor: pointer;
 }
 
 .section-info:hover {
 	color: var(--fhc-dashboard-section-info-color-hover);
 }
 
-.denied-dragging-animation {
+.drop-grid-item-blocker [pinned='true'] {
 	animation: wiggle 0.5s linear;
 	color: var(--fhc-dashboard-denied-dragging-animation-color) !important;
 }
@@ -204,13 +212,13 @@
 
 }
 
-.hiddenWidget{
+.hidden-widget {
 	background: var(--fhc-disabled-background);
 	opacity: 40%;
 }
 
-.hiddenWidget .card,
-.hiddenWidget .card-body,
-.hiddenWidget .card-body *{
+.hidden-widget .card,
+.hidden-widget .card-body,
+.hidden-widget .card-body * {
 	background: inherit !important;
 }

public/css/components/dashboard/news.css

@@ -193,3 +193,6 @@
 	word-break: break-word;
 }
 
+.news-list-item p {
+	word-break: break-word;
+}

public/js/api/factory/abgabe.js

@@ -77,6 +77,13 @@ export default {
 			}
 		};
 	},
+	patchProjektarbeitAbgabeMultiple(payload) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/patchProjektarbeitAbgabeMultiple',
+			params: payload
+		};
+	},
 	deleteProjektarbeitAbgabe(paabgabe_id) {
 		return {
 			method: 'post',
@@ -84,6 +91,13 @@ export default {
 			params: { paabgabe_id }
 		};
 	},
+	deleteProjektarbeitAbgabeMultiple(paabgabe_ids) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/deleteProjektarbeitAbgabeMultiple',
+			params: { paabgabe_ids }
+		};
+	},
 	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, upload_allowed, projektarbeit_ids, fixtermin) {
 		return {
 			method: 'post',
@@ -139,6 +153,14 @@ export default {
 			url: '/api/frontend/v1/Abgabe/getSignaturStatusForProjektarbeitAbgaben',
 			params: {paabgabe_ids, student_uid},
 
+		};
+	},
+	postStudentProjektarbeitTitel(projektarbeit_id, titel) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/postStudentProjektarbeitTitel',
+			params: {projektarbeit_id, titel},
+
 		};
 	}
 };

public/js/api/factory/cis/dashboard.js

@@ -19,7 +19,7 @@ export default {
 	getViewData() {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Cis4FhcApi/getViewData'
+			url: '/api/frontend/v1/Cis4FhcApi/dashboardViewData'
 		};
 	}
 };

public/js/api/factory/cis/studium.js

@@ -0,0 +1,26 @@
+/**
+ * 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/>.
+ */
+
+export default {
+	getAllStudienSemester(studiensemester, studiengang, semester, studienplan) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/Studium/getStudienAllSemester/',
+			params: {studiensemester, studiengang, semester, studienplan}
+		};
+	},
+}

public/js/api/factory/dashboard/board.js

@@ -0,0 +1,46 @@
+/**
+ * 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/>.
+ */
+
+export default {
+	list() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/board/list'
+		};
+	},
+	add(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/board/create',
+			params
+		};
+	},
+	update(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/board/update',
+			params
+		};
+	},
+	delete(dashboard_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/board/delete',
+			params: { dashboard_id }
+		};
+	}
+}

public/js/api/factory/dashboard/preset.js

@@ -0,0 +1,47 @@
+/**
+ * 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/>.
+ */
+
+export default {
+	list(dashboard_kurzbz) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/preset/list/'
+				+ encodeURIComponent(dashboard_kurzbz)
+		};
+	},
+	getBatch(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/preset/getBatch',
+			params
+		};
+	},
+	addWidget(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/preset/addWidget',
+			params
+		};
+	},
+	removeWidget(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/preset/removeWidget',
+			params
+		};
+	}
+};

public/js/api/factory/dashboard/user.js

@@ -0,0 +1,45 @@
+/**
+ * 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/>.
+ */
+
+export default {
+	get(dashboard) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/user/get/' + dashboard
+		};
+	},
+	addWidget(dashboard, widget) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/dashboard/user/addWidget',
+			params: {
+				dashboard,
+				widget
+			}
+		};
+	},
+	removeWidget(dashboard, widget) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/dashboard/user/removeWidget',
+			params: {
+				dashboard,
+				widget
+			}
+		};
+	}
+};

public/js/api/factory/dashboard/widget.js

@@ -0,0 +1,46 @@
+/**
+ * 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/>.
+ */
+
+export default {
+	get(widget) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/widget/get/' + widget
+		};
+	},
+	list(dashboard) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/widget/list/' + dashboard
+		};
+	},
+	listAllowed(dashboard) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/widget/listAllowed/' + dashboard
+		};
+	},
+	setAllowed(dashboard_id, widget_id, allowed) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/dashboard/widget/setAllowed',
+			params: {
+				dashboard_id, widget_id, allowed
+			}
+		};
+	}
+};

public/js/api/factory/lehre.js

@@ -35,5 +35,11 @@ export default {
 			method: 'get',
 			url: `/api/frontend/v1/Lehre/Pruefungen/${lehrveranstaltung_id}`
 		};
+	},
+	getSemesterAverageGrade(semester) {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/Lehre/semesterAverageGrade/${semester}`
+		}
 	}
 };