horizontalsplit component analog to verticalsplit; also built it into Studentenverwaltung.js menu; added defaultRatio prop to both components which defaults to 50/50 seperation

application/config/abgabe.php

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

application/config/routes.php

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

application/config/searchcis.php

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

application/config/studierendenantrag.php

@@ -168,32 +168,3 @@ $config['stgkz_blacklist_wiederholung'] = [];
  * @var array           An array of noten ids
  */
 $config['note_blacklist_wiederholung'] = [];
-
-/**
- *  Enable/disable the Abmeldung StG process
- *
- * @var bool
- */
-$config['abmeldung_stg_enabled'] = true;
-
-/**
- *  Enable/disable the Abmeldung process
- *
- * @var bool
- */
-$config['abmeldung_enabled'] = true;
-
-/**
- *  Enable/disable the Unterbrecher process
- *
- * @var bool
- */
-$config['unterbrechung_enabled'] = true;
-
-/**
- *  Enable/disable the Wiederholer process
- *
- * @var bool
- */
-$config['wiederholung_enabled'] = true;
-

application/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/OverviewLvPlan.php

@@ -0,0 +1,39 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class OverviewLvPlan 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()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'OverviewLvPlan']);
+	}
+}

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

@@ -28,6 +28,12 @@ class StgOrgLvPlan extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'StgOrgLvPlan']);
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, '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/Lehre.php

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

application/controllers/api/frontend/v1/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,8 +33,8 @@ 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,
@@ -47,12 +46,11 @@ class LvPlan extends FHCAPI_Controller
 			'fetchFerienEvents' => self::PERM_LOGGED,
 			'getStudiengaenge' => self::PERM_LOGGED,
 			'getLehrverband' => self::PERM_LOGGED,
-			'permissionOtherLvPlan' => self::PERM_LOGGED,
-			'compactibleEventTypes' => self::PERM_LOGGED,
+
 		]);
 
-		$this->load->library('LogLib');
-		$this->loglib->setConfigs(array(
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
 			'classIndex' => 5,
 			'functionIndex' => 5,
 			'lineIndex' => 4,
@@ -60,17 +58,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');
@@ -97,22 +95,16 @@ class LvPlan extends FHCAPI_Controller
 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);
-
-		// disallow accessing other user's events if missing permission
-		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
-			$this->terminateWithError("Missing permission to view other users' timetables!");
-		}
 
 		// fetching lvplan events
-		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
+		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date);
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events
-		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date, $uid);
+		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date);
 
 		// fetching ferien events
-		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date, $uid);
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
 
 
 		$this->terminateWithSuccess(array_merge(
@@ -136,11 +128,15 @@ class LvPlan extends FHCAPI_Controller
 		$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()) {
+		if (!$this->form_validation->run())
+		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 			$stgOrgEvents = [];
 			$ferienEvents = [];
-		} else {
+		}
+
+		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);
@@ -174,7 +170,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());
 
@@ -197,42 +193,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 +257,10 @@ class LvPlan extends FHCAPI_Controller
 		$roomplan_data = $this->stundenplanlib->getRoomplan($ort_kurzbz, $start_date, $end_date);
 
 		$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-
+		
 		$this->terminateWithSuccess($roomplan_data);
 	}
