Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc

To make headings stand out more clearly from the buttons

application/config/Events.php

@@ -23,6 +23,15 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });
 
+Events::on('loadRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["slot_room"] = array(
+		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Slot/roomModalTitle.js',
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Slot/roomModalContent.js',
+		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["ferien"] = array(
@@ -33,27 +42,5 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });
 
-//Tempus Renderers:
-Events::on('loadTempusRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["reservierung"] = array(
-		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/calendarEvent.js'),
-		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalTitle.js'),
-		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalContent.js'),
-		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-Events::on('loadTempusRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["lehreinheit"] = array(
-		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/calendarEvent.js'),
-		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalTitle.js'),
-		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalContent.js'),
-		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-
 
 

application/config/noten.php

@@ -0,0 +1,6 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+// 'entschuldigt' & 'noch nicht eingetragen' -> wirken sich nicht auf Antritte aus
+$config['NOTEN_OHNE_ANTRITT'] = [9, 17]; // tbl_note pk

application/config/routes.php

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

application/config/searchcis.php

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

application/config/tempus.php

@@ -1,3 +0,0 @@
-<?php
-
-$config['send_update_mails'] = false;

application/controllers/Cis/Abgabetool.php

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

application/controllers/Cis/Auth.php

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

application/controllers/Cis/Benotungstool.php

@@ -5,18 +5,18 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  *
  */
-class Dashboard extends Auth_Controller
+class Benotungstool extends Auth_Controller
 {
 	/**
 	 * Constructor
 	 */
 	public function __construct()
 	{
-		parent::__construct(
-			array(
-				'index' => 'dashboard/benutzer:r'
-			)
-		);
+		parent::__construct([
+			'index' => self::PERM_LOGGED
+		]);
+
+		$this->_ci =& get_instance();
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -27,17 +27,11 @@ class Dashboard extends Auth_Controller
 	 */
 	public function index()
 	{
-
-		$this->load->model('person/Person_model','PersonModel');
-		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
-
 		$viewData = array(
-			'uid' => getAuthUID(),
-			'name' => $personData->vorname,
-			'person_id' => $personData->person_id
+			'uid'=>getAuthUID(),
 		);
-		
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData]);
 
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Benotungstool']);
 	}
+	
 }

application/controllers/Cis/LvPlan.php

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

application/controllers/Cis/MyLv.php

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

application/controllers/Cis/MyLvPlan.php

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

application/controllers/Cis/OtherLvPlan.php

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

application/controllers/Cis/Profil.php

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

application/controllers/Cis/ProjektabgabeUebersicht.php

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

application/controllers/Cis/Raumsuche.php

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

application/controllers/Cis/StgOrgLvPlan.php

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

application/controllers/Cis/Studium.php

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

application/controllers/Cis/Zeitsperren.php

@@ -0,0 +1,30 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Zeitsperren extends Auth_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	/**
+	 * index loads the view Zeitsperren
+	 * @access public
+	 * @return void
+	 */
+	public function index()
+	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'zeitsperren']);
+	}
+}

application/controllers/Cis4.php

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

application/controllers/Tempus.php

@@ -1,40 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Tempus extends Auth_Controller
-{
-	public function __construct()
-	{
-		$permissions = [];
-		$router = load_class('Router');
-		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
-		parent::__construct($permissions);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	/**
-	 * @return void
-	 */
-	public function _remap()
-	{
-
-		$this->load->view('Tempus', [
-			'permissions' => [
-				'admin' => $this->permissionlib->isBerechtigt('admin')
-			],
-			'variables' => [
-				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
-				'timezone' => $this->config->item('timezone')
-			]
-		]);
-	}
-}

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

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

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

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

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

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

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

@@ -18,18 +18,9 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-//require_once('../../../include/studiengang.class.php');
-//require_once('../../../include/student.class.php');
-//require_once('../../../include/datum.class.php');
-//require_once('../../../include/mail.class.php');
-//require_once('../../../include/benutzerberechtigung.class.php');
-//require_once('../../../include/phrasen.class.php');
-//require_once('../../../include/projektarbeit.class.php');
-//require_once('../../../include/projektbetreuer.class.php');
-
 class Lehre extends FHCAPI_Controller
 {
-	
+
 	/**
 	 * Object initialization
 	 */
@@ -38,39 +29,58 @@ class Lehre extends FHCAPI_Controller
 		parent::__construct([
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
-			'Pruefungen' => self::PERM_LOGGED
+			'Pruefungen' => self::PERM_LOGGED,
+			'semesterAverageGrade' => self::PERM_LOGGED,
+			'getZugewieseneLv' => self::PERM_LOGGED,
+			'getLeForLv' => self::PERM_LOGGED
 		]);
-		
+
+		$this->load->library('PhrasesLib');
+
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui',
+				'abgabetool'
+			)
+		);
+
+		$this->load->helper('hlp_sancho_helper');
+
+		require_once(FHCPATH . 'include/studiengang.class.php');
+		require_once(FHCPATH . 'include/student.class.php');
+		require_once(FHCPATH . 'include/projektarbeit.class.php');
+		require_once(FHCPATH . 'include/projektbetreuer.class.php');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-    /**
+	/**
 	 * constructs the emails of the groups from a lehrveranstaltung
 	 */
-    public function lvStudentenMail()
+	public function lvStudentenMail()
 	{
-        $lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
-        
-        // return early if the required parameter is missing
-        if(!isset($lehreinheit_id))
-        {
-            $this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
-        }
+		$lehreinheit_id = $this->input->get("lehreinheit_id",TRUE);
 
-        $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-        
-        $studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+		// return early if the required parameter is missing
+		if(!isset($lehreinheit_id))
+		{
+			$this->terminateWithError('Missing required parameter', self::ERROR_TYPE_GENERAL);
+		}
 
-        $studentenMails = $this->getDataOrTerminateWithError($studentenMails);
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+		$studentenMails = $this->LehreinheitModel->getStudentenMail($lehreinheit_id);
+
+		$studentenMails = $this->getDataOrTerminateWithError($studentenMails);
 
 		//convert array of objects into array of strings
 		$studentenMails = array_map(function($element){
 			return $element->mail;
 		}, $studentenMails);
 
-        $this->terminateWithSuccess($studentenMails);
+		$this->terminateWithSuccess($studentenMails);
 	}
 
 	public function LV($studiensemester_kurzbz, $lehrveranstaltung_id)
@@ -80,13 +90,13 @@ class Lehre extends FHCAPI_Controller
 		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage(), $lehrveranstaltung_id);
 
 		$result = current($this->getDataOrTerminateWithError($result));
-		
+
 		$this->terminateWithSuccess($result);
 	}
 
 	/**
 	 * fetches all Pruefungen of a student for a specific lehrveranstaltung
-	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database 
+	 * if the student passed the Pruefung on the first attempt, no information about the Pruefungen is stored in the database
 	 * @param mixed $lehrveranstaltung_id
 	 * @return void
 	 */
@@ -100,5 +110,90 @@ 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]);
+	}
+
+	/**
+	 * fetches all assigned lehrveranstaltungen of a mitarbeiter for a given semester
+	 * @param mixed $uid
+	 * @param mixed $sem_kurzbz
+	 * @return void
+	 */
+	public function getZugewieseneLv() {
+		$uid = $this->input->get("uid",TRUE);
+		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
+
+		// TODO: error messages
+
+		if(!isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		if (!isset($uid) || isEmptyString($uid))
+			$uid = getAuthUID();
+
+		// querying other ma_uids data requires admin permission
+		if($uid !== getAuthUID()) {
+			$this->load->library('PermissionLib');
+			$isAdmin = $this->permissionlib->isBerechtigt('admin');
+			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
+		}
+
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$result = $this->LehrveranstaltungModel->getLvForLektorInSemester($sem_kurzbz, $uid);
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLeForLv() {
+		$lv_id = $this->input->get("lv_id",TRUE);
+		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
+
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+//		$this->terminateWithSuccess($this->LehreinheitModel->getLesForLv($lv_id, $sem_kurzbz));
+		$this->terminateWithSuccess($this->LehreinheitModel->getAllLehreinheitenForLvaAndMaUid($lv_id, getAuthUID(), $sem_kurzbz));
+	}
+
+}

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

@@ -36,7 +36,8 @@ class LvMenu extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getLvMenu' => self::PERM_LOGGED
+			'getLvMenu' => self::PERM_LOGGED,
+			'getMultipleLvMenu' => self::PERM_LOGGED
 		]);
 
 		$this->load->model("ressource/Mitarbeiter_model");
@@ -61,24 +62,23 @@ class LvMenu extends FHCAPI_Controller
 
 	/**
 	 * alternative function to get multiple lvMenus with a single http request
+	 * not yet working as intended as the menu_lv.inc.php scripts called by the
+	 * lvMenuBuild event have logic coupled to require_once import which results in
+	 * a wrong logic after the first invocation -> faulty results for lvinfo, moodle
+	 * and several others
 	 */
