code cleanup

- load dropdown only if dropdown before was chosen
- validation if field in between is empty
- ensure no null value gets into route

application/config/navigation.php

@@ -170,13 +170,6 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 51,
 					'requiredPermissions' => 'vertrag/mitarbeiter:r'
-				),
-				'studierendenverwaltung' => array(
-					'link' => site_url('studentenverwaltung'),
-					'description' => 'Studierendenverwaltung',
-					'expand' => true,
-					'sort' => 52,
-					'requiredPermissions' => ['admin:r', 'assistenz:r']
 				)
 			)
 		),

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/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/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/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/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,24 @@ 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,
 		]);
 
-        $this->load->library('LogLib');
-        $this->loglib->setConfigs(array(
+		$this->load->library('LogLib');
+		$this->loglib->setConfigs(array(
 			'classIndex' => 5,
 			'functionIndex' => 5,
 			'lineIndex' => 4,
@@ -53,17 +59,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 +89,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 lv plan 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 = $uid ? [] : $this->fetchMoodleEvents($start_date, $end_date);
 
 		// 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 +121,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 +173,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 +188,6 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
-		
 
 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -146,40 +196,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 +262,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 +278,27 @@ 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);
 
 		// 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 +341,58 @@ 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'));
+	}
+
 	/**
 	 * fetch moodle events
 	 *
@@ -299,19 +405,19 @@ class LvPlan extends FHCAPI_Controller
 		$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;
 			},
 			[
@@ -331,23 +437,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 +463,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/detailheader/Detailheader.php

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

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

@@ -246,12 +246,12 @@ class Abschlusspruefung extends FHCAPI_Controller
 	{
 		$searchString = $this->input->get('searchString') ?? '';
 
-		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$result = $this->PersonModel->searchPerson($searchString, 'mitMaUid');
+		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'ohneMaUid');
 
 		if (isError($result)) {
-			  $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->terminateWithSuccess($result ?: []);

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

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

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

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

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

@@ -90,15 +90,6 @@ class Projektarbeit extends FHCAPI_Controller
 
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
 
-		$result = $this->fetchProjektarbeitByID($projektarbeit_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-	
-	private function fetchProjektarbeitById($projektarbeit_id) {
-		$this->ProjektarbeitModel->resetQuery();
 		$this->ProjektarbeitModel->addSelect(
 			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
 			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
@@ -106,10 +97,13 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
 		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
-		return $this->ProjektarbeitModel->loadWhere(
+		$result = $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);
 
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
 	}
 
 	/**
@@ -138,8 +132,7 @@ class Projektarbeit extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$data = $this->getDataOrTerminateWithError($this->fetchProjektarbeitById($data));
-		
+
 		$this->terminateWithSuccess($data);
 	}
 

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

@@ -144,7 +144,6 @@ class Student extends FHCAPI_Controller
 				. $this->PrestudentModel->escape($studiensemester_kurzbz)
 				. ")  AS statusofsemester"
 		);
-		$this->PrestudentModel->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz');
 
 		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT');

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

@@ -25,6 +25,9 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  */
 class Students extends FHCAPI_Controller
 {
+	private $allowedStgs = [];
+
+
 	public function __construct()
 	{
 		$permissions = [];
@@ -32,17 +35,16 @@ class Students extends FHCAPI_Controller
 		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
 		parent::__construct($permissions);
 
-		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
-		$allowedStgs = array_merge($allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+		$this->allowedStgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$this->allowedStgs = array_merge($this->allowedStgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
 		
-		if (!$allowedStgs) {
+		if (!$this->allowedStgs) {
 			$this->_outputAuthError([$router->method => ['admin:r', 'assistenz:r']]);
 			exit;
 		}
 
 		// Load Libraries
 		$this->load->library('PhrasesLib');
-		$this->load->library('stv/StudentListLib', ['allowedStgs' => $allowedStgs]);
 		$this->loadPhrases(
 			array(
 				'lehre'
@@ -109,19 +111,23 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->studentlistlib->addJoin(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM public.tbl_prestudentstatus
 				WHERE status_kurzbz = 'Incoming'
 				AND studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) test",
-			"prestudent_id",
-			"",
-			"start"
+			"prestudent_id"
 		);
 
-		$this->studentlistlib->addSelect("COALESCE(
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -129,13 +135,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
-
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->load();
+		
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -155,7 +164,10 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->studentlistlib->addJoin(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
 			"(
 				SELECT prestudent_id 
 				FROM bis.tbl_bisio bis 
@@ -175,12 +187,14 @@ class Students extends FHCAPI_Controller
 				) AND stdsem.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 				GROUP BY prestudent_id
 			) test",
-			"prestudent_id",
-			"",
-			"start"
+			"prestudent_id"
 		);
 
-		$this->studentlistlib->addSelect("COALESCE(
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -188,13 +202,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
 		
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->load();
+		
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -214,18 +231,23 @@ class Students extends FHCAPI_Controller
 		]);
 		
 
-		$this->studentlistlib->addJoin(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+
+		$this->PrestudentModel->addJoin(
 			"(
 				SELECT prestudent_id
 				FROM bis.tbl_mobilitaet 
 				WHERE studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
 			) bis",
-			"prestudent_id",
-			"",
-			"start"
+			"prestudent_id"
 		);
 
-		$this->studentlistlib->addSelect("COALESCE(
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -233,13 +255,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
 		
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+
+		$result = $this->PrestudentModel->load();
+		
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -288,6 +313,8 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
 		$selectRT = "
@@ -304,38 +331,38 @@ class Students extends FHCAPI_Controller
 			AND r.studiensemester_kurzbz=" . $stdsemEsc;
 
 		
-		$this->studentlistlib->addWhere('tbl_prestudent.studiengang_kz', $studiengang_kz);
+		$where = ['tbl_prestudent.studiengang_kz' => $studiengang_kz];
 
 		if ($orgform_kurzbz) {
-			$this->studentlistlib->addWhere('ps.orgform_kurzbz', $orgform_kurzbz);
+			$where['ps.orgform_kurzbz'] = $orgform_kurzbz;
 		}
 
 		switch ($filter) {
 			case "interessenten":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$where['ps.status_kurzbz'] = 'Interessent';
 				break;
 			case "bewerbungnichtabgeschickt":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NULL');
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bewerbung_abgeschicktamum'] = null;
 				break;
 			case "bewerbungabgeschickt":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bewerbung_abgeschicktamum IS NOT NULL');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NULL');
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bewerbung_abgeschicktamum IS NOT NULL'] = null;
+				$where['ps.bestaetigtam'] = null;
 				break;
 			case "statusbestaetigt":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
 				break;
 			case "statusbestaetigtrtnichtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
-				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('ps.bestaetigtam IS NOT NULL');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "zgv":
 				$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -347,69 +374,69 @@ class Students extends FHCAPI_Controller
 					$this->terminateWithSuccess([]);
 				$stg = current($stg);
 
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
+				$where['ps.status_kurzbz'] = 'Interessent';
 				
 				if ($stg->typ == 'm') {
-					$this->studentlistlib->addWhere('zgvmas_code IS NOT NULL');
+					$where['zgvmas_code IS NOT NULL'] = null;
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$this->studentlistlib->addWhere('zgvmas_erfuellt', true);
+						$where['zgvmas_erfuellt'] = true;
 				} elseif ($stg->typ == 'p') {
-					$this->studentlistlib->addWhere('zgvdoktor_code IS NOT NULL');
+					$where['zgvdoktor_code IS NOT NULL'] = null;
 					if (defined('ZGV_DOKTOR_ANZEIGEN') && ZGV_DOKTOR_ANZEIGEN)
-						$this->studentlistlib->addWhere('zgvdoktor_erfuellt', true);
+						$where['zgvdoktor_erfuellt'] = true;
 				} else {
-					$this->studentlistlib->addWhere('zgv_code IS NOT NULL');
+					$where['zgv_code IS NOT NULL'] = null;
 					if (defined('ZGV_ERFUELLT_ANZEIGEN') && ZGV_ERFUELLT_ANZEIGEN)
-						$this->studentlistlib->addWhere('zgv_erfuellt', true);
+						$where['zgv_erfuellt'] = true;
 				}
 				break;
 			case "reihungstestangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "reihungstestnichtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Interessent');
-				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Interessent';
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerber":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
+				$where['ps.status_kurzbz'] = 'Bewerber';
 				break;
 			case "bewerberrtnichtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('NOT EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldet":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "bewerberrtangemeldetteilgenommen":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
-				$this->studentlistlib->addWhere('reihungstestangetreten', true);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = true;
 				break;
 			case "bewerberrtangemeldetnichtteilgenommen":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Bewerber');
-				$this->studentlistlib->addWhere('EXISTS(' . $selectRT . ')', null, false);
-				$this->studentlistlib->addWhere('reihungstestangetreten', false);
+				$where['ps.status_kurzbz'] = 'Bewerber';
+				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
+				$where['reihungstestangetreten'] = false;
 				break;
 			case "aufgenommen":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Aufgenommener');
+				$where['ps.status_kurzbz'] = 'Aufgenommener';
 				break;
 			case "warteliste":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Wartender');
+				$where['ps.status_kurzbz'] = 'Wartender';
 				break;
 			case "absage":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Abgewiesener');
+				$where['ps.status_kurzbz'] = 'Abgewiesener';
 				break;
 			case "incoming":
 				// NOTE(chris): in FAS it was not filtered for studiengang_kz
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Incoming');
+				$where['ps.status_kurzbz'] = 'Incoming';
 				break;
 			case "absolvent":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Absolvent');
+				$where['ps.status_kurzbz'] = 'Absolvent';
 				break;
 			case "diplomand":
-				$this->studentlistlib->addWhere('ps.status_kurzbz', 'Diplomand');
+				$where['ps.status_kurzbz'] = 'Diplomand';
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
@@ -417,9 +444,9 @@ class Students extends FHCAPI_Controller
 					 * show all prestudents in this stg who don't have a status
 					 * $orgform_kurzbz does not change the results since orgform is stored in the status table
 					 */
-					$this->studentlistlib->addWhere('ps.status_kurzbz IS NULL');
+					$where['ps.status_kurzbz'] = null;
 				} else {
-					$this->studentlistlib->addWhere('ps.status_kurzbz', [
+					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
 						'Interessent',
 						'Bewerber',
 						'Aufgenommener',
@@ -430,21 +457,21 @@ class Students extends FHCAPI_Controller
 				break;
 		}
 
-		$this->studentlistlib->addSelect("
+		$this->prepareQuery($studiensemester_kurzbz);
+		
+		$this->PrestudentModel->addSelect("
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
 				THEN ps.ausbildungssemester::text 
 				ELSE ''::text 
 			END AS semester", false);
-		$this->studentlistlib->addSelect("'' AS verband");
-		$this->studentlistlib->addSelect("'' AS gruppe");
-
-		$query_studiensemester_kurzbz = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : '\'NULL\'';
-		$this->studentlistlib->addSelect($query_studiensemester_kurzbz . ' as query_studiensemester_kurzbz');
+		$this->PrestudentModel->addSelect("'' AS verband");
+		$this->PrestudentModel->addSelect("'' AS gruppe");
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere($where);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -547,6 +574,7 @@ class Students extends FHCAPI_Controller
 		$gruppe_kurzbz = null,
 		$orgform_kurzbz = null
 	) {
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
@@ -554,30 +582,34 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		// NOTE(chris): overwrite 'LEFT JOIN' with 'JOIN'
-		$this->studentlistlib->addJoin("public.tbl_student s", "prestudent_id");
+		$this->prepareQuery($studiensemester_kurzbz, '');
 
-		$this->studentlistlib->addSelect("'' AS priorisierung_relativ");
-		$this->studentlistlib->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz');
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
+
+
+		$where = [];
 
 		if ($gruppe_kurzbz !== null) {
-			$this->studentlistlib->addJoin('public.tbl_benutzergruppe g', 'uid', '', 'after_b');
-			$this->studentlistlib->addWhere('g.gruppe_kurzbz', $gruppe_kurzbz);
-			$this->studentlistlib->addWhere('g.studiensemester_kurzbz', $studiensemester_kurzbz);
+			$this->PrestudentModel->addJoin('public.tbl_benutzergruppe g', 'uid');
+			$where['g.gruppe_kurzbz'] = $gruppe_kurzbz;
+			$where['g.studiensemester_kurzbz'] = $studiensemester_kurzbz;
 		} else {
-			$this->studentlistlib->addWhere('v.studiengang_kz', $studiengang_kz);
+			$where['v.studiengang_kz'] = $studiengang_kz;
 
 			if ($semester !== null)
-				$this->studentlistlib->addWhere('v.semester', $semester);
+				$where['v.semester'] = $semester;
 
 			if ($verband !== null)
-				$this->studentlistlib->addWhere('v.verband', $verband);
+				$where['v.verband'] = $verband;
 
 			if ($gruppe !== null)
-				$this->studentlistlib->addWhere('v.gruppe', $gruppe);
+				$where['v.gruppe'] = $gruppe;
 	
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
-				$this->studentlistlib->addWhere(
+				$this->PrestudentModel->db->where(
 					"(
 						SELECT orgform_kurzbz
 						FROM public.tbl_prestudentstatus 
@@ -591,10 +623,9 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
-
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere($where);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -621,8 +652,11 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
-		
-		$this->studentlistlib->addSelect("COALESCE(
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(
 			v.semester::text, 
 			CASE 
 				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
@@ -630,15 +664,16 @@ class Students extends FHCAPI_Controller
 				ELSE ''::text 
 			END
 		) AS semester", false);
-		$this->studentlistlib->addSelect("COALESCE(v.verband::text, ''::text) AS verband");
-		$this->studentlistlib->addSelect("COALESCE(v.gruppe::text, ''::text) AS gruppe");
-
-		$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_id);
+		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
 
+		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere([
+			'tbl_prestudent.prestudent_id' => $prestudent_id
+		]);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -665,13 +700,23 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		$this->addSelectPrioRel();
+
 
-		$this->studentlistlib->addWhere('s.student_uid', $student_uid);
-		
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere([
+			's.student_uid' => $student_uid
+		]);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -699,13 +744,21 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->studentlistlib->addWhere('p.person_id', $person_id);
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect('v.semester');
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		$this->addSelectPrioRel();
 
-		
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->loadWhere([
+			'p.person_id' => $person_id
+		]);
 		
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -737,8 +790,29 @@ class Students extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
+		);
+
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
 		$prestudent_ids = [];
 		$student_uids = [];
+			$this->addMeta('data', $data);
 		foreach ($data as $row) {
 			$dataset = json_decode($row->data);
 			if ($row->type == 'prestudent') {
@@ -748,39 +822,197 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
-
-		$this->studentlistlib->addSelect("COALESCE(
-			v.semester::text, 
-			CASE 
-				WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-				THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text 
-				ELSE ''::text 
-			END
-		) AS semester", false);
-
-		$this->studentlistlib->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz');
-
 		if ($prestudent_ids && $student_uids) {
-			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
-			$this->studentlistlib->addOrWhere('s.student_uid', $student_uids);
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->PrestudentModel->db->or_where_in('s.student_uid', $student_uids);
 		} elseif ($prestudent_ids) {
-			$this->studentlistlib->addWhere('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
 		} elseif ($student_uids) {
-			$this->studentlistlib->addWhere('s.student_uid', $student_uids);
+			$this->PrestudentModel->db->where_in('s.student_uid', $student_uids);
 		} else {
 			$this->terminateWithSuccess([]);
 		}
 
-
-		$this->addFilter($studiensemester_kurzbz);
-
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
+		$result = $this->PrestudentModel->load();
 
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * @param string|null	$studiensemester_kurzbz
+	 * @param string		$type
+	 *
+	 * @return void
+	 */
+	protected function prepareQuery($studiensemester_kurzbz, $type = 'LEFT')
+	{
+		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
+
+		$this->load->config('stv');
+
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$tags = $this->config->item('stv_prestudent_tags');
+
+			$whereTags = '';
+			if (is_array($tags) && !isEmptyArray($tags)) {
+				$tags = array_keys($tags);
+
+				foreach ($tags as $key => $tag) {
+					$tags[$key] = $this->db->escape($tag);
+				}
+				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+			}
+			$subQueryTag = "
+			  (
+				SELECT
+				  tag.prestudent_id,
+				  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+				FROM (
+				  SELECT DISTINCT ON (n.notiz_id)
+					n.notiz_id AS id,
+					nt.typ_kurzbz,
+					array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+					n.text AS notiz,
+					nt.style,
+					n.erledigt AS done,
+					nz.prestudent_id
+				  FROM public.tbl_notizzuordnung AS nz
+					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
+				. $whereTags .
+				"
+				) AS tag
+				GROUP BY tag.prestudent_id
+			  ) AS tag_data_agg
+			";
+		}
+
+		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', $type);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+		$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+		$this->PrestudentModel->addJoin(
+			'public.tbl_studentlehrverband v',
+			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
+			$type
+		);
+		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+			ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');
+
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+		}
+
+
+		$this->PrestudentModel->addSelect("b.uid");
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		}
+		$this->PrestudentModel->addSelect('titelpre');
+		$this->PrestudentModel->addSelect('nachname');
+		$this->PrestudentModel->addSelect('vorname');
+		$this->PrestudentModel->addSelect('wahlname');
+		$this->PrestudentModel->addSelect('vornamen');
+		$this->PrestudentModel->addSelect('titelpost');
+		$this->PrestudentModel->addSelect('ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('gebdatum');
+		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('foto');
+		$this->PrestudentModel->addSelect('foto_sperre');
+
+		// semester
+		// verband
+		// gruppe
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
+		);
+
+		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
+		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
+		$this->PrestudentModel->addSelect("s.matrikelnr");
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
+		$this->PrestudentModel->addSelect('pls.datum AS status_datum');
+		$this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung');
+		$this->PrestudentModel->addSelect(
+			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
+			false
+		);
+		$this->PrestudentModel->addSelect("
+			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
+			THEN CONCAT(b.uid, '@', " . $this->PrestudentModel->escape(DOMAIN) . ")
+			ELSE '' END AS mail_intern", false);
+		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
+		$this->PrestudentModel->addSelect('pls.orgform_kurzbz');
+		$this->PrestudentModel->addSelect('aufmerksamdurch_kurzbz');
+		$this->PrestudentModel->addSelect(
+			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
+			false
+		);
+		$this->PrestudentModel->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.dual');
+		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
+		$this->PrestudentModel->addSelect('tbl_prestudent.prestudent_id');
+
+		// priorisierung_relativ
+
+		$this->PrestudentModel->addSelect('mentor');
+		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect('unruly');
+
+		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
+
+		$this->PrestudentModel->addOrder('nachname');
+		$this->PrestudentModel->addOrder('vorname');
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function addSelectPrioRel()
+	{
+		$this->PrestudentModel->addSelect("(
+			SELECT count(*)
+			FROM (
+				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
+				FROM public.tbl_prestudent pss
+				JOIN public.tbl_prestudentstatus USING (prestudent_id)
+				WHERE person_id = p.person_id
+				AND studiensemester_kurzbz = (
+					SELECT studiensemester_kurzbz
+					FROM public.tbl_prestudentstatus
+					WHERE prestudent_id = tbl_prestudent.prestudent_id
+					AND status_kurzbz = 'Interessent'
+					LIMIT 1
+				)
+				AND status_kurzbz = 'Interessent'
+			) prest
+			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
+			AND priorisierung <= tbl_prestudent.priorisierung
+		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
+	}
+
 	/**
 	 * Adds additional filters to the query
 	 *

application/controllers/person/Gradelist.php

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

application/core/Notiz_Controller.php

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

application/development/config.php

@@ -0,0 +1,517 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/*
+|--------------------------------------------------------------------------
+| Base Site URL
+|--------------------------------------------------------------------------
+|
+| URL to your CodeIgniter root. Typically this will be your base URL,
+| WITH a trailing slash:
+|
+|	http://example.com/
+|
+| If this is not set then CodeIgniter will try guess the protocol, domain
+| and path to your installation. However, you should always configure this
+| explicitly and never rely on auto-guessing, especially in production
+| environments.
+|
+*/
+$config['base_url'] = 'https://c3p0.dev.technikum-wien.at/ma1434/core/FHC-Core/';
+
+/*
+|--------------------------------------------------------------------------
+| Index File
+|--------------------------------------------------------------------------
+|
+| Typically this will be your index.php file, unless you've renamed it to
+| something else. If you are using mod_rewrite to remove the page set this
+| variable so that it is blank.
+|
+*/
+$config['index_page'] = 'index.ci.php';
+
+/*
+|--------------------------------------------------------------------------
+| URI PROTOCOL
+|--------------------------------------------------------------------------
+|
+| This item determines which server global should be used to retrieve the
+| URI string.  The default setting of 'REQUEST_URI' works for most servers.
+| If your links do not seem to work, try one of the other delicious flavors:
+|
+| 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
+| 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
+| 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
+|
+| WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
+*/
+$config['uri_protocol']	= 'REQUEST_URI';
+
+/*
+|--------------------------------------------------------------------------
+| URL suffix
+|--------------------------------------------------------------------------
+|
+| This option allows you to add a suffix to all URLs generated by CodeIgniter.
+| For more information please see the user guide:
+|
+| http://codeigniter.com/user_guide/general/urls.html
+*/
+$config['url_suffix'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Default Language
+|--------------------------------------------------------------------------
+|
+| This determines which set of language files should be used. Make sure
+| there is an available translation if you intend to use something other
+| than english.
+|
+*/
+$config['language']	= '';
+
+/*
+|--------------------------------------------------------------------------
+| Default Character Set
+|--------------------------------------------------------------------------
+|
+| This determines which character set is used by default in various methods
+| that require a character set to be provided.
+|
+| See http://php.net/htmlspecialchars for a list of supported charsets.
+|
+*/
+$config['charset'] = 'UTF-8';
+
+/*
+|--------------------------------------------------------------------------
+| Enable/Disable System Hooks
+|--------------------------------------------------------------------------
+|
+| If you would like to use the 'hooks' feature you must enable it by
+| setting this variable to TRUE (boolean).  See the user guide for details.
+|
+*/
+$config['enable_hooks'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Class Extension Prefix
+|--------------------------------------------------------------------------
+|
+| This item allows you to set the filename/classname prefix when extending
+| native libraries.  For more information please see the user guide:
+|
+| http://codeigniter.com/user_guide/general/core_classes.html
+| http://codeigniter.com/user_guide/general/creating_libraries.html
+|
+*/
+$config['subclass_prefix'] = 'FHC_';
+
+/*
+|--------------------------------------------------------------------------
+| Composer auto-loading
+|--------------------------------------------------------------------------
+|
+| Enabling this setting will tell CodeIgniter to look for a Composer
+| package auto-loader script in application/vendor/autoload.php.
+|
+|	$config['composer_autoload'] = TRUE;
+|
+| Or if you have your vendor/ directory located somewhere else, you
+| can opt to set a specific path as well:
+|
+|	$config['composer_autoload'] = '/path/to/vendor/autoload.php';
+|
+| For more information about Composer, please visit http://getcomposer.org/
+|
+| Note: This will NOT disable or override the CodeIgniter-specific
+|	autoloading (application/config/autoload.php)
+*/
+$config['composer_autoload'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Allowed URL Characters
+|--------------------------------------------------------------------------
+|
+| This lets you specify which characters are permitted within your URLs.
+| When someone tries to submit a URL with disallowed characters they will
+| get a warning message.
+|
+| As a security measure you are STRONGLY encouraged to restrict URLs to
+| as few characters as possible.  By default only these are allowed: a-z 0-9~%.:_-
+|
+| Leave blank to allow all characters -- but only if you are insane.
+|
+| The configured value is actually a regular expression character group
+| and it will be executed as: ! preg_match('/^[<permitted_uri_chars>]+$/i
+|
+| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
+|
+*/
+$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
+
+/*
+|--------------------------------------------------------------------------
+| Enable Query Strings
+|--------------------------------------------------------------------------
+|
+| By default CodeIgniter uses search-engine friendly segment based URLs:
+| example.com/who/what/where/
+|
+| By default CodeIgniter enables access to the $_GET array.  If for some
+| reason you would like to disable it, set 'allow_get_array' to FALSE.
+|
+| You can optionally enable standard query string based URLs:
+| example.com?who=me&what=something&where=here
+|
+| Options are: TRUE or FALSE (boolean)
+|
+| The other items let you set the query string 'words' that will
+| invoke your controllers and its functions:
+| example.com/index.php?c=controller&m=function
+|
+| Please note that some of the helpers won't work as expected when
+| this feature is enabled, since CodeIgniter is designed primarily to
+| use segment based URLs.
+|
+*/
+$config['allow_get_array'] = TRUE;
+$config['enable_query_strings'] = FALSE;
+$config['controller_trigger'] = 'c';
+$config['function_trigger'] = 'm';
+$config['directory_trigger'] = 'd';
+
+/*
+|--------------------------------------------------------------------------
+| Error Logging Threshold
+|--------------------------------------------------------------------------
+|
+| You can enable error logging by setting a threshold over zero. The
+| threshold determines what gets logged. Threshold options are:
+|
+|	0 = Disables logging, Error logging TURNED OFF
+|	1 = Error Messages (including PHP errors)
+|	2 = Debug Messages
+|	3 = Informational Messages
+|	4 = All Messages
+|
+| You can also pass an array with threshold levels to show individual error types
+|
+| 	array(2) = Debug Messages, without Error Messages
+|
+| For a live site you'll usually only enable Errors (1) to be logged otherwise
+| your log files will fill up very fast.
+|
+*/
+$config['log_threshold'] = 1;
+
+/*
+|--------------------------------------------------------------------------
+| Error Logging Directory Path
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| application/logs/ directory. Use a full server path with trailing slash.
+|
+*/
+$config['log_path'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Log File Extension
+|--------------------------------------------------------------------------
+|
+| The default filename extension for log files. The default 'php' allows for
+| protecting the log files via basic scripting, when they are to be stored
+| under a publicly accessible directory.
+|
+| Note: Leaving it blank will default to 'php'.
+|
+*/
+$config['log_file_extension'] = 'log';
+
+/*
+|--------------------------------------------------------------------------
+| Log File Permissions
+|--------------------------------------------------------------------------
+|
+| The file system permissions to be applied on newly created log files.
+|
+| IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
+|            integer notation (i.e. 0700, 0644, etc.)
+*/
+$config['log_file_permissions'] = 0644;
+
+/*
+|--------------------------------------------------------------------------
+| Date Format for Logs
+|--------------------------------------------------------------------------
+|
+| Each item that is logged has an associated date. You can use PHP date
+| codes to set your own date formatting
+|
+*/
+$config['log_date_format'] = 'Y-m-d H:i:s';
+
+/*
+|--------------------------------------------------------------------------
+| Error Views Directory Path
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| application/views/errors/ directory.  Use a full server path with trailing slash.
+|
+*/
+$config['error_views_path'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Cache Directory Path
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| application/cache/ directory.  Use a full server path with trailing slash.
+|
+*/
+$config['cache_path'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Cache Include Query String
+|--------------------------------------------------------------------------
+|
+| Whether to take the URL query string into consideration when generating
+| output cache files. Valid options are:
+|
+|	FALSE      = Disabled
+|	TRUE       = Enabled, take all query parameters into account.
+|	             Please be aware that this may result in numerous cache
+|	             files generated for the same page over and over again.
+|	array('q') = Enabled, but only take into account the specified list
+|	             of query parameters.
+|
+*/
+$config['cache_query_string'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Encryption Key
+|--------------------------------------------------------------------------
+|
+| If you use the Encryption class, you must set an encryption key.
+| See the user guide for more info.
+|
+| http://codeigniter.com/user_guide/libraries/encryption.html
+|
+*/
+$config['encryption_key'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Session Variables
+|--------------------------------------------------------------------------
+|
+| 'sess_driver'
+|
+|	The storage driver to use: files, database, redis, memcached
+|
+| 'sess_cookie_name'
+|
+|	The session cookie name, must contain only [0-9a-z_-] characters
+|
+| 'sess_expiration'
+|
+|	The number of SECONDS you want the session to last.
+|	Setting to 0 (zero) means expire when the browser is closed.
+|
+| 'sess_save_path'
+|
+|	The location to save sessions to, driver dependent.
+|
+|	For the 'files' driver, it's a path to a writable directory.
+|	WARNING: Only absolute paths are supported!
+|
+|	For the 'database' driver, it's a table name.
+|	Please read up the manual for the format with other session drivers.
+|
+|	IMPORTANT: You are REQUIRED to set a valid save path!
+|
+| 'sess_match_ip'
+|
+|	Whether to match the user's IP address when reading the session data.
+|
+| 'sess_time_to_update'
+|
+|	How many seconds between CI regenerating the session ID.
+|	NOTE: Keep it as it is to prevent security issues (https://en.wikipedia.org/wiki/Session_fixation)
+|
+| 'sess_regenerate_destroy'
+|
+|	Whether to destroy session data associated with the old session ID
+|	when auto-regenerating the session ID. When set to FALSE, the data
+|	will be later deleted by the garbage collector.
+|
+| Other session cookie settings are shared with the rest of the application,
+| except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
+|
+*/
+$config['sess_driver'] = 'files';
+$config['sess_cookie_name'] = 'sess_ci_session';
+$config['sess_expiration'] = 1800; // Session expires every 30 minutes
+$config['sess_save_path'] = NULL;
+$config['sess_match_ip'] = FALSE;
+$config['sess_time_to_update'] = 300;
+$config['sess_regenerate_destroy'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Cookie Related Variables
+|--------------------------------------------------------------------------
+|
+| 'cookie_prefix'   = Set a cookie name prefix if you need to avoid collisions
+| 'cookie_domain'   = Set to .your-domain.com for site-wide cookies
+| 'cookie_path'     = Typically will be a forward slash
+| 'cookie_secure'   = Cookie will only be set if a secure HTTPS connection exists.
+| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript)
+|
+| Note: These settings (with the exception of 'cookie_prefix' and
+|       'cookie_httponly') will also affect sessions.
+|
+*/
+$config['cookie_prefix']	= '';
+$config['cookie_domain']	= '';
+$config['cookie_path']		= '/';
+$config['cookie_secure']	= FALSE;
+$config['cookie_httponly'] 	= FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Standardize newlines
+|--------------------------------------------------------------------------
+|
+| Determines whether to standardize newline characters in input data,
+| meaning to replace \r\n, \r, \n occurrences with the PHP_EOL value.
+|
+| This is particularly useful for portability between UNIX-based OSes,
+| (usually \n) and Windows (\r\n).
+|
+*/
+$config['standardize_newlines'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Global XSS Filtering
+|--------------------------------------------------------------------------
+|
+| Determines whether the XSS filter is always active when GET, POST or
+| COOKIE data is encountered
+|
+| WARNING: This feature is DEPRECATED and currently available only
+|          for backwards compatibility purposes!
+|
+*/
+$config['global_xss_filtering'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Cross Site Request Forgery
+|--------------------------------------------------------------------------
+| Enables a CSRF cookie token to be set. When set to TRUE, token will be
+| checked on a submitted form. If you are accepting user data, it is strongly
+| recommended CSRF protection be enabled.
+|
+| 'csrf_token_name' = The token name
+| 'csrf_cookie_name' = The cookie name
+| 'csrf_expire' = The number in seconds the token should expire.
+| 'csrf_regenerate' = Regenerate token on every submission
+| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
+*/
+$config['csrf_protection'] = FALSE;
+$config['csrf_token_name'] = 'csrf_test_name';
+$config['csrf_cookie_name'] = 'csrf_cookie_name';
+$config['csrf_expire'] = 7200;
+$config['csrf_regenerate'] = TRUE;
+$config['csrf_exclude_uris'] = array();
+
+/*
+|--------------------------------------------------------------------------
+| Output Compression
+|--------------------------------------------------------------------------
+|
+| Enables Gzip output compression for faster page loads.  When enabled,
+| the output class will test whether your server supports Gzip.
+| Even if it does, however, not all browsers support compression
+| so enable only if you are reasonably sure your visitors can handle it.
+|
+| Only used if zlib.output_compression is turned off in your php.ini.
+| Please do not use it together with httpd-level output compression.
+|
+| VERY IMPORTANT:  If you are getting a blank page when compression is enabled it
+| means you are prematurely outputting something to your browser. It could
+| even be a line of whitespace at the end of one of your scripts.  For
+| compression to work, nothing can be sent before the output buffer is called
+| by the output class.  Do not 'echo' any values with compression enabled.
+|
+*/
+$config['compress_output'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Master Time Reference
+|--------------------------------------------------------------------------
+|
+| Options are 'local' or any PHP supported timezone. This preference tells
+| the system whether to use your server's local time as the master 'now'
+| reference, or convert it to the configured one timezone. See the 'date
+| helper' page of the user guide for information regarding date handling.
+|
+*/
+$config['time_reference'] = 'local';
+
+/*
+|--------------------------------------------------------------------------
+| Rewrite PHP Short Tags
+|--------------------------------------------------------------------------
+|
+| If your PHP installation does not have short tag support enabled CI
+| can rewrite the tags on-the-fly, enabling you to utilize that syntax
+| in your view files.  Options are TRUE or FALSE (boolean)
+|
+| Note: You need to have eval() enabled for this to work.
+|
+*/
+$config['rewrite_short_tags'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Reverse Proxy IPs
+|--------------------------------------------------------------------------
+|
+| If your server is behind a reverse proxy, you must whitelist the proxy
+| IP addresses from which CodeIgniter should trust headers such as
+| HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
+| the visitor's IP address.
+|
+| You can use both an array or a comma-separated list of proxy addresses,
+| as well as specifying whole subnets. Here are a few examples:
+|
+| Comma-separated:	'10.0.1.200,192.168.5.0/24'
+| Array:		array('10.0.1.200', '192.168.5.0/24')
+*/
+$config['proxy_ips'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| FHComplete Build Version
+|--------------------------------------------------------------------------
+|
+| Version Number of the Current Build
+| This is used to invalidate Cache for JS and CSS Files
+| 
+| Example: 2019102901
+*/
+$config['fhcomplete_build_version'] = '2019102903';

application/development/database.php

@@ -0,0 +1,122 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+defined('DB_HOST') OR require_once './config/system.config.inc.php'; // For CLI-Migrations
+
+/*
+| -------------------------------------------------------------------
+| DATABASE CONNECTIVITY SETTINGS
+| -------------------------------------------------------------------
+| This file will contain the settings needed to access your database.
+|
+| For complete instructions please consult the 'Database Connection'
+| page of the User Guide.
+|
+| -------------------------------------------------------------------
+| EXPLANATION OF VARIABLES
+| -------------------------------------------------------------------
+|
+|	['dsn']      The full DSN string describe a connection to the database.
+|	['hostname'] The hostname of your database server.
+|	['username'] The username used to connect to the database
+|	['password'] The password used to connect to the database
+|	['database'] The name of the database you want to connect to
+|	['dbdriver'] The database driver. e.g.: mysqli.
+|			Currently supported:
+|				 cubrid, ibase, mssql, mysql, mysqli, oci8,
+|				 odbc, pdo, postgre, sqlite, sqlite3, sqlsrv
+|	['dbprefix'] You can add an optional prefix, which will be added
+|				 to the table name when using the  Query Builder class
+|	['pconnect'] TRUE/FALSE - Whether to use a persistent connection
+|	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
+|	['cache_on'] TRUE/FALSE - Enables/disables query caching
+|	['cachedir'] The path to the folder where cache files should be stored
+|	['char_set'] The character set used in communicating with the database
+|	['dbcollat'] The character collation used in communicating with the database
+|				 NOTE: For MySQL and MySQLi databases, this setting is only used
+| 				 as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7
+|				 (and in table creation queries made with DB Forge).
+| 				 There is an incompatibility in PHP with mysql_real_escape_string() which
+| 				 can make your site vulnerable to SQL injection if you are using a
+| 				 multi-byte character set and are running versions lower than these.
+| 				 Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
+|	['swap_pre'] A default table prefix that should be swapped with the dbprefix
+|	['encrypt']  Whether or not to use an encrypted connection.
+|
+|			'mysql' (deprecated), 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
+|			'mysqli' and 'pdo/mysql' drivers accept an array with the following options:
+|
+|				'ssl_key'    - Path to the private key file
+|				'ssl_cert'   - Path to the public key certificate file
+|				'ssl_ca'     - Path to the certificate authority file
+|				'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
+|				'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
+|				'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
+|
+|	['compress'] Whether or not to use client compression (MySQL only)
+|	['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
+|							- good for ensuring strict SQL while developing
+|	['ssl_options']	Used to set various SSL options that can be used when making SSL connections.
+|	['failover'] array - A array with 0 or more data for connections if the main should fail.
+|	['save_queries'] TRUE/FALSE - Whether to "save" all executed queries.
+| 				NOTE: Disabling this will also effectively disable both
+| 				$this->db->last_query() and profiling of DB queries.
+| 				When you run a query, with this setting set to TRUE (default),
+| 				CodeIgniter will store the SQL statement for debugging purposes.
+| 				However, this may cause high memory usage, especially if you run
+| 				a lot of SQL queries ... disable this to avoid that problem.
+|
+| The $active_group variable lets you choose which connection group to
+| make active.  By default there is only one group (the 'default' group).
+|
+| The $query_builder variables lets you determine whether or not to load
+| the query builder class.
+*/
+$active_group = 'default';
+$query_builder = TRUE;
+
+$db['default'] = array(
+	'dsn'	=> '',
+	'hostname' => DB_HOST,
+	'username' => DB_USER,
+	'password' => DB_PASSWORD,
+	'port' 	   => DB_PORT,
+	'database' => DB_NAME,
+	'dbdriver' => 'postgre',
+	'dbprefix' => '',
+	'pconnect' => DB_CONNECT_PERSISTENT,
+	'db_debug' => (ENVIRONMENT !== 'production'),
+	'cache_on' => FALSE,
+	'cachedir' => '',
+	'char_set' => 'utf8',
+	'dbcollat' => 'utf8_general_ci',
+	'swap_pre' => '',
+	'encrypt' => FALSE,
+	'compress' => FALSE,
+	'stricton' => FALSE,
+	'failover' => array(),
+	'save_queries' => TRUE
+);
+
+$db['system'] = array(
+	'dsn'	=> '',
+	'hostname' => DB_HOST,
+	'username' => 'fhcomplete',
+	'password' => 'Fhcomplet3Onc4p1',
+	'database' => DB_NAME,
+	'port'     => DB_PORT,
+	'dbschema' => 'public',
+	'dbdriver' => 'postgre',
+	'dbprefix' => '',
+	'pconnect' => DB_CONNECT_PERSISTENT,
+	'db_debug' => (ENVIRONMENT !== 'production'),
+	'cache_on' => FALSE,
+	'cachedir' => '',
+	'char_set' => 'utf8',
+	'dbcollat' => 'utf8_general_ci',
+	'swap_pre' => '',
+	'encrypt' => FALSE,
+	'compress' => FALSE,
+	'stricton' => FALSE,
+	'failover' => array(),
+	'save_queries' => TRUE
+);

application/libraries/AntragLib.php

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

application/libraries/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))
@@ -445,6 +448,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/stv/StudentListLib.php

@@ -1,370 +0,0 @@
-<?php
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This generates a list of students and or prestudents used for Studierendenverwaltung
- */
-class StudentListLib
-{
-	private $_ci; // Code igniter instance
-
-	private $_allowedStgs = [];
-	private $_selects = [];
-	private $_joins = [];
-	
-	/**
-	 * Gets the CI instance, loads model and prepares default values
-	 *
-	 * @param array		$params
-	 *
-	 * @return void
-	 */
-	public function __construct($params = null)
-	{
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		if (isset($params['allowedStgs']))
-			$this->_allowedStgs = $params['allowedStgs'];
-
-		// Add default SELECTs
-		$this->addSelect("b.uid");
-		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-			$this->addSelect('tag_data_agg.tags');
-		$this->addSelect('titelpre');
-		$this->addSelect('nachname');
-		$this->addSelect('vorname');
-		$this->addSelect('wahlname');
-		$this->addSelect('vornamen');
-		$this->addSelect('titelpost');
-		$this->addSelect('ersatzkennzeichen');
-		$this->addSelect('gebdatum');
-		$this->addSelect('geschlecht');
-		$this->addSelect('foto');
-		$this->addSelect('foto_sperre');
-		$this->addSelect('v.semester');
-		$this->addSelect('v.verband');
-		$this->addSelect('v.gruppe');
-		$this->addSelect("statusofsemester"); // Will be replaced later
-		$this->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
-		$this->addSelect('tbl_prestudent.studiengang_kz');
-		$this->addSelect('stg.bezeichnung AS stg_bezeichnung');
-		$this->addSelect("s.matrikelnr");
-		$this->addSelect('p.person_id');
-		$this->addSelect('pls.status_kurzbz AS status');
-		$this->addSelect('pls.datum AS status_datum');
-		$this->addSelect('pls.bestaetigtam AS status_bestaetigung');
-		$this->addSelect("
-			CASE
-				WHEN pls.status_kurzbz = 'Interessent'
-				THEN pls.ausbildungssemester
-				ELSE s.semester
-			END AS semester_berechnet
-		");
-		$this->addSelect(
-			"(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat",
-			false
-		);
-		$this->addSelect("
-			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
-			THEN CONCAT(b.uid, '@', " . $this->_ci->PrestudentModel->escape(DOMAIN) . ")
-			ELSE '' END AS mail_intern", false);
-		$this->addSelect('p.anmerkung AS anmerkungen');
-		$this->addSelect('tbl_prestudent.anmerkung');
-		$this->addSelect('pls.orgform_kurzbz');
-		$this->addSelect('aufmerksamdurch_kurzbz');
-		$this->addSelect(
-			"(SELECT rt_gesamtpunkte AS punkte FROM public.tbl_prestudent WHERE prestudent_id=ps.prestudent_id) AS punkte",
-			false
-		);
-		$this->addSelect('tbl_prestudent.aufnahmegruppe_kurzbz');
-		$this->addSelect('tbl_prestudent.dual');
-		$this->addSelect('p.matr_nr');
-		$this->addSelect('sp.bezeichnung AS studienplan_bezeichnung');
-		$this->addSelect('tbl_prestudent.prestudent_id');
-		$this->addSelect("(
-			SELECT count(*)
-			FROM (
-				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
-				FROM public.tbl_prestudent pss
-				JOIN public.tbl_prestudentstatus USING (prestudent_id)
-				WHERE person_id = p.person_id
-				AND studiensemester_kurzbz = (
-					SELECT studiensemester_kurzbz
-					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id = tbl_prestudent.prestudent_id
-					AND status_kurzbz = 'Interessent'
-					LIMIT 1
-				)
-				AND status_kurzbz = 'Interessent'
-			) prest
-			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
-			AND priorisierung <= tbl_prestudent.priorisierung
-		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false); // TODO(chris): overwrite in fetchStudents
-		$this->addSelect('mentor');
-		$this->addSelect('b.aktiv AS bnaktiv');
-		$this->addSelect('unruly');
-		
-		// Add default JOINs
-		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
-		$this->addJoin('public.tbl_person p', 'person_id');
-		$this->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT'); // TODO(chris): overwrite in fetchStudents
-		$this->addJoin('public.tbl_prestudentstatus pls', '
-			pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
-			AND pls.prestudent_id=tbl_prestudent.prestudent_id 
-			AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
-			AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
-		$this->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
-		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
-		$this->addJoin("v", "", ""); // Will be replaced later
-		$this->addJoin("ps", "", ""); // Will be replaced later
-		if (defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED) {
-			$this->_ci->load->config('stv');
-			$tags = $this->_ci->config->item('stv_prestudent_tags');
-
-			$whereTags = '';
-			if (is_array($tags) && !isEmptyArray($tags)) {
-				$tags = array_keys($tags);
-
-				foreach ($tags as $key => $tag) {
-					$tags[$key] = $this->_ci->PrestudentModel->escape($tag);
-				}
-				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
-			}
-			$subQueryTag = "(
-				SELECT
-					tag.prestudent_id,
-					COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-				FROM (
-					SELECT DISTINCT ON (n.notiz_id)
-						n.notiz_id AS id,
-						nt.typ_kurzbz,
-						array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-						n.text AS notiz,
-						nt.style,
-						n.erledigt AS done,
-						nz.prestudent_id
-					FROM public.tbl_notizzuordnung AS nz
-					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz " . $whereTags . "
-				) AS tag
-				GROUP BY tag.prestudent_id
-			) AS tag_data_agg";
-
-			$this->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-		}
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * Adds a SELECT statement to the query.
-	 *
-	 * @param string|array	$select
-	 * @param boolean		$escape (optional)
-	 *
-	 * @return void
-	 */
-	public function addSelect($select, $escape = true)
-	{
-		if (is_array($select)) {
-			foreach ($select as $s)
-				$this->addSelect($s, $escape);
-			return;
-		}
-		$alias = $this->getAliasFromSelect($select);
-		$this->_selects[$alias] = [$select, $escape];
-	}
-
-	/**
-	 * Joins a table to the query.
-	 *
-	 * @param string		$table
-	 * @param string		$cond
-	 * @param string		$type (optional)
-	 * @param string		$position (optional)
-	 *
-	 * @return void
-	 */
-	public function addJoin($table, $cond, $type = '', $position = 'end')
-	{
-		$alias = $this->getAliasFromTable($table);
-
-		if ($position == 'end') {
-			return $this->_joins[$alias] = [$table, $cond, $type];
-		}
-
-		if ($position == 'start') {
-			return $this->_joins = [$alias => [$table, $cond, $type]] + $this->_joins;
-		}
-
-		if (substr($position, 0, 7) == 'before_') {
-			$ref = substr($position, 7);
-			$index = 0;
-		} elseif (substr($position, 0, 6) == 'after_') {
-			$ref = substr($position, 6);
-			$index = 1;
-		} else {
-			return $this->addJoin($table, $cond, $type);
-		}
-		if (!isset($this->_joins[$ref]))
-			return $this->addJoin($table, $cond, $type);
-
-		$key_indeces = array_flip(array_keys($this->_joins));
-		$index += $key_indeces[$ref];
-
-		if (!$index)
-			return $this->addJoin($table, $cond, $type, 'start');
-
-		$front_part = array_slice($this->_joins, 0, $index, true);
-		$back_part = array_slice($this->_joins, $index, null, true);
-
-		if (isset($front_part[$alias])) {
-			unset($front_part[$alias]);
-		}
-
-		$this->_joins = $front_part + [$alias => [$table, $cond, $type]] + $back_part;
-	}
-
-	/**
-	 * Adds a WHERE clause to the query.
-	 *
-	 * @param string|array	$key
-	 * @param string|array	$value
-	 * @param boolean		$escape
-	 *
-	 * @return void
-	 */
-	public function addWhere($key, $value = null, $escape = true)
-	{
-		if (!is_array($key) && is_array($value)) {
-			$this->_ci->PrestudentModel->db->where_in($key, $value, $escape);
-		} else {
-			$this->_ci->PrestudentModel->db->where($key, $value, $escape);
-		}
-	}
-
-	/**
-	 * Adds a OR WHERE clause to the query.
-	 *
-	 * @param string|array	$key
-	 * @param string|array	$value
-	 * @param boolean		$escape
-	 *
-	 * @return void
-	 */
-	public function addOrWhere($key, $value = null, $escape = true)
-	{
-		if (!is_array($key) && is_array($value)) {
-			$this->_ci->PrestudentModel->db->or_where_in($key, $value, $escape);
-		} else {
-			$this->_ci->PrestudentModel->db->or_where($key, $value, $escape);
-		}
-	}
-
-	/**
-	 * Generates the query and executes it.
-	 *
-	 * @param string|null	$studiensemester_kurzbz
-	 *
-	 * @return stdClass		result of the query
-	 */
-	public function execute($studiensemester_kurzbz)
-	{
-		$stdsemEsc = $studiensemester_kurzbz ? $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
-
-
-		$this->addSelect(
-			"public.get_rolle_prestudent(
-				public.tbl_prestudent.prestudent_id, 
-				" . $this->_ci->PrestudentModel->escape($studiensemester_kurzbz) . "
-			)  AS statusofsemester"
-		);
-		$this->addJoin(
-			'public.tbl_studentlehrverband v',
-			'v.student_uid=s.student_uid AND v.studiensemester_kurzbz' . ($studiensemester_kurzbz ? '=' . $stdsemEsc : ' IS NULL'),
-			'LEFT'
-		);
-		$this->addJoin(
-			'public.tbl_prestudentstatus ps',
-			'ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
-				AND ps.prestudent_id=tbl_prestudent.prestudent_id 
-				AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
-				AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')
-			',
-			'LEFT'
-		);
-
-		$this->addWhere('tbl_prestudent.studiengang_kz', $this->_allowedStgs);
-
-		foreach ($this->_joins as $join)
-			$this->_ci->PrestudentModel->addJoin($join[0], $join[1], $join[2]);
-
-		foreach ($this->_selects as $select)
-			$this->_ci->PrestudentModel->addSelect($select[0], $select[1]);
-
-		$this->_ci->PrestudentModel->addOrder('nachname');
-		$this->_ci->PrestudentModel->addOrder('vorname');
-
-		return $this->_ci->PrestudentModel->load();
-	}
-
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Protected methods
-
-	/**
-	 * Get alias of a table or select statement
-	 *
-	 * @param string		$select
-	 *
-	 * @return string
-	 */
-	final protected function getAliasFromSelect($select)
-	{
-		if (strpos($select, ' ') !== false) {
-			return trim(strrchr($select, ' '));
-		}
-
-		if (strpos($select, '.') !== false) {
-			return substr(strrchr($select, '.'), 1);
-		}
-
-		return $select;
-	}
-
-	/**
-	 * Get alias of a table or select statement
-	 *
-	 * @param string|array	$table
-	 *
-	 * @return string|array
-	 */
-	final protected function getAliasFromTable($table)
-	{
-		if (strpos($table, ' ') !== false) {
-			return trim(strrchr($table, ' '));
-		}
-
-		return $table;
-	}
-}

application/libraries/vertragsbestandteil/AbstractBestandteil.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

@@ -137,25 +137,19 @@ EOTXT;
 		return parent::__toString() . $txt;
 	}
 
-	public function validate()
+	/* 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.';
-			}
+		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
+				array(
+					'options' => array(
+						'min_range' => 1,
+						'max_range' => 50
+					)
+				)
+			)) ) {
+			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
 		}
 		
 		return parent::validate();
-	} 
+	} */
 }

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::date = CURRENT_DATE - INTERVAL ?
-			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
-			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-		
+		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
+		   OR campus.tbl_paabgabe.updateamum >= NOW() - 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 = CURRENT_DATE - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";

application/models/organisation/Studiengang_model.php

@@ -594,10 +594,7 @@ 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, ', ', "
-			. "UPPER(" . $this->dbTable . ".typ), "
-			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(

application/models/person/Person_model.php

@@ -149,7 +149,7 @@ class Person_model extends DB_Model
 	 * @param $filter Term to search for.
 	 * @return DB-result
 	 */
-	public function searchPerson($filter, $mode=null)
+	public function searchPerson($filter)
 	{
 		$this->addSelect('vorname, nachname, gebdatum, person_id, titelpre, titelpost');
 		$this->addSelect("CASE
@@ -161,26 +161,6 @@ class Person_model extends DB_Model
 				THEN 'Student'
 				ELSE 'Person'
 			END AS status");
-
-		if($mode == 'mitMaUid')
-		{
-			$this->addSelect("(
-				SELECT m.mitarbeiter_uid
-				FROM public.tbl_benutzer b
-				JOIN public.tbl_mitarbeiter m
-					 ON b.uid = m.mitarbeiter_uid
-				WHERE b.person_id = tbl_person.person_id
-				LIMIT 1
-				)
-				AS uid");
-			$this->addOrder('uid, lower(nachname), lower(vorname)');
-		}
-		else
-		{
-			$this->addOrder('lower(nachname), lower(vorname)');
-		}
-
-
 		$result = $this->loadWhere(
 			'lower(nachname) like '.$this->db->escape('%'.mb_strtolower($filter).'%')."
 			OR lower(vorname) like ".$this->db->escape('%'.$filter.'%')."

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/views/CisRouterView/CisRouterView.php

@@ -47,8 +47,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/system/infocenter/infocenterData.php

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

application/views/system/infocenter/onboardingData.php

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

cis/private/info/service_uebersicht.php

@@ -46,13 +46,12 @@ 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
@@ -72,7 +71,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\',\'filter\']
+					widgets: [\'zebra\']
 				});
 			}
 		);
@@ -152,9 +151,8 @@ 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>',$oeBez->bezeichnung,'</td>';
+		echo '<td>',$row->oe_kurzbz,'</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/frage.php

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

cis/testtool/gebietfertig.php

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

cis/testtool/login.php

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

cis/testtool/menu.php

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

content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php

@@ -342,8 +342,6 @@ 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,7 +1708,6 @@ 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);
 }
 
@@ -1726,7 +1725,6 @@ 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/studentoverlay.js.php

@@ -3555,14 +3555,6 @@ function StudentZeugnisDokumentArchivieren()
 		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,10 +364,9 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');
 
 		//laden des Datensatzes
-			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
+			$qry = "SELECT *
 					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))";
@@ -395,7 +394,6 @@ 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,7 +25,6 @@
  */
 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
 {
@@ -433,8 +432,6 @@ class konto extends basis_db
 
 		$qry.=" ORDER BY beschreibung";
 
-		$oehBeitrag = $this->_getOEHBeitrag();
-
 		if($this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object())
@@ -443,15 +440,7 @@ class konto extends basis_db
 
 				$typ->buchungstyp_kurzbz = $row->buchungstyp_kurzbz;
 				$typ->beschreibung = $row->beschreibung;
-				if (strtolower($typ->buchungstyp_kurzbz) === 'oeh' && $oehBeitrag)
-				{
-					$typ->standardbetrag = $oehBeitrag;
-				}
-				else
-				{
-					$typ->standardbetrag = $row->standardbetrag;
-				}
-
+				$typ->standardbetrag = $row->standardbetrag;
 				$typ->standardtext = $row->standardtext;
 				$typ->credit_points = $row->credit_points;
 				$typ->aktiv = $this->db_parse_bool($row->aktiv);
@@ -1001,43 +990,6 @@ 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

@@ -584,9 +584,8 @@ class lehreinheitmitarbeiter extends basis_db
 
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT
-					DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
-					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode, stg.melderelevant
+				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
+					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -599,7 +598,6 @@ class lehreinheitmitarbeiter extends basis_db
 					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
 			)

include/pruefling.class.php

@@ -584,32 +584,6 @@ class pruefling extends basis_db
 		
 		$qry .= " LIMIT 1";
 
-		if($result = $this->db_query($qry))
-		{
-			if ($this->db_num_rows($result) == 0)
-				return false;
-			else
-				return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei einer Abfrage';
-			return false;
-		}
-	}
-	public function personAlreadyInRT($person_id, $reihungstest_id, $prestudent_id)
-	{
-		$qry = "SELECT tbl_prestudent.prestudent_id
-				FROM public.tbl_rt_person
-					JOIN public.tbl_prestudent ON tbl_prestudent.person_id = tbl_rt_person.person_id
-					JOIN public.tbl_prestudentstatus ON tbl_prestudent.prestudent_id = tbl_prestudentstatus.prestudent_id AND status_kurzbz = 'Bewerber'
-						AND tbl_prestudentstatus.studienplan_id = tbl_rt_person.studienplan_id
-				WHERE tbl_rt_person.person_id = " . $this->db_add_param($person_id) . "
-					AND tbl_rt_person.rt_id = " . $this->db_add_param($reihungstest_id) . "
-					AND tbl_prestudent.prestudent_id != " . $this->db_add_param($prestudent_id) . "
-					AND get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) = 'Bewerber'
-				LIMIT 1";
-
 		if($result = $this->db_query($qry))
 		{
 			if ($this->db_num_rows($result) == 0)

locale/de-AT/testtool.php

@@ -17,7 +17,6 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basisgebiete';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='Der zuteilte Reihungstest ist noch nicht freigeschaltet';
-$this->phrasen['testtool/reihungstestNichtRegistriert']='Sie sind für den Reihungstest nicht registriert';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden. Melden Sie sich bitte bei der Reihungstestaufsicht.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Ihr Geburtsdatum stimmt nicht mit unseren Daten überein. Bitte wenden Sie sich an die Aufsichtsperson';
 $this->phrasen['testtool/home']='Home';
@@ -32,14 +31,10 @@ $this->phrasen['testtool/keineAntwort']='Keine Antwort';
 $this->phrasen['testtool/speichernUndWeiter']='Speichern und weiter';
 $this->phrasen['testtool/alleFragenBeantwortet']='GLÜCKWUNSCH! \n\nSie haben alle Fragen in der zur Verfügung stehenden Zeit beantwortet. \nNutzen Sie die verbleibende Zeit, um Ihre Antworten zu kontrollieren oder fahren Sie mit dem nächsten Teilgebiet fort.';
 $this->phrasen['testtool/zeitAbgelaufen']='Die Maximalzeit für dieses Gebiet ist abgelaufen, oder alle Fragen wurden beantwortet';
-$this->phrasen['testtool/alleGebietGestartet']='Sie haben alle Gebiete bearbeitet.';
-$this->phrasen['testtool/alleGebieteGestartetInfo']='Sie können sich nun ausloggen und den Browser schließen.';
 $this->phrasen['testtool/spracheDerTestfragen']='Gewünschte Sprache der Testfragen';
 $this->phrasen['testtool/einleitung']='Einleitung';
 $this->phrasen['testtool/blaettern']='Blättern';
 $this->phrasen['testtool/demo']='Demobeispiel ansehen';
-$this->phrasen['testtool/abbrechen']='Abbrechen';
-$this->phrasen['testtool/startGebiet']='Gebiet starten';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Klicken Sie OK um dieses Gebiet zu starten. \nSie haben für die Bearbeitung ein Zeitlimit von';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Bitte zuerst anmelden!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Fehler beim generieren des Fragenpools';

locale/en-US/testtool.php

@@ -17,7 +17,6 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basic test';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='The entrance examination assigned has not yet been activated.';
-$this->phrasen['testtool/reihungstestNichtRegistriert']='You are not registered for the placement test.';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The placement test you are assigned to could not be loaded. Please contact the placement test supervisior.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Your date of birth does not correspond to the data we have. Please speak to the supervisor. ';
 $this->phrasen['testtool/home']='Home';
@@ -32,14 +31,10 @@ $this->phrasen['testtool/keineAntwort']='No Answer';
 $this->phrasen['testtool/speichernUndWeiter']='Save and next';
 $this->phrasen['testtool/alleFragenBeantwortet']='CONGRATULATIONS!\n\nYou have answered all the questions in the time allowed.\n Use the remaining time to check your answers or continue to the next section.';
 $this->phrasen['testtool/zeitAbgelaufen']='The time for this part has expired or you have answered all the questions.';
-$this->phrasen['testtool/alleGebietGestartet']='You have worked on all sections.';
-$this->phrasen['testtool/alleGebieteGestartetInfo']='You can now log out and close the browser.';
 $this->phrasen['testtool/spracheDerTestfragen']='Desired language of questions';
 $this->phrasen['testtool/einleitung']='Introduction';
 $this->phrasen['testtool/blaettern']='Browse';
 $this->phrasen['testtool/demo']='See an example';
-$this->phrasen['testtool/abbrechen']='Cancel';
-$this->phrasen['testtool/startGebiet']='Start the section';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Click OK to start this section. \nYou have a timelimit of';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Please log in first!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Error in generating the pool of questions.';

package-lock.json

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

public/css/Studentenverwaltung.css

@@ -2,7 +2,6 @@
 @import './SvgIcons.css';
 @import './components/searchbar/searchbar.css';
 @import './components/verticalsplit.css';
-@import './components/horizontalsplit.css';
 @import './components/FilterComponent.css';
 @import './components/Tabs.css';
 @import './components/Notiz.css';
@@ -198,6 +197,10 @@ html.fs_huge {
 	margin-bottom: -1px;
 }
 
+.tiny-90 div.tox.tox-tinymce {
+	height: 90% !important;
+}
+
 /* slim begin */
 .stv .form-label {
 	margin-bottom: .15rem;
@@ -278,7 +281,3 @@ html.fs_huge {
 }
 */
 /* slim ende */
-
-.fhc-xxl-modal {
-	min-width: 80vw;
-}

public/css/components/horizontalsplit.css

@@ -1,75 +0,0 @@
-:root {
-	--fhc-horizontalsplit-hsplitter-bg-color: var(--fhc-background, #eee);
-	--fhc-horizontalsplit-hsplitter-border-color: var(--fhc-border, #eee);
-	--fhc-horizontalsplit-hsplitter-splitactions-color: var(--fhc-dark, #000);
-}
-
-.horizontalsplit-container {
-	display: flex;
-	flex-direction: row;
-	overflow: hidden;
-	max-height: 100%;
-	padding: 0px;
-}
-
-.horizontalsplitted {
-	overflow: auto;
-	flex-shrink: 0;
-}
-
-.horizontalsplitter {
-	flex-shrink: 0;
-	width: 16px;
-	cursor: col-resize;
-	user-select: none;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.horizontalsplitter.left {
-	border-left: solid 3px var(--fhc-horizontalsplit-hsplitter-border-color);
-	margin-right: 3px;
-}
-
-.horizontalsplitter.right {
-	border-right: solid 3px var(--fhc-horizontalsplit-hsplitter-border-color);
-	margin-left: 3px;
-}
-
-.splitactions.horizontal {
-	background-color: var(--fhc-horizontalsplit-hsplitter-bg-color);
-	color: var(--fhc-horizontalsplit-hsplitter-splitactions-color);
-	display: flex;
-	flex-direction: column;
-	padding: 5px 0 5px 0;
-}
-
-.splitactions.horizontal.left {
-	border-radius: 0 40% 40% 0;
-}
-
-.splitactions.horizontal.right {
-	border-radius: 40% 0 0 40%;
-}
-
-.splitactions.horizontal .splitaction {
-	width: 14px;
-	height: 28px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.splitactions.horizontal .splitaction.resize {
-	cursor: col-resize;
-}
-
-#content {
-	padding-top: 0 !important;
-	padding-bottom: 0 !important;
-}
-
-#content > div:first-child {
-	margin-top: 30px;
-}

public/css/tags.css

@@ -69,7 +69,6 @@
 
 .tag_limette {
 	background-color: #D3FFCE;
-	color: black;
 }
 
 .tag_done {
@@ -112,4 +111,4 @@
 .copy-btn {
 	float: right;
 	margin-top: 3px;
-}
+}

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/detailHeader.js

@@ -34,10 +34,4 @@ export default {
 			url: 'api/frontend/v1/detailheader/detailheader/getLeitungOrg/' + oekurzbz,
 		};
 	},
-	getSemesterStati(prestudent_id){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/detailheader/detailheader/getSemesterStati/' + prestudent_id,
-		};
-	},
 }

public/js/api/factory/lvPlan.js

@@ -16,6 +16,12 @@
  */
 
 export default {
+	getMyLvPlanViewData() {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/LvPlan/myLvPlanViewData`,
+		};
+	},
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return {
 			method: 'post',
@@ -30,11 +36,11 @@ export default {
 			params: { start_date, end_date, lv_id }
 		};
 	},
-	eventsPersonal(start_date, end_date) {
+	eventsPersonal(start_date, end_date, uid = null) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/lvPlan/eventsPersonal',
-			params: { start_date, end_date }
+			params: { start_date, end_date, uid }
 		};
 	},
 	eventsLv(lv_id, start_date, end_date) {
@@ -57,11 +63,11 @@ export default {
 			params: { start_date, end_date }
 		};
 	},
-	getLvPlanReservierungen(start_date, end_date) {
+	getLvPlanReservierungen(start_date, end_date, uid = null) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/LvPlan/getReservierungen',
-			params: { start_date, end_date }
+			params: { start_date, end_date, uid }
 		};
 	},
 	getLehreinheitStudiensemester(lehreinheit_id) {
@@ -92,5 +98,36 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/LvPlan/getLv/' + lehrveranstaltung_id
 		};
+	},
+	eventsStgOrg(start_date, end_date, stg_kz, sem, verband, gruppe) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lvPlan/eventsStgOrg',
+			params: { start_date, end_date, stg_kz, sem, verband, gruppe }
+		};
+	},
+	getStudiengaenge(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lvPlan/getStudiengaenge'
+		}
+	},
+	getLehrverband(stg_kz, sem){
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}`
+		}
+	},
+	getGruppe(stg_kz, sem, verband){
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}/${verband}`
+		}
+	},
+	checkPermissionOtherLvPlan(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lvPlan/permissionOtherLvPlan',
+		}
 	}
 };

public/js/api/factory/otherLvPlan.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getOtherLvPlanViewData(uid) {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/OtherLvPlan/otherLvPlanViewData/${uid}`,
+		};
+	},
+};

public/js/api/factory/profil.js

@@ -17,7 +17,7 @@
 
 export default {
 	
-	profilViewData(uid) {
+	getProfilViewData(uid = null) {
 		let url = "/api/frontend/v1/Profil/profilViewData";
 		if(uid){
 			url += `/${uid}`;

public/js/api/factory/stgOrgLvPlan.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getStgOrgLvPlanViewData(uid) {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/StgOrgLvPlan/stgOrgLvPlanViewData`,
+		};
+	},
+};

public/js/api/factory/stv/konto.js

@@ -38,10 +38,6 @@ export default {
 		};
 	},
 	insert(params) {
-		if(params.betrag)
-		{
-			params.betrag = params.betrag.replace(',', '.');
-		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/insert',
@@ -56,10 +52,6 @@ export default {
 		};
 	},
 	edit(params) {
-		if(params.betrag)
-		{
-			params.betrag = params.betrag.replace(',', '.');
-		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/update',
@@ -73,14 +65,10 @@ export default {
 			params: { buchungsnr }
 		};
 	},
-	getBuchungstypen(studiensemester_kurzbz) {
-		let url = 'api/frontend/v1/stv/konto/getBuchungstypen'
-		if (!!studiensemester_kurzbz)
-			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
-
+	getBuchungstypen() {
 		return {
 			method: 'get',
-			url: url
+			url: 'api/frontend/v1/stv/konto/getBuchungstypen'
 		};
-	},
+	}
 };

public/js/api/stv/abschlusspruefung.js

@@ -35,6 +35,9 @@ export default {
 	getMitarbeiter(searchString){
 		return this.$fhcApi.get('api/frontend/v1/stv/abschlusspruefung/getMitarbeiter/' + searchString);
 	},
+	getPruefer(searchString){
+		return this.$fhcApi.get('api/frontend/v1/stv/abschlusspruefung/getPruefer/' + searchString);
+	},
 	getNoten(){
 		return this.$fhcApi.get('api/frontend/v1/stv/abschlusspruefung/getNoten/');
 	},

public/js/apps/Cis.js

@@ -1,146 +1,201 @@
 import FhcSearchbar from "../components/searchbar/searchbar.js";
 import CisMenu from "../components/Cis/Menu.js";
-import PluginsPhrasen from '../plugins/Phrasen.js';
-import ApiSearchbar from '../api/factory/searchbar.js';
+import PluginsPhrasen from "../plugins/Phrasen.js";
 import Theme from "../plugins/Theme.js";
 
+import ApiSearchbar from "../api/factory/searchbar.js";
+import ApiLvPlan from "../api/factory/lvPlan.js";
+
 const app = Vue.createApp({
-    name: 'CisApp',
-    components: {
-        FhcSearchbar,
-        CisMenu
-    },
-    data: function() {
-        return {
-            searchbaroptions: {
+	name: "CisApp",
+	components: {
+		FhcSearchbar,
+		CisMenu,
+	},
+	data: function () {
+		return {
+			searchbaroptions: {
 				origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
 				types: {
-					employee: Vue.computed(() => this.$p.t("search/type_employee")),
-					student: Vue.computed(() => this.$p.t("search/type_student")),
+					employee: Vue.computed(() =>
+						this.$p.t("search/type_employee"),
+					),
+					student: Vue.computed(() =>
+						this.$p.t("search/type_student"),
+					),
 					room: Vue.computed(() => this.$p.t("search/type_room")),
-					organisationunit: Vue.computed(() => this.$p.t("search/type_organisationunit")),
+					organisationunit: Vue.computed(() =>
+						this.$p.t("search/type_organisationunit"),
+					),
 					cms: Vue.computed(() => this.$p.t("search/type_cms")),
-					dms: Vue.computed(() => this.$p.t("search/type_dms"))
+					dms: Vue.computed(() => this.$p.t("search/type_dms")),
 				},
-                actions: {
-                    employee: {
-                        defaultaction: {
-                            type: "link",
-                            action: function(data) {
-									return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-										"/Cis/Profil/View/"+data.uid;
-							}
+				actions: {
+					employee: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								return (
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									"/Cis/Profil/View/" +
+									data.uid
+								);
+							},
 						},
-                        childactions: []
+						childactions: [],
 					},
 					student: {
 						defaultaction: {
 							type: "link",
 							action: function (data) {
-								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									"/Cis/Profil/View/" + data.uid;
-
-							}
+								return (
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									"/Cis/Profil/View/" +
+									data.uid
+								);
+							},
 						},
-						childactions: []
+						childactions: [],
 					},
-                    room: {
-                        defaultaction: {
-                            type: "link",
-							renderif: function(data) {
-								if(data.content_id === null){
+					room: {
+						defaultaction: {
+							type: "link",
+							renderif: function (data) {
+								if (data.content_id === null) {
 									return false;
 								}
 								return true;
 							},
-                            action: function(data) { 
-								const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							action: function (data) {
+								const link =
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
 									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									'/CisVue/Cms/content/' + data.content_id;
+									"/CisVue/Cms/content/" +
+									data.content_id;
 								return link;
-                            }
-                        },
-                        childactions: [
-                            {
-                                label: "LV-Plan",
-                                icon: "fas fa-bookmark",
-                                type: "link",
-                                action: function(data) {
-									const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							},
+						},
+						childactions: [
+							{
+								label: "LV-Plan",
+								icon: "fas fa-bookmark",
+								type: "link",
+								action: function (data) {
+									const link =
+										FHC_JS_DATA_STORAGE_OBJECT.app_root +
 										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-										'/CisVue/Cms/getRoomInformation/' + data.ort_kurzbz;
+										"/CisVue/Cms/getRoomInformation/" +
+										data.ort_kurzbz;
 									return link;
-                                }
-                            },
-                            {
-                                label: "Rauminformation",
-                                icon: "fas fa-info-circle",
-                                type: "link",
-                                renderif: function(data) {
-									if(data.content_id === null){
+								},
+							},
+							{
+								label: "Rauminformation",
+								icon: "fas fa-info-circle",
+								type: "link",
+								renderif: function (data) {
+									if (data.content_id === null) {
 										return false;
 									}
 									return true;
-                                },
-                                action: function(data) {
-									const link= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+								},
+								action: function (data) {
+									const link =
+										FHC_JS_DATA_STORAGE_OBJECT.app_root +
 										FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-										'/CisVue/Cms/content/' + data.content_id;
+										"/CisVue/Cms/content/" +
+										data.content_id;
 									return link;
-                                }
-                            },
-                        ]
-                    },
-                    organisationunit: {
-                        defaultaction: {
-                            type: "link",
-							renderif: function(data) {
-								if(data.mailgroup) {
+								},
+							},
+						],
+					},
+					organisationunit: {
+						defaultaction: {
+							type: "link",
+							renderif: function (data) {
+								if (data.mailgroup) {
 									return true;
 								}
 								return false;
 							},
-                            action: function(data) {
-                                const link = 'mailto:' + data.mailgroup;
+							action: function (data) {
+								const link = "mailto:" + data.mailgroup;
 								return link;
-                            }
-                        },
-                        childactions: []
-                    },
+							},
+						},
+						childactions: [],
+					},
 					cms: {
 						defaultaction: {
 							type: "link",
 							action: function (data) {
-								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+								const link =
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
 									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									'/CisVue/Cms/content/' + data.content_id;
+									"/CisVue/Cms/content/" +
+									data.content_id;
 								return link;
-							}
+							},
 						},
-						childactions: []
+						childactions: [],
 					},
 					dms: {
 						defaultaction: {
 							type: "link",
 							action: function (data) {
-								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-									'cms/dms.php?id=' + data.dms_id;
+								const link =
+									FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									"cms/dms.php?id=" +
+									data.dms_id;
 								return link;
-							}
+							},
 						},
-						childactions: []
-					}
-                }
-            }
-        };
-    },
-    methods: {
-        searchfunction: function(searchsettings) {
-        	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
-        }
-    }
+						childactions: [],
+					},
+				},
+			},
+		};
+	},
+	methods: {
+		searchfunction: function (searchsettings) {
+			return this.$api.call(ApiSearchbar.searchCis(searchsettings));
+		},
+	},
+	async mounted() {
+		const openOtherLvPlanAction = {
+			label: Vue.computed(() => this.$p.t("lehre/stundenplan")),
+			icon: "fas fa-calendar-days",
+			type: "link",
+			action: function (data) {
+				const uid = JSON.parse(data.data).uid;
+				const link =
+					FHC_JS_DATA_STORAGE_OBJECT.app_root +
+					FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+					"/Cis/OtherLvPlan/" +
+					uid;
+				return link;
+			},
+		};
+		let checkPermissionOtherLvPlanResult = await this.$api.call(
+			ApiLvPlan.checkPermissionOtherLvPlan(),
+		);
+		if (
+			checkPermissionOtherLvPlanResult.meta.status === "success" &&
+			checkPermissionOtherLvPlanResult.data
+		) {
+			this.searchbaroptions.actions.employee.childactions.push(
+				openOtherLvPlanAction,
+			);
+			this.searchbaroptions.actions.student.childactions.push(
+				openOtherLvPlanAction,
+			);
+		}
+	},
 });
 
 FhcApps.makeExtendable(app);
@@ -148,9 +203,9 @@ FhcApps.makeExtendable(app);
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,
-		tooltip: 8000
-	}
-})
+		tooltip: 8000,
+	},
+});
 app.use(PluginsPhrasen);
 app.use(Theme);
-app.mount('#cis-header');
+app.mount("#cis-header");

public/js/apps/Dashboard/Fhc.js

@@ -4,7 +4,7 @@ import Theme from '../../plugins/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
-import MyLvPlan from "../../components/Cis/LvPlan/Personal.js";
+import MyLvPlan from "../../components/Cis/LvPlan/MyLvPlan.js";
 import MylvStudent from "../../components/Cis/Mylv/Student.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
 import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
@@ -17,6 +17,8 @@ import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMit
 import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 import Studium from "../../components/Cis/Studium/Studium.js";
+import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
+import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
 
 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
@@ -197,6 +199,26 @@ const router = VueRouter.createRouter({
 				};
 			}
 		},
+		{
+			path: `/Cis/StgOrgLvPlan/:mode?/:focus_date?/:stgkz?/:sem?/:verband?/:gruppe?`,
+			name: 'StgOrgLvPlan',
+			component: StgOrgLvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
+				};
+			}
+		},
+		{
+      		path: `/Cis/OtherLvPlan/:otherUid/:mode?/:focus_date?`,
+      		name: "OtherLvPlan",
+      		component: OtherLvPlan,
+      		props(route) {
+        		return {
+					propsViewData: route.params
+        		};
+      		}
+    	},
 		{
 			path: `/Cis4`,
 			name: 'Cis4',
@@ -283,7 +305,6 @@ const app = Vue.createApp({
 		}
 	},
 	async created(){
-		
 		await this.$api
 			.call(ApiRenderers.loadRenderers())
 			.then(res => res.data)

public/js/components/Calendar/LvPlan.js

@@ -88,12 +88,15 @@ export default {
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;
 			this.$emit('update:range', rangeInterval);
+		},
+		resetEventLoader() {
+			this.reset();
 		}
 	},
 	setup(props, context) {
 		const rangeInterval = Vue.ref(null);
 		
-		const { events, lv } = useEventLoader(rangeInterval, props.getPromiseFunc);
+		const { events, lv, reset } = useEventLoader(rangeInterval, props.getPromiseFunc);
 
 		Vue.watch(lv, newValue => {
 			context.emit('update:lv', newValue);
@@ -102,7 +105,8 @@ export default {
 		return {
 			rangeInterval,
 			events,
-			lv
+			lv,
+			reset
 		};
 	},
 	created() {

public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js

@@ -42,14 +42,6 @@ export const AbgabetoolAssistenz = {
 		stg_kz_prop: {
 			default: null
 		},
-		viewData: {
-			type: Object,
-			required: true,
-			default: () => ({name: '', uid: ''}),
-			validator(value) {
-				return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
-			}
-		}
 	},
 	data() {
 		return {

public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js

@@ -31,16 +31,6 @@ export const AbgabetoolMitarbeiter = {
 			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link)
 		}
 	},
-	props: {
-		viewData: {
-			type: Object,
-			required: true,
-			default: () => ({name: '', uid: ''}),
-			validator(value) {
-				return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
-			}
-		}
-	},
 	data() {
 		return {
 			tableData: null,

public/js/components/Cis/Abgabetool/AbgabetoolStudent.js

@@ -3,6 +3,7 @@ import ApiAbgabe from '../../../api/factory/abgabe.js'
 import BsModal from "../../Bootstrap/Modal.js";
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
 import { getDateStyleClass} from "./getDateStyleClass.js";
+import ApiAuthinfo from "../../../api/factory/authinfo.js";
 
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
@@ -24,14 +25,6 @@ export const AbgabetoolStudent = {
 		student_uid_prop: {
 			default: null
 		},
-		viewData: {
-			type: Object,
-			required: true,
-			default: () => ({uid: ''}),
-			validator(value) {
-				return value && value.uid
-			}
-		}
 	},
 	data() {
 		return {
@@ -44,9 +37,18 @@ export const AbgabetoolStudent = {
 			detail: null,
 			projektarbeiten: null,
 			selectedProjektarbeit: null,
-			moodle_link: null
+			moodle_link: null,
+			uid: null,
 		};
 	},
+	computed: {
+		isViewMode() {
+			return this.student_uid !== this.uid
+		},
+		student_uid() {
+			return this.student_uid_prop || this.uid || null
+		}
+	},
 	methods: {
 		checkQualityGatesStrict(termine) {
 			let qgate1Passed = false
@@ -258,18 +260,11 @@ export const AbgabetoolStudent = {
 		},
 		handleDownloadBeurteilung2(projektarbeit) {
 			window.open(projektarbeit.beurteilung2)
-		}
-	},
-	watch: {
-
-	},
-	computed: {
-		isViewMode() {
-			return this.student_uid !== this.viewData.uid
 		},
-		student_uid() {
-			return this.student_uid_prop || this.viewData?.uid || null
-		}
+		async fetchAuthUID() {
+			const authIdResponse = await this.$api.call(ApiAuthinfo.getAuthUID());
+			this.uid = authIdResponse.data.uid;
+		},
 	},
 	async created() {
 		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
@@ -302,6 +297,8 @@ export const AbgabetoolStudent = {
 		}).catch(e => {
 			this.loading = false
 		})
+
+		await this.fetchAuthUID();
 	},
 	mounted() {
 		this.setupMounted()

public/js/components/Cis/Abgabetool/DeadlineOverview.js

@@ -10,14 +10,6 @@ export const DeadlineOverview = {
 		person_uid_prop: {
 			default: null	
 		},
-		viewData: {
-			type: Object,
-			required: true,
-			default: () => ({name: '', uid: ''}),
-			validator(value) {
-				return value && value.name && value.uid
-			}
-		}
 	},
 	data() {
 		return {

public/js/components/Cis/LvPlan/LvPlan.js

@@ -11,22 +11,21 @@ export default {
 		FhcCalendar
 	},
 	props: {
-		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
 	},
 	data() {
-		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			lv: null
+			lv: null,
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 		};
 	},
 	computed:{
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
@@ -35,7 +34,7 @@ export default {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
 			
-			const opts = { zone: this.viewData.timezone };
+			const opts = { zone: this.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -115,7 +114,7 @@ export default {
 		<fhc-calendar
 			ref="calendar"
 			v-model:lv="lv"
-			:timezone="viewData.timezone"
+			:timezone="timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Cis/LvPlan/MyLvPlan.js

@@ -11,7 +11,6 @@ export default {
 		FhcCalendar
 	},
 	props: {
-		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
 	},
 	data() {
@@ -21,13 +20,14 @@ export default {
 			studiensemester_ende: null,
 			uid: null,
 			isMitarbeiter: false,
-			isStudent: false
+			isStudent: false,
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 		};
 	},
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+				return luxon.DateTime.now().setZone(this.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
@@ -47,7 +47,7 @@ export default {
 				return;
 			}
 
-			const opts = { zone: this.viewData.timezone };
+			const opts = { zone: this.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -102,16 +102,18 @@ export default {
 				this.$api.call(ApiLvPlan.eventsPersonal(start.toISODate(), end.toISODate())),
 				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
 			];
-		}
+		},
+		async fetchAuthInfo() {
+			const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
+			
+			const authInfo = authInfoResponse.data;
+			this.uid = authInfo.uid;
+			this.isMitarbeiter = authInfo.isMitarbeiter;
+			this.isStudent = authInfo.isStudent;
+		},
 	},
-	created() {
-		this.$api
-			.call(ApiAuthinfo.getAuthInfo())
-			.then(res => {
-				this.uid = res.data.uid;
-				this.isMitarbeiter = res.data.isMitarbeiter;
-				this.isStudent = res.data.isStudent;
-			});
+	async created() {
+		await this.fetchAuthInfo();
 	},
 	template: /*html*/`
 	<div class="cis-lvplan-personal d-flex flex-column h-100">
@@ -123,8 +125,9 @@ export default {
 		</h2>
 		<hr>
 		<fhc-calendar
+			v-if="timezone"
 			ref="calendar"
-			:timezone="viewData.timezone"
+			:timezone="timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Cis/LvPlan/OtherLvPlan.js

@@ -0,0 +1,262 @@
+import FormForm from "../../Form/Form.js";
+import FormInput from "../../Form/Input.js";
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from "../.././../api/factory/lvPlan.js";
+import ApiOtherLvPlan from "../.././../api/factory/otherLvPlan.js";
+import ApiAuthinfo from "../../../api/factory/authinfo.js";
+
+export const DEFAULT_MODE_LVPLAN = "Week";
+
+export default {
+	name: "OtherLvPlan",
+	components: {
+		FormForm,
+		FormInput,
+		FhcCalendar,
+	},
+	props: {
+		propsViewData: Object,
+	},
+	data() {
+		return {
+			localProps: {},
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			isOtherPersonMitarbeiter: false,
+			isOtherPersonStudent: false,
+			currentStgBezeichnung: null,
+			listVerband: [],
+			listGroup: [],
+			rangeIntervalFirst: null,
+			otherPersonData: {
+				fullName: "",
+				photo: "",
+			},
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+		};
+	},
+	computed: {
+		currentDay() {
+			if (
+				!this.propsViewData?.focus_date ||
+				isNaN(new Date(this.propsViewData?.focus_date))
+			)
+				return luxon.DateTime.now().setZone(this.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (
+				!this.propsViewData?.mode ||
+				!["day", "week", "month"].includes(
+					this.propsViewData?.mode.toLowerCase(),
+				)
+			)
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		downloadLinks() {
+			if (
+				!this.studiensemester_start ||
+				!this.studiensemester_ende ||
+				!this.propsViewData.otherUid
+			)
+				return false;
+
+			const type = this.isOtherPersonStudent
+				? "student"
+				: this.isOtherPersonMitarbeiter
+					? "lektor"
+					: null;
+
+			if (!type) return;
+
+			const opts = { zone: this.timezone };
+			const start = luxon.DateTime.fromISO(
+				this.studiensemester_start,
+				opts,
+			).toUnixInteger();
+			const ende = luxon.DateTime.fromISO(
+				this.studiensemester_ende,
+				opts,
+			).toUnixInteger();
+
+			const download_link =
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				"cis/private/lvplan/stpl_kalender.php" +
+				"?type=" +
+				type +
+				"&pers_uid=" +
+				this.propsViewData.otherUid +
+				"&begin=" +
+				start +
+				"&ende=" +
+				ende;
+
+			return [
+				{
+					title: "excel",
+					icon: "fa-solid fa-file-excel",
+					link: download_link + "&format=excel",
+				},
+				{
+					title: "csv",
+					icon: "fa-solid fa-file-csv",
+					link: download_link + "&format=csv",
+				},
+				{
+					title: "ical1",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=1&target=ical",
+				},
+				{
+					title: "ical2",
+					icon: "fa-regular fa-calendar",
+					link: download_link + "&format=ical&version=2&target=ical",
+				},
+			];
+		},
+		get_image_base64_src: function () {
+			if (!this.otherPersonData.photo?.length) {
+				return "";
+			}
+			return "data:image/jpeg;base64," + this.otherPersonData.photo;
+		},
+	},
+	watch: {
+		"propsViewData.otherUid": {
+			handler() {
+				this.$router.go();
+			},
+		},
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1);
+			const focus_date = day.toISODate();
+
+			this.$router.push({
+				name: "OtherLvPlan",
+				params: {
+					mode,
+					focus_date,
+				},
+			});
+		},
+		updateRange(rangeInterval) {
+			this.$api
+				.call(
+					ApiLvPlan.studiensemesterDateInterval(
+						rangeInterval.end.startOf("week").toISODate(),
+					),
+				)
+				.then((res) => {
+					this.studiensemester_kurzbz =
+						res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(
+					ApiLvPlan.eventsPersonal(
+						start.toISODate(),
+						end.toISODate(),
+						this.propsViewData.otherUid,
+					),
+				),
+				this.$api.call(
+					ApiLvPlan.getLvPlanReservierungen(
+						start.toISODate(),
+						end.toISODate(),
+						this.propsViewData.otherUid,
+					),
+				),
+			];
+		},
+		async fetchViewData() {
+			const viewDataResponse = await this.$api.call(
+				ApiOtherLvPlan.getOtherLvPlanViewData(
+					this.propsViewData.otherUid,
+				),
+			);
+
+			const viewData = viewDataResponse.data;
+
+			this.isOtherPersonMitarbeiter =
+				!!viewData?.user_data?.is_mitarbeiter;
+			this.isOtherPersonStudent = !!viewData?.user_data?.is_student;
+			this.otherPersonData.fullName =
+				viewData?.user_data?.vorname +
+				" " +
+				viewData?.user_data?.nachname;
+			this.otherPersonData.photo = viewData?.user_data?.foto;
+		},
+		async redirectToMyLvPlanIfAuthUid() {
+			const authInfoResponse = await this.$api.call(
+				ApiAuthinfo.getAuthInfo(),
+			);
+			const authId = authInfoResponse.data.uid;
+			if (authId === this.propsViewData.otherUid) {
+				this.$router.push({ name: "MyLvPlan" });
+			}
+		},
+	},
+	async created() {
+		await this.redirectToMyLvPlanIfAuthUid();
+		await this.fetchViewData();
+	},
+	template: `
+    <div class="d-flex flex-column h-100">
+        <h2>
+            <div class="d-flex flex-row justify-content-between align-items-center">
+			          <span>    
+                    {{ $p.t('lehre/stundenplan') + (studiensemester_kurzbz ? " " + studiensemester_kurzbz : "") }}
+                </span>
+                <div @click="this.$router.push({name: 'ProfilView', params: {uid: propsViewData.otherUid}})" type="button" class="d-flex flex-row align-items-center gap-3">
+                    <span v-if="otherPersonData.fullName?.length">
+                        {{ otherPersonData.fullName }}
+                    </span>
+                    <img v-if="otherPersonData.photo?.length" alt="profile picture" class=" img-thumbnail " style=" max-height:60px; "  :src="get_image_base64_src"/>
+                </div>
+            </div>
+		</h2>
+		<hr>
+        <fhc-calendar
+			v-if="timezone"
+            ref="calendar"
+            :timezone="timezone"
+            :get-promise-func="getPromiseFunc"
+            :date="currentDay"
+            :mode="currentMode"
+            @update:date="handleChangeDate"
+            @update:mode="handleChangeMode"
+            @update:range="updateRange"
+            class="responsive-calendar"
+        >
+            <div
+                v-if="downloadLinks"
+                class="d-flex gap-1 justify-items-start"
+                >
+                <div v-for="{ title, icon, link } in downloadLinks">
+                    <a
+                        :href="link"
+                        :aria-label="title"
+                        class="py-1 btn btn-outline-secondary"
+                    >
+                        <div class="d-flex flex-column">
+                            <i aria-hidden="true" :class="icon"></i>
+                            <span style="font-size:.5rem">{{ title }}</span>
+                        </div>
+                    </a>
+                </div>
+            </div>
+        </fhc-calendar>
+    </div>
+    `,
+};

public/js/components/Cis/LvPlan/StgOrg.js

@@ -0,0 +1,341 @@
+import FormForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../.././../api/factory/lvPlan.js';
+import ApiStgOrgLvPlan from '../.././../api/factory/stgOrgLvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN = 'Week';
+
+export default {
+	name: 'LvPlanStgOrg',
+	components: {
+		FormForm,
+		FormInput,
+		FhcCalendar,
+	},
+	props: {
+		propsViewData: Object
+	},
+	data() {
+		return {
+			localProps: {},
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			uid: null,
+			isMitarbeiter: false,
+			isStudent: false,
+			currentStgBezeichnung: null,
+			formData:  {
+				stgkz: null,
+				sem: null,
+				verband: null,
+				gruppe: null,
+			},
+			listStg: [],
+			listSem: [1,2,3,4,5,6,7,8,9,10],
+			listVerband: [],
+			listGroup: [],
+			rangeIntervalFirst: null,
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+		};
+	},
+	computed: {
+		maxSemester(){
+			const currentStg = this.listStg.find(
+				item => item.studiengang_kz === this.formData.stgkz
+			);
+			return currentStg?.max_semester;
+		},
+		currentDay() {
+			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+				return luxon.DateTime.now().setZone(this.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		downloadLinks() {
+			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+				return false;
+
+			let type = false;
+			type = this.isStudent ? 'student' : type;
+			type = this.isMitarbeiter ? 'lektor' : type;
+			if (false === type)
+			{
+				return;
+			}
+
+			const opts = { zone: this.timezone };
+			const start = luxon.DateTime
+				.fromISO(this.studiensemester_start, opts)
+				.toUnixInteger();
+			const ende = luxon.DateTime
+				.fromISO(this.studiensemester_ende, opts)
+				.toUnixInteger();
+
+			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ 'cis/private/lvplan/stpl_kalender.php'
+				+ '?type=' + type
+				+ '&pers_uid=' + this.uid
+				+ '&begin=' + start
+				+ '&ende=' + ende;
+
+			return [
+				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
+				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
+				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
+				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
+			];
+		}
+	},
+	methods: {
+		loadLvPlan(){
+			if(!this.formData.stgkz){
+				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
+				return;
+			}
+
+			if(!this.formData.sem && (this.formData.verband || this.formData.gruppe)){
+				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_SemMissing'));
+				return;
+			}
+
+			if(!this.formData.verband && this.formData.gruppe){
+				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_VerbandMissing'));
+				return;
+			}
+
+			const params = {
+				mode: this.currentMode,
+				focus_date: this.currentDay,
+				stgkz: this.formData.stgkz,
+				sem: this.formData.sem,
+				verband: this.formData.verband,
+				gruppe: this.formData.gruppe,
+			};
+
+			//ensure logic: no value after a null value in route
+			if(params.sem == null)
+			{
+				params.verband = null;
+				params.gruppe = null;
+			}
+			if(params.verband == null) {
+				params.gruppe = null;
+			}
+
+			//delete all null values to avoid null in router
+			Object.keys(params).forEach(
+				key => params[key] == null && delete params[key]
+			);
+
+			this.$router.push({
+				name: "StgOrgLvPlan",
+				params,
+			});
+
+			this.$refs['calendar']?.resetEventLoader();
+		},
+		loadListSem(){
+			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
+		},
+		loadListVerband(){
+			this.$api
+				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.then(result => {
+					const data = result.data;
+					const mappedData = data.map(item => item.verband);
+					this.listVerband = [...new Set(mappedData.filter(v =>
+						v !== null &&
+						v !== undefined &&
+						String(v).trim() !== ""
+					))]
+						.sort();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		loadListGroup(){
+			this.$api
+				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, this.formData.verband))
+				.then(result => {
+					const data = result.data;
+					const mappedData = data.map(item => item.gruppe);
+					this.listGroup =  [...new Set(mappedData.filter(v =>
+						v !== null &&
+						v !== undefined &&
+						String(v).trim() !== ""))]
+						.sort();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1);
+			const focus_date = day.toISODate();
+
+			this.$router.push({
+				name: "StgOrgLvPlan",
+				params: {
+					mode,
+					focus_date,
+					stgkz: this.formData.stgkz,
+					sem: this.formData.sem,
+					verband: this.formData.verband,
+					gruppe: this.formData.gruppe,
+				},
+			});
+		},
+		updateRange(rangeInterval) {
+			this.$api
+				.call(ApiLvPlan.studiensemesterDateInterval(
+					rangeInterval.end.startOf('week').toISODate()
+				))
+				.then(res => {
+					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe))
+			];
+		},
+		async fetchAuthInfo() {
+			const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo());
+
+			const authInfo = authInfoResponse.data;
+			this.uid = authInfo.uid;
+			this.isMitarbeiter = authInfo.isMitarbeiter;
+			this.isStudent = authInfo.isStudent;
+		},
+		async fetchViewData() {
+			const viewDataResponse = await this.$api.call(ApiStgOrgLvPlan.getStgOrgLvPlanViewData());
+
+			const viewData = viewDataResponse.data;
+			this.listStg = viewData.studiengaenge;
+		},
+	},
+	async created(){
+		await this.fetchAuthInfo();
+    	await this.fetchViewData();
+
+		if (this.propsViewData) {
+			this.formData.stgkz = this.propsViewData.stgkz ? this.propsViewData.stgkz: null;
+			this.formData.sem = this.propsViewData.sem ? this.propsViewData.sem: null;
+			this.formData.verband = this.propsViewData.verband ? this.propsViewData.verband: null;
+			this.formData.gruppe = this.propsViewData.gruppe ? this.propsViewData.gruppe: null;
+		}
+	},
+	template: `
+	<div class="cis-lvplan-stg-org d-flex flex-column h-100">
+
+		<div class="mt-3">
+	 		<form-form class="row row-cols-1 row-cols-md-2 row-cols-lg-4 row-cols-xl-5 g-3 mb-3">
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.stgkz"
+	 				@change="loadListSem(formData.stgkz)"
+	 				>
+					<option :value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
+					<option
+						v-for="stg in listStg"
+						:key="stg.studiengang_kz"
+						:value="stg.studiengang_kz"
+						>
+						{{ stg.kurzbzlang }} ({{ stg.bezeichnung }})
+					</option>
+	 			</form-input>
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.sem"
+	 				@change="loadListVerband()"
+	 				@click="loadListSem(formData.stgkz)"
+	 				>
+						<option :value="null" selected>Semester</option>
+						<option
+							v-for="sem in listSem"
+							:key="sem"
+							:value="sem"
+							>
+							{{ sem }}
+						</option>
+	 			</form-input>
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.verband"
+	 				@change="loadListGroup()"
+	 				>
+	 					<option :value="null" selected>{{ $p.t('lehre/verband') }} </option>
+					<option
+						v-for="verband in listVerband"
+						:key="verband"
+						:value="verband"
+						>
+						{{ verband }}
+					</option>
+	 			</form-input>
+	 			<form-input
+	 				type="select"
+	 				v-model="formData.gruppe"
+	 				>
+	 				<option :value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
+						<option
+							v-for="group in listGroup"
+							:key="group"
+							:value="group"
+							>
+							{{ group }}
+						</option>
+	 			</form-input>
+				<button type="button" class="btn btn-secondary" @click="loadLvPlan">{{ $p.t('LvPlan/loadLvPlan') }}</button>
+
+	 		</form-form>
+	 	</div>
+
+		<template v-if="timezone">
+			<fhc-calendar
+				v-if="propsViewData && propsViewData.stgkz"
+				ref="calendar"
+				v-model:lv="formData"
+				:timezone="timezone"
+				:get-promise-func="getPromiseFunc"
+				:date="currentDay"
+				:mode="currentMode"
+				@update:date="handleChangeDate"
+				@update:mode="handleChangeMode"
+				@update:range="updateRange"
+				class="responsive-calendar"
+			>
+				<div
+					v-if="downloadLinks"
+					class="d-flex gap-1 justify-items-start"
+				>
+					<div v-for="{ title, icon, link } in downloadLinks">
+						<a
+							:href="link"
+							:aria-label="title"
+							class="py-1 btn btn-outline-secondary"
+						>
+							<div class="d-flex flex-column">
+								<i aria-hidden="true" :class="icon"></i>
+								<span style="font-size:.5rem">{{ title }}</span>
+							</div>
+						</a>
+					</div>
+				</div>
+			</fhc-calendar>
+		</template>
+	</div>
+	`,
+
+
+};

public/js/components/Cis/LvPlan/StgOrg_DEPR.js

@@ -0,0 +1,187 @@
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../.././../api/factory/lvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN = 'Week';
+
+export default {
+	name: 'LvPlanStgOrg',
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+	},
+	components: {
+		FhcCalendar,
+	},
+	props: {
+		viewData: Object,
+		propsViewData: Object
+	},
+	data() {
+		return {
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			uid: null,
+			isMitarbeiter: false,
+			isStudent: false,
+			listStg: [],
+			currentStgBezeichnung: null
+		};
+	},
+	computed:{
+		currentDay() {
+			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		downloadLinks() {
+			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+				return false;
+
+			let type = false;
+			type = this.isStudent ? 'student' : type;
+			type = this.isMitarbeiter ? 'lektor' : type;
+			if (false === type)
+			{
+				return;
+			}
+
+			const opts = { zone: this.viewData.timezone };
+			const start = luxon.DateTime
+				.fromISO(this.studiensemester_start, opts)
+				.toUnixInteger();
+			const ende = luxon.DateTime
+				.fromISO(this.studiensemester_ende, opts)
+				.toUnixInteger();
+
+			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ 'cis/private/lvplan/stpl_kalender.php'
+				+ '?type=' + type
+				+ '&pers_uid=' + this.uid
+				+ '&begin=' + start
+				+ '&ende=' + ende;
+
+			return [
+				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
+				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
+				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
+				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
+			];
+		}
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = day.toISODate();
+
+			this.$router.push({
+				name: "StgOrgLvPlan",
+				params: {
+					mode,
+					focus_date,
+					stgkz: this.propsViewData.stgkz,
+					sem: this.propsViewData.sem,
+					verband: this.propsViewData.verband,
+					gruppe: this.propsViewData.gruppe,
+				}
+			});
+		},
+		updateRange(rangeInterval) {
+			this.$api
+				.call(ApiLvPlan.studiensemesterDateInterval(
+					rangeInterval.end.startOf('week').toISODate()
+				))
+				.then(res => {
+					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),
+				//local for test
+				/*				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.stgkz, this.sem, this.verband, this.gruppe))*/
+			];
+		},
+		backToDropdown(){
+			this.$router.push({
+				name: "OverviewLvPlan",
+			});
+		}
+	},
+	created(){
+		this.$api
+			.call(ApiAuthinfo.getAuthInfo())
+			.then(res => {
+				this.uid = res.data.uid;
+				this.isMitarbeiter = res.data.isMitarbeiter;
+				this.isStudent = res.data.isStudent;
+			});
+
+		if(this.propsViewData.stgkz) {
+			this.$api
+				.call(ApiLvPlan.getStudiengaenge())
+				.then(result => {
+					const currentStg = result.data.find(
+						item => item.studiengang_kz == this.propsViewData.stgkz
+					);
+					this.currentStgBezeichnung = currentStg.kurzbzlang + " - " + currentStg.bezeichnung;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+	template: `
+	<div class="cis-lvplan-stg-org d-flex flex-column h-100">
+		<h2>{{ $p.t('LvPlan/headerLvPlanLvVerband') }}</h2>
+		<p v-if="propsViewData.stgkz"><span><strong>{{currentStgBezeichnung}}</strong></span>
+			<span v-if="propsViewData.sem" style="margin-left:10px;"> Semester: {{propsViewData.sem}} </span>
+			<span v-if="propsViewData.verband" style="margin-left:10px;"> Verband: {{propsViewData.verband}} </span>
+			<span v-if="propsViewData.gruppe" style="margin-left:10px;"> Gruppe: {{propsViewData.gruppe}} </span>
+			<button class="py-1 btn btn-outline-secondary" :title="this.$p.t('LvPlan', 'backToDropdown')" style="margin-left:10px;"> <i class="fa fa-arrow-left fa-xs" @click="backToDropdown"></i></button>
+		</p>
+		<p v-else>{{ $p.t('LvPlan/noStgProvided') }}</p>
+
+		<fhc-calendar
+			ref="calendar"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
+			:date="currentDay"
+			:mode="currentMode"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			@update:range="updateRange"
+			class="responsive-calendar"
+		>
+			<div
+				v-if="downloadLinks"
+				class="d-flex gap-1 justify-items-start"
+				>
+				<div v-for="{ title, icon, link } in downloadLinks">
+					<a
+						:href="link"
+						:aria-label="title"
+						class="py-1 btn btn-outline-secondary"
+					>
+						<div class="d-flex flex-column">
+							<i aria-hidden="true" :class="icon"></i>
+							<span style="font-size:.5rem">{{ title }}</span>
+						</div>
+					</a>
+				</div>
+			</div>
+		</fhc-calendar>
+	</div>
+	`,
+};

public/js/components/Cis/Profil/MitarbeiterProfil.js

@@ -9,6 +9,7 @@ import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import CalendarSync from "./ProfilComponents/CalendarSync.js";
 
 import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
@@ -26,6 +27,7 @@ export default {
 		ProfilEmails,
 		RoleInformation,
 		ProfilInformation,
+		CalendarSync,
 	},
 
 	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
@@ -103,7 +105,6 @@ export default {
 					},
 				],
 			},
-
 			betriebsmittel_table_options: {
 				persistenceID: "filterTableMaProfilBetriebsmittel",
 				persistence: {
@@ -160,6 +161,7 @@ export default {
 	props: {
 		data: Object,
 		editData: Object,
+		calendarSyncUrls: Array,
 	},
 	
 	methods: {
@@ -296,6 +298,11 @@ export default {
 				}
 			};
 		},
+		quickLinks() {
+			let quickLinks = [];
+			//
+			return quickLinks;
+		},
 	},
 
 	created() {
@@ -313,7 +320,6 @@ export default {
 		});
 		//? sorts the profil Updates: pending -> accepted -> rejected
 		this.data.profilUpdates?.sort(this.sortProfilUpdates);
-
 	},
 	watch: {
 		'data.funktionen'(newVal) {
@@ -331,12 +337,6 @@ export default {
     <edit-profil v-if="showModal" ref="editModal" :isMitarbeiter="true" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <div class="row">
         <div  class="d-md-none col-12 ">
-            <!--TODO: uncomment when implemented
-                <div class="row mb-3">
-                           <div class="col">
-                           <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
-                           </div>
-                         </div>-->
             <!-- Bearbeiten Button -->
             <div v-if="isEditable" class="row mb-3 ">
                 <div class="col">
@@ -465,17 +465,11 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-            <!--TODO: uncomment when implemented
-                <div  class="row d-none d-md-block mb-3">
-                           
-                           <div class="col">
-                            
-                               <quick-links :title="$p.t('profil','quickLinks')"></quick-links>
-                              
-                                 
-                             
-                             </div>
-                           </div>-->
+			<div v-if="quickLinks.length" class="row mb-4">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
             <!-- Bearbeiten Button -->
             <div class="row d-none d-md-block ">
                 <div class="col mb-3">
@@ -501,12 +495,17 @@ export default {
                     <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
                 </div>
             </div>
-            <div  class="row">
+            <div class="row mb-3">
                 <div class="col">
                     <!-- MAILVERTEILER -->
                     <mailverteiler  :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
                 </div>
             </div>
+			<div class="row">
+                <div class="col">
+					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+                </div>
+			</div>
         </div>
     </div>
 </div>

public/js/components/Cis/Profil/MitarbeiterViewProfil.js

@@ -1,30 +1,30 @@
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import { CoreFilterCmpt } from "../../../components/filter/Filter.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
-import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
 
-import { dateFilter } from '../../../tabulator/filters/Dates.js';
+import { dateFilter } from "../../../tabulator/filters/Dates.js";
 
 export default {
 	components: {
 		CoreFilterCmpt,
 		Mailverteiler,
-		QuickLinks,
 		RoleInformation,
 		ProfilEmails,
 		ProfilInformation,
+		QuickLinks,
 	},
 	inject: ["collapseFunction", "language"],
 	data() {
 		return {
 			collapseIconFunktionen: true,
-			preloadedPhrasen:{},
+			preloadedPhrasen: {},
 			funktionen_table_options: {
 				persistenceID: "filterTableMaViewProfilFunktionen",
 				persistence: {
-					columns: false
+					columns: false,
 				},
 				minHeight: 300,
 				layout: "fitColumns",
@@ -35,58 +35,65 @@ export default {
 					//? option when wanting to hide the collapsed list
 
 					{
-						title:
-							"<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
+						title: "<i id='collapseIconFunktionen' role='button' class='fa-solid fa-angle-down  '></i>",
 						field: "collapse",
 						headerSort: false,
 						headerFilter: false,
 						formatter: "responsiveCollapse",
 						maxWidth: 40,
 						headerClick: this.collapseFunction,
-						visible: true
+						visible: true,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('ui/bezeichnung')),
+						title: Vue.computed(() => this.$p.t("ui/bezeichnung")),
 						field: "Bezeichnung",
 						headerFilter: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('lehre/organisationseinheit')),
+						title: Vue.computed(() =>
+							this.$p.t("lehre/organisationseinheit"),
+						),
 						field: "Organisationseinheit",
 						headerFilter: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigVon')),
+						title: Vue.computed(() =>
+							this.$p.t("global/gueltigVon"),
+						),
 						field: "Gültig_von",
-						headerFilterFunc: 'dates',
+						headerFilterFunc: "dates",
 						headerFilter: dateFilter,
 						resizable: true,
 						minWidth: 200,
 						visible: true,
-						formatter:"datetime",
-						formatterParams: this.datetimeFormatterParams()
+						formatter: "datetime",
+						formatterParams: this.datetimeFormatterParams(),
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigBis')),
+						title: Vue.computed(() =>
+							this.$p.t("global/gueltigBis"),
+						),
 						field: "Gültig_bis",
-						headerFilterFunc: 'dates',
+						headerFilterFunc: "dates",
 						headerFilter: dateFilter,
 						resizable: true,
 						minWidth: 200,
 						visible: true,
-						formatter:"datetime",
-						formatterParams: this.datetimeFormatterParams()
+						formatter: "datetime",
+						formatterParams: this.datetimeFormatterParams(),
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/wochenstunden')),
+						title: Vue.computed(() =>
+							this.$p.t("profil/wochenstunden"),
+						),
 						field: "Wochenstunden",
 						headerFilter: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
 					},
 				],
 			},
@@ -94,47 +101,56 @@ export default {
 	},
 
 	//? this is the prop passed to the dynamic component with the custom data of the view
-	props: ["data"],
+	props: ["data", "permissions"],
 	methods: {
 		funktionenTableBuilt: function () {
 			this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
 		},
-		datetimeFormatterParams: function() {
+		datetimeFormatterParams: function () {
 			const params = {
-				inputFormat:"yyyy-MM-dd",
-				outputFormat:"dd.MM.yyyy",
-				invalidPlaceholder:"(invalid date)",
-				timezone:FHC_JS_DATA_STORAGE_OBJECT.timezone
+				inputFormat: "yyyy-MM-dd",
+				outputFormat: "dd.MM.yyyy",
+				invalidPlaceholder: "(invalid date)",
+				timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 			};
 			return params;
-		}
+		},
 	},
 	watch: {
-		'data.funktionen'(newVal) {
-			if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setData(newVal);
+		"data.funktionen"(newVal) {
+			if (this.$refs.funktionenTable)
+				this.$refs.funktionenTable.tabulator.setData(newVal);
+		},
+		"language.value"(newVal) {
+			// reevaluates computed phrasen
+			if (this.$refs.funktionenTable)
+				this.$refs.funktionenTable.tabulator.setColumns(
+					this.funktionen_table_options.columns,
+				);
 		},
-		'language.value'(newVal) {  // reevaluates computed phrasen
-			if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setColumns(this.funktionen_table_options.columns)
-		}
 	},
 	computed: {
 		getTelefonValue() {
-			if(this.data.standort_telefon?.kontakt) {
-				return this.data.standort_telefon.kontakt + " " + this.data.telefonklappe
-			} else if(this.data.standort_telefon) {
-				return this.data.standort_telefon + " " + this.data.telefonklappe
+			if (this.data.standort_telefon?.kontakt) {
+				return (
+					this.data.standort_telefon.kontakt +
+					" " +
+					this.data.telefonklappe
+				);
+			} else if (this.data.standort_telefon) {
+				return (
+					this.data.standort_telefon + " " + this.data.telefonklappe
+				);
 			} else {
-				return this.data.telefonklappe
+				return this.data.telefonklappe;
 			}
 		},
 		fotoStatus() {
 			return this.data?.fotoStatus ?? null;
 		},
-
 		personEmails() {
 			return this.data?.emails ? this.data.emails : [];
 		},
-
 		profilInformation() {
 			if (!this.data) {
 				return {};
@@ -151,42 +167,67 @@ export default {
 				foto: this.data.foto,
 			};
 		},
-
 		roleInformation() {
 			if (!this.data) {
 				return {};
 			}
 			return {
 				geburtsdatum: {
-					label: `${this.$p.t('profil','Geburtsdatum')}`,
-					value: this.data.gebdatum
+					label: `${this.$p.t("profil", "Geburtsdatum")}`,
+					value: this.data.gebdatum,
 				},
 				geburtsort: {
-					label: `${this.$p.t('profil','Geburtsort')}`,
-					value: this.data.gebort
+					label: `${this.$p.t("profil", "Geburtsort")}`,
+					value: this.data.gebort,
 				},
 				personenkennzeichen: {
-					label: `${this.$p.t('profil','Kurzzeichen')}`,
-					value: this.data.kurzbz
+					label: `${this.$p.t("profil", "Kurzzeichen")}`,
+					value: this.data.kurzbz,
 				},
 				telefon: {
-					label: `${this.$p.t('profil','Telefon')}`,
-					value: this.getTelefonValue
+					label: `${this.$p.t("profil", "Telefon")}`,
+					value: this.getTelefonValue,
 				},
 				office: {
-					label: `${this.$p.t('profil','Büro')}`,
-					value: this.data.ort_kurzbz
-				}
+					label: `${this.$p.t("profil", "Büro")}`,
+					value: this.data.ort_kurzbz,
+				},
 			};
 		},
+		quickLinks() {
+			let quickLinks = [];
+			if (
+				this.$props.permissions &&
+				this.$props.permissions["basis/other_lv_plan"]
+			) {
+				quickLinks.push({
+					icon: "fa-calendar-days",
+					phrase: "lehre/stundenplan",
+					action: () => {
+						this.$router.push({
+							name: "OtherLvPlan",
+							params: { otherUid: this.$props.data.username },
+						});
+					},
+				});
+			}
+			return quickLinks;
+		},
 	},
-	created(){
+	created() {
 		this.$p.loadCategory(["ui", "lehre", "global", "profil"]).then(() => {
-			this.preloadedPhrasen.bezeichnungPhrase = this.$p.t('ui/bezeichnung');
-			this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t('lehre/organisationseinheit');
-			this.preloadedPhrasen.gueltigVonPhrase = this.$p.t('global/gueltigVon');
-			this.preloadedPhrasen.gueltigBisPhrase = this.$p.t('global/gueltigBis');
-			this.preloadedPhrasen.wochenstundenPhrase = this.$p.t('profil/wochenstunden');
+			this.preloadedPhrasen.bezeichnungPhrase =
+				this.$p.t("ui/bezeichnung");
+			this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t(
+				"lehre/organisationseinheit",
+			);
+			this.preloadedPhrasen.gueltigVonPhrase =
+				this.$p.t("global/gueltigVon");
+			this.preloadedPhrasen.gueltigBisPhrase =
+				this.$p.t("global/gueltigBis");
+			this.preloadedPhrasen.wochenstundenPhrase = this.$p.t(
+				"profil/wochenstunden",
+			);
 			this.preloadedPhrasen.loaded = true;
 		});
 	},
@@ -242,7 +283,7 @@ export default {
                 </div>
                 <!-- START OF THE SECOND PROFIL INFORMATION ROW -->
                 <!-- ROW WITH PROFIL IMAGE AND INFORMATION END -->
-            </div  >
+            </div>
             <!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
             <div class="row">
                 <!-- FIRST TABLE -->
@@ -256,26 +297,22 @@ export default {
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
             <!-- VISIBLE UNTIL VIEWPORT MD -->
-            <!--TODO: uncomment when implemented
-                <div  class="row d-none d-md-block mb-3">
-                  <div class="col">
-                
-                   <quick-links :title="$p.t('profil','quickLinks')" ></quick-links>
-                
-                  </div>
-                </div>
-                -->
-            <div  class="row">
-                <div class="col">
-                    <!-- MAILVERTEILER -->
-                    <mailverteiler :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
-                </div>
-            </div>
-            <!-- END OF SIDE PANEL -->
-        </div>
+			<div v-if="quickLinks.length" class="row mb-4">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
+			<div class="row">
+				<div class="col">
+					<!-- MAILVERTEILER -->
+					<mailverteiler :data="data?.mailverteiler" :title="$p.t('profil','mailverteiler')"></mailverteiler>
+				</div>
+			</div>
+			<!-- END OF SIDE PANEL -->
+		</div>
         <!-- END OF CONTAINER ROW-->
-    </div>
-    <!-- END OF CONTAINER -->
+	</div>
+	<!-- END OF CONTAINER -->
 </div>
 `,
 };

public/js/components/Cis/Profil/Profil.js

@@ -4,8 +4,8 @@ import ViewStudentProfil from "./StudentViewProfil.js";
 import ViewMitarbeiterProfil from "./MitarbeiterViewProfil.js";
 import Loading from "../../Loader.js";
 
-import ApiProfil from '../../../api/factory/profil.js';
-import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
+import ApiProfil from "../../../api/factory/profil.js";
+import ApiProfilUpdate from "../../../api/factory/profilUpdate.js";
 
 Vue.$collapseFormatter = function (data) {
 	//data - an array of objects containing the column title and value for each cell
@@ -35,7 +35,7 @@ Vue.$collapseFormatter = function (data) {
 };
 
 export const Profil = {
-	name: 'Profil',
+	name: "Profil",
 	components: {
 		StudentProfil,
 		MitarbeiterProfil,
@@ -46,11 +46,8 @@ export const Profil = {
 	props: {
 		uid: {
 			type: String,
-			required:false,
+			required: false,
 		},
-		viewData: {
-			type: Object,
-		}
 	},
 	data() {
 		return {
@@ -62,17 +59,19 @@ export const Profil = {
 			data: null,
 			// notfound is null by default, but contains an UID if no user exists with that UID
 			notFoundUID: null,
-			isEditable: this.viewData.editable ?? false,
+			isEditable: false,
+			authPermissions: null,
+			calendarSyncUrls: [],
 		};
 	},
 	provide() {
 		return {
-			isEditable: Vue.computed(()=>this.isEditable),
+			isEditable: Vue.computed(() => this.isEditable),
 			profilUpdateStates: Vue.computed(() =>
-				this.profilUpdateStates ? this.profilUpdateStates : false
+				this.profilUpdateStates ? this.profilUpdateStates : false,
 			),
 			profilUpdateTopic: Vue.computed(() =>
-				this.profilUpdateTopic ? this.profilUpdateTopic : false
+				this.profilUpdateTopic ? this.profilUpdateTopic : false,
 			),
 			setLoading: (newValue) => {
 				this.loading = newValue;
@@ -130,8 +129,12 @@ export const Profil = {
 				//? if they have the same status the insert date is used for ordering
 				if (ele1.status === ele2.status) {
 					result =
-						new Date(ele2.insertamum.split(".").reverse().join("-")) -
-						new Date(ele1.insertamum.split(".").reverse().join("-"));
+						new Date(
+							ele2.insertamum.split(".").reverse().join("-"),
+						) -
+						new Date(
+							ele1.insertamum.split(".").reverse().join("-"),
+						);
 				}
 				return result;
 			},
@@ -139,6 +142,8 @@ export const Profil = {
 	},
 	methods: {
 		async load() {
+			await this.fetchViewData();
+
 			// fetch profilUpdateStates to provide them to children components
 			await this.$api
 				.call(ApiProfilUpdate.getStatus())
@@ -157,20 +162,20 @@ export const Profil = {
 				.catch((error) => {
 					console.error(error);
 				});
-			
-			
-			this.$api
-				.call(ApiProfil.profilViewData(this.$route.params.uid??null))
-				.then((response) => response.data).then(data=>{
-					this.view = data?.profil_data.view;
-					this.data = data?.profil_data.data;
-					this.isEditable = data?.editable ?? false;
-				})
-				.catch((error) => {
-					console.error(error);
-				});
-			
-			
+		},
+		async fetchViewData() {
+			let viewDataResult = await this.$api.call(
+				ApiProfil.getProfilViewData(this.$route.params.uid ?? null),
+			);
+
+			const data = viewDataResult.data;
+			if (!data) return;
+
+			this.view = data.profil_data.view;
+			this.isEditable = data.profil_data.editable;
+			this.data = data.profil_data.data;
+			this.calendarSyncUrls = data.calendar_sync_urls ?? [];
+			this.authPermissions = data.permissions;
 		},
 		zustellAdressenCount() {
 			if (!this.data || !this.data.adressen) {
@@ -186,7 +191,7 @@ export const Profil = {
 						})
 						.map((adresse) => {
 							return adresse.requested_change.adresse_id;
-						})
+						}),
 				);
 			}
 
@@ -197,8 +202,9 @@ export const Profil = {
 					.every((adresse) =>
 						this.data.profilUpdates.some(
 							(update) =>
-								update.requested_change.adresse_id == adresse.adresse_id
-						)
+								update.requested_change.adresse_id ==
+								adresse.adresse_id,
+						),
 					)
 			) {
 				adressenArray = adressenArray.concat(
@@ -208,12 +214,11 @@ export const Profil = {
 						})
 						.map((adr) => {
 							return adr.adresse_id;
-						})
+						}),
 				);
 			}
 
 			return [...new Set(adressenArray)];
-			
 		},
 		zustellKontakteCount() {
 			if (!this.data || !this.data.kontakte) {
@@ -226,14 +231,17 @@ export const Profil = {
 				kontakteArray = kontakteArray.concat(
 					this.data.profilUpdates
 						.filter((update) => {
-							return update.status === 'Pending' && update.requested_change.zustellung;
+							return (
+								update.status === "Pending" &&
+								update.requested_change.zustellung
+							);
 						})
 						.map((kontant) => {
 							return {
-										kontakt_id: kontant.requested_change.kontakt_id,
-										kontakttyp: kontant.requested_change.kontakttyp
-								};
-						})
+								kontakt_id: kontant.requested_change.kontakt_id,
+								kontakttyp: kontant.requested_change.kontakttyp,
+							};
+						}),
 				);
 			}
 
@@ -244,8 +252,10 @@ export const Profil = {
 					.every((kontakt) =>
 						this.data.profilUpdates.some(
 							(update) =>
-								update.status === 'Pending' && update.requested_change.kontakt_id == kontakt.kontakt_id
-						)
+								update.status === "Pending" &&
+								update.requested_change.kontakt_id ==
+									kontakt.kontakt_id,
+						),
 					)
 			) {
 				kontakteArray = kontakteArray.concat(
@@ -255,10 +265,10 @@ export const Profil = {
 						})
 						.map((kon) => {
 							return {
-										kontakt_id: kon.kontakt_id,
-										kontakttyp: kon.kontakttyp
-								};
-						})
+								kontakt_id: kon.kontakt_id,
+								kontakttyp: kon.kontakttyp,
+							};
+						}),
 				);
 			}
 
@@ -266,7 +276,6 @@ export const Profil = {
 		},
 	},
 	computed: {
-		
 		filteredEditData() {
 			if (!this.data) {
 				return;
@@ -330,8 +339,12 @@ export const Profil = {
 								// excludes all contacts that are already used in pending profil update requests
 								return !this.data.profilUpdates?.some(
 									(update) =>
-										update.status === this.profilUpdateStates["Pending"] &&
-										update.requested_change?.kontakt_id === item.kontakt_id
+										update.status ===
+											this.profilUpdateStates[
+												"Pending"
+											] &&
+										update.requested_change?.kontakt_id ===
+											item.kontakt_id,
 								);
 							})
 							.map((kontakt) => {
@@ -347,12 +360,18 @@ export const Profil = {
 						topic: this.profilUpdateTopic?.["Private Adressen"],
 						data: this.data.adressen
 							?.filter((item) => {
-								return !this.data.profilUpdates?.some((update) => {
-									return (
-										update.status === this.profilUpdateStates["Pending"] &&
-										update.requested_change?.adresse_id == item.adresse_id
-									);
-								});
+								return !this.data.profilUpdates?.some(
+									(update) => {
+										return (
+											update.status ===
+												this.profilUpdateStates[
+													"Pending"
+												] &&
+											update.requested_change
+												?.adresse_id == item.adresse_id
+										);
+									},
+								);
 							})
 							.map((adresse) => {
 								return {
@@ -374,12 +393,12 @@ export const Profil = {
 				this.$refs.loadingModalRef.hide();
 			}
 		},
-		uid (newVal, oldVal) {
-			this.load()
-		}
+		uid(newVal, oldVal) {
+			this.load();
+		},
 	},
 	created() {
-		this.load()
+		this.load();
 	},
 	template: `
 	<div>
@@ -388,9 +407,14 @@ export const Profil = {
 		</div>
 		<div v-else>
             <loading ref="loadingModalRef" :timeout="0"></loading>
-            <component  :is="view" :data="data" :editData="filteredEditData" ></component>
+            <component
+				:is="view"
+				:data="data"
+				:editData="filteredEditData"
+				:permissions="authPermissions"
+				:calendarSyncUrls="calendarSyncUrls"></component>
 		</div>
 	</div>`,
-}
+};
 
-export default Profil
+export default Profil;

public/js/components/Cis/Profil/ProfilComponents/CalendarSync.js

@@ -0,0 +1,54 @@
+export default {
+	name: "CalendarSync",
+	props: { uid: String, calendarSyncUrls: Array },
+	data() {
+		return {
+			syncInstructionsUrlWithoutParam:
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				"cms/content.php?content_id=",
+		};
+	},
+	methods: {
+		copyUrlToClipboard(url) {
+			navigator.clipboard.writeText(url);
+			this.$fhcAlert.alertSuccess(
+				this.$p.t("profil/calendar_sync_clipboard_copy_confirmation"),
+			);
+		},
+	},
+	template: `
+<div class="card">
+    <div class="card-header">
+        {{ $p.t("profil/calendar_sync") }}
+    </div>
+    <div class="card-body">
+        <div class="d-flex flex-column gap-3">
+            <a
+                target="_blank"
+                :href="syncInstructionsUrlWithoutParam + $p.t('DMS-Link/lvplanSyncFAQ')"
+                class="fhc-link-color d-flex flex-row gap-2 align-items-center"
+            >
+                <span>
+                    <i class="fa-solid fa-up-right-from-square ms-2"></i>
+                </span>
+                <span>
+                    {{ $p.t("profil/calendar_sync_instructions") }}
+                </span>
+            </a>
+            <a
+                v-for="syncUrl in $props.calendarSyncUrls"
+                :key="syncUrl.identifier"
+                @click.prevent="copyUrlToClipboard(syncUrl.url)"
+                @contextmenu.prevent="copyUrlToClipboard(syncUrl.url)"
+                href="#"
+                class="fhc-link-color d-flex flex-row gap-2 align-items-center"
+            >
+                <span>
+                    <i class="fa-regular fa-copy ms-2 text-decoration-none"></i>
+                </span>
+                    {{ $p.t(syncUrl.labelPhrase) }}
+            </a>
+        </div>
+    </div>
+</div>`,
+};

public/js/components/Cis/Profil/ProfilComponents/QuickLinks.js

@@ -1,53 +1,31 @@
 export default {
-	//TODO: To be implemented
-	props: {
-		data: {
-			type: String,
-		},
-		title: {
-			type: String,
-			required: true,
-		},
-		mobile: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	methods: {
-		hideCollapse: function () {
-			this.collapseOpen = false;
-		},
-		showCollapse: function () {
-			this.collapseOpen = true;
-		},
-	},
-	data() {
-		return {
-			collapseOpen: false,
-		};
-	},
-	template: /*html*/ `
+  name: "QuickLinks",
+  data() {
+    return {};
+  },
+  props: {
+    title: {
+      type: String,
+      required: true,
+    },
+    links: {
+      type: Array,
+      required: true,
+    },
+  },
+  template: `
 <div class="card">
-    <template v-if="mobile">
-        <button class="btn btn-outline-primary"  data-bs-toggle="collapse"  data-bs-target="#quickLinks" :aria-expanded="collapseOpen" aria-controls="quickLinks" >
-            {{title}}
-            <i class="fa " :class="collapseOpen?'fa-chevron-up':'fa-chevron-down'"></i> 
-        </button>
-        <div @[\`show.bs.collapse\`]="collapseOpen=true;" @[\`hide.bs.collapse\`]="collapseOpen=false;" class="mt-1 collapse" id="quickLinks">
-            <div class="list-group">
-                <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','zeitwuensche')}}</a>
-                <a href="#" class="list-group-item list-group-item-action">{{$p.t('profil','lehrveranstaltungen')}}</a>
-                <a href="#" class="list-group-item list-group-item-action ">{{$p.t('profil','zeitsperren')}}</a>
+    <div class="card-header">
+        {{title}}
+    </div>
+    <div class="card-body">
+        <div class="d-flex flex-row align-items-center gap-3 flex-wrap">
+            <div v-for="link in links" @click="link.action()" type="button" class="d-flex flex-row gap-2 px-3 py-2 border fhc-primary">
+                <div><i class="fa" :class="link.icon"></i></div>
+                {{ $p.t(link.phrase) }}
+                <div><i class="fa fa-arrow-up-right-from-square" style="color:var(--fhc-light) !important"></i></div>
             </div>
         </div>
-    </template>
-    <template v-else>
-        <div class="card-header">{{title}}</div>
-        <div class="card-body">
-            <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitwuensche')}}</a>
-            <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','lehrveranstaltungen')}}</a>
-            <a style="text-decoration:none" class="my-1 d-block" href="#">{{$p.t('profil','zeitsperren')}}</a>
-        </div>
-    </template>
+    </div>
 </div>`,
 };

public/js/components/Cis/Profil/StudentProfil.js

@@ -1,7 +1,6 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
 import AusweisStatus from "./ProfilComponents/FhAusweisStatus.js";
-import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import Adresse from "./ProfilComponents/Adresse.js";
 import Kontakt from "./ProfilComponents/Kontakt.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
@@ -9,6 +8,8 @@ import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
 import EditProfil from "./ProfilModal/EditProfil.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
+import CalendarSync from "./ProfilComponents/CalendarSync.js";
 
 import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
@@ -18,7 +19,6 @@ export default {
 		CoreFilterCmpt,
 		Mailverteiler,
 		AusweisStatus,
-		QuickLinks,
 		Adresse,
 		Kontakt,
 		ProfilEmails,
@@ -26,6 +26,8 @@ export default {
 		ProfilInformation,
 		FetchProfilUpdates,
 		EditProfil,
+		QuickLinks,
+		CalendarSync,
 	},
 	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
 	data() {
@@ -101,6 +103,7 @@ export default {
 	props: {
 		data: Object,
 		editData: Object,
+		calendarSyncUrls: Array,
 	},
 	provide() {
 		return {
@@ -240,6 +243,11 @@ export default {
 				}
 			};
 		},
+		quickLinks() {
+			let quickLinks = [];
+			//
+			return quickLinks;
+		},
 	},
 	created() {
 		// preload phrasen
@@ -265,15 +273,7 @@ export default {
     :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <!-- ROW -->
     <div class="row">
-        <!-- HIDDEN QUICK LINKS -->
         <div  class="d-md-none col-12 ">
-            <!--TODO: uncomment when implemented
-			<div class="row py-2">
-                <div class="col">
-                    <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
-                </div>
-            </div>-->
-
 			<!-- Bearbeiten Button -->
 			<div v-if="isEditable" class="row ">
 				<div class="col mb-3">
@@ -403,12 +403,11 @@ export default {
 		</div>
 		<!-- START OF SIDE PANEL -->
 		<div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-			<!--TODO: uncomment when implemented
-			<div  class="row d-none d-md-block mb-3">
+			<div v-if="quickLinks.length" class="row mb-4">
 				<div class="col">
-					<quick-links :title="$p.t('profil','quickLinks')"></quick-links>
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
 				</div>
-			</div>-->
+			</div>
 			<!-- Bearbeiten Button -->
 			<div class="row d-none d-md-block">
 				<div class="col mb-3">
@@ -434,13 +433,18 @@ export default {
 				</div>
 			</div>
 			<!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-			<div  class="row">
+            <div class="row mb-3">
 				<div class="col">
 					<!-- HIER SIND DIE MAILVERTEILER -->
 					<mailverteiler :title="$p.t('profil','mailverteiler')" :data="data?.mailverteiler"></mailverteiler>
 				</div>
             <!-- END OF THE SECOND ROW IN THE SIDE PANEL -->
             </div>
+			<div class="row">
+                <div class="col">
+					<calendar-sync :uid="$props.data.username" :calendarSyncUrls="$props.calendarSyncUrls"></calendar-sync>
+                </div>
+			</div>
         <!-- END OF SIDE PANEL -->
         </div>
     <!-- END OF CONTAINER ROW-->

public/js/components/Cis/Profil/StudentViewProfil.js

@@ -1,30 +1,28 @@
-import QuickLinks from "./ProfilComponents/QuickLinks.js";
 import Mailverteiler from "./ProfilComponents/Mailverteiler.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
+import QuickLinks from "./ProfilComponents/QuickLinks.js";
 
 export default {
-	data() {
-		return {};
-	},
 	components: {
-		QuickLinks,
 		Mailverteiler,
 		ProfilEmails,
 		RoleInformation,
 		ProfilInformation,
+		QuickLinks,
+	},
+	props: ["data", "permissions"],
+	data() {
+		return {};
 	},
-
-	props: ["data"],
 	provide() {
 		return {
-			studiengang_kz: Vue.computed({ get: () => this.data.studiengang_kz }),
-		}
+			studiengang_kz: Vue.computed({
+				get: () => this.data.studiengang_kz,
+			}),
+		};
 	},
-	
-	methods: {},
-
 	computed: {
 		fotoStatus() {
 			return this.data?.fotoStatus ?? null;
@@ -45,66 +43,67 @@ export default {
 				foto: this.data.foto,
 			};
 		},
-
 		personEmails() {
 			return this.data?.emails ? this.data.emails : [];
 		},
-
 		roleInformation() {
 			if (!this.data) {
 				return {};
 			}
 
-
 			return {
 				geburtsdatum: {
-					label: `${this.$p.t('profil','Geburtsdatum')}`,
-					value: this.data.gebdatum
+					label: `${this.$p.t("profil", "Geburtsdatum")}`,
+					value: this.data.gebdatum,
 				},
 				geburtsort: {
-					label: `${this.$p.t('profil','Geburtsort')}`,
-					value: this.data.gebort
+					label: `${this.$p.t("profil", "Geburtsort")}`,
+					value: this.data.gebort,
 				},
 				personenkennzeichen: {
-					label: `${this.$p.t('person','personenkennzeichen')}`,
-					value: this.data.personenkennzeichen
+					label: `${this.$p.t("person", "personenkennzeichen")}`,
+					value: this.data.personenkennzeichen,
 				},
 				studiengang: {
-					label: `${this.$p.t('lehre','studiengang')}`,
-					value: this.data.studiengang
+					label: `${this.$p.t("lehre", "studiengang")}`,
+					value: this.data.studiengang,
 				},
 				semester: {
-					label: `${this.$p.t('lehre','semester')}`,
-					value: this.data.semester
+					label: `${this.$p.t("lehre", "semester")}`,
+					value: this.data.semester,
 				},
 				verband: {
-					label: `${this.$p.t('lehre','lehrverband')}`,
-					value: this.data.verband
+					label: `${this.$p.t("lehre", "lehrverband")}`,
+					value: this.data.verband,
 				},
 				gruppe: {
-					label: `${this.$p.t('lehre','gruppe')}`,
-					value: this.data.gruppe.trim()
-				}
+					label: `${this.$p.t("lehre", "gruppe")}`,
+					value: this.data.gruppe.trim(),
+				},
 			};
 		},
+		quickLinks() {
+			let quickLinks = [];
+			if (this.$props.permissions && this.$props.permissions["basis/other_lv_plan"]) {
+				quickLinks.push({
+					icon: "fa-calendar-days",
+					phrase: "lehre/stundenplan",
+					action: () => {
+						this.$router.push({
+							name: "OtherLvPlan",
+							params: { otherUid: this.$props.data.username },
+						});
+					},
+				});
+			}
+			return quickLinks;
+		},
 	},
-
-	mounted() {
-	},
-
 	template: /*html*/ ` 
 
 <div class="container-fluid text-break fhc-form"  >
     <!-- ROW --> 
     <div class="row">
-        <!-- HIDDEN QUICK LINKS -->
-        <!-- uncomment when implemented
-            <div  class="d-md-none col-12 ">
-            
-            <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
-            
-             </div>-->
-        <!-- END OF HIDDEN QUCK LINKS -->
         <!-- MAIN PANNEL -->
         <div class="col-sm-12 col-md-8 col-xxl-9 ">
             <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
@@ -112,12 +111,18 @@ export default {
             <!-- ROW WITH THE PROFIL INFORMATION --> 
             <div class="row mb-4">
                 <!-- FIRST KAESTCHEN -->
-                <div  class="col-lg-12 col-xl-6 ">
+                <div class="col-lg-12 col-xl-6 ">
                     <div class="row mb-4">
                         <div class="col">
                             <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
+                    <!-- SECOND ROW OF FIRST COLUMN -->
+					<div class="row mb-4">
+                        <div class="col">
+                            
+                        </div>
+                    </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
                     <!-- END OF PROFIL INFORMATION ROW -->
                     <!-- INFORMATION CONTENT END -->
@@ -145,17 +150,12 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-            <!-- SRART OF QUICK LINKS IN THE SIDE PANEL -->
-            <!-- START OF THE FIRDT ROW IN THE SIDE PANEL -->
-            <!-- THESE QUCK LINKS ARE ONLY VISIBLE UNTIL VIEWPORT MD -->
-            <!--TODO: uncomment when implemented
-                <div  class="row d-none d-md-block mb-3">
-                      <div class="col">
-                     
-                       <quick-links :title="$p.t('profil','quickLinks')"></quick-links>
-                
-                      </div>
-                    </div>-->
+            <!-- START OF THE FIRST ROW IN THE SIDE PANEL -->
+            <div v-if="quickLinks.length" class="row mb-4">
+				<div class="col">
+					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+				</div>
+			</div>
             <!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
             <div  class="row">
                 <div class="col">

public/js/components/Cis/Raumsuche/Raumsuche.js

@@ -3,9 +3,6 @@ import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiOrt from '../../../api/factory/ort.js'
 export const Raumsuche =  {
 	name: "Raumsuche",
-	props: {
-		
-	},
 	components: {
 		VueDatePicker,
 		CoreFilterCmpt,

public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js

@@ -31,7 +31,7 @@ export default {
 						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
 						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
 					].join(": "));
-				} else {;
+				} else {
 					tooltipArray.push([
 						this.$p.t('lehre/lektor'),
 						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")

public/js/components/Cis/Renderer/Lehreinheit/modalContent.js

@@ -142,7 +142,6 @@ export default {
 					</tr>
 				</tbody>
 		</table>
-		
-		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu.length" :menu="lvMenu" />
+		<lv-menu v-if="lvMenu.length && $route.name === 'MyLvPlan'" :containerStyles="['p-0']" :rowStyles="['m-0']" :menu="lvMenu" />
 	</div>`,
 }

public/js/components/Dashboard/Dashboard.js

@@ -2,6 +2,7 @@ import DashboardSection from "./Section.js";
 import DashboardWidgetPicker from "./Widget/Picker.js";
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
+import ApiDashboard from '../../api/factory/cis/dashboard.js';
 import ApiDashboardWidget from '../../api/factory/dashboard/widget.js';
 import ApiDashboardUser from '../../api/factory/dashboard/user.js';
 
@@ -17,27 +18,22 @@ export default {
 			required: true,
 			default: 'CIS'
 		},
-		viewData: {
-			type: Object,
-			required: true,
-			validator(value) {
-				return value && value.name && value.timezone
-			}
-		}
 	},
 	data() {
 		return {
 			widgets: [],
 			originalWidgets: {},
 			widgetsSetup: null,
-			editMode: false
+			editMode: false,
+			timezone: null,
+			userFirstName: null,
 		}
 	},
 	provide() {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
 			widgetsSetup: Vue.computed(() => this.widgetsSetup),
-			timezone: Vue.computed(() => this.viewData.timezone)
+			timezone: this.timezone
 		}
 	},
 	methods: {
@@ -120,11 +116,19 @@ export default {
 					this.widgets = this.widgets.filter(widget => widget.id != id);
 				})
 				.catch(this.$fhcAlert.handleSystemError);
+		},
+		async fetchViewData() {
+			let viewDataResult = await this.$api.call(ApiDashboard.getViewData());
+			const viewData = viewDataResult.data;
+			this.timezone = viewData?.timezone;
+			this.userFirstName = viewData?.name;
 		}
 	},
-	created() {
+	async created() {
 		this.$p.loadCategory('dashboard');
 
+		await this.fetchViewData();
+
 		this.$api
 			.call(ApiDashboardWidget.listAllowed(this.dashboard))
 			.then(res => {
@@ -158,7 +162,7 @@ export default {
 	template: `
 	<div class="core-dashboard">
 		<h3>
-			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
+			{{ userFirstName ? $p.t('global/personalGreeting', [ userFirstName ]) : '' }}
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
 		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>

public/js/components/DetailHeader/DetailHeader.js

@@ -1,13 +1,11 @@
 import ApiDetailHeader from "../../api/factory/detailHeader.js";
 import ApiHandleFoto from "../../api/factory/fotoHandling.js";
 import ModalUploadFoto from "./Modal/UploadFoto.js";
-import PvSkeleton from "../../../../index.ci.php/public/js/components/primevue/skeleton/skeleton.esm.min.js";
 
 export default {
 	name: 'DetailHeader',
 	components: {
-		ModalUploadFoto,
-		PvSkeleton
+		ModalUploadFoto
 	},
 	props: {
 		headerData: {
@@ -40,14 +38,6 @@ export default {
 					'mitarbeiter',
 				].includes(value)
 			}
-		},
-		currentSemester: {
-			type: String,
-			default: ''
-		},
-		isLoading: { //if true, then parent isLoading
-			type: Boolean,
-			default: false
 		}
 	},
 	computed: {
@@ -70,7 +60,8 @@ export default {
 		},
 		hasTileUIDSlot() {
 			return !!this.$slots.uid
-		}
+		},
+
 	},
 	created(){
 		if (this.typeHeader === 'student') {
@@ -80,7 +71,7 @@ export default {
 		} else if (this.typeHeader === 'mitarbeiter') {
 			if (!this.person_id || !this.mitarbeiter_uid || !this.domain) {
 				throw new Error(
-					'[DetailHeader] "person_id", "mitarbeiter_uid", and "domain" are required.'
+					'[DetailHeader] "person_id", "mitarbeiter_uid", and "domain" are requried.'
 				)
 			}
 			this.loadHeaderData(this.person_id, this.mitarbeiter_uid);
@@ -95,26 +86,13 @@ export default {
 			},
 			deep: true,
 		},
-		headerData: {
-			handler(newVal) {
-				if (this.typeHeader === 'student' && newVal?.length) {
-					this.getSemesterStati(newVal[0].prestudent_id);
-				}
-			},
-			immediate: true
-		},
 	},
 	data(){
 		return{
 			headerDataMa: {},
 			departmentData: {},
 			leitungData: {},
-			isFetchingIssues: false,
-			noCurrentStatus: false,
-			semesterStatiLoading: false,
-			leitungOrgLoading: false,
-			departmentDataLoading: false,
-			headerDataMaLoading: false
+			isFetchingIssues: false
 		};
 	},
 	methods: {
@@ -130,40 +108,29 @@ export default {
 				});
 		},
 		getHeader(person_id) {
-			this.headerDataMaLoading = true;
 			return this.$api
 				.call(ApiDetailHeader.getHeader(person_id))
 				.then(result => {
 					this.headerDataMa = result.data;
+
 				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					this.headerDataMaLoading = false;
-				});
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadDepartmentData(mitarbeiter_uid) {
-			this.departmentDataLoading = true;
 			return this.$api
 				.call(ApiDetailHeader.getPersonAbteilung(mitarbeiter_uid))
 				.then(result => {
 					this.departmentData = result.data;
 				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					this.departmentDataLoading = false;
-				});
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		getLeitungOrg(oekurzbz){
-			this.leitungOrgLoading = true;
 			return this.$api
 				.call(ApiDetailHeader.getLeitungOrg(oekurzbz))
 				.then(result => {
 					this.leitungData = result.data;
 				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					this.leitungOrgLoading = false;
-				});
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		async goToLeitung() {
 			this.loadHeaderData(this.leitungData.person_id, this.leitungData.uid);
@@ -212,33 +179,6 @@ export default {
 			} else {
 				return 'data:image/jpeg;base64,' + foto;
 			}
-		},
-		getSemesterStati(prestudent_id){
-			this.semesterStatiLoading = true;
-			this.$api
-				.call(ApiDetailHeader.getSemesterStati(prestudent_id))
-				.then(result => {
-					this.semesterStati = result.data;
-					this.setNoCurrentStatus();
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					this.semesterStatiLoading = false;
-				});
-		},
-		setNoCurrentStatus() {
-			if(!Array.isArray(this.semesterStati))
-			{
-				this.noCurrentStatus = false;
-			}
-
-			if(!this.semesterStati.some(item => item.studiensemester_kurzbz === this.currentSemester)) {
-				this.noCurrentStatus = true;
-			}
-			else
-			{
-				this.noCurrentStatus = false;
-			}
 		}
 	},
 	template: `
@@ -260,6 +200,7 @@ export default {
 			</modal-upload-foto>
 
 			<template v-if="typeHeader==='student'">
+
 				<div
 					v-for="person in headerData"
 					:key="person.person_id"
@@ -295,100 +236,62 @@ export default {
 					<small class="text-muted">{{person.uid}}</small>
 				</div>
 
-				<div v-if="headerData.length == 1">
-					<div v-if="!isLoading" class="d-flex align-items-center gap-3">
-						<h2 class="h4">
-							{{headerData[0].titelpre}}
-							{{headerData[0].vorname}}
-							{{headerData[0].nachname}}
-							<span v-if="headerData[0].titelpost">, </span>
-							{{headerData[0].titelpost}}
-						</h2>
-						<h6  v-if="headerData[0].unruly" class="badge" :class="'bg-unruly rounded-0'"><strong>unruly</strong></h6>
-					</div>
-					<div v-else class="d-flex align-items-center gap-3">
-						<pv-skeleton width="15rem" height="2rem" borderRadius="16px"></pv-skeleton>
-						<h6  v-if="headerData[0].unruly" class="badge" :class="'bg-unruly rounded-0'"><strong>unruly</strong></h6>
-					</div>
+					<div v-if="headerData.length == 1">
+						<div class="d-flex align-items-center gap-3">
+							<h2 class="h4">
+								{{headerData[0].titelpre}}
+								{{headerData[0].vorname}}
+								{{headerData[0].nachname}}
+								<span v-if="headerData[0].titelpost">, </span>
+								{{headerData[0].titelpost}}
+							</h2>
+							<h6  v-if="headerData[0].unruly" class="badge" :class="'bg-unruly rounded-0'"><strong>unruly</strong></h6>
+						</div>
 
-				<h5 class="h6 d-flex align-items-center flex-wrap gap-1">
-					<strong class="text-muted">{{$p.t('lehre', 'studiengang')}} </strong>
-					<span v-if="!isLoading">
-					 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
-					 </span>
-					 <span v-else>
-					 	<pv-skeleton width="10rem"></pv-skeleton>
-					 </span>
-					<template v-if="!semesterStatiLoading">
-						<strong v-if="headerData[0].semester != null" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
-							{{headerData[0].semester}}
-						<strong v-if="headerData[0].gruppe !== null && headerData[0].verband != ' '" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
-							{{headerData[0].verband}}
-						<strong v-if="headerData[0].gruppe !== null && headerData[0].gruppe != ' '" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
-							{{headerData[0].gruppe}}
-					</template>
-					<template v-else>
-					<strong class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
-					  <pv-skeleton size="1rem" class="mr-2"></pv-skeleton>
-					<strong class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
-						<pv-skeleton size="1rem" class="mr-2"></pv-skeleton>
-					<strong class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
-						<pv-skeleton size="1rem" class="mr-2"></pv-skeleton>
-					</template>
-				</h5>
+					<h5 class="h6">
+						<strong class="text-muted">{{$p.t('lehre', 'studiengang')}} </strong>
+						 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+						<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
+						  {{headerData[0].semester}}
+						<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
+						{{headerData[0].verband}}
+						<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
+						{{headerData[0].gruppe}}
+					</h5>
 
-				<h5 class="h6 d-flex align-items-center flex-wrap gap-1">
-					<strong class="text-muted">Email </strong>
-					<span v-if="!isLoading">
-						<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
-					</span>
-					<span v-else>
-						<pv-skeleton width="10rem"></pv-skeleton>
-					</span>
-					<strong class="text-muted"> | Status </strong>
-					<span v-if="noCurrentStatus">
-						<strong class="text-danger">{{$p.t('lehre', 'textNoStatusInSem', { sem: currentSemester}) }}</strong>
-					</span>
-					<span v-else>
-						{{headerData[0].statusofsemester}}
-					</span>
-				</h5>
-			</div>
-			<div v-if="headerData.length == 1" class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
-				<div class="d-flex py-1">
-					<div class="px-2" style="min-width: 100px;">
-						<slot name="issues"></slot>
-					</div>
-					<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
-						<h4 class="mb-1 text-center"><slot name="titleGammaTile"></slot></h4>
-						<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
-							<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
-							<slot v-else name="valueGammaTile"></slot>
-						</h6>
-					</div>
-					<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
-						<h4 class="mb-1 text-center"><slot name="titleBetaTile"></slot></h4>
-						<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
-							<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
-							<slot v-else name="valueBetaTile"></slot>
-						</h6>
-					</div>
-					<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
-						<h4 class="mb-1 text-center"><slot name="titleAlphaTile"></slot></h4>
-						<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
-							<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
-							<slot v-else name="valueAlphaTile"></slot>
-						</h6>
-					</div>
-					<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
-						<h4 class="mb-1 text-center">UID</h4>
-						<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
-							<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
-							<slot v-else name="uid"></slot>
-						</h6>
+					<h5 class="h6">
+						<strong class="text-muted">Email </strong>
+						<span>
+							<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+						</span>
+						<strong v-if="headerData[0].statusofsemester" class="text-muted"> | Status </strong>
+						 {{headerData[0].statusofsemester}}
+					  </h5>
+
+				</div>
+				<div v-if="headerData.length == 1" class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
+					<div class="d-flex py-1">
+						<div class="px-2" style="min-width: 100px;">
+							<slot name="issues"></slot>
+						</div>
+						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1 text-center"><slot name="titleGammaTile"></slot></h4>
+							<h6 class="text-muted text-center"><slot name="valueGammaTile"></slot></h6>
+						</div>
+						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1 text-center"><slot name="titleBetaTile"></slot></h4>
+							<h6 class="text-muted text-center"><slot name="valueBetaTile"></slot></h6>
+						</div>
+						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1 text-center"><slot name="titleAlphaTile"></slot></h4>
+							<h6 class="text-muted text-center"><slot name="valueAlphaTile"></slot></h6>
+						</div>
+						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1 text-center">UID</h4>
+							<h6 class="text-muted text-center"><slot name="uid"></slot></h6>
+						</div>
 					</div>
 				</div>
-			</div>
 
 		</template>
 
@@ -427,51 +330,27 @@ export default {
 
 				<!--show Ma-Details-->
 				<div class="col-md-9 text-nowrap mt-2">
-					<h4 v-if="!headerDataMaLoading">{{headerDataMa.titelpre}} {{headerDataMa.vorname}} {{headerDataMa.nachname}}<span v-if="headerDataMa?.titelpost">, </span> {{headerDataMa.titelpost}}</h4>
-					<h4 v-else><pv-skeleton width="15rem" height="2rem" borderRadius="16px"></pv-skeleton></h4>
-					<div class="d-flex align-items-center flex-wrap gap-1">
-						<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong>
-						<span v-if="!departmentDataLoading">
-							{{departmentData.bezeichnung}}
-						</span>
-						<span v-else>
-							<pv-skeleton width="12rem"></pv-skeleton>
-						</span>
-						<span v-if="leitungData.uid"> | </span>
-						<strong v-if="leitungData.uid" class="text-muted">Vorgesetzte*r </strong>
-						<span v-if="!leitungOrgLoading">
-							<a href="#" @click.prevent="goToLeitung">
-							{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
+					<h4>{{headerDataMa.titelpre}} {{headerDataMa.vorname}} {{headerDataMa.nachname}}<span v-if="headerDataMa?.titelpost">, </span> {{headerDataMa.titelpost}}</h4>
+					<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong>
+						{{departmentData.bezeichnung}}
+					<span v-if="leitungData.uid"> | </span>
+					<strong v-if="leitungData.uid" class="text-muted">Vorgesetzte*r </strong>
+					<a href="#" @click.prevent="goToLeitung">
+						{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
+					</a>
+					<p>
+						<strong class="text-muted">Email </strong>
+						 <span v-if="headerDataMa && (headerDataMa.alias === undefined || headerDataMa.alias === null || headerDataMa.alias === '')">
+							<a :href="'mailto:' + mitarbeiter_uid + '@' + domain">
+							  {{ mitarbeiter_uid }}@{{ domain }}
 							</a>
 						</span>
 						<span v-else>
-							<pv-skeleton width="5rem"></pv-skeleton>
+							<a :href="'mailto:'+headerDataMa?.alias+'@'+domain">{{headerDataMa.alias}}@{{domain}}</a>
 						</span>
-					</div>
-
-					<div class="d-flex align-items-center gap-2 flex-nowrap">
-					  <div class="d-flex align-items-center gap-1">
-						<strong class="text-muted">Email</strong>
-						<template v-if="!headerDataMaLoading">
-						  <a :href="'mailto:' + (headerDataMa?.alias || mitarbeiter_uid) + '@' + domain">
-							{{ (headerDataMa?.alias || mitarbeiter_uid) + '@' + domain }}
-						  </a>
-						</template>
-						<pv-skeleton v-else width="10rem"></pv-skeleton>
-					  </div>
-
-					  <div v-if="headerDataMa?.telefonklappe" class="d-flex align-items-center gap-1">
-						<span>|</span>
-						<strong class="text-muted">DW</strong>
-						<template v-if="!headerDataMaLoading">
-						  {{ headerDataMa.telefonklappe }}
-						</template>
-						<pv-skeleton v-else width="4rem"></pv-skeleton>
-					  </div>
-					</div>
-
+						<span v-if="headerDataMa?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerDataMa?.telefonklappe}}</span>
+					</p>
 					<slot name="tag"></slot>
-
 				</div>
 
 				<div class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
@@ -481,33 +360,20 @@ export default {
 						</div>
 						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1 text-center"><slot name="titleGammaTile"></slot></h4>
-							<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
-								<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
-								<slot v-else name="valueGammaTile"></slot>
-							</h6>
+							<h6 class="text-muted text-center"><slot name="valueGammaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1 text-center"><slot name="titleBetaTile"></slot></h4>
-							<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
-								<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
-								<slot v-else name="valueBetaTile"></slot>
-							</h6>
+							<h6 class="text-muted text-center"><slot name="valueBetaTile" :valueBetaTile="valueBetaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1 text-center"><slot name="titleAlphaTile"></slot></h4>
-							<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
-								<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
-								<slot v-else name="valueAlphaTile"></slot>
-							</h6>
+							<h6 class="text-muted text-center"><slot name="valueAlphaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1 text-center">UID</h4>
-							<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
-								<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
-								<slot v-else name="uid"></slot>
-							</h6>
+							<h6 class="text-muted text-center"><slot name="uid"></slot></h6>
 						</div>
-
 					</div>
 				</div>
 

public/js/components/Form/Input.js

@@ -29,8 +29,7 @@ export default {
 		label: String,
 		// NOTE(chris): remove these from $attrs array to prevent doubled event listeners
 		onInput: [Array, Function],
-		'onUpdate:modelValue': [Array, Function],
-		titleActionButton: String
+		'onUpdate:modelValue': [Array, Function]
 	},
 	data() {
 		return {
@@ -318,7 +317,6 @@ export default {
 			:id="idCmp"
 			:name="name"
 			:class="validationClass"
-			:titleActionButton="titleActionButton"
 			@update:model-value="clearValidationForThisName"
 			>
 			<slot></slot>

public/js/components/Form/Upload/Image.js

@@ -1,14 +1,9 @@
 export default {
 	emits: [
-		'update:modelValue',
-		'actionbutton-clicked'
+		'update:modelValue'
 	],
 	props: {
-		modelValue: String,
-		titleActionButton: {
-			type: String,
-			default: ""
-		}
+		modelValue: String
 	},
 	computed: {
 		valueAsBase64DataString() {
@@ -33,9 +28,6 @@ export default {
 		},
 		deleteImage() {
 			this.$emit('update:modelValue', '');
-		},
-		emitAction(){
-			this.$emit('actionbutton-clicked', this.modelValue);
 		}
 	},
 	template: `
@@ -50,7 +42,6 @@ export default {
 					<button type="button" class="btn btn-outline-dark btn-sm" @click="openUploadDialog">
 						<i class="fa fa-pen"></i>
 					</button>
-					<button	v-if="titleActionButton" class="btn btn-outline-dark btn-sm" @click="emitAction">{{titleActionButton}}</button>
 				</div>
 			</div>
 		</template>

public/js/components/Messages/Details/NewMessage/Modal.js

@@ -63,7 +63,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				min_height: 300,
+				//height: 800,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',
@@ -313,7 +313,7 @@ export default {
 
 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2 align-content-start" ref="formMessage">
+						<form-form class="row g-3 mt-2 h-100" ref="formMessage">
 
 							<div class="row mb-3">
 
@@ -338,7 +338,7 @@ export default {
 							</div>
 
 							<!--Tiny MCE-->
-							<div class="row mb-3 tiny-90">
+							<div class="row mb-3 h-100 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"

public/js/components/Messages/Details/NewMessage/NewDiv.js

@@ -62,7 +62,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				min_height: 300,
+				//height: 800,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',

public/js/components/Messages/Details/TableMessages.js

@@ -30,7 +30,6 @@ export default {
 			personId: null,
 			layoutColumnsOnNewData:	false,
 			height: '400',
-			arePhrasesLoaded: false
 		}
 	},
 	methods: {
@@ -196,7 +195,7 @@ export default {
 						],
 						formatter: (cell, formatterParams) => {
 							const key = formatterParams[cell.getValue()];
-							return this.$p?.t?.('messages', key) || key;
+							return this.$p.t('messages', key);
 						},
 					},
 					{
@@ -306,6 +305,8 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
+						await this.$p.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz']);
+
 						const setHeader = (field, text) => {
 							const col = this.$refs.table.tabulator.getColumn(field);
 							if (!col) return;
@@ -356,12 +357,6 @@ export default {
 				});*/
 	},
 	created(){
-		this.$p
-			.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz'])
-			.then(() => {
-				this.arePhrasesLoaded = true;
-			});
-
 		if(this.typeId != 'person_id' && Array.isArray(this.id) && this.id.length === 1) {
 			const params = {
 				id: this.id,
@@ -386,7 +381,6 @@ export default {
 				<!--table-->
 				<div class="col-sm-6 pt-1">
 					<core-filter-cmpt
-						v-if="arePhrasesLoaded"
 						ref="table"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
@@ -419,7 +413,6 @@ export default {
 				<div class="col-sm-12 pt-6">
 					<core-filter-cmpt
 						ref="table"
-						v-if="arePhrasesLoaded"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
 						table-only

public/js/components/Stv/Studentenverwaltung.js

@@ -18,7 +18,6 @@
 import CoreSearchbar from "../searchbar/searchbar.js";
 import NavLanguage from "../navigation/Language.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
-import HorizontalSplit from "../horizontalsplit/horizontalsplit.js";
 import AppMenu from "../AppMenu.js";
 import AppConfig from "../AppConfig.js";
 import StvVerband from "./Studentenverwaltung/Verband.js";
@@ -38,7 +37,6 @@ export default {
 		CoreSearchbar,
 		NavLanguage,
 		VerticalSplit,
-		HorizontalSplit,
 		AppMenu,
 		AppConfig,
 		StvVerband,
@@ -194,44 +192,7 @@ export default {
 			}
 
 			return extraItems;
-		},
-		appMenuLvPlanungItems() {
-			const extraItems = [];
-
-			if (this.studiengangKz !== undefined && this.selected_semester !== undefined) {
-				const studiengang_kz = String(this.studiengangKz);
-				const semester = String(this.selected_semester);
-				const orgform = this.selected_orgform || '';
-
-				extraItems.push({
-					link: FHC_JS_DATA_STORAGE_OBJECT.app_root
-						+ 'content/statistik/lvplanung.xls.php?'
-						+ '&studiengang_kz=' + studiengang_kz
-						+ '&semester=' + semester
-						+ '&studiensemester_kurzbz=' + this.studiensemesterKurzbz
-						+ '&orgform_kurzbz=' + orgform,
-					description: 'stv/lvplanung_xls'
-				});
-				extraItems.push({
-					link: FHC_JS_DATA_STORAGE_OBJECT.app_root
-						+ 'content/statistik/lvplanung.php?'
-						+ '&studiengang_kz=' + studiengang_kz
-						+ '&semester=' + semester,
-					description: 'stv/lvplanung_html'
-				});
-			}
-
-			return extraItems;
-		},
-		linkRt(){
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + '/vilesci/stammdaten/reihungstestverwaltung.php'
-		},
-		selected_uid(){
-			return this.selected?.[this.selected.length - 1]?.uid ?? null;
-		},
-		linkGradeList(){
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/person/gradelist/index/' + this.selected_uid
-		},
+		}
 	},
 	watch: {
 		'url_studiensemester_kurzbz': function (newVal, oldVal) {
@@ -251,7 +212,6 @@ export default {
 		'url_studiengang': function (newVal, oldVal) {
 			if (newVal !== oldVal) {
 				this.checkUrlStudiengang();
-				this.$refs.stvList.clearSelection();
 			}
 		},
 		'url_mode': function () {
@@ -275,10 +235,6 @@ export default {
 					}
 				}
 			}
-		},
-		sidebarCollapsed(newVal) {
-			if(newVal) this.$refs.hSplit.collapseLeft()
-			else this.$refs.hSplit.showBoth()
 		}
 	},
 	methods: {
@@ -475,15 +431,6 @@ export default {
 		},
 		deleteCustomFilter(){
 			this.$refs.stvList.resetFilter();
-		},
-		showAlertNoSelectedStudent(){
-			this.$fhcAlert.alertError(this.$p.t('ui', 'alert_chooseStudent'));
-		},
-		showAlertMultipleStudents() {
-			this.$fhcAlert.alertError(this.$p.t('ui', 'alert_chooseOnlyOneStudent'));
-		},
-		showAlertNoGroupChosen(){
-			this.$fhcAlert.alertError(this.$p.t('ui', 'alert_chooseGroupSem'));
 		}
 	},
 	created() {
@@ -659,26 +606,19 @@ export default {
 					</div>
 					<div class="offcanvas-body">
 						<app-menu app-identifier="stv">
-							<li :class="{ dropend: appMenuExtraItems.length }">
+							<li class="dropend">
 								<a
-									v-if="appMenuExtraItems.length"
 									class="dropdown-toggle"
 									href="#"
 									role="button"
 									data-bs-toggle="dropdown"
 									aria-expanded="false"
+									:class="{ disabled: !appMenuExtraItems.length }"
 									data-bs-popper-config='{"strategy":"fixed"}'
 								>
 									{{ $p.t('stv/grade_report') }}
 								</a>
-								<a
-									v-else
-									href="#"
-									@click.prevent="showAlertNoGroupChosen"
-									>
-										{{ $p.t('stv/grade_report') }}
-								</a>
-								<ul v-if="appMenuExtraItems.length" class="dropdown-menu p-0">
+								<ul class="dropdown-menu p-0">
 									<li
 										v-for="(item, key) in appMenuExtraItems"
 										:key="key"
@@ -689,79 +629,26 @@ export default {
 									</li>
 								</ul>
 							</li>
-							<li :class="{ dropend: appMenuExtraItems.length }">
-								<a
-									v-if="appMenuExtraItems.length"
-									class="dropdown-toggle"
-									href="#"
-									role="button"
-									data-bs-toggle="dropdown"
-									aria-expanded="false"
-									data-bs-popper-config='{"strategy":"fixed"}'
-									>
-										{{ $p.t('stv/lvplanung') }}
-								</a>
-								<a
-									v-else
-									href="#"
-									@click.prevent="showAlertNoGroupChosen"
-								>
-									{{ $p.t('stv/lvplanung') }}
-								</a>
-								<ul v-if="appMenuExtraItems.length" class="dropdown-menu p-0">
-									<li
-										v-for="(item, key) in appMenuLvPlanungItems"
-										:key="key"
-									>
-										<a class="dropdown-item" :href="item.link" target="_blank">
-											{{ $p.t(item.description) }}
-										</a>
-									</li>
-								</ul>
-							</li>
-							<li>
-								<a :href="linkRt" target="_blank">
-									{{ $p.t('stv/RTVerwaltung') }}
-								</a>
-							</li>
-							<li>
-								<a v-if="selected.length === 1" :href="linkGradeList" target="_blank">
-									{{ $p.t('stv/studienverlauf') }}
-								</a>
-								<a v-else-if="selected.length === 0" href="#" @click.prevent="showAlertNoSelectedStudent">
-									{{ $p.t('stv/studienverlauf') }}
-								</a>
-								<a v-else href="#" @click.prevent="showAlertMultipleStudents">
-									{{ $p.t('stv/studienverlauf') }}
-								</a>
-							</li>
 						</app-menu>
 					</div>
 				</aside>
-				<horizontal-split ref="hSplit" :defaultRatio="[15, 85]">
-					<template #left>
-						<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100  w-100">
-							<div class="offcanvas-header justify-content-end px-1 d-md-none">
-								<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
-							</div>
-							<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
-							<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
-						</nav>
-					</template>
-					<template #right>
-						<main>
-							<vertical-split :defaultRatio="[50, 50]">
-								<template #top>
-									<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
-								</template>
-								<template #bottom>
-									<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
-								</template>
-							</vertical-split>
-						</main>
-					</template>
-				</horizontal-split>
-				
+				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+					<div class="offcanvas-header justify-content-end px-1 d-md-none">
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
+					</div>
+					<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
+				</nav>
+				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+					<vertical-split>
+						<template #top>
+							<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
+						</template>
+						<template #bottom>
+							<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
+						</template>
+					</vertical-split>
+				</main>
 			</div>
 		</div>
 		<app-config ref="config" v-model="appconfig" :endpoints="configEndpoints"></app-config>

public/js/components/Stv/Studentenverwaltung/Details.js

@@ -2,18 +2,12 @@ import FhcTabs from "../../Tabs.js";
 import FhcHeader from "../../DetailHeader/DetailHeader.js";
 
 import ApiStvApp from '../../../api/factory/stv/app.js';
-import ApiStudent from '../../../api/factory/stv/students.js';
 
 // TODO(chris): alt & title
 // TODO(chris): phrasen
 
 export default {
 	name: "DetailsPrestudent",
-	inject: {
-		currentSemester: {
-			from: 'currentSemester',
-		},
-	},
 	components: {
 		FhcTabs,
 		FhcHeader
@@ -21,9 +15,7 @@ export default {
 	data() {
 		return {
 			configStudent: {},
-			configStudents: {},
-			activeTab: null,
-			localStudent: null
+			configStudents: {}
 		};
 	},
 	props: {
@@ -48,9 +40,6 @@ export default {
 			}
 			return Object.fromEntries(Object.entries(this.configStudents).filter(([ , value ]) => !value.showOnlyWithUid && !value.showOnlyWithUid));
 		},
-		isLoading() {
-			return this.students === null; //null-> loading, [] -> empty, [...] -> data, necessary for skeleton in child
-		},
 		tile_PersId(){
 			let tile = this.students[0].person_id != null ? this.students[0].person_id : '-';
 			return tile;
@@ -68,21 +57,6 @@ export default {
 		'$p.user_language.value'(n, o) {
 			if (n !== o && o !== undefined)
 				this.loadConfig();
-		},
-		currentSemester(newVal) {
-			if (
-				Array.isArray(this.students) &&
-				this.students.length === 1 &&
-				newVal !== this.students[0].query_studiensemester_kurzbz
-			) {
-				this.reloadDataStudent();
-			}
-			else {
-				this.localStudent = null;
-			}
-		},
-		students() {
-			this.localStudent = null;
 		}
 	},
 	methods: {
@@ -100,28 +74,10 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		handleTabChanged(key) {
-			this.activeTab = key
-			this.reload()	
-		},
 		reload() {
 			if (this.$refs.tabs?.$refs?.current?.reload)
 				this.$refs.tabs.$refs.current.reload();
 		},
-		reloadDataStudent(){
-			this.localStudent = null;
-			const studentArr = this.students;
-
-			if (!studentArr || !studentArr.length) {
-				return;
-			}
-
-			this.$api
-				.call(ApiStudent.uid(studentArr[0].uid, this.currentSemester))
-				.then(result => {
-					this.localStudent = result.data;
-				});
-		},
 		reloadList() {
 			this.$emit('reload');
 		},
@@ -136,12 +92,10 @@ export default {
 		</div>
 		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100">
 			<fhc-header
-				:headerData="localStudent || students"
-				:currentSemester="currentSemester"
+				:headerData="students"
 				typeHeader="student"
 				@reload="reloadList"
 				fotoEditable
-				:isLoading="isLoading"
 			>
 				<template #uid>{{students[0].uid}}</template>
 				<template #titleAlphaTile>PersID</template>
@@ -153,16 +107,16 @@ export default {
 			</fhc-header>
 			<fhc-tabs
 				v-if="students.length == 1"
-				ref="tabs"
+				ref="tabs" 
 				:useprimevue="true"
-				:modelValue="(Array.isArray(localStudent) && localStudent[0]) || students[0]"
+				:modelValue="students[0]"
 				:config="config"
-				:default="activeTab ?? $route.params.tab"
+				:default="$route.params.tab"
 				style="flex: 1 1 0%; height: 0%"
-				@changed="handleTabChanged"
+				@changed="reload"
 				>
 				</fhc-tabs>
-			<fhc-tabs v-else ref="tabs" :useprimevue="true" :modelValue="students" :config="config" :default="activeTab ?? $route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="handleTabChanged"></fhc-tabs>
+			<fhc-tabs v-else ref="tabs" :useprimevue="true" :modelValue="students" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
 		</div>
 		<div v-else>
 			Loading...

public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js

@@ -238,16 +238,6 @@ export default {
 			}
 			return this.student.map(e => e.uid);
 		},
-		studentNames() {
-			if (this.student.uid)
-			{
-				return [this.student.vorname + ' ' + this.student.nachname];
-			}
-
-			const array =  this.student.map(e => ' ' + e.vorname + ' ' + e.nachname + '(' + e.uid +')');
-
-			return array.toString();
-		},
 		studentKzs(){
 			if (this.student.uid)
 			{
@@ -297,50 +287,10 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		actionNewAbschlusspruefung() {
-			this.setDefaultFormData();
+			this.resetForm();
 			this.statusNew = true;
-
-			//prepare local Storage
-			let STORAGE_KEY = 'finalExamDefaultData';
-			const id = '20260224_02';
-			const stored = JSON.parse(localStorage.getItem(STORAGE_KEY)) || {};
-
-			if (stored[id]) {
-				const data = stored[id];
-
-				this.formData.pruefungstyp_kurzbz = data.pruefungstyp_kurzbz;
-				this.formData.datum = data.datum;
-				this.formData.sponsion = data.sponsion;
-				this.formData.akadgrad_id = data.akadgrad_id;
-
-				if (data.vorsitz_uid) {
-					this.selectedVorsitz = {
-						mitarbeiter_uid: data.vorsitz_uid,
-						person_id: data.vorsitz_person_id,
-						label: data.vorsitz_label
-					};
-				}
-
-				if (data.pruefer1_person_id) {
-					this.selectedPruefer1 = {
-						person_id: data.pruefer1_person_id,
-						label: data.pruefer1_label
-					};
-				}
-				if (data.pruefer2_person_id) {
-					this.selectedPruefer2 = {
-						person_id: data.pruefer2_person_id,
-						label: data.pruefer2_label
-					};
-				}
-				if (data.pruefer3_person_id) {
-					this.selectedPruefer3 = {
-						person_id: data.pruefer3_person_id,
-						label: data.pruefer3_label
-					};
-				}
-			}
 			this.$refs.finalexamModal.show();
+			this.setDefaultFormData();
 		},
 		actionEditAbschlusspruefung(abschlusspruefung_id) {
 			this.resetForm();
@@ -355,23 +305,20 @@ export default {
 				};
 				if (data.p1_person_id) {
 					this.selectedPruefer1 = {
-						label: this.getPersonLabel(data.p1_titelpre, data.p1_nachname, data.p1_vorname, data.p1_titelpost, data.p1_uid),
-						person_id: data.p1_person_id,
-						mitarbeiter_uid: data.p1_uid
+						label: this.getPersonLabel(data.p1_titelpre, data.p1_nachname, data.p1_vorname, data.p1_titelpost),
+						person_id: data.p1_person_id
 					};
 				}
 				if (data.p2_person_id) {
 					this.selectedPruefer2 = {
-						label: this.getPersonLabel(data.p2_titelpre, data.p2_nachname, data.p2_vorname, data.p2_titelpost, data.p2_uid),
-						person_id: data.p2_person_id,
-						mitarbeiter_uid: data.p2_uid
+						label: this.getPersonLabel(data.p2_titelpre, data.p2_nachname, data.p2_vorname, data.p2_titelpost),
+						person_id: data.p2_person_id
 					}
 				};
 				if (data.p3_person_id) {
 					this.selectedPruefer3= {
-						label: this.getPersonLabel(data.p3_titelpre, data.p3_nachname, data.p3_vorname, data.p3_titelpost, data.p3_uid),
-						person_id: data.p3_person_id,
-						mitarbeiter_uid: data.p3_uid
+						label: this.getPersonLabel(data.p3_titelpre, data.p3_nachname, data.p3_vorname, data.p3_titelpost),
+						person_id: data.p3_person_id
 					};
 				}
 			});
@@ -390,29 +337,6 @@ export default {
 				.then(this.deleteAbschlusspruefung)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		saveOrUpdateLocalStorage(){
-			let STORAGE_KEY = 'finalExamDefaultData';
-
-			const id = '20260224_02';
-			const stored = JSON.parse(localStorage.getItem(STORAGE_KEY)) || {};
-
-			stored[id] = {
-				pruefungstyp_kurzbz: this.formData.pruefungstyp_kurzbz,
-				vorsitz_uid: this.selectedVorsitz?.mitarbeiter_uid || null,
-				vorsitz_person_id: this.selectedVorsitz?.person_id || null,
-				vorsitz_label: this.selectedVorsitz?.label || null,
-				pruefer1_person_id: this.selectedPruefer1?.person_id || null,
-				pruefer1_label: this.selectedPruefer1?.label || null,
-				pruefer2_person_id: this.selectedPruefer2?.person_id || null,
-				pruefer2_label: this.selectedPruefer2?.label || null,
-				pruefer3_person_id: this.selectedPruefer3?.person_id || null,
-				pruefer3_label: this.selectedPruefer3?.label || null,
-				akadgrad_id: this.formData.akadgrad_id,
-				datum: this.formData.datum,
-				sponsion: this.formData.sponsion
-			};
-			localStorage.setItem(STORAGE_KEY, JSON.stringify(stored));
-		},
 		addNewAbschlusspruefung() {
 			const dataToSend = {
 				uid: this.student.uid,
@@ -423,8 +347,6 @@ export default {
 				.call(ApiStvAbschlusspruefung.addNewAbschlusspruefung(dataToSend))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					//save formData fields in LocalStorage
-					this.saveOrUpdateLocalStorage();
 					this.hideModal('finalexamModal');
 					this.resetForm();
 				})
@@ -433,26 +355,6 @@ export default {
 					this.reload();
 				});
 		},
-		async addNewAbschlusspruefungMulti(){
-			try {
-				for (const student of this.studentUids) {
-
-					await this.$refs.formFinalExam.call(
-						ApiStvAbschlusspruefung.addNewAbschlusspruefung({
-							uid: student,
-							formData: this.formData
-						})
-					);
-				}
-				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-				//save formData fields in LocalStorage
-				this.saveOrUpdateLocalStorage();
-				this.hideModal('finalexamModal');
-				this.resetForm();
-			} catch (error) {
-				this.$fhcAlert.handleSystemError(error);
-			}
-		},
 		hideModal(modalRef){
 			this.$refs[modalRef].hide();
 		},
@@ -474,9 +376,6 @@ export default {
 				id: abschlusspruefung_id,
 				formData: this.formData
 			};
-			//uncomment if also save data in local storage for update
-			//this.saveOrUpdateLocalStorage();
-
 			return this.$refs.formFinalExam
 				.call(ApiStvAbschlusspruefung.updateAbschlusspruefung(dataToSend))
 				.then(response => {
@@ -518,6 +417,7 @@ export default {
 			this.selectedPruefer1 = null;
 			this.selectedPruefer2 = null;
 			this.selectedPruefer3 = null;
+
 		},
 		setDefaultFormData() {
 
@@ -571,29 +471,29 @@ export default {
 		searchPerson(event) {
 			if (this.abortController.persons) {
 				this.abortController.persons.abort();
-			  }
+			}
+
 			this.abortController.persons = new AbortController();
 
 			return this.$api
 				.call(ApiStvAbschlusspruefung.getPruefer(event.query))
 				.then(result => {
-				  this.filteredPersons = [];
-				  for (let person of result.data.retval) {
-					  this.filteredPersons.push(
-					  {
-						  label: this.getPersonLabel(
-								  person.titelpre,
-								  person.nachname,
-								  person.vorname,
-								  person.titelpost,
-								  person.uid
-						  ),
-						  person_id: person.person_id,
-						  mitarbeiter_uid: person.uid
-					  }
-				  );
-			  }
-			});
+					this.filteredPersons = [];
+					for (let person of result.data.retval) {
+						this.filteredPersons.push(
+							{
+								label: this.getPersonLabel(
+									person.titelpre,
+									person.nachname,
+									person.vorname,
+									person.titelpost,
+									person.person_uid
+								),
+								person_id: person.person_id
+							}
+						);
+					}
+				});
 		},
 	},
 	created() {
@@ -626,7 +526,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(ApiStvAbschlusspruefung.getAkadGrade(this.stg_kz))
+			.call(ApiStvAbschlusspruefung.getAkadGrade(this.student.studiengang_kz))
 			.then(result => {
 				this.arrAkadGrad = result.data;
 			})
@@ -647,8 +547,7 @@ export default {
 	<div class="stv-details-abschlusspruefung h-100 pb-3">
 		<h4>{{this.$p.t('stv','tab_finalexam')}}</h4>
 
-		<div v-if="this.student.length" class="d-flex gap-2">
-			<button class="btn btn-primary" @click="actionNewAbschlusspruefung()"> + {{$p.t('stv', 'tab_finalexam')}}</button>
+		<div v-if="this.student.length">
 			<abschlusspruefung-dropdown
 				:showAllFormats="showAllFormats"
 				:studentUids="studentUids"
@@ -680,14 +579,12 @@ export default {
 			<template #title>
 				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('abschlusspruefung', 'abschluessPruefungAnlegen')}}</p>
 				<p v-else class="fw-bold mt-3">{{$p.t('abschlusspruefung', 'abschluessPruefungBearbeiten')}}</p>
-				<small v-if="this.student.length" class="text-muted">{{studentNames}}</small>
 			</template>
 
-			<form-form ref="formFinalExam" @submit.prevent>
+			<form-form v-if="!this.student.length" ref="formFinalExam" @submit.prevent>
 
 				<legend>{{this.$p.t('global','details')}}</legend>
 				<p v-if="statusNew">[{{$p.t('ui', 'neu')}}]</p>
-
 				<div class="row mb-3">
 					<form-input
 						container-class="col-6 stv-details-abschlusspruefung-typ"
@@ -705,7 +602,6 @@ export default {
 						</option>
 					</form-input>
 					<form-input
-						v-if="!this.student.length"
 						container-class="col-6 stv-details-abschlusspruefung-note"
 						:label="$p.t('abschlusspruefung', 'notekommpruefung')"
 						type="select"
@@ -774,10 +670,9 @@ export default {
 					>
 					</form-input>
 				</div>
-
+				
 				<div class="row mb-3">
 					<form-input
-						v-if="!this.student.length"
 						container-class="col-6 stv-details-abschlusspruefung-abschlussbeurteilung_kurzbz"
 						:label="$p.t('abschlusspruefung', 'abschlussbeurteilung')"
 						type="select"
@@ -803,23 +698,7 @@ export default {
 						optionValue="person_id"
 						dropdown
 						forceSelection
-						:suggestions="filteredPersons"
-						@complete="searchPerson"
-						:min-length="3"
-					>
-					</form-input>
-					<form-input
-						v-if="this.student.length"
-						type="autocomplete"
-						container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-						:label="$p.t('abschlusspruefung', 'pruefer3')"
-						name="pruefer3"
-						v-model="selectedPruefer3"
-						optionLabel="label"
-						optionValue="person_id"
-						dropdown
-						forceSelection
-						:suggestions="filteredPersons"
+						:suggestions="filteredPersons" 
 						@complete="searchPerson"
 						:min-length="3"
 					>
@@ -843,7 +722,6 @@ export default {
 						</option>
 					</form-input>
 					<form-input
-						v-if="!this.student.length"
 						type="autocomplete"
 						container-class="col-6 stv-details-abschlusspruefung-pruefer3"
 						:label="$p.t('abschlusspruefung', 'pruefer3')"
@@ -853,7 +731,7 @@ export default {
 						optionValue="person_id"
 						dropdown
 						forceSelection
-						:suggestions="filteredPersons"
+						:suggestions="filteredPersons" 
 						@complete="searchPerson"
 						:min-length="3"
 					>
@@ -901,7 +779,6 @@ export default {
 						>
 					</form-input>
 					<form-input
-						v-if="!this.student.length"
 						container-class="col-6 stv-details-abschlusspruefung-protokoll"
 						:label="$p.t('abschlusspruefung', 'protokoll')"
 						type="textarea"
@@ -913,7 +790,7 @@ export default {
 					</form-input>
 				</div>
 
-				<div v-if="!this.student.length" class="row mb-3 col-6">
+				<div class="row mb-3 col-6">
 					<div class="col">
 						<p >{{$p.t('abschlusspruefung', 'zurBeurteilung')}}</p>
 					</div>
@@ -930,9 +807,8 @@ export default {
 
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
-				<button v-if="statusNew && !this.student.length" class="btn btn-primary" @click="addNewAbschlusspruefung()"> {{$p.t('ui', 'speichern')}}</button>
-				<button v-else-if="statusNew && this.student.length" class="btn btn-primary" @click="addNewAbschlusspruefungMulti(studentUids)"> {{$p.t('ui', 'speichern')}}</button>
-				<button v-else class="btn btn-primary" @click="updateAbschlusspruefung(formData.abschlusspruefung_id)"> {{$p.t('ui', 'speichern')}}</button>
+					<button v-if="statusNew" class="btn btn-primary" @click="addNewAbschlusspruefung()"> {{$p.t('ui', 'speichern')}}</button>
+					<button v-else class="btn btn-primary" @click="updateAbschlusspruefung(formData.abschlusspruefung_id)"> {{$p.t('ui', 'speichern')}}</button>
 			</template>
 
 		</bs-modal>

public/js/components/Stv/Studentenverwaltung/Details/Archiv.js

@@ -84,14 +84,6 @@ export default {
 					'microcredential_2',
 					'microcredential_3',
 					'microcredential_4',
-					'microdegree_1',
-					'microdegree_2',
-					'microdegree_3',
-					'microdegree_4',
-					'microdegreeabschluss_1',
-					'microdegreeabschluss_2',
-					'microdegreeabschluss_3',
-					'microdegreeabschluss_4',
 				]
 			},
 			documentDropdownObject: {}