-
+	
 	/**
 	 * gets the reservierungen of a room if the ort_kurzbz parameter is
 	 * supplied otherwise gets the reservierungen of the lvplan of a student
@@ -279,32 +273,25 @@ class LvPlan extends FHCAPI_Controller
 	{
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);
-
-		// disallow accessing other user's reservierungen if missing permission
-		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
-			$this->terminateWithError("Missing permission to view other users' timetables!");
-		}
 
 		// get data
 		$this->load->library('StundenplanLib');
 
-		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz);
 
 		$result = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getLehreinheitStudiensemester($lehreinheit_id)
-	{
+	public function getLehreinheitStudiensemester($lehreinheit_id){
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
 		$result = $this->LehreinheitModel->load($lehreinheit_id);
@@ -349,7 +336,7 @@ class LvPlan extends FHCAPI_Controller
 
 	public function getStudiengaenge()
 	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Studiengang_model','StudiengangModel');
 
 		$this->StudiengangModel->addOrder('typ');
 		$this->StudiengangModel->addOrder('kurzbz');
@@ -362,19 +349,19 @@ class LvPlan extends FHCAPI_Controller
 		return $this->terminateWithSuccess($data);
 	}
 
-	public function getLehrverband($studiengang_kz, $semester = null, $verband = null)
+	public function getLehrverband($studiengang_kz, $semester=null, $verband=null)
 	{
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->load->model('organisation/Lehrverband_model','LehrverbandModel');
 
 		$where = [
 			'aktiv' => true,
 			'studiengang_kz' => $studiengang_kz,
 		];
 
-		if ($semester !== null && $semester !== 'null' && $semester !== 'undefined') {
+		if ($semester !== null  && $semester !== 'null' && $semester !== 'undefined') {
 			$where['semester'] = $semester;
 		}
-		if ($verband !== null && $verband !== 'null' && $verband !== 'undefined') {
+		if ($verband !== null  && $verband !== 'null' && $verband !== 'undefined') {
 			$where['verband'] = $verband;
 		}
 
@@ -389,26 +376,6 @@ class LvPlan extends FHCAPI_Controller
 		return $this->terminateWithSuccess($data);
 	}
 
-	/**
-	 * Checks if the current user has permission to view other users' timetables
-	 *
-	 * @return void
-	 */
-	public function permissionOtherLvPlan()
-	{
-		$this->terminateWithSuccess($this->permissionlib->isBerechtigt('basis/other_lv_plan'));
-	}
-
-	/**
-	 * get event types which can be compacted in lv plan display
-	 *
-	 * @return void
-	 */
-	public function compactibleEventTypes()
-	{
-		$this->terminateWithSuccess(["lehreinheit", "reservierung", "ferien", "moodle"]);
-	}
-
 	/**
 	 * fetch moodle events
 	 *
@@ -416,34 +383,30 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchMoodleEvents($start_date, $end_date, $uid = null)
+	private function fetchMoodleEvents($start_date, $end_date)
 	{
-		if ($uid && $uid !== getAuthUID()) {
-			return [];
-		}
-
 		$this->load->config('calendar');
 
 		$tz = new DateTimeZone($this->config->item('timezone'));
-
+		
 		$start = new DateTime($start_date);
 		$start->setTimezone($tz);
-
+		
 		$end = new DateTime($end_date);
 		$end->setTimezone($tz);
 		$end->modify('+1 day -1 second');
-
+		
 		$moodle_events = [];
-
+		
 		Events::trigger(
 			'moodleCalendarEvents',
-			function &() use (&$moodle_events) {
+			function & () use (&$moodle_events) {
 				return $moodle_events;
 			},
 			[
 				'start_date' => $start->format('c'),
 				'end_date' => $end->format('c'),
-				'username' => $uid ?? getAuthUID()
+				'username' => getAuthUID()
 			]
 		);
 
@@ -457,7 +420,7 @@ 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');
@@ -469,7 +432,7 @@ class LvPlan extends FHCAPI_Controller
 			$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);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

application/controllers/jobs/AbgabetoolJob.php

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

application/controllers/jobs/AntragJob.php

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

application/controllers/lehre/Studierendenantrag.php

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

application/core/Notiz_Controller.php

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

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

application/libraries/ProfilLib.php

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

application/libraries/StundenplanLib.php

@@ -40,16 +40,13 @@ class StundenplanLib
 	 * @return stdClass
 	 * @access public
 	 */