-	public function getMultipleLvMenu($lvMenuOptionList){
+	public function getMultipleLvMenu(){
+		$lvMenuOptionList = $this->input->post('lvMenuOptionList', true);
 		$result =[];
 		foreach($lvMenuOptionList as $lvMenuOptions){
-			$lvMenu = $this->getLvMenu($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
-			if(isError($lvMenu)){
-				// TODO: some lvMenu threw an error, handle error here
-			}
+			$lvMenu = $this->getLvMenuInternal($lvMenuOptions['lvid'],$lvMenuOptions['studiensemester_kurzbz']);
+			
 			$result[$lvMenuOptions['lvid']]=$lvMenu;
 		}
 		$this->terminateWithSuccess($result);
 	}
-
-	/**
-	 * 
-	 */
-	public function getLvMenu($lvid, $studiensemester_kurzbz)
-	{
+	
+	private function getLvMenuInternal($lvid, $studiensemester_kurzbz) {
 
 		// return early if parameters are missing
 		if(!isset($lvid) || !isset($studiensemester_kurzbz))
@@ -89,14 +89,14 @@ class LvMenu extends FHCAPI_Controller
 
 		// get the user
 		if (!$user=getAuthUID())
-		    $this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));
+			$this->terminateWithError($this->p->t('global', 'nichtAngemeldet'));
 
 		// check if is_lector
 		$is_lector = false;
 		$mares = $this->Mitarbeiter_model->isMitarbeiter($user);
 		if(hasData($mares))
 		{
-		    $is_lector = getData($mares);
+			$is_lector = getData($mares);
 		}
 
 		// definition of user_is_allowed_to_upload
@@ -105,7 +105,7 @@ class LvMenu extends FHCAPI_Controller
 
 		// load lehrveranstaltung
 		$lvres = $this->Lehrveranstaltung_model->load($lvid);
-		if(!hasData($lvres)) 
+		if(!hasData($lvres))
 		{
 			$this->terminateWithError('LV ' . $lvid . ' not found.');
 		}
@@ -124,7 +124,7 @@ class LvMenu extends FHCAPI_Controller
 		$stgres = $this->Studiengang_model->load(strval($studiengang_kz));
 		if(!hasData($stgres))
 		{
-		    $this->terminateWithError('Stg ' . $lv->studiengang_kz . ' not found.');
+			$this->terminateWithError('Stg ' . $lv->studiengang_kz . ' not found.');
 		}
 		$stg = (getData($stgres))[0];
 		$kurzbz = strtoupper($stg->typ . $stg->kurzbz);
@@ -139,7 +139,7 @@ class LvMenu extends FHCAPI_Controller
 			$angemeldet = false;
 
 			$lesres = $this->Lehreinheit_model->getLehreinheitenForStudentAndStudienSemester(
-			    $lvid, $user, $angezeigtes_stsem
+				$lvid, $user, $angezeigtes_stsem
 			);
 
 			if(hasData($lesres) && count(getData($lesres)) > 0)
@@ -148,7 +148,7 @@ class LvMenu extends FHCAPI_Controller
 
 		// lehrfach
 		$lehrfach_id='';
-		
+
 		if(defined('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN)
 		{
 			// Wenn der eingeloggte User zu einer der Lehreinheiten zugeteilt ist
@@ -211,8 +211,8 @@ class LvMenu extends FHCAPI_Controller
 		foreach($fbs as $row)
 		{
 			$lehrfach_oe_kurzbz_arr[] = $row->oe_kurzbz;
-			if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz) 
-			    || $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
+			if($this->PermissionLib->isBerechtigt('lehre', null, $row->oe_kurzbz)
+				|| $this->PermissionLib->isBerechtigt('assistenz', null, $stg->oe_kurzbz))
 			{
 				$user_is_allowed_to_upload=true;
 			}
@@ -224,21 +224,21 @@ class LvMenu extends FHCAPI_Controller
 		$menu = array();
 
 		$this->fhc_menu_lvinfo($menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr);
-		
+
 		$this->fhc_menu_feedback($menu, $angemeldet, $lvid);
-		
+
 		$this->fhc_menu_gesamtnote($menu, $angemeldet, $lvid, $lv, $is_lector, $angezeigtes_stsem);
-		
+
 		$this->fhc_menu_emailStudierende($menu, $user, $angemeldet, $lvid, $angezeigtes_stsem);
-		
+
 		$this->fhc_menu_abmeldung($menu, $user, $is_lector, $lvid, $angezeigtes_stsem);
-		
+
 		$this->fhc_menu_lehretools($menu, $lvid, $angezeigtes_stsem, $sprache);
-		
+
 		$this->fhc_menu_anrechnungStudent($menu, $lvid, $angezeigtes_stsem);
-		
+
 		$this->fhc_menu_anrechnungLector($menu, $angezeigtes_stsem);
-		
+
 
 		// Addons Menu Logic
 		// ##########################################################################################		
@@ -272,18 +272,18 @@ class LvMenu extends FHCAPI_Controller
 			'permissionLib' => &$this->PermissionLib,
 			'phrasesLib' => &$this->PhrasesLib
 		];
-		
-		Events::trigger('lvMenuBuild', 
-						// passing $menu per reference
-						function & () use (&$menu) {
-							return $menu;
-						},
-						$params
+
+		Events::trigger('lvMenuBuild',
+			// passing $menu per reference
+			function & () use (&$menu) {
+				return $menu;
+			},
+			$params
 		);
 
 		// Menu sortieren
 		// ##########################################################################################
-		
+
 		foreach ($menu as $key => $row){
 
 			// removes menu points that are not needed in the c4 lvUebersicht
@@ -291,7 +291,7 @@ class LvMenu extends FHCAPI_Controller
 				unset($menu[$key]);
 				continue;
 			}
-			
+
 			// fills pos array to sort the menu 
 			$pos[$key] = $row['position'];
 
@@ -299,11 +299,18 @@ class LvMenu extends FHCAPI_Controller
 
 		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
 
-		// HTTP response
-		// ##########################################################################################
+
+		return $menu;
+	}
+	
+	/**
+	 * 
+	 */
+	public function getLvMenu($lvid, $studiensemester_kurzbz)
+	{
+		$menu = $this->getLvMenuInternal($lvid, $studiensemester_kurzbz);
 		
 		$this->terminateWithSuccess($menu);
-
 	}
 
 	private function fhc_menu_lvinfo(&$menu, $lvid, $studiengang_kz, $lektor_der_lv, $is_lector, $lehrfach_oe_kurzbz_arr){

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

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

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

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

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

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

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

@@ -31,7 +31,7 @@ class RendererLoader extends FHCAPI_Controller
 
 		parent::__construct([
 			'GetRenderers' => self::PERM_LOGGED,
-			'GetTempusRenderers' => self::PERM_LOGGED,
+           
 		]);
 
         $this->load->library('LogLib');
@@ -66,26 +66,6 @@ class RendererLoader extends FHCAPI_Controller
 		$this->terminateWithSuccess($renderer_paths);
 	}
 
-	public function GetTempusRenderers(){
-		$renderer_paths = [];
-		Events::trigger(
-				'loadRenderers',
-				function & () use (&$renderer_paths)
-				{
-					return $renderer_paths;
-				}
-			);
-
-		Events::trigger(
-				'loadTempusRenderers',
-				function & () use (&$renderer_paths)
-				{
-					return $renderer_paths;
-				}
-			);
-		$this->terminateWithSuccess($renderer_paths);
-	}
-
 	
 	
 

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

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

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

@@ -0,0 +1,67 @@
+<?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 Studiensemester extends FHCAPI_Controller
+{
+
+	private $_ci;
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudiensemester'=> self::PERM_LOGGED,
+
+		]);
+
+		$this->_ci =& get_instance();
+		
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * GET METHOD
+	 * returns List of all studiensemester as well as current one
+	 */
+	public function getStudiensemester()
+	{
+		$this->_ci->StudiensemesterModel->addOrder("start", "DESC");
+		$result = $this->_ci->StudiensemesterModel->load();
+
+		$studiensemester = getData($result);
+		$result = $this->_ci->StudiensemesterModel->getAkt();
+		$aktuell = getData($result);
+
+		$this->terminateWithSuccess(array($studiensemester, $aktuell));
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+
+
+}
+

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

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

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

@@ -0,0 +1,367 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Zeitsperren extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getZeitsperrenUser' => self::PERM_LOGGED,
+			'getTypenZeitsperren' => self::PERM_LOGGED,
+			'getTypenErreichbarkeit' => self::PERM_LOGGED,
+			'getStunden' => self::PERM_LOGGED,
+			'loadZeitsperre' => self::PERM_LOGGED,
+			'add' => self::PERM_LOGGED,
+			'update' => self::PERM_LOGGED,
+			'delete' => self::PERM_LOGGED,
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'person',
+			'zeitsperren'
+		]);
+
+		// Load models
+		$this->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
+		$this->load->model('ressource/Zeitsperretyp_model', 'ZeitsperretypModel');
+		$this->load->model('ressource/Erreichbarkeit_model', 'ErreichbarkeitModel');
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+		$this->load->model('ressource/Zeitaufzeichnung_model', 'ZeitaufzeichnungModel');
+	}
+
+	public function getZeitsperrenUser($uid)
+	{
+		//check if $uid is passedUser
+		$loggedInUser = getAuthUID();
+		if($loggedInUser != $uid) {
+			$this->load->library('PermissionLib');
+			$isAdmin = $this->permissionlib->isBerechtigt('admin');
+			if(!$isAdmin) {
+				$this->terminateWithError($this->p->t('ui', 'noAdmin'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		$result = $this->ZeitsperreModel->getZeitsperrenUser($uid);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getTypenZeitsperren()
+	{
+		$this->ZeitsperretypModel->addOrder('beschreibung', 'ASC');
+		$result = $this->ZeitsperretypModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getTypenErreichbarkeit()
+	{
+		$result = $this->ErreichbarkeitModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getStunden()
+	{
+		$this->StundeModel->addOrder('stunde', 'ASC');
+		$result = $this->StundeModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function loadZeitsperre($zeitsperre_id)
+	{
+		$this->ZeitsperreModel->addSelect(
+			'campus.tbl_zeitsperre.*, typ.*,
+			ma.person_id AS ma_person_id, ma.vorname AS ma_vorname, ma.nachname AS ma_nachname,
+			ma.titelpre AS ma_titelpre, ma.titelpost AS ma_titelpost'
+		);
+		$this->ZeitsperreModel->addJoin('campus.tbl_zeitsperretyp typ', 'ON (typ.zeitsperretyp_kurzbz = campus.tbl_zeitsperre.zeitsperretyp_kurzbz)');
+		$this->ZeitsperreModel->addJoin('public.tbl_benutzer ben', 'ON (ben.uid = campus.tbl_zeitsperre.vertretung_uid)', 'LEFT');
+		$this->ZeitsperreModel->addJoin('public.tbl_person ma', 'ON (ma.person_id = ben.person_id)', 'LEFT');
+		$result = $this->ZeitsperreModel->loadWhere(
+			array('zeitsperre_id' => $zeitsperre_id)
+		);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((current(getData($result)) ?: []));
+	}
+
+	public function add($mitarbeiter_uid)
+	{
+		$loggedInUser = getAuthUID();
+
+		if($mitarbeiter_uid != $loggedInUser)
+			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
+
+		$this->form_validation->set_rules('zeitsperretyp_kurzbz', 'Grund Zeitsperre', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Grund Zeitsperre'])
+		]);
+
+		$this->form_validation->set_rules('vondatum', 'VonDatum', 'required|is_valid_date', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		]);
+
+		$this->form_validation->set_rules('bisdatum', 'BisDatum', 'required|is_valid_date|callback_check_von_bis_datum|callback_check_diff_intval', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'BisDatum']),
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum']),
+			'check_von_bis_datum' => $this->p->t('zeitsperre', 'error_VonDatumGroesserAlsBisDatum'),
+			'check_diff_intval' => $this->p->t('zeitsperre', 'error_zeitraumAuffallendHoch')
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$bezeichnung = $this->input->post('bezeichnung');
+		$vondatum = $this->input->post('vondatum');
+		$vonstunde = $this->input->post('vonstunde');
+		$bisdatum = $this->input->post('bisdatum');
+		$bisstunde = $this->input->post('bisstunde');
+		//$vonIso = $this->input->post('vonISO'); //Timestamp für Stunde
+		//$bisIso = $this->input->post('bisISO'); //Timestamp für Stunde
+		$erreichbarkeit_kurzbz = $this->input->post('erreichbarkeit_kurzbz');
+		$vertretung_uid = $this->input->post('vertretung_uid');
+		$zeitsperretyp_kurzbz = $this->input->post('zeitsperretyp_kurzbz');
+
+		//check if existing zeitsperre
+		$result = $this->ZeitsperreModel->getSperreByDate($mitarbeiter_uid, $vondatum, $vonstunde, true);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if(hasData($result))
+		{
+			$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitsperre', ['typ'=> current($data)->zeitsperretyp_kurzbz]), self::ERROR_TYPE_GENERAL);
+		}
+
+		//check if existing zeitaufzeichnung
+		if(in_array($zeitsperretyp_kurzbz, Zeitsperre_model::BLOCKIERENDE_ZEITSPERREN))
+		{
+			$result = $this->ZeitsperreModel->existsZeitaufzeichnung($mitarbeiter_uid, $vondatum, $bisdatum);
+
+			if(hasData($result))
+				$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitaufzeichnung'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->ZeitsperreModel->insert(
+			[
+				'mitarbeiter_uid' => $mitarbeiter_uid,
+				'bezeichnung' => $bezeichnung,
+				'vondatum' => $vondatum,
+				'vonstunde' => $vonstunde,
+				'bisdatum' => $bisdatum,
+				'bisstunde' => $bisstunde,
+				'erreichbarkeit_kurzbz' => $erreichbarkeit_kurzbz,
+				'zeitsperretyp_kurzbz' => $zeitsperretyp_kurzbz,
+				'vertretung_uid' => $vertretung_uid,
+				'insertvon' =>  $loggedInUser,
+				'insertamum' => date('c'),
+			]
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function update($zeitsperre_id)
+	{
+		//check if loggedin User is owner of the zeitsperre
+		$loggedInUser = getAuthUID();
+		$result = $this->ZeitsperreModel->load($zeitsperre_id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$uid = current($data)->mitarbeiter_uid;
+
+		if($uid != $loggedInUser)
+			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
+
+		if(!$zeitsperre_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
+		}
+		//get current params
+		$array_update = [
+			'bezeichnung',
+			'vondatum',
+			'vonstunde',
+			'bisdatum',
+			'bisstunde',
+			//	'vonISO', //Timestamp für Stunde
+			//	'bisISO', //Timestamp für Stunde
+			'erreichbarkeit_kurzbz',
+			'vertretung_uid',
+			'zeitsperretyp_kurzbz',
+			'mitarbeiter_uid',
+		];
+		$post = $this->input->post();
+		$update = [];
+
+		foreach ($array_update as $prop)
+		{
+			if (array_key_exists($prop, $post))
+			{
+				$update[$prop] = $post[$prop];
+			}
+		}
+
+		// Validation
+		$rulesDefined = false;  //necessary, otherwise CI validation will always be triggered, even without rules
+		foreach ($update as $key => $val) {
+			switch ($key) {
+				case 'zeitsperretyp_kurzbz':
+					$this->form_validation->set_rules(
+						$key,
+						'Grund Zeitsperre',
+						'required',
+						['required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'Grund Zeitsperre'])]
+					);
+					$rulesDefined = true;
+					break;
+				case 'vondatum':
+					$this->form_validation->set_rules(
+						$key,
+						'VonDatum',
+						'required|is_valid_date',
+						[
+							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'VonDatum']),
+							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'VonDatum'])
+						]
+					);
+					$rulesDefined = true;
+					break;
+				case 'bisdatum':
+					$rules = 'required|is_valid_date';
+					if (array_key_exists('vondatum', $update)) {
+						$rules .= '|callback_check_von_bis_datum|callback_check_diff_intval';
+					}
+					$this->form_validation->set_rules(
+						$key,
+						'BisDatum',
+						$rules,
+						[
+							'required' => $this->p->t('ui', 'error_fieldRequired', ['field'=>'BisDatum']),
+							'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field'=>'BisDatum']),
+							'check_von_bis_datum' => $this->p->t('zeitsperre', 'error_VonDatumGroesserAlsBisDatum'),
+							'check_diff_intval' => $this->p->t('zeitsperre', 'error_zeitraumAuffallendHoch')
+						]
+					);
+					$rulesDefined = true;
+					break;
+			}
+		}
+
+		if ($rulesDefined && $this->form_validation->run() == false) {
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		if(array_key_exists('vondatum', $post) || array_key_exists('bisdatum', $post))
+		{
+			$result = $this->ZeitsperreModel->load($zeitsperre_id);
+			$data = $this->getDataOrTerminateWithError($result);
+			$data = current($data);
+
+			$mitarbeiter_uid = array_key_exists('mitarbeiter_uid', $post) ? $update['mitarbeiter_uid'] : $data->mitarbeiter_uid;
+			$vondatum = array_key_exists('vondatum', $post) ? $update['vondatum'] : $data->vondatum;
+			$bisdatum = array_key_exists('bisdatum', $post) ? $update['bisdatum'] : $data->bisdatum;
+			$vonstunde = array_key_exists('vonstunde', $post) ? $update['vonstunde'] : $data->vonstunde;
+			$zeitsperretyp_kurzbz = array_key_exists('zeitsperretyp_kurzbz', $post) ? $update['zeitsperretyp_kurzbz'] : $data->zeitsperretyp_kurzbz;
+
+			$result = $this->ZeitsperreModel->getSperreByDate($mitarbeiter_uid, $vondatum, $vonstunde, true);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			if(hasData($result))
+			{
+				$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitsperre', ['typ'=> current($data)->zeitsperretyp_kurzbz]), self::ERROR_TYPE_GENERAL);
+			}
+
+			//check if existing zeitaufzeichnung
+			if(in_array($zeitsperretyp_kurzbz, Zeitsperre_model::BLOCKIERENDE_ZEITSPERREN))
+			{
+				$result = $this->ZeitsperreModel->existsZeitaufzeichnung($mitarbeiter_uid, $vondatum, $bisdatum);
+
+				if(hasData($result))
+					$this->terminateWithError($this->p->t('zeitsperren', 'error_existingZeitaufzeichnung'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		if (!empty($update)) {
+			$update['updatevon'] = $loggedInUser;
+			$update['updateamum'] = date('c');
+			$result = $this->ZeitsperreModel->update($zeitsperre_id, $update);
+
+			$data = $this->getDataOrTerminateWithError($result);
+
+			$this->terminateWithSuccess($data);
+		}
+		else
+			$this->terminateWithSuccess("no update");
+	}
+
+	public function delete($zeitsperre_id)
+	{
+
+		if (!is_numeric($zeitsperre_id) || (int)$zeitsperre_id <= 0)
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Zeitsperre_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		//check if loggedin User is owner of the zeitsperre
+		$loggedInUser = getAuthUID();
+		$result = $this->ZeitsperreModel->load($zeitsperre_id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$uid = current($data)->mitarbeiter_uid;
+
+		if($uid != $loggedInUser)
+			$this->terminateWithError($this->p->t('ui', 'noPermission'), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->ZeitsperreModel->delete(
+			array('zeitsperre_id' => $zeitsperre_id)
+		);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function check_von_bis_datum($bisdatum)
+	{
+		$vondatum = $this->input->post('vondatum');
+
+		return $vondatum <= $bisdatum;
+	}
+
+	public function check_diff_intval($bisdatum)
+	{
+		$vondatum = $this->input->post('vondatum');
+
+		// Intervall in days
+		$vonTs = strtotime($vondatum);
+		$bisTs = strtotime($bisdatum);
+
+		$tage = ($bisTs - $vonTs) / 86400;
+
+		// if intervall > 14
+		return $tage <= 14;
+	}
+
+
+}

application/controllers/api/frontend/v1/calendar/RoomPlan.php

@@ -0,0 +1,232 @@
+<?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 RoomPlan extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'addRoomReservation' => self::PERM_LOGGED,
+			'deleteRoomReservation' => self::PERM_LOGGED,
+			'getRoomCreationInfo' => self::PERM_LOGGED,
+			'getGruppen' => self::PERM_LOGGED,
+			'getLektor' => self::PERM_LOGGED,
+			'getReservableMap' => self::PERM_LOGGED,
+		]);
+
+		$this->load->library('LogLib');
+		$this->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API',
+			'dbExecuteUser' => 'RESTful API'
+		));
+
+		$this->load->library('form_validation');
+		$this->load->library('PermissionLib');
+		$this->load->library('StundenplanLib');
+
+		$this->loadPhrases(['ui']);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+
+	public function addRoomReservation()
+	{
+		$this->form_validation->set_rules('selectedStart', "Start", "required");
+		$this->form_validation->set_rules('selectedEnd', "End", "required");
+		$this->form_validation->set_rules('title', "Title", "required|max_length[10]");
+		$this->form_validation->set_rules('beschreibung', "Beschreibung", "required|max_length[32]");
+		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required|max_length[16]");
+		$this->form_validation->set_rules('studiengang', 'Studiengang', 'numeric');
+		$this->form_validation->set_rules('semester', 'Semester', 'integer|greater_than_equal_to[0]');
+		$this->form_validation->set_rules('verband', 'Verband', 'trim');
+		$this->form_validation->set_rules('gruppe', 'Gruppe', 'trim');
+		$this->form_validation->set_rules('spezialgruppe', 'Spezialgruppe', 'max_length[32]');
+		$this->form_validation->set_rules('lektoren', 'Lektoren');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$start = $this->input->post('selectedStart');
+		$end = $this->input->post('selectedEnd');
+		$title = $this->input->post('title');
+		$beschreibung = $this->input->post('beschreibung');
+		$ort_kurzbz = $this->input->post('ort_kurzbz');
+
+		$studiengang_kz = $this->input->post('studiengang');
+		$semester = $this->input->post('semester');
+		$verband = $this->input->post('verband');
+		$gruppe = $this->input->post('gruppe');
+		$spezialgruppe = $this->input->post('spezialgruppe');
+		$lektoren = $this->input->post('lektoren');
+
+
+		$result = $this->stundenplanlib->addReservation($start, $end, $title, $beschreibung, $ort_kurzbz, $lektoren, $studiengang_kz, $semester, $verband, $gruppe, $spezialgruppe);
+
+		if (isError($result))
+			$this->terminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function deleteRoomReservation()
+	{
+		$reservierung_id = $this->input->post('reservierung_id');
+
+		$result = $this->stundenplanlib->deleteReservation($reservierung_id);
+
+		if (isError($result))
+			$this->terminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getRoomCreationInfo()
+	{
+		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
+		if (!$this->permissionlib->isBerechtigt('lehre/reservierung'))
+			$this->terminateWithSuccess($return_array);
+
+		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess($return_array);
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
+		$this->StudiengangModel->addOrder('typ, kurzbz');
+		$this->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
+		$studiengaenge = $this->StudiengangModel->loadWhere(array('aktiv' => true));
+
+		if (isError($studiengaenge))
+			$this->terminateWithError($studiengaenge);
+
+		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
+		$return_array['berechtigt'] = true;
+
+		$this->terminateWithSuccess($return_array);
+	}
+
+	public function getGruppen()
+	{
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess([]);
+
+		$this->load->model('organisation/gruppe_model', 'GruppeModel');
+
+		$query_words = explode(' ', urldecode($query));
+
+		$this->GruppeModel->addOrder('gruppe_kurzbz');
+		$this->GruppeModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->GruppeModel->db->group_start();
+			$this->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
+			$this->GruppeModel->db->or_where('beschreibung ILIKE', "%" . $word . "%");
+			$this->GruppeModel->db->or_where('orgform_kurzbz ILIKE', "%" . $word . "%");
+
+			if (is_numeric($word))
+			{
+				$this->GruppeModel->db->or_where('studiengang_kz', $word);
+			}
+			$this->GruppeModel->db->group_end();
+		}
+		$this->GruppeModel->db->group_end();
+		$this->GruppeModel->db->where_in('studiengang_kz', $stg_berechtigungen);
+		$gruppen = $this->GruppeModel->loadWhere(array('sichtbar' => true, 'lehre' => true));
+		if (isError($gruppen))
+			$this->terminateWithError($gruppen);
+
+		$this->terminateWithSuccess(hasData($gruppen) ? getData($gruppen) : []);
+	}
+
+	public function getLektor()
+	{
+
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$stg_berechtigungen = $this->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess([]);
+
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+		$query_words = explode(' ', urldecode($query));
+
+		$this->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
+		$this->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
+		$this->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
+		$this->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
+		$this->MitarbeiterModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->MitarbeiterModel->db->group_start();
+			$this->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
+			$this->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
+			$this->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
+			$this->MitarbeiterModel->db->group_end();
+		}
+		$this->MitarbeiterModel->db->group_end();
+
+		$this->MitarbeiterModel->addOrder('nachname');
+		$this->MitarbeiterModel->addOrder('vorname');
+		$mitarbeiter = $this->MitarbeiterModel->load();
+		if (isError($mitarbeiter))
+			$this->terminateWithError($mitarbeiter);
+
+		$this->terminateWithSuccess(hasData($mitarbeiter) ? getData($mitarbeiter) : []);
+	}
+
+	public function getReservableMap($ort_kurzbz = null)
+	{
+		$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);
+
+		$result = $this->stundenplanlib->getReservableMap($ort_kurzbz, $start_date, $end_date);
+
+		$this->terminateWithSuccess(array('reservierbarMap' => hasData($result) ? getData($result) : []));
+	}
+
+}

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

@@ -40,11 +40,32 @@ 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);
 
-		$this->terminateWithSuccess($result);
+		$data = array_map(function ($dashboard) {
+			$tmpSetups = json_decode($dashboard->widgetSetup);
+			$tmpSetups = array_map(function ($widget) {
+				$widget->setup->file = absoluteJsImportUrl($widget->setup->file);
+				return $widget;
+			}, $tmpSetups);
+			$dashboard->widgetSetup = $tmpSetups;
+			return $dashboard;
+		}, $data);
+
+		$this->terminateWithSuccess($data);
 	}
 
 	public function create()
@@ -82,7 +103,7 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function delete()
@@ -116,6 +137,6 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($data);
 	}
 }

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

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

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

@@ -48,25 +48,9 @@ class User extends FHCAPI_Controller
 		
 		$uid = $this->authlib->getAuthObj()->username;
 
-		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);
+		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
 
-		$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
-		]);
+		$this->terminateWithSuccess($mergedconfig);
 	}
 
 	public function addWidget()
@@ -86,26 +70,15 @@ 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);
 
-		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
-			$override_decoded['general'] = [];
+		$override_decoded[$widget['widgetid']] = $widget;
 
-		 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);
@@ -135,18 +108,10 @@ class User extends FHCAPI_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 
-		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]);
-			}
-		}
+		if (!isset($override_decoded[$widget_id]))
+			show_404();
+		
+		unset($override_decoded[$widget_id]);
 
 		$override->override = json_encode($override_decoded);
 				

application/controllers/api/frontend/v1/education/PaabgabeUebersicht.php

@@ -0,0 +1,218 @@
+<?php
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+class PaabgabeUebersicht extends FHCAPI_Controller
+{
+	const DOWNLOAD_PERMISSION = 'lehre/abgabetool:download';
+	const ABGABE_TYPES = ['Bachelor', 'Diplom'];
+
+	/**
+	 * PaabgabeUebersicht API constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'viewData' => self::PERM_LOGGED,
+			'getPaAbgaben' => array('lehre/abgabetool:r'),
+			'getStudiengaenge' => array('lehre/abgabetool:r'),
+			'getTermine' => array('lehre/abgabetool:r'),
+			'getPaAbgabetypen' => array('lehre/abgabetool:r'),
+			'downloadZip' => array('lehre/abgabetool:r'),
+			//'downloadProjektarbeit' => array('lehre/abgabetool:r')
+		]);
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+
+		$this->load->library('PermissionLib');
+
+		// Load Phrases
+		$this->loadPhrases([
+			'abgabetool'
+		]);
+	}
+
+	public function viewData()
+	{
+		$viewData = [
+			"uid" => getAuthUID(),
+			// TODO create permission
+			"showEdit" => true,
+		];
+
+        $this->terminateWithSuccess($viewData);
+	}
+
+	/**
+	 * Get Projektabgaben for search criteria.
+	 */
+	public function getPaAbgaben()
+	{
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
+		$abgabedatum = $this->input->get('abgabedatum');
+		$personSearchString = $this->input->get('personSearchString');
+
+		$result = $this->PaabgabeModel->getPaAbgaben(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz, $abgabedatum, $personSearchString);
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+
+		// check wether Abgabe is in visual library
+		if (hasData($result))
+		{
+			Events::trigger('in_visual_library', getData($result));
+		}
+
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	/**
+	 * Get all Studiengänge for which user is entitled for
+	 */
+	public function getStudiengaenge()
+	{
+		$studiengang_kz_arr = $this->permissionlib->getSTG_isEntitledFor(self::DOWNLOAD_PERMISSION);
+
+		if (!$studiengang_kz_arr) $this->terminateWithSuccess([]);
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$this->StudiengangModel->addSelect('tbl_studiengang.*, UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) AS kuerzel', $studiengang_kz_arr);
+		$this->StudiengangModel->db->where_in('studiengang_kz', $studiengang_kz_arr);
+		$this->StudiengangModel->addOrder('typ, kurzbz');
+		$result = $this->StudiengangModel->load();
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	/**
+	 * Get projekt work due dates, depending on search criteria.
+	 */
+	public function getTermine()
+	{
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
+
+		$result = $this->PaabgabeModel->getTermine(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz);
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	/**
+	 * Get all submission types.
+	 */
+	public function getPaAbgabetypen()
+	{
+		// Load model PaabgabetypModel
+		$this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel');
+
+		$this->PaabgabetypModel->addOrder('bezeichnung');
+		$result = $this->PaabgabetypModel->load();
+
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	/**
+	 * Download zip files with project works matching submission search criteria.
+	 */
+	public function downloadZip()
+	{
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		$abgabetyp_kurzbz = $this->input->get('abgabetyp_kurzbz');
+		$abgabedatum = $this->input->get('abgabedatum');
+		$personSearchString = $this->input->get('personSearchString');
+
+		if (!isset($studiengang_kz) && !isset($abgabetyp_kurzbz) && !isset($abgabedatum) && !isset($personSearchString))
+			$this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'nichtsAusgewaehlt'));
+
+		$this->load->library('zip');
+
+		$result = $this->PaabgabeModel->getPaAbgaben(self::ABGABE_TYPES, $studiengang_kz, $abgabetyp_kurzbz, $abgabedatum, $personSearchString);
+
+		if (isError($result)) $this->terminateWithFileOutput('text/plain', getError($result));
+
+		$fileExists = false;
+		$studiengang_kuerzel = null;
+
+		if (!hasData($result)) $this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'keineDateienVorhanden'));
+
+		$abgaben = getData($result);
+
+		foreach ($abgaben as $abgabe)
+		{
+			$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$abgabe->uid.'.pdf';
+			if (file_exists($path))
+			{
+				$fileExists = true;
+				$studiengang_kuerzel = $abgabe->studiengang_kuerzel;
+				$this->zip->read_file($path);
+			}
+		}
+
+		if (!$fileExists) $this->terminateWithFileOutput('text/plain', $this->p->t('abgabetool', 'keineDateienVorhanden'));
+
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		$zipFileName = 'Abgabe'.(isset($studiengang_kz) && isset($studiengang_kuerzel) ? '_'.$studiengang_kuerzel : '').'.zip';
+		$this->zip->download($zipFileName);
+	}
+
+	/**
+	 * Download Projektarbeit document.
+	 */
+	//~ public function downloadProjektarbeit()
+	//~ {
+		//~ $paabgabe_id = $this->input->get('paabgabe_id');
+
+		//~ if (!is_numeric($paabgabe_id))
+			//~ $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Abgabe ID']), self::ERROR_TYPE_GENERAL);
+
+		//~ //$abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
+		//~ $this->PaabgabeModel->addSelect("paabgabe_id, student_uid, tbl_paabgabe.datum, tbl_paabgabe.abgabedatum, projekttyp_kurzbz, titel, titel_english,
+					//~ paabgabe_id || '_' || student_uid || '.pdf' AS filename");
+		//~ $this->PaabgabeModel->addJoin('lehre.tbl_projektarbeit', 'projektarbeit_id');
+		//~ $abgabeRes = $this->PaabgabeModel->load($paabgabe_id);
+
+		//~ if (isError($abgabeRes))
+			//~ show_error(getError($abgabeRes));
+
+		//~ if (hasData($abgabeRes))
+		//~ {
+			//~ $endabgabe = getData($abgabeRes)[0];
+			//~ $filepath = PAABGABE_PATH.$endabgabe->filename;
+
+			//~ if (file_exists($filepath))
+			//~ {
+				//~ $this->output
+					//~ ->set_status_header(200)
+					//~ ->set_content_type('application/pdf', 'utf-8')
+					//~ ->set_header('Content-Disposition: attachment; filename="'.$endabgabe->filename.'"')
+					//~ ->set_output(file_get_contents($filepath))
+					//~ ->_display();
+			//~ }
+			//~ else
+			//~ {
+				//~ show_error("File does not exist.");
+			//~ }
+		//~ }
+	//~ }
+}

application/controllers/api/frontend/v1/lv/Gruppe.php

@@ -118,17 +118,54 @@ class Gruppe extends FHCAPI_Controller
 
 		$query_words = explode(' ', $query);
 
