minor fix

application/config/routes.php

@@ -64,9 +64,6 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
-$route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
-//Route for LV Plan Stg/Semester/Verband/Gruppe
-$route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
 
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';

application/controllers/Cis/Abgabetool.php

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

application/controllers/Cis/Auth.php

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

application/controllers/Cis/LvPlan.php

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

application/controllers/Cis/MyLv.php

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

application/controllers/Cis/MyLvPlan.php

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

application/controllers/Cis/OtherLvPlan.php

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

application/controllers/Cis/Profil.php

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

application/controllers/Cis/Raumsuche.php

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

application/controllers/Cis/StgOrgLvPlan.php

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

application/controllers/Cis/Studium.php

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

application/controllers/Cis4.php

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

application/controllers/CisVue/Dashboard.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -40,32 +40,11 @@ class Board extends FHCAPI_Controller
 
 	public function list()
 	{
-		$this->DashboardModel->addSelect('dashboard_id');
-		$this->DashboardModel->addSelect('dashboard_kurzbz');
-		$this->DashboardModel->addSelect('tbl_dashboard.beschreibung');
-		$this->DashboardModel->addSelect("(
-			SELECT json_agg(w.*) 
-			FROM dashboard.tbl_widget w 
-			JOIN dashboard.tbl_dashboard_widget dw 
-			USING(widget_id) 
-			WHERE dw.dashboard_id=tbl_dashboard.dashboard_id
-		) AS \"widgetSetup\"");
-
 		$result = $this->DashboardModel->load();
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$data = array_map(function ($dashboard) {
-			$tmpSetups = json_decode($dashboard->widgetSetup);
-			$tmpSetups = array_map(function ($widget) {
-				$widget->setup->file = absoluteJsImportUrl($widget->setup->file);
-				return $widget;
-			}, $tmpSetups);
-			$dashboard->widgetSetup = $tmpSetups;
-			return $dashboard;
-		}, $data);
-
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function create()
@@ -103,7 +82,7 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function delete()
@@ -137,6 +116,6 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 }

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

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

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

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

application/development/config.php

@@ -1,517 +0,0 @@
-<?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

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

application/libraries/dashboard/DashboardLib.php

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

application/models/content/Content_model.php

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

application/models/dashboard/Bookmark_model.php

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

application/models/dashboard/Dashboard_model.php

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

application/models/education/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/ressource/Reservierung_model.php

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

application/models/ressource/Stundenplan_model.php

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

application/views/CisRouterView/CisRouterView.php

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

application/views/templates/CISVUE-Footer.php

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

application/views/templates/CISVUE-Header.php

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

cis/private/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/menu.php

@@ -293,7 +293,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; 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>';
 		}
 

composer.json

@@ -70,18 +70,6 @@
 				}
 			}
 		},
-		{
-			"type": "package",
-			"package": {
-				"name": "drag-drop-touch-js/dragdroptouch",
-				"version": "2.0.3",
-				"source": {
-					"url": "https://github.com/drag-drop-touch-js/dragdroptouch.git",
-					"type": "git",
-					"reference": "master"
-				}
-			}
-		},
 		{
 			"type": "package",
 			"package": {
@@ -464,8 +452,6 @@
 
 		"easyrdf/easyrdf": "0.9.*",
 
-		"drag-drop-touch-js/dragdroptouch": "*",
-
 		"fgelinas/timepicker": "0.3.3",
 		"fortawesome/font-awesome4": "4.7.*",
 		"fortawesome/font-awesome6": "6.1.*",

composer.lock

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

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

package-lock.json

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

public/css/Cis4/Cis.css

@@ -147,8 +147,6 @@ html {
 	--fhc-cis-menu-lvl-5-color-hover: var(--fhc-text);
 	--fhc-cis-grade-positive: var(--fhc-success);
 	--fhc-cis-grade-negative: var(--fhc-danger);
-
-  --fhc-offcanvas-zindex: 1045;
 }
 
 #themeSwitch i{
@@ -377,7 +375,7 @@ html {
 /* searchbar */
 #nav-search {
   background-color: var(--fhc-primary);
- 	z-index: calc(var(--fhc-offcanvas-zindex) + 1) !important;
+  z-index: 1;
 }
 #nav-search.me-3 {
   margin: 0 !important;
@@ -415,18 +413,10 @@ html {
 	color: var(--fhc-link) !important;
 }
 
-#nav-main {
-   	z-index: var(--fhc-offcanvas-zindex);
-}
-
 #nav-main-sticky {
 	max-height: calc(100vh - var(--fhc-cis-header-height));
 }
 
-#nav-user-menu {
-   	z-index: calc(var(--fhc-offcanvas-zindex) + 1);
-}
-
 #nav-user-menu img {
   object-fit: cover;
   height: calc( 3 * var(--fhc-cis-header-py));

public/css/components/dashboard.css

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

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

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

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

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

public/js/api/factory/lvPlan.js