-	public function getEventsUser($start, $end, $uid = null)
+	public function getEventsUser($start, $end)
 	{
 		$this->_ci =& get_instance();
 
 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		if (!$uid) {
-			$uid = getAuthUID();
-		}
-		
+		$uid = getAuthUID();
 		if (is_null($uid))
 			return error("No UID");
 		
@@ -220,7 +217,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
 	{
 		$this->_ci =& get_instance();
 
@@ -231,14 +228,14 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? getAuthUID()));
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
 
 		if ($is_mitarbeiter && empty($ort_kurzbz)) {
 			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 		}
 		
 		if (isError($reservierungen))
@@ -360,10 +357,7 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object_data = getData($ort_content_object);
-				$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
-					? $ort_content_object_data[0]
-					: null;
+				$ort_content_object = getData($ort_content_object)[0];
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}

application/libraries/dashboard/DashboardLib.php

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

application/libraries/stv/StudentListLib.php

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

application/libraries/vertragsbestandteil/AbstractBestandteil.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

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

application/models/content/Content_model.php

@@ -234,9 +234,9 @@ class Content_model extends DB_Model
 							FROM
 								campus.tbl_content c1
 							LEFT JOIN
-								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=? 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/Lehrveranstaltung_model.php

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

application/models/education/Paabgabe_model.php

@@ -79,10 +79,10 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum::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/education/Projektarbeit_model.php

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

application/models/education/Studierendenantrag_model.php

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

application/models/education/Studierendenantragstatus_model.php

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

application/models/organisation/Studiengang_model.php

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

application/models/person/Benutzerfunktion_model.php

@@ -261,42 +261,6 @@ class Benutzerfunktion_model extends DB_Model
     }
 
 
-	/**
-	 * Get active Kompetenzfeldleitung bei UID.
-	 *
-	 * @param $uid
-	 * @return array|stdClass|null
-	 */
-	public function getKFLByUID($uid)
-	{
-		$query = '
-            SELECT
-			  	bf.uid,
-				bf.oe_kurzbz,
-  				oe.organisationseinheittyp_kurzbz
-            FROM
-			  	public.tbl_benutzerfunktion bf
-				JOIN public.tbl_organisationseinheit oe USING (oe_kurzbz)
-  				JOIN public.tbl_benutzer b USING (uid)
-            WHERE
-                b.uid = ?
-              	AND b.aktiv = TRUE
-                AND funktion_kurzbz = \'Leitung\'
-               	AND organisationseinheittyp_kurzbz = \'Kompetenzfeld\'
-              	AND (datum_von IS NULL OR datum_von <= now())
-              	AND (datum_bis IS NULL OR datum_bis >= now())
-        ';
-
-		$parameters_array = array();
-		if (is_string($uid))
-		{
-			$parameters_array[] = $uid;
-		}
-
-		return $this->execQuery($query, $parameters_array);
-	}
-
-
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

application/models/ressource/Reservierung_model.php

@@ -18,10 +18,10 @@ class Reservierung_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null, $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/system/Message_model.php

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

application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php

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

application/models/vertragsbestandteil/Vertragsbestandteil_model.php

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

application/views/Cis/Abgabetool.php

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

application/views/CisRouterView/CisRouterView.php

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

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

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

application/views/system/infocenter/infocenterData.php

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

application/views/system/infocenter/onboardingData.php

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

application/views/templates/CISVUE-Footer.php

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

application/views/templates/CISVUE-Header.php

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

cis/private/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/private/lehre/notenliste.xls.php

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

cis/testtool/frage.php

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

cis/testtool/gebietfertig.php

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

cis/testtool/login.php

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

cis/testtool/menu.php

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

composer.json

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

composer.lock

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

config/global.config-default.inc.php

@@ -373,8 +373,4 @@ define('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED', false);
 
 //enable tags in StudVW
 define('STV_TAGS_ENABLED', false);
-
-//student accounts grace period
-define('STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_PERIOD', '0 days');
-define('STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_ROLES', serialize(array('NO_DEFINED_ROLE')));
 ?>

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/statistik/notenspiegel_erweitert.php

@@ -95,37 +95,37 @@ foreach ($result_student as $row)
 if ($uids == '')
 	die('Es befinden sich keine Studierende in diesem Semester');
 