-		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
+		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
+											studiengang_kz,
+											semester,
+											bezeichnung,
+											gid,
+											\'false\' as lehrverband');
+		$this->_ci->GruppeModel->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
+		$this->_ci->GruppeModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->GruppeModel->db->group_start();
+			$this->_ci->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->GruppeModel->db->group_end();
+		}
+		$this->_ci->GruppeModel->db->group_end();
+
+		$gruppen_result = $this->_ci->GruppeModel->load();
+
+		$gruppen_array = array();
 
 		if (isError($gruppen_result))
 			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
 
-		$gruppen_array = array();
-
 		if (hasData($gruppen_result))
 			$gruppen_array = getData($gruppen_result);
 
-		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
+		$this->_ci->LehrverbandModel->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
+												studiengang_kz,
+												semester,
+												tbl_lehrverband.bezeichnung,
+												gid,
+												\'true\' as lehrverband');
+		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+		$this->_ci->LehrverbandModel->addOrder('verband');
+		$this->_ci->LehrverbandModel->addOrder('gruppe');
+		$this->_ci->LehrverbandModel->db->where(array('tbl_lehrverband.aktiv' => true));
+
+		$this->_ci->LehrverbandModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->LehrverbandModel->db->group_start();
+			$this->_ci->LehrverbandModel->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
+			$this->_ci->LehrverbandModel->db->group_end();
+		}
+		$this->_ci->LehrverbandModel->db->group_end();
+		$lehrverband_result = $this->_ci->LehrverbandModel->load();
 
 		$lehrverband_array = array();
 

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

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

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

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

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

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

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

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

application/controllers/api/frontend/v1/tempus/Config.php

@@ -1,116 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-
-class Config extends FHCAPI_Controller
-{
-	private $_ci;
-
-	public function __construct()
-	{
-		parent::__construct([
-			'get' => ['admin:r', 'assistenz:r'],
-			'getHeader' => ['admin:r', 'assistenz:r'],
-			'set' => ['admin:r', 'assistenz:r'],
-		]);
-
-		// Load Phrases
-		$this->loadPhrases([
-			'ui',
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-	}
-
-	public function get()
-	{
-		$this->_ci->load->model('system/Variable_model', 'VariableModel');
-
-		$config = [];
-
-		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), ['ignore_kollision', 'kollision_student', 'ignore_reservierung', 'ignore_zeitsperre']);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$config['ignore_kollision'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_kollision'),
-			"value" => ($data['ignore_kollision'] ?? 'false') === 'true'
-
-		];
-
-		$config['kollision_student'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'kollision_student'),
-			"value" => ($data['kollision_student'] ?? 'false') === 'true'
-		];
-
-		$config['ignore_reservierung'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_reservierung'),
-			"value" => ($data['ignore_reservierung'] ?? 'false') === 'true'
-
-		];
-
-		$config['ignore_zeitsperre'] = [
-			"type"  => "checkbox",
-			"label" => $this->p->t('ui', 'ignore_zeitsperre'),
-			"value" => ($data['ignore_zeitsperre'] ?? 'false') === 'true'
-		];
-
-
-
-		$this->terminateWithSuccess($config);
-	}
-	public function getHeader()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS status');
-		$this->_ci->KalenderStatusModel->addOrder('sort');
-		$this->_ci->KalenderStatusModel->db->where_not_in('status_kurzbz', array('archived', 'deleted'));
-		$visible_status = $this->_ci->KalenderStatusModel->load();
-
-		$visible_status = getData($visible_status);
-
-		$config['visible_status']['all'] = 'Alle';
-
-		foreach ($visible_status as $status)
-		{
-			$config['visible_status'][$status->status_kurzbz] = $status->status;
-		}
-
-		$this->terminateWithSuccess($config);
-	}
-
-	public function set()
-	{
-		$this->_ci->load->model('system/Variable_model', 'VariableModel');
-
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_kollision',
-			$this->input->post('ignore_kollision') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'kollision_student',
-			$this->input->post('kollision_student') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_reservierung',
-			$this->input->post('ignore_reservierung') === true ? 'true' : 'false'
-		);
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_zeitsperre',
-			$this->input->post('ignore_zeitsperre') === true ? 'true' : 'false'
-		);
-		$this->terminateWithSuccess();
-	}
-
-
-}

application/controllers/api/frontend/v1/tempus/Coursepicker.php