@@ -16,12 +16,6 @@
  */
 
 export default {
-	getMyLvPlanViewData() {
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/LvPlan/myLvPlanViewData`,
-		};
-	},
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return {
 			method: 'post',
@@ -36,11 +30,11 @@ export default {
 			params: { start_date, end_date, lv_id }
 		};
 	},
-	eventsPersonal(start_date, end_date, uid = null) {
+	eventsPersonal(start_date, end_date) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/lvPlan/eventsPersonal',
-			params: { start_date, end_date, uid }
+			params: { start_date, end_date }
 		};
 	},
 	eventsLv(lv_id, start_date, end_date) {
@@ -63,11 +57,11 @@ export default {
 			params: { start_date, end_date }
 		};
 	},
-	getLvPlanReservierungen(start_date, end_date, uid = null) {
+	getLvPlanReservierungen(start_date, end_date) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/LvPlan/getReservierungen',
-			params: { start_date, end_date, uid }
+			params: { start_date, end_date }
 		};
 	},
 	getLehreinheitStudiensemester(lehreinheit_id) {
@@ -98,42 +92,5 @@ 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',
-		}
-	},
-	getCompactibleEventTypes(){
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/lvPlan/compactibleEventTypes',
-		}
-	},
+	}
 };

public/js/api/factory/otherLvPlan.js

@@ -1,25 +0,0 @@
-/**
- * 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 {
 	
-	getProfilViewData(uid = null) {
+	profilViewData(uid) {
 		let url = "/api/frontend/v1/Profil/profilViewData";
 		if(uid){
 			url += `/${uid}`;

public/js/api/factory/stgOrgLvPlan.js

@@ -1,25 +0,0 @@
-/**
- * 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/widget/bookmark.js

@@ -17,7 +17,6 @@
 
 export default {
 	getBookmarks() {
-
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/Bookmark/getBookmarks'
@@ -29,24 +28,18 @@ export default {
 			url: `/api/frontend/v1/Bookmark/delete/${bookmark_id}`
 		};
 	},
-	update({ bookmark_id, url, title, tag }) {
+	update({ bookmark_id, url, title, tag=null }) {
 		return {
 			method: 'post',
 			url: `/api/frontend/v1/Bookmark/update/${bookmark_id}`,
-			params: { url, title, tag }
+			params: { url, title }
 		};
 	},
-	insert({ url, title, tag, sort }) {
+	insert({ url, title, tag }) {
 		return {
 			method: 'post',
 			url: `/api/frontend/v1/Bookmark/insert`,
-			params: { url, title, tag, sort }
+			params: { url, title, tag }
 		}; 
-	},
-	changeOrder(bookmark_id1, bookmark_id2) {
-		return {
-			method: 'post',
-			url: `/api/frontend/v1/Bookmark/changeOrder/${bookmark_id1}/${bookmark_id2}`,
-		};
 	}
 };

public/js/apps/Cis.js

@@ -1,12 +1,11 @@
-import FhcSearchbar from "../../components/searchbar/searchbar.js";
-import CisMenu from "../../components/Cis/Menu.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";
+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 Theme from "../plugins/Theme.js";
 
 const app = Vue.createApp({
-    name: 'CisMenuApp',
+    name: 'CisApp',
     components: {
         FhcSearchbar,
         CisMenu
@@ -153,37 +152,7 @@ const app = Vue.createApp({
         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);

public/js/apps/Dashboard/Admin.js

@@ -3,10 +3,13 @@ import DashboardAdmin from '../../components/Dashboard/Admin.js';
 
 import PluginsPhrasen from '../../plugins/Phrasen.js';
 
+import ApiRenderers from '../../api/factory/renderers.js';
+
 const app = Vue.createApp({
 	name: 'DashboardAdminApp',
 	data: () => ({
-		appSideMenuEntries: {}
+		appSideMenuEntries: {},
+		renderers: null
 	}),
 	components: {
 		CoreNavigationCmpt,
@@ -14,16 +17,51 @@ const app = Vue.createApp({
 	},
 	provide() {
 		return {
+			// TODO(chris): move those two into the components that need it
+			renderers: Vue.computed(() => this.renderers),
 			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
 		};
+	},
+	created() {
+		this.$api
+			.call(ApiRenderers.loadRenderers())
+			.then(res => {
+				for (let rendertype of Object.keys(res.data)) {
+					let modalTitle = null;
+					let modalContent = null;
+					let calendarEvent = null;
+					if (res.data[rendertype].modalTitle)
+						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalTitle)));
+					if (res.data[rendertype].modalContent) 	
+						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalContent)));
+					if (res.data[rendertype].calendarEvent) 	
+						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].calendarEvent)));
+
+					if (res.data[rendertype].calendarEventStyles) {
+						var head = document.head;
+						if (!head.querySelector(`link[href="${res.data[rendertype].calendarEventStyles}"]`)) {
+							var link = document.createElement("link");
+							link.type = "text/css";
+							link.rel = "stylesheet";
+							link.href = res.data[rendertype].calendarEventStyles;
+							head.appendChild(link);
+						}
+					}
+
+					if (this.renderers === null) {
+						this.renderers = {};
+					}
+					if (!this.renderers[rendertype]) {
+						this.renderers[rendertype] = {}
+					}
+					this.renderers[rendertype].modalTitle = modalTitle;
+					this.renderers[rendertype].modalContent = modalContent;
+					this.renderers[rendertype].calendarEvent = calendarEvent;
+				}
+			})
+			.catch(this.$fhcAlert.handleSystemErrors);
 	}
 });
-app.use(primevue.config.default, {
-	zIndex: {
-		overlay: 9000,
-		tooltip: 8000
-	}
-})
 app.use(PluginsPhrasen);
 app.directive('tooltip', primevue.tooltip);
 app.mount('#main');

public/js/apps/Dashboard/Fhc.js

@@ -4,27 +4,25 @@ 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/MyLvPlan.js";
+import MyLvPlan from "../../components/Cis/LvPlan/Personal.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";
 import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
-import RoomInformation, {DEFAULT_MODE_RAUMINFO_DESKTOP, DEFAULT_MODE_RAUMINFO_MOBILE} from "../../components/Cis/Mylv/RoomInformation.js";
+import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/RoomInformation.js";
 import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
 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';
 import {capitalize} from "../../helpers/StringHelpers.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-const isMobile = window.matchMedia("(max-width: 767px)").matches;
 
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(`/${ciPath}`),
@@ -87,7 +85,7 @@ const router = VueRouter.createRouter({
 					name: "RoomInformation",
 					params: { // in this case always populate other params since they are not optional
 						ort_kurzbz: to.params.ort_kurzbz,
-						mode: isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP,
+						mode: DEFAULT_MODE_RAUMINFO,
 						focus_date: new Date().toISOString().split("T")[0]
 					},
 				};
@@ -104,7 +102,7 @@ const router = VueRouter.createRouter({
 				const mode = route.params.mode &&
 				validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
 					? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
-					: (isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP);
+					: DEFAULT_MODE_RAUMINFO;
 
 				// default to today date if not provided
 				const d = new Date(route.params.focus_date)
@@ -199,26 +197,6 @@ 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',
@@ -249,7 +227,7 @@ const router = VueRouter.createRouter({
 })
 
 const app = Vue.createApp({
-	name: 'CisApp',
+	name: 'FhcApp',
 	data: () => ({
 		appSideMenuEntries: {},
 		renderers: null,
@@ -260,11 +238,12 @@ const app = Vue.createApp({
 			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
 			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
 			return smallScreen;// && touchCapable;
-		},	
+		},
 	},
 	provide() {
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
+			renderers: Vue.computed(() => this.renderers),
 			isMobile: this.isMobile,
 		}	
 	},
@@ -303,6 +282,46 @@ const app = Vue.createApp({
 			}
 		}
 	},
+	async created(){
+		
+		await this.$api
+			.call(ApiRenderers.loadRenderers())
+			.then(res => res.data)
+			.then(data => {
+				for (let rendertype of Object.keys(data)) {
+					let modalTitle = null;
+					let modalContent = null;
+					let calendarEvent = null;
+					if (data[rendertype].modalTitle)
+						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
+					if (data[rendertype].modalContent) 	
+						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
+					if (data[rendertype].calendarEvent) 	
+						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
+
+					if (data[rendertype].calendarEventStyles){
+						var head = document.head;
+						if(!head.querySelector(`link[href="${data[rendertype].calendarEventStyles}"]`)){
+							var link = document.createElement("link");
+							link.type = "text/css";
+							link.rel = "stylesheet";
+							link.href = data[rendertype].calendarEventStyles;
+							head.appendChild(link);
+						}
+					}
+
+					if(this.renderers === null) {
+						this.renderers = {};
+					}
+					if (!this.renderers[rendertype]) {
+						this.renderers[rendertype] = {}
+					}
+					this.renderers[rendertype].modalTitle = modalTitle;
+					this.renderers[rendertype].modalContent = modalContent;
+					this.renderers[rendertype].calendarEvent = calendarEvent;
+				}
+			});
+	},
 	mounted() {
 		document.addEventListener('click', this.handleClick);
 		
@@ -334,4 +353,4 @@ app.mount('#fhccontent');
 
 router.afterEach((to, from, failure) => {
 	app.config.globalProperties.$api.call(ApiRouteInfo.info('cis4', to.fullPath));
-});
+});

public/js/apps/DashboardAdmin_DEPR.js

@@ -0,0 +1,16 @@
+import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
+import DashboardAdmin from '../components/Dashboard/Admin.js';
+import Phrases from "../plugin/Phrasen.js"
+
+Vue.createApp({
+  name: 'DashboardAdminApp',
+  data: () => ({
+      appSideMenuEntries: {}
+    }),
+  components: {
+    CoreNavigationCmpt,
+    DashboardAdmin
+  },
+  mounted() {
+  }
+}).use(Phrases).mount('#main');

public/js/components/Calendar/Base/DragAndDrop.js

@@ -20,8 +20,7 @@ export default {
 	},
 	inject: {
 		mode: "mode",
-		dropableEvents: "dropableEvents",
-		timezone: "timezone"
+		dropableEvents: "dropableEvents"
 	},
 	props: {
 		events: Array,

public/js/components/Calendar/Base/Grid/Line.js

@@ -1,5 +1,5 @@
-import LineEvent from "./Line/Event.js";
-import LineBackground from "./Line/Background.js";
+import LineEvent from './Line/Event.js';
+import LineBackground from './Line/Background.js';
 
 /**
  * TODO(chris):
@@ -10,117 +10,54 @@ export default {
 	name: "GridLine",
 	components: {
 		LineEvent,
-		LineBackground,
+		LineBackground
+	},
+	inject: {
+		axisRow: "axisRow"
 	},
-	inject: ["axisRow", "shouldCompactEvents", "compactibleEventTypes"],
 	props: {
 		date: {
 			type: luxon.DateTime,
-			required: true,
+			required: true
 		},
 		start: {
 			type: luxon.DateTime,
-			required: true,
+			required: true
 		},
 		end: {
 			type: luxon.DateTime,
-			required: true,
+			required: true
 		},
 		events: {
 			type: Array,
-			default: [],
+			default: []
 		},
 		backgrounds: {
 			type: Array,
-			default: [],
-		},
+			default: []
+		}
 	},
 	computed: {
-		formattedEvents() {
-			let formattedEvents = this.events.map((event) => {
-				event.rows = [1, -1];
+		eventsWithRowInfo() {
+			const events = [];
+			this.events.forEach(event => {
+				const rows = [1, -1];
 				if (event.startsHere) {
-					event.rows[0] =
-						"t_" + event.start.diff(this.date).toMillis();
+					rows[0] = 't_' + event.start.diff(this.date).toMillis();
 				}
 				if (event.endsHere) {
-					event.rows[1] = "t_" + event.end.diff(this.date).toMillis();
+					rows[1] = 't_' + event.end.diff(this.date).toMillis();
 				}
 
-				return event;
-			});
-
-			if (this.shouldCompactEvents && this.compactibleEventTypes?.length) {
-				formattedEvents =
-					this.compactEvents(formattedEvents, this.compactibleEventTypes);
-			}
-
-			return formattedEvents;
-		},
-	},
-	methods: {
-		compactEvents(events, compactibleEventTypes) {
-			let formattedEvents = events
-				.filter(
-					(event) =>
-						!compactibleEventTypes.includes(event.type),
-				)
-				.map((event) => {
-					event.display = "default";
-					return event;
+				events.push({
+					...event,
+					rows
 				});
-			let eventsToBeCompacted = events.filter((event) =>
-				compactibleEventTypes.includes(event.type),
-			);
-			let compactedEvents = [];
-
-			eventsToBeCompacted.forEach((event) => {
-				let existingCompactedEvent = compactedEvents.find(
-					(compactedEvent) =>
-						event.rows[0] === compactedEvent.rows[0] &&
-						event.rows[1] === compactedEvent.rows[1],
-				);
-
-				if (!existingCompactedEvent) {
-					compactedEvents.push({
-						events: [
-							{
-								farbe: event.orig.farbe,
-							},
-						],
-						rows: event.rows,
-					});
-				} else {
-					existingCompactedEvent.events.push({
-						farbe: event.orig.farbe,
-					});
-				}
 			});
-
-			compactedEvents.forEach((compactedEvent) => {
-				if (compactedEvent.events.length < 4) {
-					formattedEvents.push({
-						display: "compacted",
-						...compactedEvent,
-					});
-				} else {
-					formattedEvents.push({
-						display: "compacted",
-						events: compactedEvent.events.slice(0, 3),
-						rows: compactedEvent.rows,
-					});
-					formattedEvents.push({
-						display: "compactedExtra",
-						events: compactedEvent.events.slice(3),
-						rows: compactedEvent.rows,
-					});
-				}
-			});
-
-			return formattedEvents;
-		},
+			return events;
+		}
 	},
-	template: /* html */ `
+	template: /* html */`
 	<div
 		class="fhc-calendar-base-grid-line"
 		style="position:relative;display:grid;grid-auto-flow:dense"
@@ -132,37 +69,17 @@ export default {
 			:end="end"
 			:background="bg"
 		></line-background>
-		<template v-for="(event, i) in formattedEvents" :key="i">
-			<line-event
-				v-if="!event.display || event.display === 'default'"
-				:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
-				:event="event"
-			>
-				<template v-slot="slot">
-					<slot name="event" v-bind="slot" />
-				</template>
-			</line-event>
-			<div
-				v-else-if="event.display === 'compacted'"
-				:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
-				class="d-flex flex-row justify-content-center gap-1 align-items-center"
-			>
-				<i
-					v-for="(subEvent, subEventIndex) in event.events"
-					:key="subEventIndex"
-					class="fa-solid fa-circle fa-2xs"
-					:style="subEvent.farbe ? {color: '#' + subEvent.farbe} : {}"
-				></i>
-			</div>
-			<div
-				v-else-if="event.display === 'compactedExtra'"
-				:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
-				class="w-100 d-flex flex-row justify-content-center"
-			>
-				{{"+" + event.events.length}}
-			</div>
-		</template>
+		<line-event
+			v-for="(event, i) in eventsWithRowInfo"
+			:key="i"
+			:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
+			:event="event"
+		>
+			<template v-slot="slot">
+				<slot name="event" v-bind="slot" />
+			</template>
+		</line-event>
 		<slot name="dropzone" />
 	</div>
-	`,
-};
+	`
+}

public/js/components/Calendar/LvPlan.js

@@ -3,20 +3,24 @@ import FhcCalendar from "./Base.js";
 import ApiLvPlan from '../../api/factory/lvPlan.js';
 
 import { useEventLoader } from '../../composables/EventLoader.js';
-import { useRenderers } from '../../composables/Renderers.js';
 
 import ModeDay from './Mode/Day.js';
 import ModeWeek from './Mode/Week.js';
 import ModeMonth from './Mode/Month.js';
-import ModeList from './Mode/List.js';
 
 export default {
 	name: "CalendarLvPlan",
 	components: {
 		FhcCalendar
 	},
-	inject: ["isMobile"],
+	inject: [
+		"renderers"
+	],
 	props: {
+		timezone: {
+			type: String,
+			required: true
+		},
 		date: {
 			type: [Date, String, Number, luxon.DateTime],
 			default: luxon.DateTime.local()
@@ -30,16 +34,6 @@ export default {
 			required: true
 		}
 	},
-	provide() {
-		return {
-			shouldCompactEvents: Vue.computed(
-				() => this.$props.mode === "Month" && this.isMobile,
-			),
-			compactibleEventTypes: Vue.computed(
-				() => this.compactibleEventTypes,
-			),
-		};
-	},
 	emits: [
 		"update:date",
 		"update:mode",
@@ -47,7 +41,11 @@ export default {
 	],
 	data() {
 		return {
-			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+			modes: {
+				day: Vue.markRaw(ModeDay),
+				week: Vue.markRaw(ModeWeek),
+				month: Vue.markRaw(ModeMonth)
+			},
 			modeOptions: {
 				day: {
 					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
@@ -55,13 +53,9 @@ export default {
 				},
 				week: {
 					collapseEmptyDays: false
-				},
-				list: {
-					length: 7,
-				},
+				}
 			},
-			teachingunits: null,
-			compactibleEventTypes: [],
+			teachingunits: null
 		};
 	},
 	computed: {
@@ -83,20 +77,7 @@ export default {
 					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
 				}
 			];
-		},
-		modes() {
-			let modes = {
-				day: Vue.markRaw(ModeDay),
-				month: Vue.markRaw(ModeMonth),
-			};
-			if (this.isMobile) {
-				modes.list = Vue.markRaw(ModeList);
-			} else {
-				modes.week = Vue.markRaw(ModeWeek);
-			}
-
-			return modes;
-		},
+		}
 	},
 	methods: {
 		eventStyle(event) {
@@ -107,47 +88,33 @@ export default {
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;
 			this.$emit('update:range', rangeInterval);
-		},
-		resetEventLoader() {
-			this.reset();
-		},
-		async getStunden() {
-			let stundenResponse = await this.$api.call(ApiLvPlan.getStunden());
-			this.teachingunits = stundenResponse.data.map((el) => ({
-				id: el.stunde,
-				start: el.beginn,
-				end: el.ende,
-			}));
-		},
-		async getCompactibleEventTypes() {
-			let compactibleEventTypesResponse = await this.$api.call(
-				ApiLvPlan.getCompactibleEventTypes(),
-			);
-			this.compactibleEventTypes = compactibleEventTypesResponse.data;
-		},
+		}
 	},
 	setup(props, context) {
 		const rangeInterval = Vue.ref(null);
 		
-		const { events, lv, reset } = useEventLoader(rangeInterval, props.getPromiseFunc);
+		const { events, lv } = useEventLoader(rangeInterval, props.getPromiseFunc);
 
 		Vue.watch(lv, newValue => {
 			context.emit('update:lv', newValue);
 		});
 
-		const { renderers } = useRenderers();
-
 		return {
 			rangeInterval,
 			events,
-			lv,
-			reset,
-			renderers
+			lv
 		};
 	},
-	async created() {
-		await this.getStunden();
-		await this.getCompactibleEventTypes();
+	created() {
+		this.$api
+			.call(ApiLvPlan.getStunden())
+			.then(res => {
+				return this.teachingunits = res.data.map(el => ({
+					id: el.stunde,
+					start: el.beginn,
+					end: el.ende
+				}));
+			});
 	},
 	template: /* html */`
 	<fhc-calendar
@@ -169,13 +136,6 @@ export default {
 	>
 		<template v-slot="{ event, mode }">
 			<div
-				v-if="!event"
-				class="h-100 d-flex justify-content-center align-items-center"
-			>
-				{{ $p.t('lehre/noLvFound') }}
-			</div>
-			<div
-				v-else
 				:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
 				:type="mode == 'day' ? 'button' : undefined"
  				:style="eventStyle(event)"

public/js/components/Calendar/Mode/List.js

@@ -93,7 +93,7 @@ export default {
 	mounted() {
 		this.$emit('update:range', this.range);
 	},
-	template: /*html*/ `
+	template: `
 	<div
 		class="fhc-calendar-mode-list flex-grow-1 position-relative"
 		@cal-click-default.capture="handleClickDefaults"

public/js/components/Calendar/Widget.js

@@ -1,7 +1,6 @@
 import FhcCalendar from "./Base.js";
 
 import { useEventLoader } from '../../composables/EventLoader.js';
-import { useRenderers } from '../../composables/Renderers.js';
 
 import ModeList from '../Calendar/Mode/List.js';
 
@@ -10,17 +9,22 @@ export default {
 	components: {
 		FhcCalendar
 	},
+	inject: [
+		"renderers"
+	],
 	props: {
+		timezone: {
+			type: String,
+			required: true
+		},
 		getPromiseFunc: {
 			type: Function,
 			required: true
 		}
 	},
 	data() {
-		const timezone = FHC_JS_DATA_STORAGE_OBJECT.timezone;
 		return {
-			timezone,
-			now: luxon.DateTime.now().setZone(timezone),
+			now: luxon.DateTime.now().setZone(this.timezone),
 			modes: {
 				list: Vue.markRaw(ModeList)
 			},
@@ -55,12 +59,10 @@ export default {
 		const rangeInterval = Vue.ref(null);
 		
 		const { events } = useEventLoader(rangeInterval, props.getPromiseFunc);
-		const { renderers } = useRenderers();
 
 		return {
 			rangeInterval,
-			events,
-			renderers
+			events
 		};
 	},
 	template: /* html */`

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

@@ -42,6 +42,14 @@ 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,6 +31,16 @@ 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,7 +3,6 @@ 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",
@@ -25,6 +24,14 @@ export const AbgabetoolStudent = {
 		student_uid_prop: {
 			default: null
 		},
+		viewData: {
+			type: Object,
+			required: true,
+			default: () => ({uid: ''}),
+			validator(value) {
+				return value && value.uid
+			}
+		}
 	},
 	data() {
 		return {
@@ -37,18 +44,9 @@ export const AbgabetoolStudent = {
 			detail: null,
 			projektarbeiten: null,
 			selectedProjektarbeit: null,
-			moodle_link: null,
-			uid: null,
+			moodle_link: 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
@@ -260,11 +258,18 @@ export const AbgabetoolStudent = {
 		},
 		handleDownloadBeurteilung2(projektarbeit) {
 			window.open(projektarbeit.beurteilung2)
+		}
+	},
+	watch: {
+
+	},
+	computed: {
+		isViewMode() {
+			return this.student_uid !== this.viewData.uid
 		},
-		async fetchAuthUID() {
-			const authIdResponse = await this.$api.call(ApiAuthinfo.getAuthUID());
-			this.uid = authIdResponse.data.uid;
-		},
+		student_uid() {
+			return this.student_uid_prop || this.viewData?.uid || null
+		}
 	},
 	async created() {
 		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
@@ -297,8 +302,6 @@ export const AbgabetoolStudent = {
 		}).catch(e => {
 			this.loading = false
 		})
-
-		await this.fetchAuthUID();
 	},
 	mounted() {
 		this.setupMounted()

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

@@ -10,6 +10,14 @@ 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/Cms/News.js

@@ -2,137 +2,115 @@ import Pagination from "../../Pagination/Pagination.js";
 import StudiengangInformation from "./StudiengangInformation/StudiengangInformation.js";
 import BsConfirm from "../../Bootstrap/Confirm.js";
 
-import ApiCms from "../../../api/factory/cms.js";
+import ApiCms from '../../../api/factory/cms.js';
 
 export default {
 	name: "NewsComponent",
-	components: {
-		Pagination,
-		StudiengangInformation,
-	},
-	inject: ["isMobile"],
-	data() {
-		return {
-			content: null,
-			maxPageCount: 0,
-			page_size: 10,
-			page: 1,
-		};
-	},
-	watch: {
-		"$p.user_language.value": function (sprache) {
-			this.fetchNews();
-		},
-	},
-	computed: {
-		sprache: function () {
-			return this.$p.user_language.value;
-		},
-	},
-	methods: {
-		async fetchNews() {
-			let newsResponse = await this.$api.call(
-				ApiCms.getNews(this.page, this.page_size, this.sprache),
-			);
-			this.content = newsResponse.data;
-
-			document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
-				el.addEventListener("click", (evt) => {
-					evt.preventDefault();
-					BsConfirm.popup(el.dataset.confirm)
-						.then(() => {
-							Axios.get(el.href)
-								.then((res) => {
-									// TODO(chris): check for success then show message and/or reload
-									location = location;
-								})
-								.catch((err) => console.error("ERROR:", err));
-						})
-						.catch(() => {});
-				});
-			});
-			document.querySelectorAll("#cms [data-href]").forEach((el) => {
-				el.href = el.dataset.href.replace(
-					/^ROOT\//,
-					FHC_JS_DATA_STORAGE_OBJECT.app_root,
-				);
-			});
-
-			await this.$nextTick();
-			this.formatExternalHtml();
-		},
-		async loadNewPageContent(data) {
-			let newsResponse = await this.$api.call(
-				ApiCms.getNews(data.page, data.rows),
-			);
-			this.content = newsResponse.data;
-
-			await this.$nextTick();
-
-			this.formatExternalHtml();
-		},
-		formatExternalHtml() {
-			document
-				.querySelectorAll(".news-list-item .card-header")
-				.forEach((el) => {
-					el.classList.add("fhc-primary");
-				});
-			document.querySelectorAll(".news-list-item .row").forEach((el) => {
-				el.classList.add("w-100");
-				el.classList.add("align-items-center");
-			});
-			document
-				.querySelectorAll(".news-list-item .row h2")
-				.forEach((el) => {
-					el.classList.add("mb-0");
-				});
-		},
-		afterPageUpdated(event) {
-			this.page = event.page;
-			this.page_size = event.rows;
-			this.$refs.newsPageHeading.scrollIntoView({block: 'end'});
-			this.loadNewPageContent(event);
-		},
-	},
-	created() {
+  components: {
+    Pagination,
+	StudiengangInformation,
+  },
+  data() {
+    return {
+      content: null,
+      maxPageCount: 0,
+      page_size: 10,
+	  page:1,
+    };
+  },
+  watch:{
+	'$p.user_language.value':function(sprache){
 		this.fetchNews();
+	}
+  },
+  computed:{
+	sprache: function(){
+		return this.$p.user_language.value;
+	},
+  },
+  methods: {
+		fetchNews() {
+			return this.$api
+				.call(ApiCms.getNews(this.page, this.page_size, this.sprache))
+				.then(res => res.data)
+				.then(result => {
+					this.content = result;
+
+					document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
+						el.addEventListener("click", (evt) => {
+							evt.preventDefault();
+							BsConfirm.popup(el.dataset.confirm)
+								.then(() => {
+									Axios.get(el.href)
+										.then((res) => {
+											// TODO(chris): check for success then show message and/or reload
+											location = location;
+										})
+										.catch((err) => console.error("ERROR:", err));
+								})
+								.catch(() => {
+								});
+						});
+					});
+					document.querySelectorAll("#cms [data-href]").forEach((el) => {
+						el.href = el.dataset.href.replace(
+							/^ROOT\//,
+							FHC_JS_DATA_STORAGE_OBJECT.app_root
+						);
+					});
+					Vue.nextTick(()=>{
+						document.querySelectorAll(".card-header").forEach((el) => {
+							el.classList.add("fhc-primary");
+						});
+						document.querySelectorAll(".row").forEach((el) => {
+							el.classList.add("w-100");
+							el.classList.add("align-items-center");
+							
+						});
+						document.querySelectorAll(".row h2").forEach((el) => {
+							el.classList.add("mb-0");
+						});
+
+					})
+				});
+		},
+		loadNewPageContent(data) {
+			this.$api
+				.call(ApiCms.getNews(data.page, data.rows))
+				.then(res => res.data)
+				.then(result => {
+					this.content = result;
+					
+				});
+		}
+  },
+  created() {
+    this.fetchNews();
 
 		this.$api
 			.call(ApiCms.getNewsRowCount())
-			.then((res) => res.data)
-			.then((result) => {
+			.then(res => res.data)
+			.then(result => {
 				this.maxPageCount = result;
 			});
-	},
-	template: /*html*/ `
-	<div :class="{'pb-3': isMobile}" class="overflow-x-hidden">
-  		<h2 ref="newsPageHeading" class="fhc-primary-color">News</h2>
-		<hr/>
-		<pagination
-			v-show="content?true:false"
-			:page="page"
-			:page_size="page_size"
-			@pageUpdated="afterPageUpdated($event)"
-			:maxPageCount="maxPageCount"
-		></pagination>
-		<div class="container-fluid mt-4">
-			<div class="row">
-				<div class="col" v-html="content">
-				</div>
-				<div class="col-auto">
-					<div style="width:15rem">
-						<studiengang-information></studiengang-information>
-					</div>
+  },
+  template: /*html*/ `
+  	<h2 class="fhc-primary-color">News</h2>
+	<hr/>
+	<pagination v-show="content?true:false" :page_size="page_size"  @page="page=$event.page; loadNewPageContent($event)" :maxPageCount="maxPageCount">
+	</pagination>
+	<div class="container-fluid mt-4">
+		<div class="row">
+			<div class="col" v-html="content">
+			</div>
+			<div class="col-auto">
+				<div style="width:15rem">
+					<studiengang-information></studiengang-information>
 				</div>
 			</div>
 		</div>
-		<pagination
-			v-show="content?true:false"
-			:page="page"
-			:page_size="page_size"
-			@pageUpdated="afterPageUpdated($event)"
-			:maxPageCount="maxPageCount"
-		></pagination>
 	</div>
+	<pagination v-show="content?true:false" :page_size="page_size"  @page="loadNewPageContent" :maxPageCount="maxPageCount">
+	</pagination>
     `,
 };

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

@@ -3,8 +3,7 @@ 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_MOBILE = 'List';
-export const DEFAULT_MODE_LVPLAN_DESKTOP = 'Week';
+export const DEFAULT_MODE_LVPLAN = 'Week'
 
 export default {
 	name: 'LvPlanLehrveranstaltung',
@@ -20,21 +19,15 @@ export default {
 			lv: null
 		};
 	},
-	inject: ["isMobile"],
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
-			let validModes = ['day', 'month'];
-			validModes.push(this.isMobile ? 'list' : 'week');
-
-			const defaultMode = this.isMobile ? DEFAULT_MODE_LVPLAN_MOBILE : DEFAULT_MODE_LVPLAN_DESKTOP;
-
-			if (!this.propsViewData?.mode || !validModes.includes(this.propsViewData?.mode.toLowerCase()))
-				return defaultMode;
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
 			return this.propsViewData?.mode;
 		},
 		currentLv() {
@@ -102,6 +95,7 @@ export default {
 		<fhc-calendar
 			v-else-if="lv"
 			ref="calendar"
+			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

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

@@ -3,8 +3,7 @@ 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_MOBILE = 'List';
-export const DEFAULT_MODE_LVPLAN_DESKTOP = 'Week';
+export const DEFAULT_MODE_LVPLAN = 'Week'
 
 export default {
 	name: 'LvPlan',
@@ -12,32 +11,31 @@ 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,
-			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+			lv: null
 		};
 	},
-	inject: ["isMobile"],
 	computed:{
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 		},
 		currentMode() {
-			const defaultMode = this.isMobile ? DEFAULT_MODE_LVPLAN_MOBILE : DEFAULT_MODE_LVPLAN_DESKTOP;
-			return this.propsViewData?.mode || defaultMode;
+			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
 		},
 		downloadLinks() {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
 			
-			const opts = { zone: this.timezone };
+			const opts = { zone: this.viewData.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -117,7 +115,7 @@ export default {
 		<fhc-calendar
 			ref="calendar"
 			v-model:lv="lv"
-			:timezone="timezone"
+			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

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

@@ -1,269 +0,0 @@
-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_DESKTOP = "Week";
-export const DEFAULT_MODE_LVPLAN_MOBILE = "List";
-
-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,
-		};
-	},
-	inject: ["isMobile"],
-	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() {
-			let validModes = ["day", "month"];
-			validModes.push(this.isMobile ? "list" : "week");
-
-			const defaultMode = this.isMobile
-				? DEFAULT_MODE_LVPLAN_MOBILE
-				: DEFAULT_MODE_LVPLAN_DESKTOP;
-
-			if (
-				!this.propsViewData?.mode ||
-				!validModes.includes(this.propsViewData?.mode.toLowerCase())
-			)
-				return defaultMode;
-			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/Personal.js

@@ -3,8 +3,7 @@ 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_DESKTOP = "Week";
-export const DEFAULT_MODE_LVPLAN_MOBILE = "List";
+export const DEFAULT_MODE_LVPLAN = 'Week'
 
 export default {
 	name: 'LvPlanPersonal',
@@ -12,6 +11,7 @@ export default {
 		FhcCalendar
 	},
 	props: {
+		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
 	},
 	data() {
@@ -21,30 +21,18 @@ export default {
 			studiensemester_ende: null,
 			uid: null,
 			isMitarbeiter: false,
-			isStudent: false,
-			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
+			isStudent: false
 		};
 	},
-	inject: ["isMobile"],
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.timezone).toISODate();
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
-			let validModes = ["day", "month"];
-			validModes.push(this.isMobile ? "list" : "week");
-
-			const defaultMode = this.isMobile
-				? DEFAULT_MODE_LVPLAN_MOBILE
-				: DEFAULT_MODE_LVPLAN_DESKTOP;
-
-			if (
-				!this.propsViewData?.mode ||
-				!validModes.includes(this.propsViewData?.mode.toLowerCase())
-			)
-				return defaultMode;
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
 			return this.propsViewData?.mode;
 		},
 		downloadLinks() {
@@ -59,7 +47,7 @@ export default {
 				return;
 			}
 
-			const opts = { zone: this.timezone };
+			const opts = { zone: this.viewData.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -114,18 +102,16 @@ 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;
-		},
+		}
 	},
-	async created() {
-		await this.fetchAuthInfo();
+	created() {
+		this.$api
+			.call(ApiAuthinfo.getAuthInfo())
+			.then(res => {
+				this.uid = res.data.uid;
+				this.isMitarbeiter = res.data.isMitarbeiter;
+				this.isStudent = res.data.isStudent;
+			});
 	},
 	template: /*html*/`
 	<div class="cis-lvplan-personal d-flex flex-column h-100">
@@ -137,9 +123,8 @@ export default {
 		</h2>
 		<hr>
 		<fhc-calendar
-			v-if="timezone"
 			ref="calendar"
-			:timezone="timezone"
+			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

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

@@ -1,413 +0,0 @@
-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_DESKTOP = "Week";
-export const DEFAULT_MODE_LVPLAN_MOBILE = "List";
-
-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,
-		};
-	},
-	inject: ["isMobile"],
-	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() {
-			let validModes = ["day", "month"];
-			validModes.push(this.isMobile ? "list" : "week");
-
-			const defaultMode = this.isMobile
-				? DEFAULT_MODE_LVPLAN_MOBILE
-				: DEFAULT_MODE_LVPLAN_DESKTOP;
-
-			if (
-				!this.propsViewData?.mode ||
-				!validModes.includes(this.propsViewData?.mode.toLowerCase())
-			)
-				return defaultMode;
-			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(){
-			if(!this.listSem)
-				this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
-		},
-		loadListVerband() {
-			this.$api
-				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.sem, 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.sem, 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;
-
-			//ensure loading dropdown arrays for version propsView
-			if(!this.listVerband.length && this.formData.sem)
-			{
-				this.loadListVerband();
-			}
-			if(!this.listGroup.length && this.formData.verband)
-			{
-				this.loadListGroup();
-			}
-		}
-	},
-	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

@@ -1,187 +0,0 @@
-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/Menu.js

@@ -30,7 +30,6 @@ export default {
 			menuOpen:true,
         };
     },
-	inject: ["isMobile"],
 	provide(){
 		return{
 			setActiveEntry: this.setActiveEntry,
@@ -59,7 +58,7 @@ export default {
 		},
 		site_url(){
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		},
+		}
 	},
 	methods: {
 		fetchMenu() {
@@ -113,26 +112,10 @@ export default {
 		});
 	},
     template: /*html*/`
-	<div
-		id="header-options-collapsible"
-		class="collapse multi-collapse collapse-horizontal show"
-	>
-		<div class="d-flex flex-row align-items-center gap-2 h-100" style="width: 79px">
-			<button id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-			<span v-if="isMobile" class="d-flex flex-row align-items-center">
-				<theme-switch></theme-switch>
-			</span>
-		</div>
-	</div>
-	<fhc-searchbar
-		:searchoptions="searchbaroptions"
-		:searchfunction="searchfunction"
-		ref="searchbar"
-		id="nav-search"
-		class="fhc-searchbar w-100 py-1 py-lg-2"
-	></fhc-searchbar>
+	<button id="nav-main-btn" class="navbar-toggler rounded-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+	<fhc-searchbar ref="searchbar" id="nav-search" class="fhc-searchbar w-100 py-1 py-lg-2" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
     <div id="nav-logo" class="d-none d-lg-block">
 		<div class="d-flex h-100 justify-content-between">
 			<a :href="rootUrl">
@@ -141,32 +124,22 @@ export default {
 			<theme-switch></theme-switch>
 		</div>
     </div>
-
-	<div
-		id="header-usermenu-collapsible"
-		class="collapse multi-collapse collapse-horizontal show"
-	>
-		<div
-			:style="!isMobile ? '' : 'width: 51px'"
-			id="nav-user"
-		>
-			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-				<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
-			</button>
-			<ul ref="navUserDropdown"
-			@[\`shown.bs.collapse\`]="handleShowNavUser"
-			@[\`hide.bs.collapse\`]="handleHideNavUser"
-			id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
-				<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
-				<li >
-					<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
-				</li>
-				<li><hr class="dropdown-divider m-0 "></li>
-				<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
-			</ul>
-		</div>
+	<div id="nav-user">
+		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+			<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
+		</button>
+		<ul ref="navUserDropdown"
+		@[\`shown.bs.collapse\`]="handleShowNavUser"
+		@[\`hide.bs.collapse\`]="handleHideNavUser"
+		id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
+			<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
+			<li >
+				<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
+			</li>
+			<li><hr class="dropdown-divider m-0 "></li>
+			<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+		</ul>
 	</div>
-
     <nav id="nav-main" class="offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
 			<div id="nav-main-toggle" class="position-static d-none d-lg-block ">

public/js/components/Cis/Menu/Entry.js

@@ -68,8 +68,41 @@ export default {
 				return false;
 			}
 		},
+        link() {
+            if (this.entry.template_kurzbz == 'redirect') {
+                if (!this.entry.content)
+                    return '';
+                let xmlDoc = (new DOMParser()).parseFromString(this.entry.content,"text/xml");
+                let url = xmlDoc.getElementsByTagName('url')[0];
+
+                if (!url)
+                    return '';
+                // TODO(chris): replace get params
+                url = url.childNodes[0].nodeValue + "";
+				if (url.includes("../cms/news.php")) {
+					let news_regex = new RegExp("^\.\./cms/news\.php");
+					url = url.replace(news_regex, FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/news');
+				}
+				else if (url.includes("../cms/content.php?")) {
+					let content_regex = new RegExp("^\.\./cms/content.php\\?content_id=([0-9]+)");
+					let content_regex_result = content_regex.exec(url);
+					// content_regex_result[1] will be the first matched group
+					return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/content/' + content_regex_result[1];
+				}
+				else if(url.includes("../index.ci.php")){
+					let index_regex = new RegExp("^\.\./index\.ci\.php");
+					url = url.replace(index_regex, FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router);
+				}
+				else if (url.includes("../")) {
+					let relative_regex = new RegExp("^\.\./");
+					url = url.replace(relative_regex, FHC_JS_DATA_STORAGE_OBJECT.app_root);
+				}
+				return url;
+            }
+            return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/CisVue/Cms/content/' + this.entry.content_id;
+        },
 		hasFullLink() {
-			return this.entry.url.startsWith(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router)
+			return this.link.startsWith(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router)
 		},
         target() {
             if (this.entry.template_kurzbz == 'redirect') {
@@ -112,7 +145,7 @@ export default {
 			this.addUrlCount(count);
 		},
 		checkActiveUrl(url){
-			this.getUrlMatchPoints(url,this.entry.url);
+			this.getUrlMatchPoints(url,this.link);
 			
 			let url_hash_spaceSymbol_regex = new RegExp("%20","gi");
 			let url_hash_sharpSymbol_regex = new RegExp("^#");
@@ -122,7 +155,7 @@ export default {
 			// if the url hash contains the titel of the menu 
 			// or if the url equals the link of a menu 
 			// then set the menu active 
-			if (url_hash == this.entry.titel || url.href == this.entry.url) {
+			if (url_hash == this.entry.titel || url.href == this.link) {
 					this.setActiveEntry(this.entry.content_id);
 			}
 		},
@@ -171,7 +204,7 @@ export default {
         <template v-if="hasChilds">
 			<div class="btn-group w-100">
  				<a :target="target" 
- 					:href="(entry.menu_open && hasFullLink) ? entry.url : null"
+ 					:href="(entry.menu_open && hasFullLink)?link:null"
 					@click="toggleCollapse"
                     :class="{
                         'btn btn-default rounded-0 text-start': true,
@@ -194,7 +227,7 @@ export default {
             </ul>
         </template>
 		<a v-else
-            :href="entry.url"
+            :href="link"
             :target="target"
             :class="{
                 'btn btn-default rounded-0 w-100 text-start': true,

public/js/components/Cis/Mylv/LvUebersicht.js

@@ -100,7 +100,7 @@ export default  {
 			</template>
 			<template v-else>
 				<span v-if="event?.lehrfach_bez ">{{event?.lehrfach_bez + (event?.stg_kurzbzlang?' / ' + event?.stg_kurzbzlang:'')}}</span>
-				<span v-else>{{$p.t('lehre','lvUebersicht')}}</span>
+				<span v-else>Lehrveranstaltungs Übersicht</span>
 			</template>
 
         </template>

public/js/components/Cis/Mylv/RoomInformation.js

@@ -2,8 +2,7 @@ import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 
-export const DEFAULT_MODE_RAUMINFO_MOBILE = 'List';
-export const DEFAULT_MODE_RAUMINFO_DESKTOP = 'Week';
+export const DEFAULT_MODE_RAUMINFO = 'Week'
 
 export default {
 	name: "RoomInformation",
@@ -14,14 +13,12 @@ export default {
 		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
 	},
-	inject: ["isMobile"],
 	computed: {
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 		},
 		currentMode() {
-			const defaultMode = this.isMobile ? DEFAULT_MODE_RAUMINFO_MOBILE : DEFAULT_MODE_RAUMINFO_DESKTOP;
-			return this.propsViewData?.mode || defaultMode;
+			return this.propsViewData?.mode || DEFAULT_MODE_RAUMINFO;
 		}
 	},
 	methods:{
@@ -54,6 +51,7 @@ export default {
 		<hr>
 		<fhc-calendar 
 			ref="calendar"
+			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Cis/Mylv/Semester/Studiengang.js

@@ -1,11 +1,9 @@
 import MylvSemesterStudiengangLv from "./Studiengang/Lv.js";
-import MylvSemesterStudiengangAverageGrade from "./Studiengang/AverageGrade.js";
 import Phrasen from "../../../../mixins/Phrasen.js";
 
 export default {
 	components: {
-		MylvSemesterStudiengangLv,
-		MylvSemesterStudiengangAverageGrade
+		MylvSemesterStudiengangLv
 	},
 	mixins: [
 		Phrasen
@@ -31,10 +29,9 @@ export default {
 	methods: {
 		note(lv) {
 			return lv.benotung ? lv.znote || lv.lvnote || null : null;
-		},
+		}
 	},
 	template: `<div class="card mb-3">
-
 		<div class="card-body">
 			<h4 class="card-title mb-3">{{$p.user_language.value === 'English' ? sg_bezeichnung_eng : bezeichnung}} - {{kuerzel}}
 				<small>{{semester}}.{{$p.t('lehre/semester')}}</small>
@@ -44,7 +41,6 @@ export default {
 					<mylv-semester-studiengang-lv v-bind="lv" class="text-center h-100"></mylv-semester-studiengang-lv>
 				</div>
 			</div>
-			<mylv-semester-studiengang-average-grade :lvs="lvs" />
 		</div>
 	</div>`
 };

public/js/components/Cis/Mylv/Semester/Studiengang/AverageGrade.js

@@ -1,94 +0,0 @@
-import Phrasen from "../../../../../mixins/Phrasen.js";
-
-export default {
-	mixins: [
-		Phrasen
-	],
-	props: {
-		lvs: Array,
-	},
-	data: ( ) =>{
-		return {
-			gradeAverage: null,
-			gradeWeightedAverage: null,
-			existingGrades: false
-		}
-	},
-	methods: {
-		calculateAverages(){
-			let sum = 0;
-			let count = 0;
-			let sumWeighted = 0;
-			let sumEcts = 0;
-
-			this.lvs.forEach((lv) => {
-				if ((lv.znote >= 1 && lv.znote <= 5) && lv.znote!= null) {
-					this.existingGrades = true;
-					sum+= lv.znote;
-					count++;
-					sumWeighted += lv.znote * Number(lv.ects);
-					sumEcts += Number(lv.ects);
-				}
-			});
-			this.gradeAverage = (sum/count).toFixed(2);
-			this.gradeWeightedAverage = (sumWeighted/sumEcts).toFixed(2);
-		}
-	},
-	watch: {
-		lvs: {
-			handler() {
-				this.calculateAverages();
-			},
-			deep: true,
-			immediate: true
-		}
-	},
-	mounted(){
-		this.calculateAverages();
-	},
-	template: /*html*/`
-	<div class="card mylv-semester-studiengang-grades">
-
-		<div class="card-header text-center">
-			<h6>{{$p.t('lehre/notenstatistik')}}</h6>
-		</div>
-
-		<div v-if="existingGrades">
-			<table class="card-body table w-auto mx-auto">
-			  <tbody>
-				<tr>
-				  <td class="text-end">
-					{{$p.t('lehre/headerAverage')}}
-				  </td>
-				  <td class="text-start">
-					{{ gradeAverage }}
-				  </td>
-				</tr>
-				<tr>
-				  <td class="text-end">
-					{{$p.t('lehre/headerWeightedAverage')}}
-				  </td>
-				  <td class="text-start">
-					{{ gradeWeightedAverage }}
-				  </td>
-				</tr>
-			  </tbody>
-			</table>
-		</div>
-		<div v-else class="card-body text-center">
-			<p>{{$p.t('lehre/info_noGradesYet')}}</p>
-		</div>
-
-		<div v-if="existingGrades" class="card-footer d-flex align-items-start text-muted small">
-		  <i class="fa fa-circle-info me-2 mt-1"></i>
-		  <div>
-			<strong>{{$p.t('ui', 'hinweis')}}</strong><br>
-			* {{$p.t('lehre/noticeAverage')}}
-			<br>
-			** {{$p.t('lehre/noticeWeightedAverage')}}
-		  </div>
-		</div>
-
-	</div>
-	`
-}

public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js

@@ -73,11 +73,11 @@ export default {
 		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
-			// no more showing of grade LV, if grade Zeugnis is not existing yet
 			if(this.benotung && this.znotebez?.length) {
 				return this.znotebez[languageIndex]
-			}
-			else return null
+			} else if(this.benotung && this.lvnotebez?.length) {
+				return this.lvnotebez[languageIndex]
+			} else return null
 		},
 		LvHasPruefungenInformation(){
 			return this.pruefungenData && this.pruefungenData.length > 0;

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

@@ -9,7 +9,6 @@ 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';
@@ -27,7 +26,6 @@ export default {
 		ProfilEmails,
 		RoleInformation,
 		ProfilInformation,
-		CalendarSync,
 	},
 
 	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
@@ -105,6 +103,7 @@ export default {
 					},
 				],
 			},
+
 			betriebsmittel_table_options: {
 				persistenceID: "filterTableMaProfilBetriebsmittel",
 				persistence: {
@@ -161,7 +160,6 @@ export default {
 	props: {
 		data: Object,
 		editData: Object,
-		calendarSyncUrls: Array,
 	},
 	
 	methods: {
@@ -298,11 +296,6 @@ export default {
 				}
 			};
 		},
-		quickLinks() {
-			let quickLinks = [];
-			//
-			return quickLinks;
-		},
 	},
 
 	created() {
@@ -320,6 +313,7 @@ export default {
 		});
 		//? sorts the profil Updates: pending -> accepted -> rejected
 		this.data.profilUpdates?.sort(this.sortProfilUpdates);
+
 	},
 	watch: {
 		'data.funktionen'(newVal) {
@@ -337,6 +331,12 @@ 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,11 +465,17 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-			<div v-if="quickLinks.length" class="row mb-4">
-				<div class="col">
-					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
-				</div>
-			</div>
+            <!--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>-->
             <!-- Bearbeiten Button -->
             <div class="row d-none d-md-block ">
                 <div class="col mb-3">
@@ -495,17 +501,12 @@ export default {
                     <ausweis-status :data="data.zutrittsdatum"></ausweis-status>
                 </div>
             </div>
-            <div class="row mb-3">
+            <div  class="row">
                 <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,65 +35,58 @@ 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
 					},
 				],
 			},
@@ -101,56 +94,47 @@ export default {
 	},
 
 	//? this is the prop passed to the dynamic component with the custom data of the view
-	props: ["data", "permissions"],
+	props: ["data"],
 	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);
-		},
-		"language.value"(newVal) {
-			// reevaluates computed phrasen
-			if (this.$refs.funktionenTable)
-				this.$refs.funktionenTable.tabulator.setColumns(
-					this.funktionen_table_options.columns,
-				);
+		'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)
+		}
 	},
 	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 {};
@@ -167,67 +151,42 @@ 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;
 		});
 	},
@@ -283,7 +242,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 -->
@@ -297,22 +256,26 @@ export default {
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
             <!-- VISIBLE UNTIL VIEWPORT MD -->
-			<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>
+            <!--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>
         <!-- 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,8 +46,11 @@ export const Profil = {
 	props: {
 		uid: {
 			type: String,
-			required: false,
+			required:false,
 		},
+		viewData: {
+			type: Object,
+		}
 	},
 	data() {
 		return {
@@ -59,19 +62,17 @@ export const Profil = {
 			data: null,
 			// notfound is null by default, but contains an UID if no user exists with that UID
 			notFoundUID: null,
-			isEditable: false,
-			authPermissions: null,
-			calendarSyncUrls: [],
+			isEditable: this.viewData.editable ?? false,
 		};
 	},
 	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;
@@ -129,12 +130,8 @@ 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;
 			},
@@ -142,8 +139,6 @@ export const Profil = {
 	},
 	methods: {
 		async load() {
-			await this.fetchViewData();
-
 			// fetch profilUpdateStates to provide them to children components
 			await this.$api
 				.call(ApiProfilUpdate.getStatus())
@@ -162,20 +157,20 @@ export const Profil = {
 				.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;
+			
+			
+			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);
+				});
+			
+			
 		},
 		zustellAdressenCount() {
 			if (!this.data || !this.data.adressen) {
@@ -191,7 +186,7 @@ export const Profil = {
 						})
 						.map((adresse) => {
 							return adresse.requested_change.adresse_id;
-						}),
+						})
 				);
 			}
 
@@ -202,9 +197,8 @@ 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(
@@ -214,11 +208,12 @@ export const Profil = {
 						})
 						.map((adr) => {
 							return adr.adresse_id;
-						}),
+						})
 				);
 			}
 
 			return [...new Set(adressenArray)];
+			
 		},
 		zustellKontakteCount() {
 			if (!this.data || !this.data.kontakte) {
@@ -231,17 +226,14 @@ 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
+								};
+						})
 				);
 			}
 
@@ -252,10 +244,8 @@ 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(
@@ -265,10 +255,10 @@ export const Profil = {
 						})
 						.map((kon) => {
 							return {
-								kontakt_id: kon.kontakt_id,
-								kontakttyp: kon.kontakttyp,
-							};
-						}),
+										kontakt_id: kon.kontakt_id,
+										kontakttyp: kon.kontakttyp
+								};
+						})
 				);
 			}
 
@@ -276,6 +266,7 @@ export const Profil = {
 		},
 	},
 	computed: {
+		
 		filteredEditData() {
 			if (!this.data) {
 				return;
@@ -339,12 +330,8 @@ 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) => {
@@ -360,18 +347,12 @@ 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 {
@@ -393,28 +374,23 @@ export const Profil = {
 				this.$refs.loadingModalRef.hide();
 			}
 		},
-		uid(newVal, oldVal) {
-			this.load();
-		},
+		uid (newVal, oldVal) {
+			this.load()
+		}
 	},
 	created() {
-		this.load();
+		this.load()
 	},
 	template: `
-	<div class="pb-4">
+	<div>
 		<div v-if="notFoundUID">
 			<h3>Es wurde keine Person mit der UID {{this.notFoundUID}} gefunden</h3>
 		</div>
 		<div v-else>
             <loading ref="loadingModalRef" :timeout="0"></loading>
-            <component
-				:is="view"
-				:data="data"
-				:editData="filteredEditData"
-				:permissions="authPermissions"
-				:calendarSyncUrls="calendarSyncUrls"></component>
+            <component  :is="view" :data="data" :editData="filteredEditData" ></component>
 		</div>
 	</div>`,
-};
+}
 
-export default Profil;
+export default Profil

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

@@ -1,54 +0,0 @@
-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,31 +1,53 @@
 export default {
-  name: "QuickLinks",
-  data() {
-    return {};
-  },
-  props: {
-    title: {
-      type: String,
-      required: true,
-    },
-    links: {
-      type: Array,
-      required: true,
-    },
-  },
-  template: `
+	//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*/ `
 <div class="card">
-    <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>
+    <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>
         </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>`,
 };

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

@@ -1,6 +1,7 @@
 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";
@@ -8,8 +9,6 @@ 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';
@@ -19,6 +18,7 @@ export default {
 		CoreFilterCmpt,
 		Mailverteiler,
 		AusweisStatus,
+		QuickLinks,
 		Adresse,
 		Kontakt,
 		ProfilEmails,
@@ -26,8 +26,6 @@ export default {
 		ProfilInformation,
 		FetchProfilUpdates,
 		EditProfil,
-		QuickLinks,
-		CalendarSync,
 	},
 	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
 	data() {
@@ -103,7 +101,6 @@ export default {
 	props: {
 		data: Object,
 		editData: Object,
-		calendarSyncUrls: Array,
 	},
 	provide() {
 		return {
@@ -243,11 +240,6 @@ export default {
 				}
 			};
 		},
-		quickLinks() {
-			let quickLinks = [];
-			//
-			return quickLinks;
-		},
 	},
 	created() {
 		// preload phrasen
@@ -273,7 +265,15 @@ 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,11 +403,12 @@ export default {
 		</div>
 		<!-- START OF SIDE PANEL -->
 		<div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-			<div v-if="quickLinks.length" class="row mb-4">
+			<!--TODO: uncomment when implemented
+			<div  class="row d-none d-md-block mb-3">
 				<div class="col">
-					<quick-links :title="$p.t('profil/quickLinks')" :links="quickLinks" />
+					<quick-links :title="$p.t('profil','quickLinks')"></quick-links>
 				</div>
-			</div>
+			</div>-->
 			<!-- Bearbeiten Button -->
 			<div class="row d-none d-md-block">
 				<div class="col mb-3">
@@ -433,18 +434,13 @@ export default {
 				</div>
 			</div>
 			<!-- START OF THE SECOND ROW IN THE SIDE PANEL -->
-            <div class="row mb-3">
+			<div  class="row">
 				<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,28 +1,30 @@
+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;
@@ -43,67 +45,66 @@ 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 -->
@@ -111,18 +112,12 @@ 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 -->
@@ -150,12 +145,17 @@ export default {
         </div>
         <!-- START OF SIDE PANEL -->
         <div  class="col-md-4 col-xxl-3 col-sm-12 text-break" >
-            <!-- 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>
+            <!-- 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 SECOND ROW IN THE SIDE PANEL -->
             <div  class="row">
                 <div class="col">

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

@@ -71,6 +71,11 @@ export const Raumsuche =  {
 			}
 			]};
 	},
+	computed: {
+		isDarkMode(){
+			return this.$theme.theme_name.value == 'dark';
+		}
+	},
 	methods: {
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
@@ -176,11 +181,6 @@ export const Raumsuche =  {
 			
 		}
 	},
-	computed: {
-		isDarkMode(){
-			return this.$theme.theme_name.value == 'dark';
-		}
-	},
 	created() {
 		this.phrasenPromise = this.$p.loadCategory(['rauminfo', 'global'])
 		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
@@ -195,27 +195,14 @@ export const Raumsuche =  {
 		<div :class="{'pb-1': isMobile}" class="col-12 col-lg-2">
 			<VueDatePicker
 				@contextmenu="(e) => {if (isMobile) {e.preventDefault();}}"
-				:dark="isDarkMode"
 				v-model="datum"
+				:dark="isDarkMode"
 				:clearable="false"
-				date-picker
 				:enable-time-picker="false"
 				:format="dateFormat"
 				:text-input="datepickerTextInputOptions"
 				:min-date="new Date()"
-				auto-apply>
-			</VueDatePicker>
-		</div>
-		<div :class="{'pb-1': isMobile}" class="col-12 col-lg-1">
-			<VueDatePicker
-				@contextmenu="(e) => {if (isMobile) {e.preventDefault();}}"
-				:dark="isDarkMode"
-				v-model="von"
-				:clearable="false"
-				time-picker
-				:format="timeFormat"
-				:text-input="timepickerTextInputOptions"
-				:is-24="true"
+				date-picker
 				auto-apply
 				>
 			</VueDatePicker>
@@ -223,13 +210,27 @@ export const Raumsuche =  {
 		<div :class="{'pb-1': isMobile}" class="col-12 col-lg-1">
 			<VueDatePicker
 				@contextmenu="(e) => {if (isMobile) {e.preventDefault();}}"
+				v-model="von"
 				:dark="isDarkMode"
-				v-model="bis"
 				:clearable="false"
-				time-picker
 				:format="timeFormat"
 				:text-input="timepickerTextInputOptions"
 				:is-24="true"
+				time-picker
+				auto-apply
+				>
+			</VueDatePicker>
+		</div>
+		<div :class="{'pb-1': isMobile}" class="col-12 col-lg-1">
+			<VueDatePicker
+				@contextmenu="(e) => {if (isMobile) {e.preventDefault();}}"
+				v-model="bis"
+				:dark="isDarkMode"
+				:clearable="false"
+				:format="timeFormat"
+				:text-input="timepickerTextInputOptions"
+				:is-24="true"
+				time-picker
 				auto-apply>
 			</VueDatePicker>
 		</div>

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

public/js/components/Cis/Studium/Studium.js

@@ -1,6 +1,5 @@
 import LvUebersicht from "../Mylv/LvUebersicht.js";
 
-import ApiCisStudium from '../../../api/factory/cis/studium.js';
 
 export default {
 	data(){
@@ -27,7 +26,6 @@ export default {
 
 		}
 	},
-	name: "OverviewStudiengaenge",
 	components: {
 		LvUebersicht,
 	},
@@ -90,27 +88,6 @@ export default {
 			studienordnung.selectedIndex = newSelectIndex;
 			this.changeSelectedStudienPlan(studienordnung.value);
 		},
-		onStudiensemesterChange(event) {
-			const value = event.target.value;
-			this.setHash(value);
-			this.changeSelectedStudienSemester(value);
-
-		},
-		onStudiengangChange(event) {
-			const value = event.target.value;
-			this.setHash(value);
-			this.changeSelectedStudienGang(value);
-		},
-		onSemesterChange(event) {
-			const value = event.target.value;
-			this.setHash(value);
-			this.changeSelectedSemester(value);
-		},
-		onStudienordnungChange(event) {
-			const value = event.target.value;
-			this.setHash(value);
-			this.changeSelectedStudienPlan(value);
-		},
 		
 		storeDataToLocalStorage(key,value){
 			localStorage.setItem(key, value);
@@ -120,32 +97,28 @@ export default {
 			return value;
 		},
 		changeSelectedStudienSemester(studiensemester_kurzbz) {
-			return this.$api
-				.call(ApiCisStudium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung))
+			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
 		changeSelectedStudienGang(studiengang_kz) {
-			return this.$api
-				.call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz,  this.selectedSemester, this.selectedStudienordnung))
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
 		changeSelectedSemester(semester) {
-			return this.$api
-				.call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung))
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
 		changeSelectedStudienPlan(studienplan_id) {
-			return this.$api
-				.call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id))
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
@@ -187,7 +160,6 @@ export default {
 			this.studiengaenge = studiengang.all;
 			this.selectedStudiengang = studiengang.preselected?.studiengang_kz;
 
-
 			this.semester = semester.all;
 			this.selectedSemester = semester?.preselected;
 
@@ -223,11 +195,7 @@ export default {
 		},
 		studiengangTitel(studiengang) {
 			if (!studiengang) return "";
-			if(this.isGermanLanguage){
-				return `${studiengang?.kurzbzlang} (${studiengang?.bezeichnung})`;
-			}else{
-				return `${studiengang?.kurzbzlang} (${studiengang?.english})`;
-			}
+			return `${studiengang?.kurzbzlang} (${studiengang?.bezeichnung})`;
 		},
 		studiensemesterTitel(studiensemester){
 			if (!studiensemester) return "";
@@ -245,12 +213,9 @@ export default {
 	},
 
 	computed:{
-		isGermanLanguage(){
-			return this.$p.user_language.value == "German"
-		},
 		selectedLehrveranstaltungTitel(){
 			const studiengang = this.studiengaenge.find((studiengang) => studiengang.studiengang_kz == this.selectedStudiengang);
-			return `${this.isGermanLanguage ? this.selectedLehrveranstaltung?.bezeichnung : this.selectedLehrveranstaltung?.bezeichnung_english} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
+			return `${this.selectedLehrveranstaltung?.bezeichnung} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
 		},
 		computedStudienOrdnung(){
 			if(!this.studienOrdnung) return null;
@@ -267,14 +232,14 @@ export default {
 			let result = [];
 			Object.entries(this.computedStudienOrdnung).forEach(([key,value])=>{
 				result.push({
-					bezeichnung: `${this.$p.t('studium', 'studienordnung') }: ${key}`,
+					bezeichnung: `Studienordnung: ${key}`,
 					disabled: true,
 				});
 				value.forEach((studienplan)=>{
 					result.push({
 						studienplan:studienplan,
 						diabled: false,
-						bezeichnung: `${studienplan?.bezeichnung}-${studienplan?.orgform_kurzbz} ( ${this.isGermanLanguage ? studienplan?.orgform_bezeichnung : studienplan?.orgform_bezeichnung_english}, ${studienplan?.sprache} )`
+						bezeichnung: `${studienplan?.bezeichnung}-${studienplan?.orgform_kurzbz} ( ${studienplan?.orgform_bezeichnung}, ${studienplan?.sprache} )`
 							
 					});
 				})
@@ -291,23 +256,22 @@ export default {
 		const studienordnung = JSON.parse(this.getDataFromLocalStorage("studienordnung")) ?? undefined;
 
 		// only fetch default data if no data is stored in the local storage
-
-		this.$api
-			.call(ApiCisStudium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung))
-			.then(data => data.data)
-			.then(res => {
-				this.extractPropertyValues(res);
-			})
+		
+		this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung)
+		.then(data => data.data)
+		.then(res => {
+			this.extractPropertyValues(res);
+		})
 
 	},
-	template: /*html*/`
+	template: `
 	<div>
-	<h2>{{$p.t('studium','studium')}}</h2>
+	<h2>Studium</h2>
 	<hr>
 	<lv-uebersicht ref="lvUebersicht" :titel="selectedLehrveranstaltungTitel" :event="selectedLehrveranstaltung" :studiensemester="selectedStudiensemester" v-if="selectedLehrveranstaltung">
 		<template #content>
 			<div v-if="Array.isArray(selectedLehrveranstaltung.lektoren) && selectedLehrveranstaltung.lektoren.length>0" class="mb-4">
-				<h4>{{$p.t('studium','lektoren')}}:</h4>
+				<h4>Lektoren:</h4>
 				<a :href="'mailto:'+lektor?.email" class="fhc-link-color mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
 			</div>
 			<h4>Menu:</h4>
@@ -315,13 +279,13 @@ export default {
 	</lv-uebersicht>
 	<div class="lvOptions">
 		<div>
-		<h6>{{$p.t('studium','studiensemester')}}:</h6>
+		<h6>Studiensemester:</h6>
 		<div class="input-group">
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
-			<select ref="studiensemester" v-model="selectedStudiensemester"  @change="onStudiensemesterChange" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')">
-				<option v-for="semester in studienSemester"  :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
+			<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester.studiensemester_kurzbz)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -330,13 +294,13 @@ export default {
 		</div>
 
 		<div>
-		<h6>{{$p.t('lehre','studiengang')}}:</h6>
+		<h6>Studiengang:</h6>
 		<div class="input-group">
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
-			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" @change="onStudiengangChange" :aria-label="$p.t('global/studiensemester_auswaehlen')">
-				<option v-for="studiengang in studiengaenge"  :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
+			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -345,13 +309,13 @@ export default {
 		</div>
 
 		<div>
-		<h6>{{$p.t('lehre','semester')}}:</h6>
+		<h6>Semester:</h6>
 		<div class="input-group">
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
-			<select ref="semester" v-model="selectedSemester" class="form-select"  @change="onSemesterChange" :aria-label="$p.t('global/studiensemester_auswaehlen')">
-				<option v-for="sem in semester" :key="sem" :value="sem">{{sem}}. Semester</option>
+			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -360,13 +324,13 @@ export default {
 		</div>
 
 		<div>
-		<h6>{{$p.t('studium','studienordnung')}}:</h6>
+		<h6>Studienordnung:</h6>
 		<div class="input-group">
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
-			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select"  @change="onStudienordnungChange" :aria-label="$p.t('global/studiensemester_auswaehlen')">
-				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" :key="ordnung?.studienplan?.studienplan_id" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
+			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -381,13 +345,13 @@ export default {
 	<template v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
 		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">
-				<h5 class=" card-title">{{isGermanLanguage == 'German' ? lehrveranstaltung.bezeichnung : lehrveranstaltung.bezeichnung_english }}</h5>
+				<h5 class=" card-title">{{lehrveranstaltung.bezeichnung}}</h5>
 				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrform_kurzbz}}</h6>
 			</div>
 			<div class="card-body">
 				<ul class="list-group list-group-flush">
 					<li class="d-flex list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
-						<a class="fhc-link-color d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{isGermanLanguage == 'German' ? lv.bezeichnung : lv.bezeichnung_english}}</a>
+						<a class="fhc-link-color d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
 						<p>{{lv.lehrform_kurzbz}}</p>
 					</li>	
 				</ul>

public/js/components/Dashboard/Admin.js

@@ -4,6 +4,7 @@ import DashboardAdminWidgets from "./Admin/Widgets.js";
 import DashboardAdminPresets from "./Admin/Presets.js";
 
 import ApiDashboardBoard from "../../api/factory/dashboard/board.js";
+import ApiDashboardWidget from "../../api/factory/dashboard/widget.js";
 
 export default {
 	name: 'DashboardAdmin',
@@ -15,7 +16,7 @@ export default {
 	provide() {
 		return {
 			adminMode: true,
-			widgetsSetup: Vue.computed(() => this.dashboard ? this.dashboard.widgetSetup : null)
+			widgetsSetup: Vue.computed(() => this.dashboards[this.current] ? this.dashboards[this.current].widgetSetup : null)
 		};
 	},
 	data() {
@@ -33,32 +34,33 @@ export default {
 	methods: {
 		dashboardAdd() {
 			let _name = '';
-			BsPrompt
-				.popup('New Dashboard name')
-				.then(dashboard_kurzbz => {
+			BsPrompt.popup('New Dashboard name').then(
+				name => {
+					_name = name;
 					const params = {
-						dashboard_kurzbz
+						dashboard_kurzbz: name
 					};
 					return this.$api
 						.call(ApiDashboardBoard.add(params))
-						.then(response => {
+						.then(response =>{
 							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 							let newDashboard = {
 								dashboard_id: response.data,
-								dashboard_kurzbz,
+								dashboard_kurzbz: _name,
 								beschreibung: ''
 							};
 							this.dashboards.push(newDashboard);
 							this.current = newDashboard.dashboard_id;
 						})
 						.catch(this.$fhcAlert.handleSystemError);
-				});
+					});
 		},
 		dashboardUpdate(dashboard) {
-			this.$api
+			return this.$api
 				.call(ApiDashboardBoard.update(dashboard))
-				.then(response => {
+				.then(response =>{
+
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 					let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
@@ -68,122 +70,73 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		dashboardDelete(dashboard_id) {
-			this.$api
+			return this.$api
 				.call(ApiDashboardBoard.delete(dashboard_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 					this.current = -1;
 					this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+				});
 		},
 		assignWidgets(widgets) {
 			this.widgets = widgets;
+			/*while (this.widgets.length)
+				this.widgets.pop();
+			for (var i in widgets)
+				this.widgets.push(widgets[i]);*/
 		}
 	},
 	created() {
 		this.$api
 			.call(ApiDashboardBoard.list())
 			.then(result => {
-				this.dashboards = result.data;
+				this.dashboards = result.data.retval;
+				for (const dashboard of this.dashboards) {
+					this.$api
+						.call(ApiDashboardWidget.list(dashboard.dashboard_id))
+						.then(res => {
+							dashboard.widgetSetup = res.data;
+						})
+						.catch(this.$fhcAlert.handleSystemError);
+				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: /* html */`
-	<div class="dashboard-admin">
+	template: `<div class="dashboard-admin">
+
 		<div class="input-group">
-			<label for="dashboard-select" class="input-group-text">
-				Dashboard:
-			</label>
-			<select id="dashboard-select" v-model="current" class="form-select">
-				<option
-					v-for="dashboard in dashboards"
-					:key="dashboard.dashboard_id"
-					:value="dashboard.dashboard_id"
-				>{{ dashboard.dashboard_kurzbz }}</option>
+			<label for="dashboard-select" class="input-group-text">Dashboard:</label>
+			<select id="dashboard-select" class="form-select" v-model="current">
+				<option v-for="dashboard in dashboards" :key="dashboard.dashboard_id" :value="dashboard.dashboard_id">{{dashboard.dashboard_kurzbz}}</option>
 			</select>
-			<button
-				class="btn btn-outline-secondary"
-				type="button"
-				@click="dashboardAdd"
-			><i class="fa-solid fa-plus"></i></button>
+			<button class="btn btn-outline-secondary" type="button" @click="dashboardAdd"><i class="fa-solid fa-plus"></i></button>
 		</div>
 
 		<div v-if="dashboard">
 			<ul class="nav nav-tabs mt-3" role="tablist">
 				<li class="nav-item" role="presentation">
-					<button
-						id="edit-tab"
-						class="nav-link"
-						data-bs-toggle="tab"
-						data-bs-target="#edit"
-						type="button"
-						role="tab"
-						aria-controls="edit"
-						aria-selected="false"
-					>{{ this.$p.t('ui', 'bearbeiten') }}</button>
+					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">{{this.$p.t('ui', 'bearbeiten')}}</button>
 				</li>
 				<li class="nav-item" role="presentation">
-					<button
-						id="widgets-tab"
-						class="nav-link active"
-						data-bs-toggle="tab"
-						data-bs-target="#widgets"
-						type="button"
-						role="tab"
-						aria-controls="widgets"
-						aria-selected="true"
-					>Widgets</button>
+					<button class="nav-link active" id="widgets-tab" data-bs-toggle="tab" data-bs-target="#widgets" type="button" role="tab" aria-controls="widgets" aria-selected="true">Widgets</button>
 				</li>
 				<li class="nav-item" role="presentation">
-					<button
-						class="nav-link"
-						id="presets-tab"
-						data-bs-toggle="tab"
-						data-bs-target="#presets"
-						type="button"
-						role="tab"
-						aria-controls="presets"
-						aria-selected="false"
-					>Presets</button>
+					<button class="nav-link" id="presets-tab" data-bs-toggle="tab" data-bs-target="#presets" type="button" role="tab" aria-controls="presets" aria-selected="false">Presets</button>
 				</li>
 			</ul>
 			<div class="tab-content pt-3">
-				<div
-					id="edit"
-					class="tab-pane fade"
-					role="tabpanel"
-					aria-labelledby="edit-tab"
-				>
-					<dashboard-admin-edit
-						v-bind="dashboard"
-						@change="dashboardUpdate($event)"
-						@delete="dashboardDelete($event)"
-					></dashboard-admin-edit>
+				<div class="tab-pane fade" id="edit" role="tabpanel" aria-labelledby="edit-tab">
+					<dashboard-admin-edit v-bind="dashboard" :key="dashboard.dashboard_id" @change="dashboardUpdate($event)" @delete="dashboardDelete($event)"></dashboard-admin-edit>
 				</div>
-				<div
-					id="widgets"
-					class="tab-pane fade show active"
-					role="tabpanel"
-					aria-labelledby="widgets-tab"
-				>
-					<dashboard-admin-widgets
-						:dashboard_id="dashboard.dashboard_id"
-						:widgets="widgets"
-						@assign-widgets="assignWidgets"
-					></dashboard-admin-widgets>
+				<div class="tab-pane fade show active" id="widgets" role="tabpanel" aria-labelledby="widgets-tab">
+					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
 				</div>
-				<div
-					id="presets"
-					class="tab-pane fade"
-					role="tabpanel"
-					aria-labelledby="presets-tab"
-				>
-					<dashboard-admin-presets
-						:dashboard="dashboard.dashboard_kurzbz"
-						:widgets="widgets"
-					></dashboard-admin-presets>
+				<div class="tab-pane fade" id="presets" role="tabpanel" aria-labelledby="presets-tab">
+					<dashboard-admin-presets :dashboard="dashboard.dashboard_kurzbz" :widgets="widgets"></dashboard-admin-presets>
 				</div>
 			</div>
 		</div>

public/js/components/Dashboard/Admin/Edit.js

@@ -1,15 +1,15 @@
 import BsConfirm from '../../Bootstrap/Confirm.js';
 
 export default {
+	emits: [
+		"change",
+		"delete"
+	],
 	props: {
 		dashboard_id: Number,
 		dashboard_kurzbz: String,
 		beschreibung: String
 	},
-	emits: [
-		"change",
-		"delete"
-	],
 	data() {
 		return {
 			kurzbz: this.dashboard_kurzbz,
@@ -18,43 +18,22 @@ export default {
 	},
 	methods: {
 		sendDelete() {
-			BsConfirm
-				.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
-				.then(() => this.$emit('delete', this.dashboard_id))
-				.catch();
+			BsConfirm.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
+				.then(() => this.$emit('delete', this.dashboard_id)).catch();
 		}
 	},
-	template: /* html */`
-	<div class="dashboard-admin-edit px-3">
+	template: `<div class="dashboard-admin-edit px-3">
 		<div class="mb-3">
-			<label for="dashboard-admin-edit-kurzbz">{{ $p.t('dashboard/kurzbz') }}</label>
-			<input
-				id="dashboard-admin-edit-kurzbz"
-				v-model="kurzbz"
-				type="text"
-				class="form-control"
-			>
+			<label for="dashboard-admin-edit-kurzbz">Kurz Bezeichnung</label>
+			<input id="dashboard-admin-edit-kurzbz" type="text" class="form-control" v-model="kurzbz">
 		</div>
 		<div class="mb-3">
-			<label for="dashboard-admin-edit-beschreibung">{{ $p.t('global/beschreibung') }}</label>
-			<textarea
-				id="dashboard-admin-edit-beschreibung"
-				v-model="desc"
-				class="form-control"
-			></textarea>
+			<label for="dashboard-admin-edit-beschreibung">Beschreibung</label>
+			<textarea id="dashboard-admin-edit-beschreibung" class="form-control" v-model="desc"></textarea>
 		</div>
 		<div>
-			<button class="btn btn-danger" @click="sendDelete">
-				{{ this.$p.t('ui', 'loeschen') }}
-			</button>
-			<button
-				class="btn btn-primary"
-				@click="$emit('change', {
-					dashboard_id,
-					dashboard_kurzbz: kurzbz,
-					beschreibung: desc
-				})"
-			>{{ this.$p.t('ui', 'btnAktualisieren') }}</button>
+			<button class="btn btn-danger" @click="sendDelete">{{this.$p.t('ui', 'loeschen')}}</button>
+			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">{{this.$p.t('ui', 'btnAktualisieren')}}</button>
 		</div>
 	</div>`
 }

public/js/components/Dashboard/Admin/Presets.js

@@ -12,61 +12,20 @@ export default {
 		dashboard: String,
 		widgets: Array
 	},
-	data() {
-		return {
-			funktionen: {},
-			sections: [],
-			selectedFunktionen: [],
-			abortController: null
-		};
-	},
+	data: () => ({
+		funktionen: {},
+		sections: [],
+		tmpLoading: ''
+	}),
 	computed: {
 		pickerWidgets() {
 			return this.widgets.filter(widget => widget.allowed);
-		},
-		sizeLimits() {
-			return Object.fromEntries(this.widgets.map(({ setup, widget_id: type }) => {
-				const result = {}; // work on a copy
-				if (setup.height === undefined)
-					result.height = { min: 1, max: undefined };
-				else if (Number.isInteger(setup.height))
-					result.height = { min: setup.height, max: setup.height };
-				else
-					result.height = {
-						min: setup.height.min ?? 1,
-						max: setup.height.max
-					};
-
-				if (setup.width === undefined)
-					result.width = { min: 1, max: undefined };
-				else if (Number.isInteger(setup.width))
-					result.width = { min: setup.width, max: setup.width };
-				else
-					result.width = {
-						min: setup.width.min ?? 1,
-						max: setup.width.max
-					};
-
-				return [type, result];
-			}));
-		}
-	},
-	watch: {
-		dashboard() {
-			this.loadSections();
-			this.loadFunktionen();
 		}
 	},
 	methods: {
-		widgetAdd(widget, section_name) {
+		widgetAdd(section_name, widget) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
-				// NOTE(chris): min size
-				widget.place = Object.fromEntries(Object.entries(widget.place).map(([key, value]) => {
-					value.w = this.sizeLimits[widget_id].width.min;
-					value.h = this.sizeLimits[widget_id].height.min;
-					return [key, value];
-				}));
 				widget.id = 'loading_' + String((new Date()).valueOf());
 				delete widget.custom;
 				widget.preset = 1;
@@ -77,8 +36,6 @@ export default {
 						section.widgets.push(loading);
 				});
 
-				delete widget.id;
-
 				const params = {
 					dashboard: this.dashboard,
 					funktion_kurzbz: section_name,
@@ -107,29 +64,22 @@ export default {
 			})
 			.catch(() => {});
 		},
-		widgetUpdate(payload, section_name) {
+		widgetUpdate(section_name, payload) {
+			payload = payload[section_name];
 			for (var k in payload) {
 				const section = this.sections.find(section => section.name == section_name);
 				for (var wid in section.widgets) {
 					if (section.widgets[wid].id == k) {
-						const copy = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
-						if (payload[k].config)
-							copy.config = payload[k].config;
-						payload[k] = copy;
+						payload[k] = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
 						// NOTE(chris): remove internal props
-						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id', 'custom'])
+						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id'])
 							if (payload[k][prop])
 								delete payload[k][prop];
 						break;
 					}
 				}
-				if (payload[k].place) {
-					Object.values(payload[k].place).forEach(place => {
-						if (place.pinned === false)
-							delete place.pinned;
-					});
-				}
 				payload[k].widgetid = k;
+				delete payload[k].custom;
 			}
 			this.$api
 				.call(Object.entries(payload).map(([key, widget]) => [
@@ -156,7 +106,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		widgetRemove(id, section_name) {
+		widgetRemove(section_name, id) {
 			const params = {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
@@ -172,22 +122,21 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		loadSections() {
+		loadSections(evt) {
+			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
+			this.sections = [];
+			this.tmpLoading = funktionen.join('###');
+
 			const params = {
 				db: this.dashboard,
-				funktionen: this.selectedFunktionen
+				funktionen
 			};
 
-			if (this.abortController)
-				this.abortController.abort();
-			this.abortController = new AbortController();
-			const signal = this.abortController.signal;
-
-			this.sections = [];
-			
 			return this.$api
-				.call(ApiDashboardPreset.getBatch(params), { signal })
+				.call(ApiDashboardPreset.getBatch(params))
 				.then(result => {
+					if (this.tmpLoading !== funktionen.join('###'))
+						return; // NOTE(chris): prevent race condition
 					for (var section in result.data) {
 						let widgets = [];
 						for (var wid in result.data[section]) {
@@ -202,6 +151,7 @@ export default {
 					}
 				})
 				.catch(this.$fhcAlert.handleSystemError);
+
 		},
 		loadFunktionen() {
 			this.$api
@@ -215,17 +165,17 @@ export default {
 	created() {
 		this.loadFunktionen();
 	},
-	template: /* html */`
-	<div class="dashboard-admin-presets">
+	watch: {
+		dashboard() {
+			// TODO(chris): this should be done without a watcher
+			this.loadSections({target:this.$refs.funktionenList});
+			this.loadFunktionen();
+		}
+	},
+	template: `<div class="dashboard-admin-presets">
 		<div class="row">
 			<div class="col-3">
-				<select
-					v-model="selectedFunktionen"
-					class="form-control"
-					style="height:30em"
-					multiple
-					@change="loadSections"
-				>
+				<select ref="funktionenList" style="height:30em" class="form-control" multiple @input="loadSections">
 					<option
 						v-for="funktion in funktionen"
 						:key="funktion.funktion_kurzbz"
@@ -235,20 +185,9 @@ export default {
 				</select>
 			</div>
 			<div class="col-9">
-				<dashboard-section
-					v-for="section in sections"
-					:key="section.name"
-					:name="section.name"
-					:widgets="section.widgets"
-					@widget-add="widgetAdd"
-					@widget-update="widgetUpdate"
-					@widget-remove="widgetRemove"
-				></dashboard-section>
+				<dashboard-section v-for="section in sections" :key="section.name" :name="section.name" :widgets="section.widgets" @widget-add="widgetAdd" @widget-update="widgetUpdate" @widget-remove="widgetRemove"></dashboard-section>
 			</div>
 		</div>
-		<dashboard-widget-picker
-			ref="widgetpicker"
-			:widgets="pickerWidgets"
-		></dashboard-widget-picker>
+		<dashboard-widget-picker ref="widgetpicker" :widgets="pickerWidgets"></dashboard-widget-picker>
 	</div>`
 }

public/js/components/Dashboard/Admin/Widgets.js

@@ -1,14 +1,14 @@
 import ApiDashboardWidget from "../../../api/factory/dashboard/widget.js";
 
 export default {
-	props: {
-		dashboard_id: Number,
-		widgets: Array
-	},
 	emits: [
 		"change",
 		"assignWidgets"
 	],
+	props: {
+		dashboard_id: Number,
+		widgets: Array
+	},
 	methods: {
 		sendChange(widget_id) {
 			let allow = !this.widgets.find(el => el.widget_id == widget_id).allowed;
@@ -29,27 +29,11 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: /* html */`
+	template: `
 	<div class="dashboard-admin-widgets">
-		<div
-			v-for="widget in widgets"
-			:key="widget.widget_id"
-			class="form-check form-switch"
-		>
-			<input
-				:id="'dashboard-admin-widgets-' + widget.widget_id"
-				v-model="widget.allowed"
-				class="form-check-input"
-				type="checkbox"
-				role="switch"
-				@input.prevent="sendChange(widget.widget_id)"
-			>
-			<label
-				class="form-check-label"
-				:for="'dashboard-admin-widgets-' + widget.widget_id"
-			>
-				{{ (widget.setup && widget.setup.name) || widget.widget_kurzbz }}
-			</label>
+		<div v-for="widget in widgets" :key="widget.widget_id" class="form-check form-switch">
+			<input class="form-check-input" type="checkbox" role="switch" :id="'dashboard-admin-widgets-' + widget.widget_id" v-model="widget.allowed" @input.prevent="sendChange(widget.widget_id)">
+			<label class="form-check-label" :for="'dashboard-admin-widgets-' + widget.widget_id">{{(widget.setup && widget.setup.name) || widget.widget_kurzbz}}</label>
 		</div>
 	</div>`
 }