-$qry = "SELECT
-		lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
-	FROM
-		lehre.tbl_lehrveranstaltung
-        WHERE
-		lehrveranstaltung_id IN (
-			SELECT
-				DISTINCT lehrveranstaltung_id
-			FROM
-				campus.vw_student_lehrveranstaltung
-				JOIN public.tbl_studentlehrverband ON(student_uid = uid)
-			WHERE
-				tbl_studentlehrverband.studiengang_kz = ".$db->db_add_param($studiengang_kz, FHC_INTEGER)."
-				AND tbl_studentlehrverband.semester = ".$db->db_add_param($semester, FHC_INTEGER)."
-				AND vw_student_lehrveranstaltung.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
-				AND vw_student_lehrveranstaltung.studiensemester_kurzbz = tbl_studentlehrverband.studiensemester_kurzbz
+$qry = "SELECT 
+			lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
+		FROM 
+			lehre.tbl_lehrveranstaltung 
+        WHERE 
+        	lehrveranstaltung_id IN 
+        	(
+				SELECT 
+					distinct lehrveranstaltung_id 
+				FROM 
+					campus.vw_student_lehrveranstaltung, public.tbl_studentlehrverband
+	        	WHERE 
+	        		tbl_studentlehrverband.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND 
+	        		tbl_studentlehrverband.semester=".$db->db_add_param($semester, FHC_INTEGER)." AND 
+	        		vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
+	        		uid=student_uid AND 
+	        		vw_student_lehrveranstaltung.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz
 	        ) 
-	        AND studiengang_kz != 0
+	        AND studiengang_kz<>0
 	        AND zeugnis
-	UNION
-	SELECT
-		lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
-	FROM
-	    lehre.tbl_lehrveranstaltung
-	    JOIN lehre.tbl_zeugnisnote USING(lehrveranstaltung_id)
-	WHERE
-	    tbl_lehrveranstaltung.studiengang_kz = ".$db->db_add_param($studiengang_kz, FHC_INTEGER)."
-	    AND tbl_zeugnisnote.student_uid IN ($uids)
-	    AND tbl_zeugnisnote.studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
-	    AND zeugnis
-    ORDER BY bezeichnung";
+	    UNION
+	    SELECT
+	    	lehrveranstaltung_id, bezeichnung, studiengang_kz, semester, ects
+	    FROM
+	    	lehre.tbl_lehrveranstaltung JOIN lehre.tbl_zeugnisnote USING(lehrveranstaltung_id)
+	    WHERE
+	    	tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER)." AND
+	    	tbl_zeugnisnote.student_uid in($uids) AND
+	    	tbl_zeugnisnote.studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)." AND
+	    	zeugnis
+		ORDER BY bezeichnung";
 
 if (!$result_lva = $db->db_query($qry))
 	die('Fehler beim Ermitteln der Lehrveranstaltungen');
@@ -338,10 +338,6 @@ if ($typ == 'xls')
 	}
 	$anzahl_lvspalten = $spalte - 2;
 
-	$worksheet->write($zeile, ++$spalte, 'ECTS Summe zugeteilt', $format_bold);
-	$maxlength[$spalte] = 20;
-	$worksheet->write($zeile, ++$spalte, 'ECTS Summe gewichtet', $format_bold);
-	$maxlength[$spalte] = 20;
 	$worksheet->write($zeile, ++$spalte, 'Notendurchschnitt', $format_bold);
 	$maxlength[$spalte] = 15;
 	$worksheet->write($zeile, ++$spalte, "Gewichteter\nNotendurchschnitt", $format_bold_wrap);
@@ -376,12 +372,9 @@ if ($typ == 'xls')
 		$worksheet->write($zeile, ++$spalte, $row_student->gruppe, $format_bold_left);
 		$worksheet->write($zeile, ++$spalte, $row_student->matrikelnr, $format_bold);
 