@@ -1,254 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Coursepicker extends FHCAPI_Controller
-{
-	private $_ci;
-	public function __construct()
-	{
-		parent::__construct([
-			'search' => self::PERM_LOGGED,
-			'getByStg' => self::PERM_LOGGED
-		]);
-
-		$this->_ci = &get_instance();
-		$this->load->library('form_validation');
-
-		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
-		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
-
-
-		$this->loadPhrases(['ui']);
-	}
-
-	public function search()
-	{
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$query_words = explode(' ', $query);
-
-		//TODO Where weiter anpassen z.B. Fachbereich
-		$this->_ci->LehreinheitModel->addSelect('tbl_lehreinheit.lehreinheit_id,
-												tbl_lehreinheit.unr,
-												tbl_lehreinheit.lvnr,
-												tbl_lehreinheit.lehrfach_id,
-												lehrfach.kurzbz AS lehrfach,
-												lehrfach.bezeichnung AS lehrfach_bez,
-												lehrfach.farbe AS lehrfach_farbe,
-												tbl_lehreinheit.lehrform_kurzbz AS lehrform,
-												lema.mitarbeiter_uid AS lektor_uid,
-												tbl_mitarbeiter.kurzbz AS lektor,
-												tbl_studiengang.studiengang_kz,
-												upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
-												lvb.semester,
-												lvb.verband,
-												lvb.gruppe,
-												lvb.gruppe_kurzbz,
-												tbl_lehreinheit.raumtyp,
-												tbl_lehreinheit.raumtypalternativ,
-												tbl_lehreinheit.stundenblockung,
-												tbl_lehreinheit.wochenrythmus,
-												lema.semesterstunden,
-												lema.planstunden,
-												tbl_lehreinheit.start_kw,
-												tbl_lehreinheit.anmerkung,
-												tbl_lehreinheit.studiensemester_kurzbz');
-
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter', 'lema.mitarbeiter_uid = tbl_mitarbeiter.mitarbeiter_uid');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
-
-		$this->_ci->MitarbeiterModel->db->group_start();
-
-		foreach ($query_words as $word)
-		{
-			$this->_ci->LehreinheitModel->db->group_start();
-			$this->_ci->LehreinheitModel->db->where('lema.mitarbeiter_uid ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.kurzbzlang ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lvb.verband ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe ILIKE', "%" . $word . "%");
-			$this->_ci->LehreinheitModel->db->or_where('lehrfach.bezeichnung ILIKE', "%" . $word . "%");
-
-			if (is_numeric($word))
-			{
-				$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.studiengang_kz', $word);
-				$this->_ci->LehreinheitModel->db->or_where('lvb.semester', $word);
-			}
-			$this->_ci->LehreinheitModel->db->group_end();
-
-		}
-		$this->_ci->LehreinheitModel->db->group_end();
-		$this->_ci->LehreinheitModel->db->where('tbl_lehreinheit.studiensemester_kurzbz = \'SS2025\'');
-		$this->_ci->LehreinheitModel->db->where(array('tbl_lehrform.verplanen' => true));
-
-		$result = $this->_ci->LehreinheitModel->load();
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-	}
-
-	public function getByStg()
-	{
-		//TODO check einbauen ob studiensemester und stg vorhanden ist
-		$stg = $this->input->get('stg');
-		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
-		if (is_null($stg) || is_null($studiensemester_kurzbz))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$this->_ci->LehreinheitModel->addSelect('
-			tbl_lehreinheit.lehreinheit_id,
-			tbl_lehreinheit.unr,
-			tbl_lehreinheit.lvnr,
-			tbl_lehreinheit.lehrfach_id,
-			lehrfach.kurzbz AS lehrfach,
-			lehrfach.bezeichnung AS lehrfach_bez,
-			lehrfach.farbe AS lehrfach_farbe,
-			tbl_lehreinheit.lehrform_kurzbz AS lehrform,
-			lema.mitarbeiter_uid AS lektor_uid,
-			ma.kurzbz AS lektor,
-			tbl_person.vorname,
-			tbl_person.nachname,
-			tbl_studiengang.studiengang_kz,
-			upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
-			lvb.semester,
-			lvb.verband,
-			lvb.gruppe,
-			lvb.gruppe_kurzbz,
-			tbl_lehreinheit.raumtyp,
-			tbl_lehreinheit.raumtypalternativ,
-			tbl_lehreinheit.stundenblockung,
-			tbl_lehreinheit.wochenrythmus,
-			lema.semesterstunden,
-			lema.planstunden,
-			tbl_lehreinheit.start_kw,
-			tbl_lehreinheit.anmerkung,
-			tbl_lehreinheit.studiensemester_kurzbz
-		');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter ma', 'lema.mitarbeiter_uid = ma.mitarbeiter_uid');
-		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_benutzer', 'ma.mitarbeiter_uid = tbl_benutzer.uid');
-		$this->_ci->LehreinheitModel->addJoin('public.tbl_person', 'tbl_benutzer.person_id = tbl_person.person_id');
-
-		$result = $this->_ci->LehreinheitModel->loadWhere(array(
-			'tbl_lehrform.verplanen' => true,
-			'tbl_studiengang.studiengang_kz' => $stg,
-			'tbl_lehreinheit.studiensemester_kurzbz' => $studiensemester_kurzbz
-		));
-
-		$result = hasData($result) ? getData($result) : array();
-		$grouped = array();
-
-		foreach ($result as $row)
-		{
-			$unr = $row->unr;
-			if (!isset($grouped[$unr]))
-			{
-				$grouped[$unr] = (object)array(
-					'unr' => $row->unr,
-					'lehrfach_id' => $row->lehrfach_id,
-					'lehrfach_bez' => $row->lehrfach_bez,
-					'lehrfach_farbe' => $row->lehrfach_farbe,
-					'studiengang_kz' => $row->studiengang_kz,
-					'studiengang' => $row->studiengang,
-					'semester' => $row->semester,
-					'verband' => $row->verband,
-					'gruppe' => $row->gruppe,
-					'gruppe_kurzbz' => $row->gruppe_kurzbz,
-					'raumtyp' => $row->raumtyp,
-					'raumtypalternativ' => $row->raumtypalternativ,
-					'anmerkung' => $row->anmerkung,
-					'studiensemester_kurzbz' => $row->studiensemester_kurzbz,
-					'fachbereich_kurzbz' => isset($row->fachbereich_kurzbz) ? $row->fachbereich_kurzbz : null,
-					'lektoren' => array(),
-					'lehreinheit_id' => array(),
-					'lvnr' => array(),
-					'lehrfach' => array(),
-					'lehrform' => array(),
-					'stundenblockung' => array(),
-					'wochenrythmus' => array(),
-					'planstunden' => array(),
-					'start_kw' => array(),
-					'verplant' => array(),
-					'offenestunden' => array(),
-					'lehrverband' => array(),
-					'lem' => array(),
-					'verplant_gesamt' => 0,
-				);
-			}
-
-			$group = $grouped[$unr];
-
-			$group->lektoren[$row->lektor_uid] = (object)array(
-				'uid' => $row->lektor_uid,
-				'kurzbz' => trim($row->lektor),
-				'name' => $row->vorname . ' ' . $row->nachname,
-			);
-
-			$group->lehreinheit_id[] = $row->lehreinheit_id;
-			$group->lvnr[] = $row->lvnr;
-			$group->lehrfach[] = $row->lehrfach;
-			$group->lehrform[] = $row->lehrform;
-			$group->stundenblockung[] = $row->stundenblockung;
-			$group->wochenrythmus[] = $row->wochenrythmus;
-			$group->planstunden[] = $row->planstunden;
-			$group->start_kw[] = $row->start_kw;
-			$group->verplant[] = isset($row->verplant) ? $row->verplant : 0;
-			$group->offenestunden[] = isset($row->offenestunden) ? $row->offenestunden : 0;
-			$group->verplant_gesamt += isset($row->verplant) ? $row->verplant : 0;
-
-			$lvb = $row->studiengang . '-' . $row->semester;
-
-			if ($row->verband != '' && $row->verband != ' ' && $row->verband != '0' && $row->verband != null)
-				$lvb .= $row->verband;
-
-			if ($row->gruppe != '' && $row->gruppe != ' ' && $row->gruppe != '0' && $row->gruppe != null)
-				$lvb .= $row->gruppe;
-
-			$group->lehrverband[] = ($row->gruppe_kurzbz != '' && $row->gruppe_kurzbz != null) ? $row->gruppe_kurzbz : $lvb;
-
-			$group->lem[] = array(
-				'lehreinheit_id' => $row->lehreinheit_id,
-				'mitarbeiter_uid' => $row->lektor_uid,
-			);
-		}
-
-		foreach ($grouped as $group)
-		{
-			$group->lektoren = array_values($group->lektoren);
-			$group->lehrverband = array_values(array_unique($group->lehrverband));
-			$group->lehrfach = $this->_formatArr($group->lehrfach);
-			$group->lehrform = $this->_formatArr($group->lehrform);
-			$group->stundenblockung = $this->_formatArr($group->stundenblockung);
-			$group->wochenrythmus = $this->_formatArr($group->wochenrythmus);
-			$group->planstunden = $this->_formatArr($group->planstunden);
-			$group->start_kw = $this->_formatArr($group->start_kw);
-			$group->verplant = $this->_formatArr($group->verplant);
-			$group->offenestunden = $this->_formatArr($group->offenestunden);
-		}
-
-		$this->terminateWithSuccess(array_values($grouped));
-	}
-
-	private function _formatArr($arr)
-	{
-		$values = array_values(array_unique($arr));
-		$formatted = implode(' ', $values);
-
-		if (count($formatted) > 1)
-			$formatted .= ' ?';
-
-		return $formatted;
-	}
-
-
-}

application/controllers/api/frontend/v1/tempus/Kalender.php

@@ -1,416 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Kalender extends FHCAPI_Controller
-{
-
-	private $_ci;
-	const ALLOWED_PLAN_FILTER = ['ort', 'uid', 'stg'];
-	const ALLOWED_ROOM_FILTER = ['lehreinheit_id', 'kalender_id'];
-
-	const ALLOWED_TO_UPDATE = ['start_time', 'end_time', 'ort_kurzbz'];
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStunden' => self::PERM_LOGGED,
-			'getPlan' => self::PERM_LOGGED,
-			'getPlanByOrt' => self::PERM_LOGGED,
-			'getRaumvorschlag' => self::PERM_LOGGED,
-			'getHistory' => 'lehre/lvplan:rw',
-			'deleteEntry' => 'lehre/lvplan:rw',
-			'syncToLecturer' => 'lehre/lvplan:rw',
-			'syncToStudent' => 'lehre/lvplan:rw',
-			'getPlanLecturer' =>'lehre/lvplan:rw',
-			'getPlanStudent' => 'lehre/lvplan:rw',
-			'getZeitwuensche' => self::PERM_LOGGED,
-			'getZeitsperren' => self::PERM_LOGGED,
-			'updateKalenderEvent' => 'lehre/lvplan:rw',
-			'addKalenderEvent' => 'lehre/lvplan:rw',
-			'addReservierung' => 'lehre/lvplan:rw',
-			'sync' => 'lehre/lvplan:rw',
-		]);
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->library('LogLib');
-		$this->_ci->load->library('form_validation');
-		$this->_ci->load->library('KalenderLib');
-		$this->loadPhrases([
-			'ui'
-		]);
-
-
-		$this->_ci->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API', // required
-			'dbExecuteUser' => 'RESTful API'
-		));
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-	/**
-	 * fetches Stunden layout from database
-	 * @access public
-	 *
-	 */
-	public function getStunden()
-	{
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-
-		$this->_ci->StundeModel->addOrder('stunde', 'ASC');
-		$stunden = $this->_ci->StundeModel->load();
-
-		$stunden = $this->getDataOrTerminateWithError($stunden);
-
-		$this->terminateWithSuccess($stunden);
-	}
-
-	public function getPlan()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$filter = $this->_checkFilter(self::ALLOWED_PLAN_FILTER);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForPlanner(
-			$start_date,
-			$end_date,
-			isset($filter->ort) ? $filter->ort : null,
-			isset($filter->uid) ? $filter->uid : null,
-			isset($filter->stg) ? $filter->stg : null
-		);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getPlanStudent()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForStudent(
-			$start_date,
-			$end_date
-		);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getPlanLecturer()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getPlanForLecturer(
-			$start_date,
-			$end_date
-		);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getPlanByOrt($start_date = null, $end_date = null, $ort = null)
-	{
-		if (!isset($start_date) || !isset($end_date) || !isset($ort))
-		{
-			$this->_ci->form_validation->set_data($_GET);
-			$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-			$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-			$this->_ci->form_validation->set_rules('ort',"ort","required");
-			if($this->_ci->form_validation->run() === FALSE)
-				$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-			$start_date = $this->_ci->input->get('start_date', TRUE);
-			$end_date = $this->_ci->input->get('end_date', TRUE);
-			$ort = $this->_ci->input->get('ort', TRUE);
-		}
-
-		$this->terminateWithSuccess($this->_ci->kalenderlib->getPlanByOrt($start_date, $end_date, $ort));
-	}
-
-	public function getZeitsperren()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-		$this->_ci->form_validation->set_rules('emp',"emp","required");
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-		$emp = $this->_ci->input->get('emp', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getZeitsperren($start_date, $end_date, $emp);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function getZeitwuensche()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-		$this->_ci->form_validation->set_rules('emp',"emp","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-		$emp = $this->_ci->input->get('emp', TRUE);
-
-		$stundenplan_data = $this->_ci->kalenderlib->getZeitwuensche($start_date, $end_date, $emp);
-
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	public function updateKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$updateFields = $this->_checkUpdate($this->_ci->input->post('updatedInfos', TRUE));
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->updateKalenderEvent($kalender_id, $updateFields->ort_kurzbz ?? null,  $updateFields->start_time ?? null,  $updateFields->end_time ?? null);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess('Erfolgreich');
-	}
-
-	public function getRaumvorschlag()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$start_date = $this->_ci->input->get('start_date', TRUE);
-		$end_date = $this->_ci->input->get('end_date', TRUE);
-
-		$filter = $this->_checkFilter(self::ALLOWED_ROOM_FILTER);
-
-		if (isset($filter->lehreinheit_id))
-		{
-			$result = $this->_ci->kalenderlib->getRaumvorschlagByLehreinheitID(
-				$start_date,
-				$end_date,
-				$filter->lehreinheit_id
-			);
-		}
-
-		if (isset($filter->kalender_id))
-		{
-			$result = $this->_ci->kalenderlib->getRaumvorschlagByKalenderID(
-				$start_date,
-				$end_date,
-				$filter->kalender_id
-			);
-		}
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function getHistory()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->getHistory($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function deleteEntry()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->deleteEntry($kalender_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-
-	public function sync()
-	{
-		$result = $this->_ci->kalenderlib->sync();
-		$this->terminateWithSuccess($result);
-	}
-	public function syncToLecturer()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_preview');
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-	public function syncToStudent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_live');
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-	public function addKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
-		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-
-
-		$result = $this->_ci->kalenderlib->addKalenderEvent($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess('Erfolgreich');
-	}
-
-	public function addReservierung()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('titel',"titel","required");
-		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
-		$this->_ci->form_validation->set_rules('ort_kurzbz',"ort_kurzbz","required");
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$titel = $this->_ci->input->post('titel', TRUE);
-		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
-		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-
-
-		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess('Erfolgreich');
-	}
-
-	private function _checkFilter($filters)
-	{
-		$filter_valid = true;
-		$filter_object = new stdClass();
-		foreach ($filters as $filter)
-		{
-			if ($this->_ci->input->get($filter))
-			{
-				$filter_valid = true;
-				$filter_object->$filter = $this->_ci->input->get($filter);
-			}
-		}
-
-		if (!$filter_valid)
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		return $filter_object;
-	}
-
-	private function _checkUpdate($updateInfos)
-	{
-		$update_valid = false;
-		$update_object = new stdClass();
-		foreach (self::ALLOWED_TO_UPDATE as $filter)
-		{
-			if (isset($updateInfos[$filter]))
-			{
-				$update_valid = true;
-				$update_object->$filter = $updateInfos[$filter];
-			}
-		}
-
-		if (!$update_valid)
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-
-		return $update_object;
-	}
-}

application/controllers/api/frontend/v1/tempus/Reservierung.php

@@ -1,231 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Reservierung extends FHCAPI_Controller
-{
-	private $_ci;
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'addReservierung' => 'lehre/lvplan:rw',
-			'getRollen' => 'lehre/lvplan:rw',
-			'getInformation' => 'lehre/lvplan:rw',
-			'getLektor' => 'lehre/lvplan:rw',
-			'searchGroup' => 'lehre/lvplan:rw',
-		]);
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->library('LogLib');
-		$this->_ci->load->library('form_validation');
-		$this->_ci->load->library('KalenderLib');
-
-		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
-		$this->_ci->load->model('ressource/Kalender_Event_Rolle_model', 'KalenderEventRolleModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->_ci->load->model('organisation/gruppe_model', 'GruppeModel');
-
-
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	public function getInformation()
-	{
-		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
-
-		$this->_ci->OrtModel->db->join("
-					(select ort,standort_id,strasse, plz
-					FROM public.tbl_standort
-					LEFT JOIN public.tbl_adresse USING(adresse_id)
-				) standort", "standort_id", "LEFT", false);
-
-		$raeume = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
-		$return_array['raeume'] = hasData($raeume) ? getData($raeume) : [];
-
-		if (!$this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
-			$this->terminateWithSuccess($return_array);
-
-		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess($return_array);
-
-		$this->_ci->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
-		$this->_ci->StudiengangModel->addOrder('typ, kurzbz');
-		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
-		$studiengaenge = $this->_ci->StudiengangModel->loadWhere(array('aktiv' => true));
-
-		if (isError($studiengaenge))
-			$this->terminateWithError($studiengaenge);
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-		$this->_ci->KalenderEventRolleModel->addOrder('sort');
-		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
-
-		$rollen = $this->_ci->KalenderEventRolleModel->load();
-
-		$this->_ci->StudiensemesterModel->addOrder('start', 'DESC');
-		$studiensemester = $this->_ci->StudiensemesterModel->load();
-
-		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
-		$return_array['berechtigt'] = true;
-		$return_array['rollen'] = hasData($rollen) ? getData($rollen) : [];
-		$return_array['studiensemester'] = hasData($studiensemester) ? getData($studiensemester) : [];
-
-
-		$this->terminateWithSuccess($return_array);
-	}
-	public function getRaeume()
-	{
-
-		$this->_ci->OrtModel->db->join("
-					(select ort,standort_id,strasse, plz
-					FROM public.tbl_standort
-					LEFT JOIN public.tbl_adresse USING(adresse_id)
-				) standort", "standort_id", "LEFT", false);
-
-		$result = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	public function searchGroup()
-	{
-		$query = $this->input->get('query');
-		if (is_null($query))
-			$this->terminateWithError($this->_ci->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
-
-		if (isEmptyArray($stg_berechtigungen))
-			$this->terminateWithSuccess([]);
-
-
-		$query_words = explode(' ', urldecode($query));
-
-		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
-
-		if (isError($gruppen_result))
-			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
-
-		$gruppen_array = array();
-
-		if (hasData($gruppen_result))
-			$gruppen_array = getData($gruppen_result);
-
-		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
-
-		$lehrverband_array = array();
-
-		if (isError($lehrverband_result))
-			$this->terminateWithError(getError($lehrverband_result), self::ERROR_TYPE_GENERAL);
-
-		if (hasData($lehrverband_result))
-			$lehrverband_array = getData($lehrverband_result);
-
-		$all_gruppen = array_merge($gruppen_array, $lehrverband_array);
-
-		$gefilterte_gruppen = array_filter($all_gruppen, function($gruppe) use ($stg_berechtigungen)
-		{
-			return in_array($gruppe->studiengang_kz, $stg_berechtigungen);
-		});
-
-		$this->terminateWithSuccess($gefilterte_gruppen);
-	}
-
-	public function getRollen()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderEventRolleModel->addOrder('sort');
-		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
-
-		$result = $this->_ci->KalenderEventRolleModel->load();
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-	public function addReservierung()
-	{
-
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('titel',"titel","required");
-		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
-		$this->_ci->form_validation->set_rules('ort_kurzbz',"ort_kurzbz","required");
-		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
-		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
-
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$titel = $this->_ci->input->post('titel', TRUE);
-		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
-		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
-		$start_date = $this->_ci->input->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('end_date', TRUE);
-		$teilnehmer = $this->_ci->input->post('teilnehmer', TRUE);
-		$specialGroups = $this->_ci->input->post('specialGroups', TRUE);
-		$specialFinalGroups = $this->_ci->input->post('specialFinalGroups', TRUE);
-		$groups = $this->_ci->input->post('groups', TRUE);
-
-		if ($this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
-		{
-			if (empty($teilnehmer) || !is_array($teilnehmer))
-			{
-				$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
-			}
-		}
-		else
-			$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
-
-
-		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date, $teilnehmer, $specialFinalGroups, $specialGroups, $groups);
-
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess('Erfolgreich');
-	}
-
-
-	public function getLektor()
-	{
-		$query = $this->input->get('query');
-
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$query_words = explode(' ', $query);
-
-		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
-		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
-		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
-
-		$this->_ci->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
-
-		$this->_ci->MitarbeiterModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->MitarbeiterModel->db->group_start();
-			$this->_ci->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->group_end();
-		}
-		$this->_ci->MitarbeiterModel->db->group_end();
-		$this->_ci->MitarbeiterModel->addOrder('nachname');
-		$this->_ci->MitarbeiterModel->addOrder('vorname');
-		$result = $this->_ci->MitarbeiterModel->load();
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-	}
-
-}

application/controllers/components/Cis/Mylv.php

@@ -13,12 +13,13 @@ class Mylv extends Auth_Controller
 	 */
 	public function __construct()
 	{
+		
 		parent::__construct([
-			'Student' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Studiensemester' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Lvs' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Info' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Pruefungen' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+			'Student' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
+			'Studiensemester' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
+			'Lvs' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
+			'Info' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'], // TODO(chris): permissions?
+			'Pruefungen' => ['student/anrechnung_beantragen:r','user:r', 'basis/cis:r'] // TODO(chris): permissions?
 		]);
 	}
 
@@ -44,13 +45,27 @@ class Mylv extends Auth_Controller
 	public function Studiensemester()
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$result = $this->StudiensemesterModel->getWhereStudentHasLvs(getAuthUID());
+		$isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID())) ?? false;
+		if($isMitarbeiter) {
+			$result = $this->StudiensemesterModel->getWhereMitarbeiterHasLvs(getAuthUID());
 
-		if (isError($result))
-			return $this->outputJsonError(getError($result));
+			if (isError($result))
+				return $this->outputJsonError(getError($result));
 
-		$this->outputJsonSuccess(getData($result));
+			$this->outputJsonSuccess(getData($result));
+		} else if(getData($this->StudentModel->isStudent(getAuthUID())) ?? false) { // $isStudent
+			$result = $this->StudiensemesterModel->getWhereStudentHasLvs(getAuthUID());
+
+			if (isError($result))
+				return $this->outputJsonError(getError($result));
+
+			$this->outputJsonSuccess(getData($result));
+		} else {
+			$this->outputJsonError('neither student or mitarbeiter');
+		}
 	}
 
 	/**
@@ -58,13 +73,27 @@ class Mylv extends Auth_Controller
 	public function Lvs($studiensemester_kurzbz)
 	{
 		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
+		$isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID())) ?? false;
+		if($isMitarbeiter) {
+			$result = $this->LehrveranstaltungModel->getLvsByMitarbeiterInSemester(getAuthUID(), $studiensemester_kurzbz);
 
-		if (isError($result))
-			return $this->outputJsonError(getError($result));
+			if (isError($result))
+				return $this->outputJsonError(getError($result));
 
-		$this->outputJsonSuccess(getData($result));
+			$this->outputJsonSuccess(getData($result));
+		} else if(getData($this->StudentModel->isStudent(getAuthUID())) ?? false) { // $isStudent
+			$result = $this->LehrveranstaltungModel->getLvsByStudentWithGrades(getAuthUID(), $studiensemester_kurzbz, getUserLanguage());
+
+			if (isError($result))
+				return $this->outputJsonError(getError($result));
+
+			$this->outputJsonSuccess(getData($result));
+		} else {
+			$this->outputJsonError('neither student or mitarbeiter');
+		}
 	}
 
 	/**

application/controllers/jobs/TempusJob.php

@@ -1,27 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-class TempusJob extends JOB_Controller
-{
-	private $_ci;
-
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->helper('hlp_sancho_helper');
-		$this->_ci->load->library('KalenderLib');
-	}
-
-
-	public function sync()
-	{
-		$this->_ci->logInfo('Start job FHC-Core->Tempus->sync');
-		$this->_ci->kalenderlib->sync();
-		$this->_ci->logInfo('End job FHC-Core->Tempus->sync');
-	}
-
-}

application/controllers/lehre/Pruefungsprotokoll.php

@@ -215,8 +215,11 @@ class Pruefungsprotokoll extends Auth_Controller
 			if (hasData($abschlusspruefung))
 			{
 				$abschlusspruefung_data = getData($abschlusspruefung);
-				if ($this->permissionlib->isBerechtigt('admin') ||
-					(isset($abschlusspruefung_data->studiengang_kz) && $this->permissionlib->isBerechtigt('assistenz', 'suid', $abschlusspruefung_data->studiengang_kz))
+				if ($this->permissionlib->isBerechtigt('admin')
+					|| (
+						isset($abschlusspruefung_data->studiengang_kz)
+						&& $this->permissionlib->isBerechtigt('assistenz', 'suid', $abschlusspruefung_data->studiengang_kz)
+					)
 					|| $this->_uid === $abschlusspruefung_data->uid_vorsitz)
 					$result = $abschlusspruefung;
 				else

application/controllers/system/MigrateKalender.php

@@ -1,562 +0,0 @@
-<?php
-/*
- * Job zur einmaligen Migration des Stundenplans
- *
- * Aufruf
- * php index.ci.php system/MigrateKalender
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class MigrateKalender extends Auth_Controller
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct(array(
-			'migrateStundenplan' => ['admin:rw'],
-			'migrateReservierung' => ['admin:rw'],
-		));
-		$this->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
-		$this->load->model('ressource/Kalender_Ort_model', 'KalenderOrtModel');
-		$this->load->model('ressource/Stundenplandev_Kalender_model', 'SyncModel');
-		$this->load->model('ressource/Reservierung_Kalender_model', 'SyncReservierungModel');
-		$this->load->model('ressource/Kalender_Event_Teilnehmer_model', 'KalenderEventTeilnehmerModel');
-		$this->load->model('ressource/Kalender_Event_model', 'KalenderEventModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-	}
-
-	/**
-	 * Everything has a beginning
-	 */
-	public function migrateStundenplan($von = null, $bis = null, $studiengang_kz = null)
-	{
-		$db = new DB_Model();
-
-		$stpldevsql = '
-			WITH eindeutige_stunden AS (
-				SELECT DISTINCT unr, datum, stunde
-				FROM lehre.tbl_stundenplandev
-				WHERE datum >= ? AND datum <= ?';
-
-		$params = [$von, $bis];
-
-		if (!is_null($studiengang_kz))
-		{
-			$stpldevsql .= ' AND studiengang_kz = ?';
-
-			$params[] = $studiengang_kz;
-		}
-
-		$stpldevsql .= '),
-			
-			block_keys AS (
-				SELECT
-					unr,
-					datum,
-					stunde,
-					stunde - ROW_NUMBER() OVER (PARTITION BY unr, datum ORDER BY stunde) AS block_nr
-				FROM eindeutige_stunden
-			),
-			blocks AS (
-				SELECT
-					bk.unr,
-					bk.datum,
-					bk.block_nr,
-					MIN(bk.stunde) AS stunde_von,
-					MAX(bk.stunde) AS stunde_bis,
-					MIN(sp.lehreinheit_id) AS lehreinheit_id,
-					MIN(sp.ort_kurzbz) AS ort_kurzbz,
-					array_agg(sp.stundenplandev_id ORDER BY bk.stunde) AS stundenplandev_ids,
-					MIN(sp.insertamum) AS insertamum,
-					(array_agg(sp.insertvon ORDER BY sp.insertamum ASC))[1] AS insertvon,
-					MAX(sp.updateamum) AS updateamum,
-					(array_agg(sp.updatevon ORDER BY sp.updateamum DESC))[1] AS updatevon
-				FROM block_keys bk JOIN lehre.tbl_stundenplandev sp ON sp.unr = bk.unr AND sp.datum = bk.datum AND sp.stunde = bk.stunde
-				WHERE sp.datum >= ? AND sp.datum <= ?
-				GROUP BY bk.unr, bk.datum, bk.block_nr
-			)
-			SELECT
-				b.stundenplandev_ids,
-				b.unr,
-				b.datum,
-				b.block_nr,
-				b.lehreinheit_id,
-				b.ort_kurzbz,
-				b.datum + stundevon.beginn AS von,
-				b.datum + stundebis.ende AS bis,
-				b.insertamum,
-				b.insertvon,
-				b.updateamum,
-				b.updatevon
-			FROM blocks b
-				JOIN lehre.tbl_stunde stundevon ON stundevon.stunde = b.stunde_von
-				JOIN lehre.tbl_stunde stundebis ON stundebis.stunde = b.stunde_bis
-			ORDER BY b.datum, b.unr, b.block_nr;';
-
-		array_push($params, $von, $bis);
-		$stpldev = $db->execReadOnlyQuery($stpldevsql, $params);
-
-		if (hasData($stpldev))
-		{
-			// Pruefen ob der Eintrag schon in Sync Tabelle vorhanden ist
-			// Wenn neuere Änderungen vorhanden dann Update
-			// Wenn keine Änderungen seit leztem Sync dann Ueberspringen
-			// Wenn noch nicht vorhanden neu anlegen
-			// Danach ggf pruefen welceh Eintraege in der zwischenzeit geloescht wurden und
-			// in der neuen Tabelle auch archivieren oder loeschen
-
-			$data = getData($stpldev);
-			foreach($data as $block)
-			{
-				$ids = is_array($block->stundenplandev_ids) ? $block->stundenplandev_ids : explode(',', $block->stundenplandev_ids);
-				/*$ids = array_map('intval', $ids);*/
-
-				$this->SyncModel->db->where('stundenplandev_id IN (' . implode(',', $ids) . ')');
-				$sync_result = $this->SyncModel->load();
-
-				if (!hasData($sync_result))
-				{
-					$kalender_id = $this->_insertKalender($block, 'lehreinheit');
-					if ($kalender_id)
-					{
-						$this->_insertSync($block->stundenplandev_ids, $kalender_id);
-					}
-				}
-				else
-				{
-					$syncData = getData($sync_result);
-					$kalender_id = $syncData[0]->kalender_id;
-					$last_sync = $syncData[0]->lastupdate;
-					$synced_ids = array_column($syncData, 'stundenplandev_id');
-
-					if ($block->updateamum > $last_sync)
-					{
-						$this->_updateKalender($kalender_id, $block);
-						$this->_updateSync($synced_ids, $kalender_id);
-					}
-
-					$fehlende = array_diff($block->stundenplandev_ids, $synced_ids);
-					if (!empty($fehlende))
-					{
-						$this->_insertSync($fehlende, $kalender_id);
-					}
-				}
-				/*if(hasData($SyncResult))
-				{
-					//bereits vorhanden
-					// TODO Update
-				}
-				else
-				{
-					// Neuen Eintrag anlegen
-
-					$von = $rowstpl->datum.' '.$rowstpl->beginn;
-					$bis = $rowstpl->datum.' '.$rowstpl->ende;
-					$typ = 'lehreinheit';
-					$status = 'live';
-					$insertamum = $rowstpl->insertamum;
-					$insertvon = $rowstpl->insertvon;
-					$updateamum = $rowstpl->updateamum;
-					$updatevon = $rowstpl->updatevon;
-
-					$resultKalenderInsert = $this->KalenderModel->insert(
-						array(
-							'von' => $von,
-							'bis' => $bis,
-							'typ' => $typ,
-							'status_kurzbz' => $status,
-							'vorgaenger_kalender_id' => null,
-							'insertamum' => $insertamum,
-							'insertvon' => $insertvon,
-							'updateamum' => $updateamum,
-							'updatevon' => $updatevon
-						)
-					);
-
-					if(isSuccess($resultKalenderInsert))
-					{
-						$kalender_id = getData($resultKalenderInsert);
-
-						$resultKalenderInsert = $this->KalenderLehreinheitModel->insert(
-							array(
-								'kalender_id' => $kalender_id,
-								'lehreinheit_id' => $rowstpl->lehreinheit_id,
-							)
-						);
-
-						$resultKalenderInsert = $this->KalenderOrtModel->insert(
-							array(
-								'kalender_id' => $kalender_id,
-								'ort_kurzbz' => $rowstpl->ort_kurzbz,
-							)
-						);
-
-						$resultSyncInsert = $this->SyncModel->insert(
-							array(
-								'stundenplandev_id' => $rowstpl->stundenplandev_id,
-								'kalender_id' => $kalender_id,
-								'lastupdate' => date('Y-m-d H:i:s')
-							)
-						);
-
-					}
-				}*/
-			}
-		}
-	}
-
-	public function migrateReservierung($von = null, $bis = null, $ort_kurzbz = null)
-	{
-		$db = new DB_Model();
-
-		$qry = "WITH eindeutige_stunden AS (
-					SELECT DISTINCT titel, beschreibung, datum, stunde
-					FROM campus.tbl_reservierung
-					WHERE datum >= ? AND datum <= ?";
-
-		$params = array($von, $bis);
-
-		if (!is_null($ort_kurzbz))
-		{
-			$qry .= " AND ort_kurzbz = ?";
-			$params[] = $ort_kurzbz;
-		}
-
-		$qry .=	"),
-					 block_keys AS (
-						 SELECT
-							 titel, beschreibung, datum, stunde,
-							 stunde - ROW_NUMBER() OVER (PARTITION BY titel, beschreibung, datum ORDER BY stunde) AS block_nr
-						 FROM eindeutige_stunden
-					 ),
-					 blocks AS (
-						 SELECT
-							 bk.titel,
-							 bk.beschreibung,
-							 bk.datum,
-							 bk.block_nr,
-							 MIN(bk.stunde) AS stunde_von,
-							 MAX(bk.stunde) AS stunde_bis,
-							 array_agg(DISTINCT r.reservierung_id::text) AS reservierung_ids,
-							 array_agg(DISTINCT r.uid) AS uids,
-							 array_agg(DISTINCT r.gruppe_kurzbz) AS gruppen_kurzbz,
-							 array_agg(DISTINCT ROW(r.semester, r.verband, r.gruppe)::text) AS svg_kombis,
-							 MIN(r.ort_kurzbz) AS ort_kurzbz,
-							 MIN(r.studiengang_kz) AS studiengang_kz,
-							 MIN(r.veranstaltung_id) AS veranstaltung_id,
-							 MIN(r.reservierung_id) AS reservierung_id,
-							 MAX(r.insertamum) AS insertamum,
-							 (array_agg(r.insertvon ORDER BY r.insertamum ASC))[1] AS insertvon
-						 FROM block_keys bk
-								  JOIN campus.tbl_reservierung r
-									   ON r.titel = bk.titel AND r.beschreibung = bk.beschreibung AND r.datum = bk.datum AND r.stunde = bk.stunde
-						 WHERE r.datum >= ? AND r.datum <= ?
-						 GROUP BY bk.titel, bk.beschreibung, bk.datum, bk.block_nr
-					 )
-				SELECT
-					b.*,
-					(b.datum + s_von.beginn) AS von,
-					(b.datum + s_bis.ende)   AS bis
-				FROM blocks b
-						 JOIN lehre.tbl_stunde s_von ON s_von.stunde = b.stunde_von
-						 JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = b.stunde_bis
-				ORDER BY b.reservierung_id DESC;";
-		/*$qry = "WITH per_stunde AS (
-					SELECT
-						datum,
-						titel,
-						beschreibung, ort_kurzbz, studiengang_kz, stunde,
-						veranstaltung_id,
-						array_agg(DISTINCT uid) AS uids,
-						array_agg(DISTINCT reservierung_id::text) AS reservierung_ids,
-						array_agg(DISTINCT ROW(semester, verband, gruppe)::text) AS svg_kombis,
-						array_agg(DISTINCT gruppe_kurzbz) AS gruppen_kurzbz,
-						MIN(reservierung_id) AS reservierung_id,
-						MAX(insertamum) AS insertamum,
-						MAX(insertvon) AS insertvon
-					FROM campus.tbl_reservierung
-					WHERE datum >= ? AND datum <= ?
-					GROUP BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, stunde, veranstaltung_id
-				),
-				numbered AS (
-					SELECT
-						per_stunde.*,
-						stunde - ROW_NUMBER() OVER (PARTITION BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, veranstaltung_id ORDER BY stunde) AS grp
-					FROM per_stunde
-				),
-				grouped AS (
-					SELECT
-						MIN(reservierung_id) AS reservierung_id,
-						ort_kurzbz, studiengang_kz, datum,
-						MIN(stunde) AS stunde_von,
-						MAX(stunde) AS stunde_bis,
-						titel, beschreibung,
-						array_agg(DISTINCT gruppe_kurzbz_elem) AS gruppen_kurzbz,
-						array_agg(DISTINCT uid_elem) AS uids,
-						array_agg(DISTINCT res_id) AS reservierung_ids,
-						array_agg(DISTINCT svg_elem) AS svg_kombis,
-						veranstaltung_id,
-						MAX(insertamum) AS insertamum,
-						MAX(insertvon) AS insertvon
-					FROM numbered,
-						unnest(uids) AS uid_elem,
-						unnest(reservierung_ids) AS res_id,
-						unnest(gruppen_kurzbz) AS gruppe_kurzbz_elem,
-						unnest(svg_kombis) AS svg_elem
-					GROUP BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, veranstaltung_id, grp
-				)
-				SELECT
-					grouped.*,
-					(datum + s_von.beginn) AS von,
-					(datum + s_bis.ende) AS bis
-				FROM grouped
-					JOIN lehre.tbl_stunde s_von ON s_von.stunde = grouped.stunde_von
-					JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = grouped.stunde_bis
-				ORDER BY grouped.reservierung_id DESC";*/
-
-		array_push($params, $von, $bis);
-		$reservierung_data = $db->execReadOnlyQuery($qry, $params);
-
-
-		if (hasData($reservierung_data))
-		{
-			$data = getData($reservierung_data);
-
-			foreach($data as $block)
-			{
-
-				$ids = is_array($block->reservierung_ids) ? $block->reservierung_ids : explode(',', $block->reservierung_ids);
-
-				$this->SyncReservierungModel->db->where('reservierung_id IN (' . implode(',', $ids) . ')');
-				$sync_result = $this->SyncReservierungModel->load();
-
-				if (!hasData($sync_result))
-				{
-					$kalender_id = $this->_insertKalender($block, 'reservierung');
-					if ($kalender_id)
-					{
-						$this->_insertReservierungSync($block->reservierung_ids, $kalender_id);
-					}
-				}
-				else
-				{
-					$syncData = getData($sync_result);
-					$kalender_id = $syncData[0]->kalender_id;
-					$last_sync = $syncData[0]->lastupdate;
-					$synced_ids = array_column($syncData, 'reservierung_id');
-
-					if ($block->insertamum > $last_sync)
-					{
-						$this->_updateKalender($kalender_id, $block);
-						$this->_updateReservierungSync($synced_ids, $kalender_id);
-					}
-
-					$fehlende = array_diff($block->reservierung_ids, $synced_ids);
-					if (!empty($fehlende))
-					{
-						$this->_insertReservierungSync($fehlende, $kalender_id);
-					}
-				}
-			}
-		}
-	}
-
-
-	private function _insertKalender($block, $typ)
-	{
-		$result = $this->KalenderModel->insert(
-			array (
-				'von' => $block->von,
-				'bis' => $block->bis,
-				'typ' => $typ,
-				'status_kurzbz'=> 'live',
-				'insertamum' => $block->insertamum,
-				'insertvon' => $block->insertvon,
-				'updateamum' => $block->updateamum ?? null,
-				'updatevon' => $block->updatevon ?? null
-			)
-		);
-		if(!isSuccess($result))
-			return null;
-
-		$kalender_id = getData($result);
-
-		if ($typ === 'lehreinheit')
-		{
-			$this->KalenderLehreinheitModel->insert(
-				array (
-					'kalender_id' => $kalender_id,
-					'lehreinheit_id'=> $block->lehreinheit_id
-				)
-			);
-		}
-		else if ($typ === 'reservierung')
-		{
-			$this->KalenderEventModel->insert(array(
-				'kalender_id' => $kalender_id,
-				'titel' => $block->titel,
-				'beschreibung' => $block->beschreibung
-			));
-
-
-			if ($block->insertvon)
-			{
-				$user = $this->BenutzerModel->load(array('uid' => $block->insertvon));
-
-				if (hasData($user))
-				{
-					$this->KalenderEventTeilnehmerModel->insert(array(
-						'kalender_id' => $kalender_id,
-						'uid' => getData($user)[0]->uid,
-						'rolle_kurzbz' => 'organisator'
-					));
-				}
-			}
-
-			$uids = is_array($block->uids) ? $block->uids : explode(',', $block->uids);
-			foreach ($uids as $uid)
-			{
-				$this->KalenderEventTeilnehmerModel->insert(array(
-					'kalender_id' => $kalender_id,
-					'uid' => $uid,
-					'rolle_kurzbz' => 'teilnehmer'
-				));
-			}
-
-			$semester_range = $this->StudiensemesterModel->getByDateRange($block->von, $block->bis);
-			if (isError($semester_range)) return $semester_range;
-			$studiensemester_kurzbz = getData($semester_range)[0]->studiensemester_kurzbz ?? null;
-
-			$gruppen = is_array($block->gruppen_kurzbz) ? $block->gruppen_kurzbz : explode(',', $block->gruppen_kurzbz ?? '');
-
-			foreach ($gruppen as $gruppe_kurzbz)
-			{
-				$gruppe_kurzbz = trim($gruppe_kurzbz);
-				if (!empty($gruppe_kurzbz))
-				{
-					$this->KalenderEventTeilnehmerModel->insert(array(
-						'kalender_id' => $kalender_id,
-						'gruppe_kurzbz' => $gruppe_kurzbz,
-						'studiengang_kz' => $block->studiengang_kz,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz,
-						'rolle_kurzbz' => 'teilnehmer'
-					));
-				}
-			}
-
-			foreach ($block->svg_kombis as $kombi_str)
-			{
-				$kombi_str = trim($kombi_str, '()');
-				list($sem, $verb, $grp) = explode(',', $kombi_str);
-
-				$sem = trim($sem) === '' ? null : trim($sem);
-				$verb = trim($verb) === '' ? null : trim($verb);
-				$grp = trim($grp) === '' ? null : trim($grp);
-
-				if (is_null($sem) && is_null($verb) && is_null($grp))
-					continue;
-
-				$this->KalenderEventTeilnehmerModel->insert(array(
-					'kalender_id' => $kalender_id,
-					'studiengang_kz' => $block->studiengang_kz,
-					'semester' => $sem,
-					'verband' => $verb,
-					'gruppe' => $grp,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz,
-					'rolle_kurzbz' => 'teilnehmer'
-				));
-			}
-		}
-
-
-		$this->KalenderOrtModel->insert(
-			array (
-				'kalender_id' => $kalender_id,
-				'ort_kurzbz' => $block->ort_kurzbz
-			)
-		);
-
-		return $kalender_id;
-	}
-
-	private function _insertSync($ids, $kalender_id)
-	{
-		foreach($ids as $id)
-		{
-			$this->SyncModel->insert(
-				array (
-					'stundenplandev_id' => $id,
-					'kalender_id' => $kalender_id,
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-	private function _insertReservierungSync($ids, $kalender_id)
-	{
-
-		foreach($ids as $id)
-		{
-			$this->SyncReservierungModel->insert(
-				array (
-					'reservierung_id' => $id,
-					'kalender_id' => $kalender_id,
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-
-	private function _updateKalender($kalender_id, $block)
-	{
-		$this->KalenderModel->update(
-			array (
-				'kalender_id' => $kalender_id
-			),
-			array (
-				'von' => $block->von,
-				'bis' => $block->bis,
-				'updateamum'=> $block->updateamum,
-				'updatevon' => $block->updatevon
-			)
-		);
-	}
-
-	private function _updateSync($ids, $kalender_id)
-	{
-		foreach($ids as $id)
-		{
-			$this->SyncModel->update(
-				array (
-					'stundenplandev_id' => $id,
-					'kalender_id' => $kalender_id
-				),
-				array (
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-
-	private function _updateReservierungSync($ids, $kalender_id)
-	{
-		foreach($ids as $id)
-		{
-			$this->SyncReservierungModel->update(
-				array (
-					'reservierung_id' => $id,
-					'kalender_id' => $kalender_id
-				),
-				array (
-					'lastupdate' => date('Y-m-d H:i:s')
-				)
-			);
-		}
-	}
-}

application/core/ICollisionCheck.php

@@ -1,10 +0,0 @@
-<?php
-interface ICollisionCheck
-{
-	public function getName();
-
-	public function check($data);
-
-	public function checkAll($kalender_ids);
-
-}

application/core/Notiz_Controller.php

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

application/libraries/AntragLib.php

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

application/libraries/CollisionChecker.php

@@ -1,65 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-class CollisionChecker
-{
-	private $_checks = [];
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->library('collision/checks/RoomCollisionCheck');
-		$this->_ci->load->library('collision/checks/LectureCollisionCheck');
-		$this->_ci->load->library('collision/checks/VerbandCollisionCheck');
-		$this->_ci->load->library('collision/checks/StudentCollisionCheck');
-		$this->register($this->_ci->roomcollisioncheck);
-		$this->register($this->_ci->lecturecollisioncheck);
-		$this->register($this->_ci->verbandcollisioncheck);
-		$this->register($this->_ci->studentcollisioncheck);
-		Events::trigger('collision_register', $this);
-	}
-
-	public function register(ICollisionCheck $check)
-	{
-		$this->_checks[$check->getName()] = $check;
-	}
-
-	public function run($data)
-	{
-		$errors = [];
-
-		foreach ($this->_checks as $check)
-		{
-			$result = $check->check($data);
-
-			if (!empty($result))
-			{
-				$errors[] = $result;
-			}
-		}
-
-		return $errors;
-	}
-
-	public function runAll($kalender_ids)
-	{
-		$results = array_fill_keys($kalender_ids, []);
-
-		foreach ($this->_checks as $check)
-		{
-			$batchResult = $check->checkAll($kalender_ids);
-			foreach ($batchResult as $kalender_id => $errors)
-			{
-				$results[$kalender_id] = array_merge($results[$kalender_id], $errors);
-			}
-		}
-
-		return $results;
-	}
-}

application/libraries/KalenderNotificationLib.php

@@ -1,170 +0,0 @@
-<?php
-
-if (! defined("BASEPATH")) exit("No direct script access allowed");
-
-class KalenderNotificationLib
-{
-	private $_ci;
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->library('MailLib');
-		$this->_ci->load->config('tempus');
-
-	}
-
-	public function sendMails($mail_infos)
-	{
-		if (!$this->_ci->config->item('send_update_mails'))
-			return true;
-
-		$lektor_added = array();
-		$lektor_changed = array();
-		$lektor_deleted = array();
-
-		$student_added = array();
-		$student_changed = array();
-		$student_deleted = array();
-
-		foreach ($mail_infos as $info)
-		{
-			$entry = $info['entry'];
-			$new_status = $info['new_status'];
-			$notify = $info['notify'];
-
-			$old_entry = null;
-			if ($entry->vorgaenger_kalender_id)
-			{
-				$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
-				$vorgaenger = $this->_ci->KalenderModel->load(array('tbl_kalender.kalender_id' => $entry->vorgaenger_kalender_id));
-				if (hasData($vorgaenger))
-					$old_entry = getData($vorgaenger)[0];
-			}
-
-			if ($new_status === 'deleted')
-				$row = $this->_buildMailDeleted($entry);
-			else if ($old_entry)
-				$row = $this->_buildMailChanged($old_entry, $entry);
-			else
-				$row = $this->_buildMailNew($entry);
-
-			if (in_array('lektor', $notify))
-			{
-				if ($new_status === 'deleted')
-					$lektor_deleted[] = $row;
-				else if ($old_entry)
-					$lektor_changed[] = $row;
-				else
-					$lektor_added[] = $row;
-			}
-
-			if (in_array('student', $notify))
-			{
-				if ($new_status === 'deleted')
-					$student_deleted[] = $row;
-				else if ($old_entry)
-					$student_changed[] = $row;
-				else
-					$student_added[] = $row;
-			}
-		}
-
-		$lektor_entries = '';
-		$student_entries = '';
-
-		if (!empty($lektor_added))
-			$lektor_entries .= $this->_addToList($lektor_added, 'hinzugefügt') . '<hr/>';
-
-		if (!empty($lektor_changed))
-			$lektor_entries .= $this->_addToList($lektor_changed, 'geändert') . '<hr/>';
-
-		if (!empty($lektor_deleted))
-			$lektor_entries .= $this->_addToList($lektor_deleted, 'gelöscht') . '<hr/>';
-
-		if (!empty($student_added))
-			$student_entries .= $this->_addToList($student_added, 'hinzugefügt') . '<hr/>';
-
-		if (!empty($student_changed))
-			$student_entries .= $this->_addToList($student_changed, 'geändert') . '<hr/>';
-
-		if (!empty($student_deleted))
-			$student_entries .= $this->_addToList($student_deleted, 'gelöscht') . '<hr/>';
-
-		if (!empty($lektor_entries))
-			$this->_ci->maillib->send('', 'ma0048@technikum-wien.at', 'Lektor Tempus Update', $lektor_entries);
-		if (!empty($student_entries))
-			$this->_ci->maillib->send('', 'ma0048@technikum-wien.at', 'Student Tempus Update', $student_entries);
-	}
-
-	private function _addToList($entries, $status)
-	{
-		return 'Folgende Einträge wurden <b>'. $status .'</b>: <ul>' . implode('', $entries) . '</ul>';
-
-	}
-	private function _buildMailNew($entry)
-	{
-		$von = date('d.m.Y H:i', strtotime($entry->von));
-		$bis = date('H:i', strtotime($entry->bis));
-
-		return '<li>
-					<b>Kalender ID ' . ($entry->kalender_id ?? '-') . '</b>
-					<ul>
-						<li><b>Uhrzeit:</b> ' . $von . ' - ' . $bis . '</li>
-						<li><b>Ort:</b> ' . ($entry->ort_kurzbz ?? '-') . '</li>
-					</ul>
-				</li>';
-	}
-
-	private function _buildMailChanged($old_entry, $new_entry)
-	{
-		$old_von = date('d.m.Y H:i', strtotime($old_entry->von));
-		$old_bis = date('H:i', strtotime($old_entry->bis));
-		$new_von = date('d.m.Y H:i', strtotime($new_entry->von));
-		$new_bis = date('H:i', strtotime($new_entry->bis));
-
-		$old_ort = $old_entry->ort_kurzbz ?? '-';
-		$new_ort = $new_entry->ort_kurzbz ?? '-';
-
-		$uhrzeit_changed = ($old_von . $old_bis) !== ($new_von . $new_bis);
-		$ort_changed = $old_ort !== $new_ort;
-
-		$changes = '';
-
-		if ($uhrzeit_changed)
-		{
-			$changes .= '<li>
-							<b>Uhrzeit:</b>
-							<s style="color:red;">' . $old_von . ' - ' . $old_bis . '</s>
-							<span style="color:green;">' . $new_von . ' - ' . $new_bis . '</span>
-						</li>';
-		}
-
-		if ($ort_changed)
-		{
-			$changes .= '<li>
-				<b>Ort:</b>
-				<s style="color:red;">' . $old_ort . '</s>
-				<span style="color:green;">' . $new_ort . '</span>
-			</li>';
-		}
-
-		return '<li>
-					<b>Kalender ID ' . ($new_entry->kalender_id ?? '-') . '</b>
-					<ul>' . $changes . '</ul>
-				</li>';
-	}
-
-	private function _buildMailDeleted($entry)
-	{
-		$von = date('d.m.Y H:i', strtotime($entry->von));
-		$bis = date('H:i', strtotime($entry->bis));
-
-		return '<li style="color:red;">
-					<b><s>Kalender ID ' . ($entry->kalender_id ?? '-') . '</s></b>
-					<ul>
-						<li><s>' . $von . ' - ' . $bis . '</s></li>
-						<li><s>' . ($entry->ort_kurzbz ?? '-') . '</s></li>
-					</ul>
-				</li>';
-	}
-}

application/libraries/StundenplanLib.php

@@ -40,13 +40,16 @@ class StundenplanLib
 	 * @return stdClass
 	 * @access public
 	 */
-	public function getEventsUser($start, $end)
+	public function getEventsUser($start, $end, $uid = null)
 	{
 		$this->_ci =& get_instance();
 
 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$uid = getAuthUID();
+		if (!$uid) {
+			$uid = getAuthUID();
+		}
+		
 		if (is_null($uid))
 			return error("No UID");
 		
@@ -111,6 +114,7 @@ class StundenplanLib
 			return $stundenplan_data;
 		$stundenplan_data = getData($stundenplan_data) ?? [];
 
+		$this->_ci->addMeta("stundenplanData", $stundenplan_data);
 		$function_error = $this->expandObjectInformation($stundenplan_data);
 		if ($function_error)
 			return $function_error;
@@ -217,7 +221,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
 	{
 		$this->_ci =& get_instance();
 
@@ -228,14 +232,14 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? getAuthUID()));
 
 		if ($is_mitarbeiter && empty($ort_kurzbz)) {
 			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $uid);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
 		}
 		
 		if (isError($reservierungen))
@@ -357,7 +361,10 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object = getData($ort_content_object)[0];
+				$ort_content_object_data = getData($ort_content_object);
+				$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
+					? $ort_content_object_data[0]
+					: null;
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}
@@ -368,6 +375,39 @@ class StundenplanLib
 			$item->gruppe = $gruppe_obj_array;
 			$item->lektor = $lektor_obj_array;
 
+			$this->_ci->load->library('PermissionLib');
+			$berechtigt_begrenzt  = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt', 'sui');
+
+			$now = time();
+			$res_lektor_start = $this->jump_day($now, RES_TAGE_LEKTOR_MIN - 1);
+			$res_lektor_ende  = mktime(0, 0, 0, date('m', $now), date('d', $now) + RES_TAGE_LEKTOR_BIS, date('Y', $now));
+
+			$start_date = is_numeric($item->beginn) ? $item->beginn : strtotime($item->beginn);
+			if (!date('w', $start_date)) {
+				$start_date = $this->jump_day($start_date, 1);
+			}
+
+			$start_date_str = date('Y-m-d', $start_date);
+			$res_lektor_start_str = date('Y-m-d', $res_lektor_start);
+			$res_lektor_ende_str = date('Y-m-d', $res_lektor_ende);
+
+			$show_delete = (
+				(
+					$berechtigt_begrenzt &&
+					(
+						(isset($item->insertvon) && $item->insertvon == getAuthUID()) ||
+						(isset($item->uids) && in_array(getAuthUID(), $item->uids))
+					)
+				) &&
+				$start_date_str >= $res_lektor_start_str &&
+				$start_date_str <= $res_lektor_ende_str
+			);
+
+			if ($show_delete)
+				$item->deletable = true;
+			else
+				$item->deletable = false;
+
 		}
 	}
 
@@ -445,6 +485,237 @@ class StundenplanLib
 		return success($ferienEventsFlattened);
 	}
 
+	public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+
+		return success($stundenplan_data);
+	}
+
+	public function addReservation($start, $end, $title, $beschreibung, $ort_kurzbz, $lektoren = null, $studiengang = null, $semester = null, $verband = null, $gruppe = null, $spezialgruppe = null)
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
+		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
+		$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+		$this->_ci->load->model('ressource/stundenplan_model', 'StundenplanModel');
+		$this->_ci->load->library('PermissionLib');
+
+		$startTime = new DateTime($start);
+		$endTime = new DateTime($end);
+
+		$stunden = $this->_ci->StundeModel->loadWhere(array(
+			'beginn <' => $endTime->format('H:i:s'),
+			'ende >' => $startTime->format('H:i:s')
+		));
+
+		if (!hasData($stunden))
+		{
+			return error("Keine Stunden vorhanden");
+		}
+
+		$stunden = array_column(getData($stunden), 'stunde');
+
+		$this->_ci->StundenplandevModel->db->select('1');
+		$this->_ci->StundenplandevModel->db->where('datum', $startTime->format('Y-m-d'));
+		$this->_ci->StundenplandevModel->db->where('ort_kurzbz', $ort_kurzbz);
+		$this->_ci->StundenplandevModel->db->where_in('stunde', $stunden);
+		$stundenplandev_belegung = $this->_ci->StundenplandevModel->load();
+
+		$this->_ci->StundenplanModel->db->select('1');
+		$this->_ci->StundenplanModel->db->where('ort_kurzbz', $ort_kurzbz);
+		$this->_ci->StundenplanModel->db->where('datum', $startTime->format('Y-m-d'));
+		$this->_ci->StundenplanModel->db->where_in('stunde', $stunden);
+		$stundenplan_belegung = $this->_ci->StundenplanModel->load();
+
+		if ((hasData($stundenplandev_belegung) || hasData($stundenplan_belegung))
+			&& !$this->_ci->permissionlib->isBerechtigt('lehre/reservierungAdvanced'))
+			return error ('lvplan/bereitsReserviert');
+
+		$this->_ci->ReservierungModel->addSelect('stunde');
+		$reservation_hours = $this->_ci->ReservierungModel->loadWhere(array('datum' => $startTime->format('Y-m-d'), 'ort_kurzbz' => $ort_kurzbz));
+
+
+		if (isError($reservation_hours))
+			return $reservation_hours;
+
+		$reservation_hours = hasData($reservation_hours) ? array_column(getData($reservation_hours), 'stunde') : array();
+
+		if (!empty(array_intersect($stunden, $reservation_hours))
+			&& !$this->_ci->permissionlib->isBerechtigt('lehre/reservierungAdvanced'))
+			return error("lvplan/bereitsReserviert");
+
+
+		if (!empty($lektoren))
+		{
+			foreach ($lektoren as $lektor)
+			{
+				$insert = array('ort_kurzbz' => $ort_kurzbz,
+					'datum' => $startTime->format('Y-m-d'),
+					'titel' => $title,
+					'studiengang_kz' => is_null($studiengang) ? 0 : $studiengang,
+					'beschreibung' => $beschreibung,
+					'insertvon' => getAuthUID(),
+					'uid' => $lektor,
+					'semester' => is_null($semester) ? null : $semester,
+					'verband' => is_null($verband) ? null : $verband,
+					'gruppe' => is_null($gruppe) ? null : $gruppe,
+					'gruppe_kurzbz' => is_null($spezialgruppe) ? null : $spezialgruppe,
+				);
+
+				foreach ($stunden as $stunde)
+				{
+					$insert['stunde'] = $stunde;
+					$check_insert = $this->_ci->ReservierungModel->insert($insert);
+					if (isError($check_insert))
+						return $check_insert;
+				}
+			}
+		}
+		else
+		{
+			foreach ($stunden as $stunde)
+			{
+				$check_insert = $this->_ci->ReservierungModel->insert(array(
+					'ort_kurzbz' => $ort_kurzbz,
+					'uid' => getAuthUID(),
+					'stunde' => $stunde,
+					'datum' => $startTime->format('Y-m-d'),
+					'titel' => $title,
+					'studiengang_kz' => is_null($studiengang) ? 0 : $studiengang,
+					'beschreibung' => $beschreibung,
+					'insertvon' => getAuthUID()
+				));
+				if (isError($check_insert))
+					return $check_insert;
+			}
+		}
+
+		return success("Erfolgreich");
+	}
+
+	public function deleteReservation($reservierung_id)
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
+		$this->_ci->load->model('ressource/Stunde_model', 'StundeModel');
+		$this->_ci->load->library('PermissionLib');
+
+
+		$this->_ci->ReservierungModel->db->where_in('reservierung_id', $reservierung_id);
+		$reservation = $this->_ci->ReservierungModel->load();
+		if (isError($reservation))
+			return $reservation;
+
+		if (!hasData($reservation))
+			return error("Reservierungen nicht gefunden");
+
+		$reservations = getData($reservation);
+
+		$today = new DateTime();
+		foreach ($reservations as $reservierung)
+		{
+			if ($today->format('Y-m-d') > $reservierung->datum)
+				return error("Vergangene Reservierungen können nicht gelöscht werden");
+
+			if (($this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt')) && ($reservierung->insertvon == getAuthUID() || $reservierung->uid === getAuthUID()))
+			{
+				$delete_result = $this->_ci->ReservierungModel->delete($reservierung->reservierung_id);
+
+				if (isError($delete_result))
+					return $delete_result;
+			}
+		}
+		return success("Erfolgreich");
+	}
+
+
+	public function getReservableMap($ort_kurzbz, $start_date, $end_date)
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
+		$this->_ci->load->library('PermissionLib');
+
+		$berechtigt_begrenzt  = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung:begrenzt', 'suid');
+		$berechtigt_erweitert = $this->_ci->permissionlib->isBerechtigt('lehre/reservierung', 'suid');
+
+		$ort_data = $this->_ci->OrtModel->load($ort_kurzbz);
+		if (isError($ort_data) || !hasData($ort_data))
+			return [];
+
+		$ort_data = getData($ort_data)[0];
+
+		if (!$ort_data->reservieren)
+			return [];
+
+		if (!$berechtigt_begrenzt && !$berechtigt_erweitert)
+			return [];
+
+		$start_ts = is_numeric($start_date) ? (int)$start_date : strtotime($start_date);
+		$end_ts = is_numeric($end_date) ? (int)$end_date : strtotime($end_date);
+
+		if (!$start_ts || !$end_ts)
+			return [];
+
+		if ($end_ts < $start_ts)
+		{
+			$tmp = $start_ts;
+			$start_ts = $end_ts;
+			$end_ts = $tmp;
+		}
+
+		$now = time();
+		$tage_min = defined('RES_TAGE_LEKTOR_MIN') ? (int)RES_TAGE_LEKTOR_MIN : 0;
+		$tage_bis = defined('RES_TAGE_LEKTOR_BIS') ? (int)RES_TAGE_LEKTOR_BIS : 0;
+
+		$datum_res_lektor_start = $this->jump_day($now, $tage_min - 1);
+		$datum_res_lektor_ende = $this->jump_day($now, $tage_bis);
+
+		$start_ymd_allowed = date('Y-m-d', $datum_res_lektor_start);
+		$end_ymd_allowed = date('Y-m-d', $datum_res_lektor_ende);
+
+		$result = [];
+
+		$current = strtotime(date('Y-m-d', $start_ts) . ' 00:00:00');
+		$end_day = strtotime(date('Y-m-d', $end_ts) . ' 00:00:00');
+
+		while ($current <= $end_day)
+		{
+			$ymd = date('Y-m-d', $current);
+
+			if ((int)date('w', $current) === 0)
+			{
+				$result[$ymd] = false;
+				$current = $this->jump_day($current, 1);
+				continue;
+			}
+
+			$result[$ymd] = ($ymd >= $start_ymd_allowed && $ymd <= $end_ymd_allowed) ? true : false;
+
+			$current = $this->jump_day($current, 1);
+		}
+
+		return success($result);
+	}
+
+	private function jump_day($timestamp, $days)
+	{
+		$days = (int)$days;
+		$prefix = ($days >= 0 ? '+' : '');
+		return strtotime($prefix . $days . ' days', $timestamp);
+	}
+
 	// start of the private functions ########################################################################################################
 
 	// function used to sort an array of studiensemester strings

application/libraries/collision/checks/LectureCollisionCheck.php

@@ -1,226 +0,0 @@
-<?php
-
-class LectureCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->model('ressource/zeitsperre_model', 'ZeitsperreModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-
-	}
-
-	public function getName()
-	{
-		return 'lecture';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		$uids = $this->_getUids($data->kalender_id);
-
-		if (empty($uids)) return [];
-
-		$collisions = [];
-
-		$collisions = array_merge($collisions, $this->_checkLehreinheit($uids, $data));
-		$collisions = array_merge($collisions, $this->_checkReservierung($uids, $data));
-		$collisions = array_merge($collisions, $this->_checkZeitsperre($uids, $data));
-
-		return $collisions;
-	}
-
-	public function checkAll($kalender_ids)
-	{
-		if (empty($kalender_ids)) return [];
-
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-		$grouped = [];
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter other_lehreinheithreinheit_ma', 'other_lehreinheithreinheit_ma.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit other_lehreinheit', 'other_lehreinheit.lehreinheit_id = other_lehreinheithreinheit_ma.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit other_kalender_le', 'other_kalender_le.lehreinheit_id = other_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_kalender_le.kalender_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where(
-			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-		$result = $this->_ci->KalenderModel->load();
-		if (!isError($result) && hasData($result))
-			foreach (getData($result) as $row)
-				$grouped[$row->kalender_id][] = true;
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer other_t', 'other_t.uid = current_lehreinheit_ma.mitarbeiter_uid');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event other_e', 'other_e.kalender_id = other_t.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_e.kalender_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where(
-			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-		$result = $this->_ci->KalenderModel->load();
-		if (!isError($result) && hasData($result))
-			foreach (getData($result) as $row)
-				$grouped[$row->kalender_id][] = true;
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('campus.tbl_zeitsperre z',
-			"z.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid AND z.zeitsperretyp_kurzbz != 'ZVerfueg' AND z.vondatum < tbl_kalender.bis AND z.bisdatum > tbl_kalender.von");
-
-		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$result = $this->_ci->KalenderModel->load();
-
-
-		if (!isError($result) && hasData($result))
-			foreach (getData($result) as $row)
-				$grouped[$row->kalender_id][] = true;
-
-
-		return $grouped;
-	}
-
-	private function _getUids($kalender_id)
-	{
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
-		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
-
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'tbl_kalender.kalender_id' => $kalender_id
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$data = getData($result);
-		$mitarbeiter_uids = array_filter(array_column($data, 'mitarbeiter_uid'));
-		$event_teilnehmer = array_filter(array_column($data, 'uid'));
-
-		return array_unique(array_merge($mitarbeiter_uids, $event_teilnehmer));
-	}
-
-	private function _checkLehreinheit($uids, $data)
-	{
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where_in('mitarbeiter_uid', $uids);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
-		$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where(
-			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row) {
-			return $this->_ci->phraseslib->t('ui', 'ma_le_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-		}, getData($result));
-	}
-
-	private function _checkReservierung($uids, $data)
-	{
-		if ($this->_ci->variablelib->getVar('ignore_reservierung') === 'true') return [];
-
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-
-
-		$this->_ci->KalenderModel->addDistinct('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addSelect('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender_event_teilnehmer.uid', $uids);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
-		$this->_ci->KalenderModel->db->where_not_in('uid', $kollisionsfreie_user);
-		$this->_ci->KalenderModel->db->where(
-			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
-			null, false
-		);
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row) {
-			return $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-		}, getData($result));
-	}
-
-	private function _checkZeitsperre($uids, $data)
-	{
-		if ($this->_ci->variablelib->getVar('ignore_zeitsperre') === 'true') return [];
-
-		$this->_ci->ZeitsperreModel->addSelect('mitarbeiter_uid, vondatum as von, bisdatum as bis');
-		$this->_ci->ZeitsperreModel->db->where('zeitsperretyp_kurzbz !=', 'ZVerfueg');
-		$this->_ci->ZeitsperreModel->db->where_in('mitarbeiter_uid', $uids);
-
-		$result = $this->_ci->ZeitsperreModel->loadWhere(array(
-			'vondatum <=' => date('Y-m-d', strtotime($data->bis)),
-			'bisdatum >=' => date('Y-m-d', strtotime($data->von)),
-		));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row) {
-			return $this->_ci->phraseslib->t('ui', 'ma_zeitsperre_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-		}, getData($result));
-	}
-
-}

application/libraries/collision/checks/RoomCollisionCheck.php

@@ -1,75 +0,0 @@
-<?php
-
-class RoomCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-	public function getName()
-	{
-		return 'room';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->ort_kurzbz, $data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		$this->_ci->KalenderModel->addSelect('kalender_id, ort_kurzbz, von, bis');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'kalender_id');
-
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-
-		$result = $this->_ci->KalenderModel->loadWhere(array(
-			'von <' => $data->bis,
-			'bis >' => $data->von,
-			'ort_kurzbz' => $data->ort_kurzbz,
-		));
-
-		if (isError($result)) return [];
-		if (!hasData($result)) return [];
-
-		return array_map(function($row)
-		{
-			return $this->_ci->phraseslib->t('ui', 'raum_kollision') . ': ' . $row->ort_kurzbz . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-		}, getData($result));
-	}
-
-	public function checkAll($kalender_ids)
-	{
-		if (empty($kalender_ids)) return [];
-
-		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort current_ort', 'current_ort.kalender_id = tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort other_ort', 'other_ort.ort_kurzbz = current_ort.ort_kurzbz');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_ort.kalender_id');
-
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
-		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
-
-		$result = $this->_ci->KalenderModel->load();
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-			$grouped[$row->kalender_id][] = true;
-
-		return $grouped;
-	}
-}

application/libraries/collision/checks/StudentCollisionCheck.php

@@ -1,238 +0,0 @@
-<?php
-
-class StudentCollisionCheck implements ICollisionCheck
-{
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-	public function getName()
-	{
-		return 'student';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
-
-		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
-		$placeholders = implode(',', array_fill(0, count($kollisionsfreie_user), '?'));
-
-
-		$dbModel = new DB_Model();
-
-		$qry1 = "
-			SELECT DISTINCT tbl_benutzergruppe.uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe
-				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
-				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-
-			WHERE tbl_kalender.kalender_id = ?
-				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
-			UNION ALL
-
-			SELECT DISTINCT tbl_studentlehrverband.student_uid AS uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband
-				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
-				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
-			WHERE tbl_kalender.kalender_id = ?
-				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
-
-		";
-
-		$result1 = $dbModel->execReadOnlyQuery($qry1, array_merge(
-			[$data->kalender_id],
-			$kollisionsfreie_user,
-			[$data->kalender_id],
-			$kollisionsfreie_user
-		));
-
-		if (isError($result1) || !hasData($result1)) return [];
-
-		$curUids = array_flip(array_column(getData($result1), 'uid'));
-
-		$qry2 = "
-			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_benutzergruppe.uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe
-				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
-				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-			WHERE tbl_kalender.von < ?
-				AND tbl_kalender.bis > ?
-				AND tbl_kalender.kalender_id != ?
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
-				)
-
-			UNION ALL
-			
-			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_studentlehrverband.student_uid AS uid
-			FROM lehre.tbl_kalender
-			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband
-				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
-				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
-				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
-				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
-			WHERE tbl_kalender.von < ?
-				AND tbl_kalender.bis > ?
-				AND tbl_kalender.kalender_id != ?
-				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
-				)
-		";
-
-		$result2 = $dbModel->execReadOnlyQuery($qry2, array_merge(
-			[$data->bis, $data->von, $data->kalender_id],
-			$kollisionsfreie_user,
-			[$data->bis, $data->von, $data->kalender_id],
-			$kollisionsfreie_user
-		));
-
-		if (isError($result2) || !hasData($result2)) return [];
-
-		$conflicts = [];
-		foreach (getData($result2) as $row) {
-			if (isset($curUids[$row->uid])) {
-				$conflicts[] = $this->_ci->phraseslib->t('ui', 'student_kollision')
-					. ': ' . $row->uid
-					. ' (' . date('d.m.Y H:i', strtotime($row->von))
-					. ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-			}
-		}
-
-		return $conflicts;
-	}
-
-	public function checkAll($kalender_ids)
-	{
-
-		if (empty($kalender_ids)) return [];
-
-		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
-
-		$dbModel = new DB_Model();
-		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
-
-		$sql = "
-			SELECT DISTINCT current_kalender.kalender_id, current_benutzergruppe.uid
-			FROM lehre.tbl_kalender current_kalender
-			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe current_gruppe
-				ON current_gruppe.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
-				AND current_gruppe.semester = current_lehreinheitgruppe.semester
-				AND current_gruppe.gruppe_kurzbz = current_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe current_benutzergruppe ON current_benutzergruppe.gruppe_kurzbz = current_gruppe.gruppe_kurzbz
-					AND current_benutzergruppe.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
-			JOIN lehre.tbl_kalender other_kalender
-				ON other_kalender.kalender_id != current_kalender.kalender_id
-				AND other_kalender.von < current_kalender.bis
-				AND other_kalender.bis > current_kalender.von
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
-				)
-			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
-			JOIN public.tbl_gruppe other_gruppe
-				ON other_gruppe.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
-				AND other_gruppe.semester = other_lehreinheitgruppe.semester
-				AND other_gruppe.gruppe_kurzbz = other_lehreinheitgruppe.gruppe_kurzbz
-			JOIN public.tbl_benutzergruppe other_benutzergruppe
-				ON other_benutzergruppe.gruppe_kurzbz = other_gruppe.gruppe_kurzbz
-				AND other_benutzergruppe.uid = current_benutzergruppe.uid
-				AND other_benutzergruppe.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
-
-
-			WHERE current_kalender.kalender_id IN ($placeholders)
-
-			UNION ALL
-
-			SELECT DISTINCT current_kalender.kalender_id, current_studentlehrverband.student_uid AS uid
-			FROM lehre.tbl_kalender current_kalender
-			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband current_studentlehrverband
-				ON current_studentlehrverband.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
-				AND current_studentlehrverband.semester = current_lehreinheitgruppe.semester
-				AND current_studentlehrverband.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
-				AND (current_lehreinheitgruppe.verband = current_studentlehrverband.verband OR current_lehreinheitgruppe.verband IS NULL OR btrim(current_lehreinheitgruppe.verband::text) = '' OR current_studentlehrverband.verband IS NULL)
-				AND (current_lehreinheitgruppe.gruppe = current_studentlehrverband.gruppe OR current_lehreinheitgruppe.gruppe IS NULL OR btrim(current_lehreinheitgruppe.gruppe::text) = '' OR current_studentlehrverband.gruppe IS NULL)
-
-			JOIN lehre.tbl_kalender other_kalender
-				ON other_kalender.kalender_id != current_kalender.kalender_id
-				AND other_kalender.von < current_kalender.bis
-				AND other_kalender.bis > current_kalender.von
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND NOT EXISTS (
-					SELECT 1 FROM lehre.tbl_kalender vorgaenger
-					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
-				)
-			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
-			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
-			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
-			JOIN public.tbl_studentlehrverband other_slv
-				ON other_slv.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
-				AND other_slv.semester = other_lehreinheitgruppe.semester
-				AND other_slv.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
-				AND other_slv.student_uid = current_studentlehrverband.student_uid
-				AND (other_lehreinheitgruppe.verband = other_slv.verband OR other_lehreinheitgruppe.verband IS NULL OR btrim(other_lehreinheitgruppe.verband::text) = '' OR other_slv.verband IS NULL)
-				AND (other_lehreinheitgruppe.gruppe = other_slv.gruppe OR other_lehreinheitgruppe.gruppe IS NULL OR btrim(other_lehreinheitgruppe.gruppe::text) = '' OR other_slv.gruppe IS NULL)
-
-			WHERE current_kalender.kalender_id IN ($placeholders)
-		";
-
-		$result = $dbModel->execReadOnlyQuery($sql, array_merge($kalender_ids, $kalender_ids));
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-			$grouped[$row->kalender_id][] = true;
-
-		return $grouped;
-	}
-}

application/libraries/collision/checks/VerbandCollisionCheck.php

@@ -1,350 +0,0 @@
-<?php
-
-class VerbandCollisionCheck implements ICollisionCheck
-{
-
-	private $_ci;
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-
-	}
-
-	public function getName()
-	{
-		return 'verband';
-	}
-
-	public function check($data)
-	{
-		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
-
-		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
-
-		$kollision_student = $this->_ci->variablelib->getVar('kollision_student') === 'false';
-		$kollision_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung') === 'false';
-
-		if (!$kollision_student && !$kollision_reservierung) return [];
-
-		$dbModel = new DB_Model();
-		$collisions = [];
-
-		if ($kollision_student)
-		{
-			$union_event = "";
-
-			if ($kollision_reservierung)
-			{
-				$union_event = "
-					UNION
-					SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe, tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
-					FROM lehre.tbl_kalender_event_teilnehmer
-					WHERE tbl_kalender_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
-				";
-			}
-
-			$sql_gruppen = "
-				SELECT
-					other_kalender.von,
-					other_kalender.bis,
-					COALESCE(
-						other_lehreinheitguppe.gruppe_kurzbz,
-						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_lehreinheitguppe.semester ||
-						COALESCE(other_lehreinheitguppe.verband::text, '') ||
-						COALESCE(other_lehreinheitguppe.gruppe::text, '')
-					) AS gruppenname
-				FROM lehre.tbl_kalender current_kalender
-
-				JOIN (
-					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-					FROM lehre.tbl_kalender_lehreinheit
-					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-					". $union_event ."
-				) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
-
-				LEFT JOIN public.tbl_gruppe current_gruppe
-					ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
-
-				JOIN lehre.tbl_kalender other_kalender
-					ON other_kalender.kalender_id != current_kalender.kalender_id
-					AND other_kalender.von < ?
-					AND other_kalender.bis > ?
-
-				JOIN (
-					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-					FROM lehre.tbl_kalender_lehreinheit
-					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-					". $union_event ."
-				) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
-
-				LEFT JOIN public.tbl_gruppe other_gruppe
-					ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
-
-				LEFT JOIN public.tbl_studiengang stg
-					ON stg.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-
-				WHERE current_kalender.kalender_id = ?
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-				AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-				AND (
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND (
-							current_lehreinheitguppe.verband IS NULL
-							OR (
-								current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
-								AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
-							)
-						)
-					)
-					OR
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND current_gruppe.direktinskription IS NOT TRUE
-						AND other_gruppe.direktinskription IS NOT TRUE
-					)
-					OR
-					(
-						(
-							current_lehreinheitguppe.gruppe_kurzbz IS NULL
-							AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-							AND other_gruppe.direktinskription IS NOT TRUE
-						)
-						OR
-						(
-							current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-							AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-							AND current_gruppe.direktinskription IS NOT TRUE
-						)
-					)
-				)
-				AND other_kalender.kalender_id NOT IN (
-					SELECT vorgaenger_kalender_id
-					FROM lehre.tbl_kalender
-					WHERE vorgaenger_kalender_id IS NOT NULL
-				)
-			";
-
-			$result = $dbModel->execReadOnlyQuery($sql_gruppen, [
-				$data->bis,
-				$data->von,
-				$data->kalender_id,
-			]);
-
-			if (!isError($result) && hasData($result))
-			{
-				foreach (getData($result) as $row)
-					$collisions[] = $this->_ci->phraseslib->t('ui', 'verband_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-			}
-		}
-
-		if ($kollision_reservierung && !$kollision_student)
-		{
-			$sql_reservierung = "
-				SELECT
-					other_kalender.von,
-					other_kalender.bis,
-					COALESCE(
-						other_event_teilnehmer.gruppe_kurzbz,
-						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_event_teilnehmer.semester ||
-						COALESCE(other_event_teilnehmer.verband::text, '') ||
-						COALESCE(other_event_teilnehmer.gruppe::text, '')
-					) AS gruppenname
-				FROM lehre.tbl_kalender_event_teilnehmer current_event_teilnehmer
-				LEFT JOIN public.tbl_gruppe current_gruppe
-					ON current_gruppe.gruppe_kurzbz = current_event_teilnehmer.gruppe_kurzbz
-
-				JOIN lehre.tbl_kalender other_kalender
-					ON other_kalender.kalender_id != ?
-					AND other_kalender.von < ?
-					AND other_kalender.bis > ?
-
-				JOIN lehre.tbl_kalender_event_teilnehmer other_event_teilnehmer
-					ON other_event_teilnehmer.kalender_id = other_kalender.kalender_id
-					AND other_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
-
-				LEFT JOIN public.tbl_gruppe other_gruppe
-					ON other_gruppe.gruppe_kurzbz = other_event_teilnehmer.gruppe_kurzbz
-
-				LEFT JOIN public.tbl_studiengang stg
-					ON stg.studiengang_kz = other_event_teilnehmer.studiengang_kz
-
-				WHERE current_event_teilnehmer.kalender_id = ?
-				AND current_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
-				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-				AND current_event_teilnehmer.studiengang_kz = other_event_teilnehmer.studiengang_kz
-				AND current_event_teilnehmer.semester = other_event_teilnehmer.semester
-				AND (
-					(
-						current_event_teilnehmer.gruppe_kurzbz IS NULL
-						AND other_event_teilnehmer.gruppe_kurzbz IS NULL
-						AND (
-							current_event_teilnehmer.verband IS NULL
-							OR (
-								current_event_teilnehmer.verband = other_event_teilnehmer.verband
-								AND (current_event_teilnehmer.gruppe IS NULL OR other_event_teilnehmer.gruppe IS NULL OR current_event_teilnehmer.gruppe = other_event_teilnehmer.gruppe)
-							)
-						)
-					)
-					OR
-					(
-						current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-						AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-						AND current_gruppe.direktinskription IS NOT TRUE
-						AND other_gruppe.direktinskription IS NOT TRUE
-					)
-					OR
-					(
-						(
-							current_event_teilnehmer.gruppe_kurzbz IS NULL
-							AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-							AND other_gruppe.direktinskription IS NOT TRUE
-						)
-						OR
-						(
-							current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
-							AND other_event_teilnehmer.gruppe_kurzbz IS NULL
-							AND current_gruppe.direktinskription IS NOT TRUE
-						)
-					)
-				)
-				AND other_kalender.kalender_id NOT IN (
-					SELECT vorgaenger_kalender_id
-					FROM lehre.tbl_kalender
-					WHERE vorgaenger_kalender_id IS NOT NULL
-				)
-			";
-
-			$result = $dbModel->execReadOnlyQuery($sql_reservierung, [
-				$data->kalender_id,
-				$data->bis,
-				$data->von,
-				$data->kalender_id,
-			]);
-
-			if (!isError($result) && hasData($result))
-			{
-				foreach (getData($result) as $row)
-					$collisions[] = $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
-			}
-		}
-
-		return $collisions;
-	}
-
-	public function checkAll($kalender_ids)
-	{
-		if (empty($kalender_ids)) return [];
-
-		$dbModel = new DB_Model();
-
-		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
-
-		$sql = "
-			SELECT DISTINCT ON (current_kalender.kalender_id) current_kalender.kalender_id
-			FROM lehre.tbl_kalender current_kalender
-	
-			JOIN (
-				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-				FROM lehre.tbl_kalender_lehreinheit
-				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-				UNION
-				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
-					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
-				FROM lehre.tbl_kalender_event_teilnehmer
-			) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
-	
-			LEFT JOIN public.tbl_gruppe current_gruppe
-				ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
-	
-			JOIN lehre.tbl_kalender other_kalender
-				ON other_kalender.kalender_id != current_kalender.kalender_id
-				AND other_kalender.von < current_kalender.bis
-				AND other_kalender.bis > current_kalender.von
-	
-			JOIN (
-				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
-					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
-				FROM lehre.tbl_kalender_lehreinheit
-				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
-				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
-				UNION
-				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
-					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
-				FROM lehre.tbl_kalender_event_teilnehmer
-			) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
-	
-			LEFT JOIN public.tbl_gruppe other_gruppe
-				ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
-	
-			WHERE current_kalender.kalender_id IN ({$placeholders})
-			AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
-			AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
-			AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
-			AND (
-				(
-					current_lehreinheitguppe.gruppe_kurzbz IS NULL
-					AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-					AND (
-						current_lehreinheitguppe.verband IS NULL
-						OR (
-							current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
-							AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
-						)
-					)
-				)
-				OR
-				(
-					current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-					AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-					AND current_gruppe.direktinskription IS NOT TRUE
-					AND other_gruppe.direktinskription IS NOT TRUE
-				)
-				OR
-				(
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND other_gruppe.direktinskription IS NOT TRUE
-					)
-					OR
-					(
-						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
-						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
-						AND current_gruppe.direktinskription IS NOT TRUE
-					)
-				)
-			)
-			AND other_kalender.kalender_id NOT IN (
-				SELECT vorgaenger_kalender_id
-				FROM lehre.tbl_kalender
-				WHERE vorgaenger_kalender_id IS NOT NULL
-			)
-			
-		";
-
-		$result = $dbModel->execReadOnlyQuery($sql, $kalender_ids);
-
-		if (isError($result) || !hasData($result)) return [];
-
-		$grouped = [];
-		foreach (getData($result) as $row)
-			$grouped[$row->kalender_id][] = true;
-
-		return $grouped;
-	}
-
-}