-		// Alle Zeugnisnoten des Studierenden holen
+		//Alle Zeugnisnoten des Studierenden holen
 		$noten = array();
-		$qry = "SELECT lehrveranstaltung_id, note
-			FROM lehre.tbl_zeugnisnote
-			WHERE student_uid = ".$db->db_add_param($row_student->uid)."
-			AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell);
+		$qry = "SELECT * FROM lehre.tbl_zeugnisnote WHERE student_uid=".$db->db_add_param($row_student->uid)." AND studiensemester_kurzbz=".$db->db_add_param($semester_aktuell);
 		if ($result = $db->db_query($qry))
 			while ($row = $db->db_fetch_object($result))
 				$noten[$row->lehrveranstaltung_id] = $row->note;
@@ -389,16 +382,15 @@ if ($typ == 'xls')
 		//Zu jeder Lehrveranstaltungsnote Prüfungstyp (Anzahl der Antritte) holen
 		$pruefungstypen = array();
 		$qry = "SELECT tbl_lehrveranstaltung.lehrveranstaltung_id, pruefungstyp_kurzbz, sort, datum
-			FROM
-				lehre.tbl_pruefung
-			JOIN
-				lehre.tbl_lehreinheit USING(lehreinheit_id)
-			JOIN
-				lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-			WHERE
-				student_uid = ".$db->db_add_param($row_student->uid)."
-				AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell)."
-			ORDER BY lehrveranstaltung_id, sort, datum";
+					FROM
+						lehre.tbl_pruefung
+ 					JOIN
+ 						lehre.tbl_lehreinheit using(lehreinheit_id)
+ 					JOIN
+ 						lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+ 					WHERE 
+ 						student_uid=".$db->db_add_param($row_student->uid)." AND studiensemester_kurzbz=".$db->db_add_param($semester_aktuell)."
+ 					ORDER BY lehrveranstaltung_id, sort, datum";
 		if ($result = $db->db_query($qry))
 		{
 			while ($row = $db->db_fetch_object($result))
@@ -407,14 +399,15 @@ if ($typ == 'xls')
 			}
 		}
 
-		// Alle LVs holen zu denen der Studierende zugeteilt ist
+		//Alle LVs holen zu denen der Studierende zugeteilt ist
 		$zugeteilte_lvs = array();
-		$qry = "SELECT DISTINCT lehrveranstaltung_id
-			FROM
-				campus.vw_student_lehrveranstaltung
-			WHERE
-				uid = ".$db->db_add_param($row_student->uid)."
-				AND studiensemester_kurzbz = ".$db->db_add_param($semester_aktuell);
+		$qry = "SELECT distinct lehrveranstaltung_id
+					FROM 
+						campus.vw_student_lehrveranstaltung 
+					WHERE 
+						uid=".$db->db_add_param($row_student->uid)." AND 
+						studiensemester_kurzbz=".$db->db_add_param($semester_aktuell);
+
 		if ($result = $db->db_query($qry))
 			while ($row = $db->db_fetch_object($result))
 				$zugeteilte_lvs[] = $row->lehrveranstaltung_id;
@@ -423,20 +416,17 @@ if ($typ == 'xls')
 		$summe = 0;
 		$rowcount = 0;
 		$summeects = 0;