application/libraries/dashboard/DashboardLib.php

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

application/libraries/vertragsbestandteil/AbstractBestandteil.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

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

application/models/codex/Mobilitaet_model.php

@@ -11,4 +11,73 @@ class Mobilitaet_model extends DB_Model
 		$this->dbTable = 'bis.tbl_mobilitaet';
 		$this->pk = 'mobilitaet_id';
 	}
+	
+	public function getMobilityZusatzForUids($uids) {
+		$qry = "SELECT distinct on(nachname, vorname, public.tbl_benutzer.person_id) uid,
+			tbl_mitarbeiter.mitarbeiter_uid,
+			tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung,
+			tbl_mobilitaet.mobilitaetstyp_kurzbz,
+			(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN 1 ELSE 0 END) as doubledegree,
+			public.tbl_prestudent.gsstudientyp_kurzbz as ddtype,
+			(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
+			campus.vw_student_lehrveranstaltung
+			 JOIN public.tbl_benutzer USING(uid)
+			 JOIN public.tbl_person USING(person_id)
+			 LEFT JOIN public.tbl_student ON(uid=student_uid)
+			 LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
+			 LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
+			 LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
+				AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
+				AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
+			LEFT JOIN lehre.tbl_note USING (note)
+			LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
+			LEFT JOIN public.tbl_studiengang ON(tbl_student.studiengang_kz=tbl_studiengang.studiengang_kz)
+				LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id)
+				LEFT JOIN public.tbl_prestudent USING(prestudent_id)
+		WHERE uid IN ?";
+		
+		return $this->execReadOnlyQuery($qry, [$uids]);
+	}
+
+	public function formatZusatz($entry, $erhalter_kz) {
+		$zusatz = '';
+
+		if (isset($entry->studienstatus) && $entry->studienstatus === 'Incoming') {
+			$zusatz = '(i)';
+		}
+
+		if (isset($entry->lkt_ueberschreibbar) && $entry->lkt_ueberschreibbar === false) {
+			$zusatz .= ' (' . ($entry->anmerkung ?? '') . ')';
+		}
+
+		if (isset($entry->mitarbeiter_uid) && $entry->mitarbeiter_uid !== null) {
+			$zusatz .= ' (ma)';
+		}
+
+		if (isset($entry->stg_kz_student) && $entry->stg_kz_student == $erhalter_kz) {
+			$zusatz .= ' (a.o.)';
+		}
+
+		if (
+			isset($entry->mobilitaetstyp_kurzbz) && $entry->mobilitaetstyp_kurzbz &&
+			isset($entry->doubledegree) && $entry->doubledegree === 1
+		) {
+			$zusatz .= ' (d.d.';
+
+			$ddtype = $entry->ddtype ?? null;
+
+			if ($ddtype == 'Intern') {
+				$zusatz .= 'i.)';
+			} elseif ($ddtype == 'Extern') {
+				$zusatz .= 'o.)';
+			} else {
+				$zusatz .= ')';
+			}
+		}
+
+		return $zusatz;
+	}
 }

application/models/content/Content_model.php

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

application/models/dashboard/Bookmark_model.php

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

application/models/dashboard/Dashboard_model.php

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

application/models/education/Abschlusspruefung_model.php

@@ -100,12 +100,14 @@ class Abschlusspruefung_model extends DB_Model
 
 					if (isError($abschlussarbeit))
 						return $abschlussarbeit;
+
 					if (hasData($abschlussarbeit))
 					{
 						$abschlussarbeit = getData($abschlussarbeit)[0];
 						$abschlusspruefungdata->projektarbeit_studiengangstyp_name = $abschlussarbeit->projekttyp_kurzbz;
 						$abschlusspruefungdata->abschlussarbeit_titel = $abschlussarbeit->titel;
 						$abschlusspruefungdata->abschlussarbeit_note = $abschlussarbeit->note;
+						$abschlusspruefungdata->abschlussarbeit_sprache = $abschlussarbeit->sprache_bezeichnung;
 					}
 				}
 			}

application/models/education/LePruefung_model.php

@@ -52,4 +52,53 @@ class LePruefung_model extends DB_Model
 			'student_uid' => $student_uid
 		]);
 	}
+
+	public function getPruefungenByLvStudiensemester($lv_id, $sem_kurzbz) {
+		$qry = "SELECT lehre.tbl_pruefung.*, tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
+				   tbl_note.bezeichnung as note_bezeichnung, tbl_pruefungstyp.beschreibung as typ_beschreibung, tbl_lehreinheit.studiensemester_kurzbz as studiensemester_kurzbz
+			FROM lehre.tbl_pruefung, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_note, lehre.tbl_pruefungstyp
+			WHERE lehre.tbl_pruefung.lehreinheit_id=tbl_lehreinheit.lehreinheit_id
+			  AND tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
+			  AND lehre.tbl_pruefung.note = tbl_note.note
+			  AND lehre.tbl_pruefung.pruefungstyp_kurzbz=tbl_pruefungstyp.pruefungstyp_kurzbz
+			  AND tbl_lehrveranstaltung.lehrveranstaltung_id = ?
+			  AND tbl_lehreinheit.studiensemester_kurzbz = ?
+			ORDER BY datum DESC;";
+
+		return $this->execReadOnlyQuery($qry, array($lv_id, $sem_kurzbz));
+	}
+
+	public function getPruefungenByUidTypLvStudiensemester($uid, $typ = null, $lv_id = null, $sem_kurzbz = null) {
+		$params = [$uid];
+		$qry = "SELECT tbl_pruefung.*, tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, tbl_lehrveranstaltung.lehrveranstaltung_id,
+			    tbl_note.bezeichnung as note_bezeichnung, tbl_pruefungstyp.beschreibung as typ_beschreibung, tbl_lehreinheit.studiensemester_kurzbz as studiensemester_kurzbz
+			    FROM lehre.tbl_pruefung, lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung, lehre.tbl_note, lehre.tbl_pruefungstyp
+			    WHERE student_uid= ?
+			    AND tbl_pruefung.lehreinheit_id=tbl_lehreinheit.lehreinheit_id
+			    AND tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
+			    AND tbl_pruefung.note = tbl_note.note
+			    AND tbl_pruefung.pruefungstyp_kurzbz=tbl_pruefungstyp.pruefungstyp_kurzbz";
+		if ($typ != null)
+		{
+			$qry .= " AND tbl_pruefungstyp.pruefungstyp_kurzbz = ?";
+			$params[] = $typ;
+		}
+
+		if ($lv_id != null)
+		{
+			$qry .= " AND tbl_lehrveranstaltung.lehrveranstaltung_id = ?";
+			$params[] = $lv_id;
+		}
+
+		if ($sem_kurzbz != null)
+		{
+			$qry .= " AND tbl_lehreinheit.studiensemester_kurzbz = ?";
+			$params[] = $sem_kurzbz;
+		}
+
+
+		$qry .= " ORDER BY datum DESC";
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
 }

application/models/education/Lehreinheit_model.php

@@ -739,4 +739,26 @@ EOSQL;
 				)";
 	}
 
+
+	public function getAllLehreinheitenForLvaAndMaUid($lva_id, $ma_uid, $sem_kurzbz)
+	{
+		$query = "SELECT DISTINCT tbl_lehreinheitmitarbeiter.lehreinheit_id, tbl_lehreinheit.lehrveranstaltung_id, tbl_lehreinheit.lehrform_kurzbz,
+						tbl_lehreinheitmitarbeiter.mitarbeiter_uid,
+						tbl_lehreinheitgruppe.semester,
+						tbl_lehreinheitgruppe.verband,
+						tbl_lehreinheitgruppe.gruppe,
+						tbl_lehreinheitgruppe.gruppe_kurzbz,
+						tbl_lehrveranstaltung.kurzbz,
+			 			tbl_studiengang.kurzbzlang,
+			 			(SELECT COUNT(DISTINCT datum) FROM campus.vw_stundenplan WHERE lehreinheit_id = lehre.tbl_lehreinheit.lehreinheit_id) as termincount,
+						(SELECT COUNT(*) FROM campus.vw_student_lehrveranstaltung WHERE lehreinheit_id = lehre.tbl_lehreinheit.lehreinheit_id) as studentcount
+		FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+			JOIN lehre.tbl_lehreinheitgruppe USING(lehreinheit_id)
+			JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+			JOIN public.tbl_studiengang ON (tbl_lehreinheitgruppe.studiengang_kz = tbl_studiengang.studiengang_kz)
+		WHERE lehrveranstaltung_id = ? AND studiensemester_kurzbz = ? AND mitarbeiter_uid = ?
+		ORDER BY tbl_lehreinheitgruppe.gruppe_kurzbz";
+
+		return $this->execQuery($query, [$lva_id, $sem_kurzbz, $ma_uid]);
+	}
 }

application/models/education/Lehrveranstaltung_model.php

@@ -317,7 +317,7 @@ class Lehrveranstaltung_model extends DB_Model
 			tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
 			tbl_zeugnisnote.note, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_benutzer.uid,
 			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung,
-			tbl_student.prestudent_id
+			tbl_student.prestudent_id, campus.vw_student_lehrveranstaltung.lehreinheit_id
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN public.tbl_benutzer USING(uid)
@@ -402,14 +402,17 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit
+				lehre.tbl_lehreinheit le
 				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
 				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
 				JOIN public.tbl_person p using (person_id) 
 			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id= ?
-				AND tbl_lehreinheit.studiensemester_kurzbz = ?
+				le.lehrveranstaltung_id= ?
+				AND le.studiensemester_kurzbz = ?
 				AND lehrfunktion_kurzbz = 'LV-Leitung'
+				AND lema.mitarbeiter_uid NOT like '_Dummy%' 
+			  	AND b.aktiv = TRUE 
+			  	AND p.aktiv = TRUE
             ORDER BY 
                 lema.insertamum DESC
 			LIMIT 1
@@ -1343,4 +1346,65 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	public function getLvForLektorInSemester($sem_kurzbz, $uid) {
+		$qry = "SELECT DISTINCT (tbl_lehrveranstaltung.lehrveranstaltung_id),
+				UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as stg_kurzbz,
+				tbl_lehrveranstaltung.semester as lv_semester,
+				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+				(SELECT kurzbz FROM public.tbl_mitarbeiter
+				 WHERE mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid) as lektor
+			FROM
+				lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+									  JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+									  JOIN public.tbl_studiengang USING(studiengang_kz)
+									  JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
+			WHERE
+				tbl_lehreinheit.studiensemester_kurzbz = ?
+			  AND mitarbeiter_uid = ?
+			ORDER BY stg_kurzbz,lv_semester,lv_bezeichnung";
+
+		return $this->execReadOnlyQuery($qry, array($sem_kurzbz, $uid));
+	}
+
+	// used for cis4 mylv mitarbeiter
+	public function getLvsByMitarbeiterInSemester($mitarbeiter_uid, $sem_kurzbz) {
+		$qry = "SELECT * FROM (
+					SELECT DISTINCT ON (lehre.tbl_lehrveranstaltung.lehrveranstaltung_id) 
+						public.tbl_studiengang.studiengang_kz,
+						lehre.tbl_lehrveranstaltung.semester,
+						public.tbl_studiengang.bezeichnung as sg_bezeichnung,
+						public.tbl_studiengang.english as sg_bezeichnung_eng,
+						UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as studiengang_kuerzel,
+						lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,
+						lehre.tbl_lehrveranstaltung.bezeichnung,
+						lehre.tbl_lehrveranstaltung.bezeichnung_english as bezeichnung_eng,
+						lehre.tbl_lehrveranstaltung.farbe,
+						lehre.tbl_lehrveranstaltung.lvinfo,
+						lehre.tbl_lehrveranstaltung.benotung,
+						lehre.tbl_lehrveranstaltung.orgform_kurzbz,
+						lehre.tbl_lehrveranstaltung.sprache,
+						lehre.tbl_lehrveranstaltung.ects,
+						lehre.tbl_lehrveranstaltung.incoming
+					FROM
+						lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+											  JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+											  JOIN public.tbl_studiengang USING(studiengang_kz)
+											  JOIN lehre.tbl_lehrveranstaltung as lehrfach ON(tbl_lehreinheit.lehrfach_id=lehrfach.lehrveranstaltung_id)
+					WHERE
+						tbl_lehreinheit.studiensemester_kurzbz = ?
+					AND mitarbeiter_uid = ?) as distincted_by_lva_id
+					JOIN (
+						SELECT lehrveranstaltung_id, TRUNC(SUM(lehre.tbl_lehreinheitmitarbeiter.semesterstunden)) as semesterstunden
+						FROM lehre.tbl_lehreinheit
+								 JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+								 JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+						WHERE tbl_lehreinheit.studiensemester_kurzbz = ?
+							AND mitarbeiter_uid = ?
+						GROUP BY lehrveranstaltung_id
+					) semesterstundenAggregatedSubquery USING(lehrveranstaltung_id)
+				ORDER BY studiengang_kuerzel, semester, bezeichnung";
+		
+		return $this->execReadOnlyQuery($qry, [$sem_kurzbz, $mitarbeiter_uid, $sem_kurzbz, $mitarbeiter_uid]);
+	}
 }

application/models/education/Lvgesamtnote_model.php