-		$total_ects = 0;
 		$gewichtetenote = 0;
 
 		while ($rowcount < $db->db_num_rows($result_lva))
 		{
 			$row_lva = $db->db_fetch_object($result_lva, $rowcount);
 			$rowcount++;
-
 			//wenn es eine Note gibt
 			if (isset($noten[$row_lva->lehrveranstaltung_id]))
 			{
 				$note = $noten[$row_lva->lehrveranstaltung_id];
 				$format = 0;
-				$total_ects += $row_lva->ects;
 
 				//wenn für die LV der Studierende eine Nachprüfung hat (z.B. 2 Termin, kommissionelle...)
 				if (isset($pruefungstypen[$row_lva->lehrveranstaltung_id]))
@@ -482,7 +472,6 @@ if ($typ == 'xls')
 				//Keine Note fuer diese LV vorhanden
 				if (in_array($row_lva->lehrveranstaltung_id, $zugeteilte_lvs))
 				{
-					$total_ects += $row_lva->ects;
 					$worksheet->write($zeile, ++$spalte, '', $format_colored_nichteingetragen);
 				}
 				else
@@ -500,8 +489,6 @@ if ($typ == 'xls')
 		if ($summeects != 0)
 			$gewichtetenote /= $summeects;
 
-		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $total_ects), $format_number);
-		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $summeects), $format_number);
 		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $schnitt), $format_number);
 		$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $gewichtetenote), $format_number);
 		if ($gewichtetenote != 0)
@@ -542,8 +529,6 @@ if ($typ == 'xls')
 		$schnitt = $summe_schnitt / $anzahl_schnitt;
 	else
 		$schnitt = 0;
-	$worksheet->write($zeile, ++$spalte, '-', $format_bold_center);
-	$worksheet->write($zeile, ++$spalte, '-', $format_bold_center);
 	$worksheet->write($zeile, ++$spalte, sprintf("%.2f", $schnitt), $format_number);
 	if ($anzahlgewichtet != 0)
 		$summegewichtet = $summegewichtet / $anzahlgewichtet;

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/benutzerberechtigung.class.php

@@ -340,40 +340,6 @@ class benutzerberechtigung extends basis_db
 		return true;
 	}
 
-	protected function hasPreStudentStatusInGracePeriod($uid)
-	{
-		$period = defined('STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_PERIOD')
-				? STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_PERIOD
-				: '0 days';
-		$mapfunc = function($val) {
-			return $this->db_add_param($val);
-		};
-		$roles = defined('STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_ROLES')
-				? implode(', ', array_map($mapfunc, unserialize(STUDENTS_KEEP_PERMISSIONS_AFTER_USER_INACTIVE_ROLES)))
-				: "'NO_DEFINED_ROLE'";
-
-		$sql = <<<EOSQL
-			SELECT 
-				1
-			FROM
-				campus.vw_student vs 
-			WHERE
-				vs.uid = {$this->db_add_param($uid)}
-				AND
-				vs.aktiv = false
-				AND
-				public.get_rolle_prestudent(vs.prestudent_id, null) IN ({$roles})
-				AND
-				(vs.updateaktivam + INTERVAL {$this->db_add_param($period)})::date >= CURRENT_DATE
-EOSQL;
-		$result = $this->db_query($sql);
-		if($result && $this->db_num_rows($result) > 0)
-		{
-			return true;
-		}
-		return false;
-	}
-
 	/**
 	 * Laedt die Berechtigungen eines Users
 	 * @param $uid
@@ -389,8 +355,7 @@ EOSQL;
 			if($row = $this->db_fetch_object($result))
 			{
 				// Wenn die Person nicht aktiv ist dann hat diese auch keine Rechte
-				if($this->db_parse_bool($row->aktiv) == false
-					&& $this->hasPreStudentStatusInGracePeriod($uid) === false)
+				if($this->db_parse_bool($row->aktiv) == false)
 					return false;
 			}
 			else

include/entwicklungsteam.class.php

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

include/konto.class.php

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

include/lehreinheitmitarbeiter.class.php

@@ -584,9 +584,8 @@ class lehreinheitmitarbeiter extends basis_db
 
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT
-					DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
-					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode, stg.melderelevant
+				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
+					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -599,7 +598,6 @@ class lehreinheitmitarbeiter extends basis_db
 					AND ss.studiensemester_kurzbz IN ('.$this->implode4SQL($studiensemester_kurzbz_arr).')
 				-- nur lehre, die bisgemeldet wird
 					AND lema.bismelden
-					AND stg.melderelevant
 				-- keine lehreinheiten ohne semesterstunden
 					AND lema.semesterstunden != 0
 			)

include/pruefling.class.php

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

locale/de-AT/testtool.php

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

locale/en-US/testtool.php

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

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;
@@ -388,6 +386,12 @@ html {
 #nav-search > .input-group > * {
   border-radius: 0 !important;
 }
+#nav-search .searchbar_results {
+  top: 100% !important;
+  left: 0;
+  right: 0 !important;
+  width: 100% !important;
+}
 
 /* frame */
 .in-frame {
@@ -409,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));
@@ -461,14 +457,7 @@ html {
     /* overflow: visible !important; */
   }
   #cis-header {
-	z-index: 10;
-  }
-  #cis-header-bar {
-	position: fixed;
-	top: 0;
-	height: var(--fhc-cis-header-height);
-	width: 100%;
-    background-color: var(--fhc-primary);
+    z-index: 10;
   }
   #cis-header nav {
     position: initial;
@@ -484,7 +473,12 @@ html {
     display: none;
   }
   #nav-logo {
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: var(--fhc-cis-header-height);
     width: var(--fhc-cis-menu-width);
+    background-color: var(--fhc-primary);
     padding: var(--fhc-cis-header-py) var(--fhc-cis-header-px);
     z-index: 2;
   }
@@ -499,27 +493,37 @@ html {
   	top: var(--fhc-cis-header-height);
 	display: flex;
 	flex-direction: column;
-	height: 100%;
+  }
+  #nav-main-sticky > :not(#nav-main-toggle) {
+	overflow: auto;
   }
   #nav-main-toggle {
+    width: 0;
     z-index: 1;
   }
-  #nav-main-toggle:hover {
-	background-color: var(--fhc-secondary-highlight);
-  }
-  #nav-main-toggle .div,
-  #nav-main-toggle .fa-chevron-left {
+  #nav-main-toggle .btn,
+  #nav-main-toggle .fa-arrow-circle-left {
     transition: all 0.5s ease-in-out;
   }
   #nav-main-toggle .collapsed.btn {
     background-color: transparent !important;
   }
-  #nav-main-toggle .collapsed .fa-chevron-left {
+  #nav-main-toggle .collapsed .fa-arrow-circle-left {
     transform: scaleX(-1);
     color: var(--fhc-black-40);
   }
   #nav-search {
-	position: relative;
+    position: fixed;
+    top: 0;
+    left: var(--fhc-cis-menu-width);
+    height: var(--fhc-cis-header-height);
+    right: calc(var(--fhc-cis-header-height) + 2 * var(--fhc-cis-header-px) - 2 * var(--fhc-cis-header-py));
+    width: auto !important;
+  }
+  #nav-user {
+	position: fixed;
+	top: 0;
+	right: 0;
   }
   #nav-user-btn {
     border-width: 0;
@@ -554,7 +558,7 @@ html {
 
   #nav-main-menu {
     height: 100%;
-    background-color: var(--fhc-primary);
+    background-color: var(--fhc-cis-menu-bg);
   }
   #nav-main-menu > div {
     width: var(--fhc-cis-menu-width);
@@ -596,6 +600,9 @@ html {
   }
   #nav-user{
 	position: relative;
+  }
+  #nav-user-btn {
+
   }
   #nav-user-btn img {
     object-fit: cover;

public/css/Studentenverwaltung.css

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

public/css/components/abgabetool/abgabe.css

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

public/css/components/dashboard.css

@@ -2,7 +2,7 @@
 @import './dashboard/news.css';
 @import './dashboard/LvPlan.css';
 
-:root {
+:root{
 	--fhc-dashboard-danger: var(--fhc-danger, #842029);
 	--fhc-dashboard-grid-size: 4;
 	--fhc-dashboard-link: var(--fhc-link, #0a57ca);
@@ -17,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/css/components/horizontalsplit.css

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

public/js/api/factory/abgabe.js

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

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

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

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) {
@@ -124,16 +118,5 @@ export default {
 			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',
-		}
-	},
+
 };