@@ -14,7 +14,7 @@ class Lvgesamtnote_model extends DB_Model
 	}
 
 	/**
-	 * Laedt die Noten
+	 * Laedt die Noten - lvgesamtnote (Vorschlag) JOIN tbl.note (zeugnisnote)
 	 *
 	 * @param integer				$lehrveranstaltung_id
 	 * @param string				$student_uid
@@ -46,4 +46,19 @@ class Lvgesamtnote_model extends DB_Model
 
 		return $this->loadWhere($where);
 	}
+
+	public function getLvGesamtNoteVorschlag($lehrveranstaltung_id, $student_uid, $studiensemester_kurzbz)
+	{
+		$qry = "SELECT * FROM campus.tbl_lvgesamtnote
+				WHERE campus.tbl_lvgesamtnote.student_uid = ? 
+				  AND campus.tbl_lvgesamtnote.studiensemester_kurzbz = ?";
+		$params = [$student_uid, $studiensemester_kurzbz];
+		
+		if ($lehrveranstaltung_id) {
+			$qry .= "AND campus.tbl_lvgesamtnote.lehrveranstaltung_id = ?";
+			$params[] = $lehrveranstaltung_id;
+		}
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
 }

application/models/education/Note_model.php

@@ -11,12 +11,33 @@ class Note_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_note';
 		$this->pk = 'note';
 	}
-
+	
 	public function getAllActive() {
 		$qry ="SELECT *
 			FROM lehre.tbl_note
 			WHERE aktiv = true";
+		
+		return $this->execReadOnlyQuery($qry);
+	}
+	
+	// used to determine the primary key of note "entschuldigt" to avoid hardcoded magic numbers
+	// that might differ in a different installation of fhcomplete
+	public function getEntschuldigtNote() {
+		$qry ="SELECT *
+			FROM lehre.tbl_note
+			WHERE bezeichnung = 'entschuldigt'";
 
 		return $this->execReadOnlyQuery($qry);
 	}
+
+	// used to determine the primary key of note "noch nicht eingetragen" to avoid hardcoded magic numbers
+	// that might differ in a different installation of fhcomplete
+	public function getNochNichtEingetragenNote() {
+		$qry ="SELECT *
+			FROM lehre.tbl_note
+			WHERE bezeichnung = 'Noch nicht eingetragen'";
+
+		return $this->execReadOnlyQuery($qry);
+	}
+	
 }

application/models/education/Notenschluesselaufteilung_model.php

@@ -26,6 +26,9 @@ class Notenschluesselaufteilung_model extends DB_Model
 		$this->load->model('education/Notenschluesselzuordnung_model', 'NotenschluesselzuordnungModel');
 		$notenschluessel_kurzbz = $this->NotenschluesselzuordnungModel->getKurzbzForLv($lehrveranstaltung_id, $studiensemester_kurzbz);
 
+		if($notenschluessel_kurzbz == null)
+			return success(null);
+		
 		$this->addSelect("note");
 		$this->addOrder("punkte", "DESC");
 		$this->addLimit(1);

application/models/education/Paabgabe_model.php

@@ -61,6 +61,174 @@ class Paabgabe_model extends DB_Model
 		return $this->execReadOnlyQuery($qry, array($person_id));
 	}
 
+	/**
+	 * Gets project submissions for search criteria.
+	 * @param array $projekttyp_kurzbz_arr contains all relevant project types (e.g. Bachelor)
+	 * @param int $studiengang_kz study program
+	 * @param string $abgabetyp_kurzbz project submission type (e.g. end upload, intermediate submission)
+	 * @param string $abgabedatum due date for hand-in
+	 * @param string $personSearchString for searching by person, i.e. name, uid, person/prestudent id
+	 * @param int $limit limiting max number of results if search criteria is not precise enough
+	 * @return object
+	 */
+	public function getPaAbgaben(
+		$projekttyp_kurzbz_arr,
+		$studiengang_kz = null,
+		$abgabetyp_kurzbz = null,
+		$abgabedatum = null,
+		$personSearchString = null,
+		$limit = 1000
+	) {
+		$params = [];
+
+		$qry = "
+			SELECT
+				stg.bezeichnung AS stgbez, paabg.datum AS termin,
+				paabg.paabgabe_id, paabg.projektarbeit_id, paabg.paabgabetyp_kurzbz, paabg.abgabedatum,
+				abgabetyp.bezeichnung AS paabgabetyp_bezeichnung, ben.uid, pers.vorname, pers.nachname, pa.projekttyp_kurzbz, pa.titel,
+				UPPER(stg.typ || stg.kurzbz) AS studiengang_kuerzel,
+				(
+					 /* show all relevant Studiengänge of person and wether it is an employee*/
+					SELECT
+						STRING_AGG(studiengang || ' ' || last_status, ' | ')
+						|| (CASE WHEN EXISTS (
+							SELECT 1 FROM public.tbl_mitarbeiter ma
+							JOIN public.tbl_benutzer ben ON ma.mitarbeiter_uid = ben.uid
+							WHERE person_id = prestudents.person_id
+							AND ben.aktiv
+							) THEN ' | Mitarbeiter' ELSE '' END)
+					FROM (
+						SELECT
+							DISTINCT person_id, prestudent_id, UPPER(stg.typ || stg.kurzbz) AS studiengang,
+							get_rolle_prestudent(ps.prestudent_id, null) AS last_status
+						FROM
+							public.tbl_prestudent ps
+						JOIN public.tbl_studiengang stg USING (studiengang_kz)
+						WHERE
+							person_id = pers.person_id
+						ORDER BY
+							prestudent_id DESC
+					) prestudents
+					WHERE
+						last_status IN ('Abgewiesener','Aufgenommener', 'Student', 'Incoming', 'Diplomand', 'Abbrecher', 'Unterbrecher', 'Absolvent')
+					GROUP BY
+						person_id
+					LIMIT 1;
+				) AS status
+			FROM
+				lehre.tbl_projektarbeit pa
+				JOIN campus.tbl_paabgabe paabg USING(projektarbeit_id)
+				JOIN campus.tbl_paabgabetyp abgabetyp USING(paabgabetyp_kurzbz)
+				LEFT JOIN public.tbl_benutzer ben ON(uid=student_uid)
+				LEFT JOIN public.tbl_person pers ON(ben.person_id=pers.person_id)
+				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+				LEFT JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			WHERE
+				TRUE";
+
+		if (isset($projekttyp_kurzbz_arr) && !isEmptyArray($projekttyp_kurzbz_arr))
+		{
+			$qry .= " AND projekttyp_kurzbz IN ?";
+			$params[] = $projekttyp_kurzbz_arr;
+		}
+
+		if (isset($studiengang_kz) && is_numeric($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz=?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($abgabetyp_kurzbz))
+		{
+			$qry .= " AND paabg.paabgabetyp_kurzbz=?";
+			$params[] = $abgabetyp_kurzbz;
+		}
+
+		if (isset($abgabedatum))
+		{
+			$qry .= " AND paabg.datum=?";
+			$params[] = $abgabedatum;
+		}
+
+		if (is_numeric($personSearchString))
+		{
+			$personSearchString = (int) $personSearchString;
+			$params = array_merge($params, [$personSearchString, $personSearchString]);
+			$qry .= " AND (
+				pers.person_id = ?
+				OR EXISTS (SELECT 1 FROM public.tbl_prestudent WHERE person_id = pers.person_id AND prestudent_id = ?)
+			)";
+		}
+		elseif (is_string($personSearchString))
+		{
+			// remove empty spaces and lowercase
+			$personSearchString = strtolower(str_replace(' ', '', $personSearchString));
+			$qry .= " AND (
+				LOWER(REPLACE(pers.nachname || pers.vorname || pers.nachname, ' ', '')) LIKE ".$this->db->escape('%'.$personSearchString.'%')."
+				OR ben.uid LIKE ".$this->db->escape('%'.$personSearchString.'%')."
+			)";
+		}
+
+		$qry .= " ORDER BY nachname";
+
+		if (isset($limit) && is_numeric($limit) && (!isset($studiengang_kz) || !is_numeric($studiengang_kz)) && !isset($abgabedatum))
+		{
+			$qry .= " LIMIT ?";
+			$params[] = $limit;
+		}
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
+
+	/**
+	 * Gets due dates for projekt submission search criteria.
+	 * @param array $projekttyp_kurzbz_arr contains all relevant project types (e.g. Bachelor)
+	 * @param int $studiengang_kz study program
+	 * @param string $abgabetyp_kurzbz project submission type (e.g. end upload, intermediate submission)
+	 * @return object
+	 */
+	public function getTermine($projekttyp_kurzbz_arr, $studiengang_kz, $abgabetyp_kurzbz)
+	{
+		$params = [];
+
+		$qry = "
+			SELECT
+				DISTINCT tbl_paabgabe.datum as termin, to_char(tbl_paabgabe.datum, 'DD.MM.YYYY') as termin_anzeige
+			FROM
+				lehre.tbl_projektarbeit
+				JOIN campus.tbl_paabgabe USING(projektarbeit_id)
+				LEFT JOIN public.tbl_benutzer ON(uid=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 USING(studiengang_kz)
+			WHERE
+				TRUE";
+
+		if (isset($projekttyp_kurzbz_arr) && !isEmptyArray($projekttyp_kurzbz_arr))
+		{
+			$qry .= " AND projekttyp_kurzbz IN ?";
+			$params[] = $projekttyp_kurzbz_arr;
+		}
+
+		if (isset($studiengang_kz) && is_numeric($studiengang_kz))
+		{
+			$qry .= " AND public.tbl_studiengang.studiengang_kz=?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($abgabetyp_kurzbz))
+		{
+			$qry .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz=?";
+			$params[] = $abgabetyp_kurzbz;
+		}
+
+		$qry .= " ORDER BY termin DESC";
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
+
 	public function findAbgabenNewOrUpdatedSince($interval, $relevantTypes)
 	{
 
@@ -79,10 +247,10 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
-		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
-		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-
+		WHERE (campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
+			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
+			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+		
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
@@ -108,7 +276,7 @@ class Paabgabe_model extends DB_Model
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";

application/models/education/Projektarbeit_model.php

@@ -23,9 +23,11 @@ class Projektarbeit_model extends DB_Model
 	 */
 	public function getProjektarbeit($student_uid, $studiengang_kz = null, $studiensemester_kurzbz = null, $projekttyp = null, $final = null)
 	{
+		$sprache_index = "COALESCE((SELECT index FROM public.tbl_sprache WHERE sprache=" . $this->escape(getUserLanguage()) . " LIMIT 1), 1)";
 		$qry = "SELECT
 					pa.*, tbl_projekttyp.bezeichnung,
 					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
+					tbl_sprache.bezeichnung[".$sprache_index."] AS sprache_bezeichnung,
 					tbl_firma.name AS firma_name,
 					(
 						SELECT
@@ -44,6 +46,7 @@ class Projektarbeit_model extends DB_Model
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
 					LEFT JOIN public.tbl_firma USING (firma_id)
+					LEFT JOIN public.tbl_sprache ON pa.sprache = tbl_sprache.sprache
 				WHERE
 					pa.student_uid = ?";
 

application/models/education/Pruefung_model.php

@@ -306,4 +306,5 @@ class Pruefung_model extends DB_Model
 
 		return $this->loadWhereCommitteeExamsFailed();
 	}
+	
 }

application/models/organisation/Gruppe_model.php

@@ -11,26 +11,4 @@ class Gruppe_model extends DB_Model
 		$this->dbTable = 'public.tbl_gruppe';
 		$this->pk = 'gruppe_kurzbz';
 	}
-
-	public function search($query_words)
-	{
-		$this->addSelect('gruppe_kurzbz,
-											studiengang_kz,
-											semester,
-											bezeichnung,
-											gid,
-											\'false\' as lehrverband');
-		$this->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
-		$this->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->db->group_start();
-			$this->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->db->group_end();
-		}
-		$this->db->group_end();
-
-		return $this->load();
-	}
 }

application/models/organisation/Lehrverband_model.php

@@ -41,29 +41,4 @@ class Lehrverband_model extends DB_Model
 
 		return $result;
 	}
-
-	public function search($query_words)
-	{
-		$this->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
-												studiengang_kz,
-												semester,
-												tbl_lehrverband.bezeichnung,
-												gid,
-												\'true\' as lehrverband');
-		$this->addJoin('public.tbl_studiengang', 'studiengang_kz');
-		$this->addOrder('verband');
-		$this->addOrder('gruppe');
-		$this->db->where(array('tbl_lehrverband.aktiv' => true));
-
-		$this->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->db->group_start();
-			$this->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
-			$this->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
-			$this->db->group_end();
-		}
-		$this->db->group_end();
-		return $this->load();
-	}
 }

application/models/organisation/Studiengang_model.php

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

application/models/organisation/Studienplan_model.php

@@ -59,6 +59,37 @@ class Studienplan_model extends DB_Model
 			'tbl_studienplan_lehrveranstaltung.semester' => $semester
 		));
 	}
+	
+	public function getStudienplanByLvaSemKurzbz($lehrveranstaltung_id, $studiensemester_kurzbz) {
+		$qry= "
+			SELECT
+				DISTINCT tbl_studienplan.*
+			FROM
+				lehre.tbl_studienplan
+				JOIN lehre.tbl_studienplan_lehrveranstaltung 
+					USING(studienplan_id)
+			WHERE
+				tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id IN (
+					SELECT 
+						lv.lehrveranstaltung_id
+					FROM
+						lehre.tbl_lehrveranstaltung AS lv
+						LEFT JOIN lehre.tbl_lehrveranstaltung AS t ON t.lehrveranstaltung_id=lv.lehrveranstaltung_template_id
+					WHERE
+						lv.lehrtyp_kurzbz<>'tpl'
+						AND (lv.lehrveranstaltung_id= ? OR (lv.lehrveranstaltung_template_id= ? AND t.lehrtyp_kurzbz='tpl'))
+					)
+				AND EXISTS (
+					SELECT 1 
+					FROM 
+						lehre.tbl_studienplan_semester
+					WHERE studienplan_id=tbl_studienplan.studienplan_id
+						AND studiensemester_kurzbz= ?
+						AND semester = tbl_studienplan_lehrveranstaltung.semester)
+			ORDER BY bezeichnung";
+		
+		return $this->execReadOnlyQuery($qry, array($lehrveranstaltung_id, $lehrveranstaltung_id, $studiensemester_kurzbz));
+	}
 
 	public function getStudienplanLehrveranstaltungForPrestudent($studienplan_id, $semester, $prestudent_id)
 	{

application/models/organisation/Studiensemester_model.php

@@ -242,6 +242,30 @@ class Studiensemester_model extends DB_Model
 		return $this->loadWhere(['uid' => $student_uid, 'v.lehre' => true]);
 	}
 
+	public function getWhereMitarbeiterHasLvs($uid) {
+		// first order by year with last 2 letter from right,
+		// then order by WS/SS inside the years
+		// query it asc so the ordering magic in cis4 turns it around again
+		$qry = "WITH unique_semesters AS (
+				SELECT DISTINCT ON (studiensemester_kurzbz)
+					studiensemester_kurzbz, 
+					start, 
+					ende, 
+					bezeichnung, 
+					studienjahr_kurzbz
+				FROM lehre.tbl_lehreinheit
+				JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
+				JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+				WHERE mitarbeiter_uid = ?
+			)
+			SELECT * FROM unique_semesters
+			ORDER BY 
+				RIGHT(studiensemester_kurzbz, 2) ASC,
+				LEFT(studiensemester_kurzbz, 2) ASC;";
+		
+		return $this->execReadOnlyQuery($qry, [$uid]);
+	}
+
 	public function getAktAndFutureSemester()
 	{
 		$query = 'SELECT studiensemester_kurzbz

application/models/person/Benutzerfunktion_model.php

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

application/models/ressource/Kalender_Event_Rolle_model.php

@@ -1,15 +0,0 @@
-<?php
-class Kalender_Event_Rolle_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_event_rolle';
-		$this->pk = array('rolle_kurzbz');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Event_Teilnehmer_model.php

@@ -1,16 +0,0 @@
-<?php
-class
-Kalender_Event_Teilnehmer_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_event_teilnehmer';
-		$this->pk = array('kalender_event_teilnehmer_id');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Event_model.php

@@ -1,15 +0,0 @@
-<?php
-class Kalender_Event_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_event';
-		$this->pk = array('kalender_id');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Lehreinheit_model.php

@@ -1,15 +0,0 @@
-<?php
-class Kalender_Lehreinheit_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_lehreinheit';
-		$this->pk = array('kalender_id','lehreinheit_id');
-		$this->hasSequence = false;
-	}
-}

application/models/ressource/Kalender_Ort_model.php

@@ -1,14 +0,0 @@
-<?php
-class Kalender_Ort_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_ort';
-		$this->pk = 'kalender_ort_id';
-	}
-}

application/models/ressource/Kalender_model.php

@@ -1,14 +0,0 @@
-<?php
-class Kalender_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender';
-		$this->pk = 'kalender_id';
-	}
-}

application/models/ressource/Kalenderstatus_model.php

@@ -1,14 +0,0 @@
-<?php
-class Kalenderstatus_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'lehre.tbl_kalender_status';
-		$this->pk = 'status_kurzbz';
-	}
-}

application/models/ressource/Reservierung_Kalender_model.php

@@ -1,14 +0,0 @@
-<?php
-class Reservierung_Kalender_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'sync.tbl_reservierung_kalender';
-		$this->pk = 'reservierung_kalender_id';
-	}
-}

application/models/ressource/Reservierung_model.php

@@ -18,10 +18,10 @@ class Reservierung_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null, $uid = null)
 	{
-		
-		$lvplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
+
+		$lvplan_reservierungen_query = "SELECT r.* , stund.beginn, stund.ende,
 			CASE
 				WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/')) 
@@ -35,7 +35,7 @@ class Reservierung_model extends DB_Model
 			LEFT JOIN public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz = ss2.studiensemester_kurzbz AND ss2.start <=r.datum AND ss2.ende >= r.datum 
 			WHERE datum >= ? AND datum <= ? AND (ss1.studiensemester_kurzbz IS NOT NULL
 			OR ss2.studiensemester_kurzbz IS NOT NULL)";
-		
+
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
 			CASE
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
@@ -46,28 +46,29 @@ 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,
+		DISTINCT(insertvon),  
+		'reservierung' as type, beginn, ende, datum, array_agg(DISTINCT reservierung_id) AS reservierung_id,
 		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
-		
+		array_agg(DISTINCT(uid)) as uids,
 		ort_kurzbz, 'FFFFFF' as farbe
 		
 		FROM 
 		(
-			". $subquery ."
+			" . $subquery . "
 		) AS subquery
 
-		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
+		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung, insertvon
 		
 		ORDER BY datum, beginn
-		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
+		", is_null($ort_kurzbz) ? [$uid ?? getAuthUID(), $uid ?? getAuthUID(), $start_date, $end_date] : [$ort_kurzbz, $start_date, $end_date]);
+
 
-		
 		return $query_result;
 	}
 
@@ -76,7 +77,7 @@ class Reservierung_model extends DB_Model
 	 *
 	 * @return stdClass
 	 */
-	public function getReservierungenMitarbeiter($start_date, $end_date)
+	public function getReservierungenMitarbeiter($start_date, $end_date, $uid = null)
 	{
 
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
@@ -91,25 +92,26 @@ class Reservierung_model extends DB_Model
 
 		$subquery = $raum_reservierungen_query;
 
-		
-		$query_result= $this->execReadOnlyQuery("
+
+		$query_result = $this->execReadOnlyQuery("
 		SELECT 
+		DISTINCT(insertvon),  
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
-		
+		array_agg(DISTINCT(uid)) as uids,
 		ort_kurzbz, 'FFFFFF' as farbe
 		
 		FROM 
 		(
-			". $subquery ."
+			" . $subquery . "
 		) AS subquery
 
-		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
+		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung, insertvon
 		
 		ORDER BY datum, beginn
-		", [getAuthUID(), $start_date, $end_date]);
+		", [$uid ?? getAuthUID(), $start_date, $end_date]);
 
 
 		return $query_result;
@@ -129,9 +131,9 @@ class Reservierung_model extends DB_Model
 		$this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=r.datum AND ss2.ende>=r.datum', 'LEFT');
 		$this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
 		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
-		
+
 		$query = $this->db->get_compiled_select('campus.vw_reservierung r');
-		
+
 		return $this->execQuery($query, [$uid, $uid]);
 	}
 

application/models/ressource/Stundenplan_model.php

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

application/models/ressource/Stundenplandev_Kalender_model.php

@@ -1,14 +0,0 @@
-<?php
-class Stundenplandev_Kalender_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'sync.tbl_stundenplandev_kalender';
-		$this->pk = 'stundenplandev_kalender_id';
-	}
-}

application/models/ressource/Zeitsperre_model.php

@@ -12,6 +12,8 @@ class Zeitsperre_model extends DB_Model
 		$this->pk = 'zeitsperre_id';
 	}
 
+	const BLOCKIERENDE_ZEITSPERREN = ['Krank','Urlaub','ZA','DienstV','PflegeU','DienstF','CovidSB','CovidKS'];
+
     /**
      * Save or update Zeitsperre.
      *
@@ -61,4 +63,128 @@ class Zeitsperre_model extends DB_Model
 
         return $this->execQuery($qry);
     }
+
+	/**
+	 * get Zeitsperren of a user
+	 *
+	 * @param $uid mitarbeiteruid
+	 * @param $bisgrenze @true show only entries of actual business year (1.9.- 31.8.)
+	 *
+	 * @return array
+	 */
+	public function getZeitsperrenUser($uid, $bisgrenze = true)
+	{
+		$qry = "
+  			SELECT
+			    tbl_zeitsperre.*, tbl_zeitsperretyp.*, tbl_erreichbarkeit.farbe  AS erreichbarkeit_farbe,
+  			    tbl_erreichbarkeit.beschreibung AS erreichbarkeit_beschreibung,
+            	CONCAT (ps.vorname, ' ', ps.nachname) as vertretung
+			FROM (campus.tbl_zeitsperre JOIN campus.tbl_zeitsperretyp USING (zeitsperretyp_kurzbz))
+			LEFT JOIN campus.tbl_erreichbarkeit USING (erreichbarkeit_kurzbz)
+			LEFT JOIN public.tbl_benutzer ON campus.tbl_zeitsperre.vertretung_uid = public.tbl_benutzer.uid
+			LEFT JOIN public.tbl_person ps USING (person_id)
+			WHERE mitarbeiter_uid= ?
+			";
+
+		if($bisgrenze)
+		{
+			$qry.=" 
+				AND (
+					(date_part('month',vondatum)>=9 AND date_part('year', vondatum)>='".(date('Y')-1)."')
+					OR
+					(date_part('month',vondatum)<9 AND date_part('year', vondatum)>='".(date('Y'))."')
+				)";
+		}
+
+		$qry.= " ORDER BY vondatum DESC";
+
+		return $this->execQuery($qry, array('mitarbeiter_uid' => $uid));
+	}
+
+	/**
+	 * check a date for existing zeitsperre
+	 *
+	 * @param $uid mitarbeiteruid
+	 * @param $datum datum to check
+	 * @param $stunde stunde (default = null)
+	 * @param bool $nurblockierend if only hr relevante zeitsperren have to be checked
+	 *
+	 * @return array
+	 */
+	public function getSperreByDate($uid, $datum, $stunde = null, $nurblockierend = false)
+	{
+		$parametersArray = [$datum, $datum];
+
+		$qry = "
+			SELECT
+				*
+			FROM
+				campus.tbl_zeitsperre
+			WHERE
+				vondatum <= ?
+				AND bisdatum>= ?";
+
+		if($nurblockierend)
+		{
+			$qry .= " AND zeitsperretyp_kurzbz IN ('"
+				. implode("','", self::BLOCKIERENDE_ZEITSPERREN)
+				. "')";
+		}
+
+		if(!is_null($stunde))
+		{
+			$parametersArray = array_merge(
+				$parametersArray,
+				[$datum, $stunde, $datum, $datum, $stunde, $datum]
+			);
+
+			$qry.=" AND
+					((vondatum= ? AND vonstunde<= ? OR vonstunde is null OR vondatum<> ?) AND
+					(bisdatum= ? AND bisstunde>= ? OR bisstunde is null OR bisdatum<> ?))";
+		}
+
+		array_push($parametersArray, $uid);
+
+		$qry .= "AND mitarbeiter_uid= ? ";
+
+		return $this->execQuery($qry, $parametersArray);
+	}
+
+	/**
+	 * check a date for existing zeitsperre
+	 *
+	 * @param $uid mitarbeiteruid
+	 * @param $vondatum datum in Format IS0
+	 * @param $bisdatum datum in Format ISO
+	 *
+	 * @return array
+	 */
+	public function existsZeitaufzeichnung($uid, $vonDay, $bisDay)
+	{
+		try {
+			$from = new DateTime($vonDay);
+			$to   = new DateTime($bisDay);
+		} catch (Exception $e) {
+			throw new Exception("Invalid date format");
+		}
+
+		//remove hour stamps
+		$from->setTime(0, 0, 0);
+		$to->setTime(0, 0, 0)->modify('+1 day');
+
+		$fromSql = $from->format('Y-m-d');
+		$toSql   = $to->format('Y-m-d');
+		$params = [$uid, $fromSql, $toSql];
+
+		$qry = "
+			SELECT *
+			FROM campus.tbl_zeitaufzeichnung
+			WHERE uid = ?
+			AND start >= ?
+			AND ende < ? ";
+
+		$result = $this->execQuery($qry, $params);
+
+		return $result;
+	}
 }