Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into demo

# Conflicts:
#	system/dbupdate_3.4.php

application/config/Events.php

@@ -33,27 +33,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/abgabe.php

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

application/config/routes.php

@@ -63,10 +63,8 @@ $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/Benotungstool/.*'] = 'Cis/Benotungstool/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
-$route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
-//Route for LV Plan Stg/Semester/Verband/Gruppe
-$route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
 
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';

application/config/searchcis.php

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

application/config/studierendenantrag.php

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

application/config/tempus.php

@@ -1,5 +0,0 @@
-<?php
-
-$config['send_update_mails'] = false;
-$config['calendar_start'] = 7;
-$config['calendar_end'] = 23;

application/controllers/Cis/Abgabetool.php

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

application/controllers/Cis/Auth.php

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

application/controllers/Cis/Benotungstool.php

@@ -0,0 +1,51 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Benotungstool extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED
+		]);
+
+		$this->_ci =& get_instance();
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		
+		// TODO: check if related CIS config is also loaded when being routed in Cis4 by vuerouter
+		// TODO: check if new benotungstool should be configurable the exact same way?
+
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'CIS_GESAMTNOTE_UEBERSCHREIBEN' => CIS_GESAMTNOTE_UEBERSCHREIBEN,
+			'CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF' => CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF,
+			'CIS_GESAMTNOTE_PRUEFUNG_TERMIN3' => CIS_GESAMTNOTE_PRUEFUNG_TERMIN3,
+			'CIS_GESAMTNOTE_PRUEFUNG_TERMIN2' => CIS_GESAMTNOTE_PRUEFUNG_TERMIN2,
+			'CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE' => CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE,
+			'CIS_GESAMTNOTE_PUNKTE' => CIS_GESAMTNOTE_PUNKTE,
+			'CIS_GESAMTNOTE_GEWICHTUNG' => CIS_GESAMTNOTE_GEWICHTUNG,
+			'CIS_ANWESENHEITSLISTE_NOTENLISTE_ANZEIGEN' => CIS_ANWESENHEITSLISTE_NOTENLISTE_ANZEIGEN
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Benotungstool']);
+	}
+	
+}

application/controllers/Cis/LvPlan.php

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

application/controllers/Cis/MyLv.php

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

application/controllers/Cis/MyLvPlan.php

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

application/controllers/Cis/OtherLvPlan.php

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

application/controllers/Cis/Profil.php

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

application/controllers/Cis/Raumsuche.php

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

application/controllers/Cis/StgOrgLvPlan.php

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

application/controllers/Cis/Studium.php

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

application/controllers/Cis4.php

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

application/controllers/CisVue/Dashboard.php

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

application/controllers/Tempus.php

@@ -1,60 +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');
-	}
-
-	public function index()
-	{
-		$this->_loadView();
-	}
-
-	public function sync()
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-		$this->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$this->StudiengangModel->addJoin('tbl_organisationseinheit', 'oe_kurzbz', 'LEFT');
-		$organisationen = getData($this->StudiengangModel->loadWhere(array('tbl_studiengang.aktiv' => 'true')));
-
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
-		$studiensemestern = getData($this->StudiensemesterModel->load());
-
-		$this->_loadView(array('organisationen' => $organisationen, 'studiensemestern' => $studiensemestern));
-	}
-
-	private function _loadView($extraVariables = [])
-	{
-		$this->load->view('Tempus', [
-			'permissions' => [
-				'admin' => $this->permissionlib->isBerechtigt('admin')
-			],
-			'variables' => array_merge([
-				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
-				'timezone' => $this->config->item('timezone')
-			], $extraVariables)
-		]);
-	}
-}

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,929 @@
+<?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');
+
+use CI3_Events as Events;
+
+class Noten extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudentenNoten' => array('lehre/benotungstool:rw'),
+			'getNoten' => array('lehre/benotungstool:rw'),
+			'saveStudentenNoten' => array('lehre/benotungstool:rw'),
+			'getNotenvorschlagStudent' => array('lehre/benotungstool:rw'),
+			'saveNotenvorschlag' => array('lehre/benotungstool:rw'),
+			'saveStudentPruefung' => array('lehre/benotungstool:rw'),
+			'createPruefungen' => array('lehre/benotungstool:rw'),
+			'saveNotenvorschlagBulk' => array('lehre/benotungstool:rw'),
+			'savePruefungenBulk' => array('lehre/benotungstool:rw')
+		]);
+
+		$this->load->library('AuthLib', null, 'AuthLib');
+		$this->load->library('PhrasesLib');
+		
+		// Loads phrases system
+		$this->loadPhrases([
+			'global',
+			'person',
+			'benotungstool',
+			'lehre',
+			'ui'
+		]);
+		require_once(FHCPATH . 'include/mobilitaet.class.php');
+		
+		$this->load->model('education/LePruefung_model', 'LePruefungModel');
+		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+
+		$this->load->helper('hlp_sancho_helper');
+
+	}
+
+
+	/**
+	 * GET METHOD
+	 * expects 'lv_id', 'sem_kurzbz'
+	 * returns List of all Students of given lehrveranstaltung and semester and fetches their grades.
+	 * Loads LvGesamtnote aswell as Teilnoten from externalSources via getExternalGrades Event.
+	 * Calculates the Notenvorschlag for every student based on averaging their Teilnoten.
+	 * Finally also fetches all Prüfungen for every student which are linked to lva and semester.
+	 */
+	public function getStudentenNoten() {
+		$lv_id = $this->input->get("lv_id",TRUE);
+		$sem_kurzbz = $this->input->get("sem_kurzbz",TRUE);
+
+		if (!isset($lv_id) || isEmptyString($lv_id)
+			|| !isset($sem_kurzbz) || isEmptyString($sem_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		// get studenten for lva & sem with zeugnisnote if available
+		$studenten = $this->LehrveranstaltungModel->getStudentsByLv($sem_kurzbz, $lv_id);
+		$studentenData = $this->getDataOrTerminateWithError($studenten);
+		
+		$func = function ($value) {
+			return $value->uid;
+		};
+		
+		$grades = array();
+		$student_uids = array_map($func, $studentenData);
+		
+		foreach($student_uids as $uid) {
+			$grades[$uid]['grades'] = [];
+			
+			$res = $this->StudentModel->load([$uid]);
+			if(!isError($res) && hasData($res)) $student = getData($res)[0];
+
+			$prestudent_id = $student->prestudent_id;
+			
+			
+			// TODO: last class to get rid of but this one is complicated
+			$mobility = new mobilitaet();
+			$mobility->loadPrestudent($prestudent_id);
+			$output = $mobility->result;
+			$eintrag = '';
+			foreach ($output as $k)
+			{
+				if(($k->mobilitaetstyp_kurzbz == 'GS') && ($k->studiensemester_kurzbz == $sem_kurzbz))
+					$eintrag = ' (d.d.)';
+			}
+			$grades[$uid]['mobility'] = $eintrag;
+			
+			$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, $uid, $sem_kurzbz);
+
+			if(!isError($result) && hasData($result)) {
+				$lvgesamtnote = getData($result)[0];
+				$grades[$uid]['note_lv'] = $lvgesamtnote->note;
+				$grades[$uid]['freigabedatum'] = $lvgesamtnote->freigabedatum;
+				$grades[$uid]['benotungsdatum'] = $lvgesamtnote->benotungsdatum;
+				$grades[$uid]['punkte_lv'] = $lvgesamtnote->punkte;
+			} else {
+				$grades[$uid]['note_lv'] = null;
+				$grades[$uid]['freigabedatum'] = null;
+				$grades[$uid]['benotungsdatum'] = null;
+				$grades[$uid]['punkte_lv'] = null;
+			}
+		}
+
+		// send $grades reference to moodle addon
+		Events::trigger(
+			'getExternalGrades',
+			function & () use (&$grades)
+			{
+				return $grades;
+			},
+			[
+				'lvid' => $lv_id,
+				'stsem' => $sem_kurzbz
+			]
+		);
+		
+		// calculate notenvorschläge from teilnoten
+		foreach($studentenData as $student) {
+			$g = $grades[$student->uid]['grades'];
+			$note_lv = $grades[$student->uid]['note_lv'];
+			
+			// overwrite any calculation with lv note once available
+			if(!is_null($note_lv)) {
+				$student->note_vorschlag = $note_lv;
+			} else if(count($g) > 0) {
+				
+				$notensumme = 0;
+				$notensumme_gewichtet = 0;
+				$gewichtsumme = 0;
+				$punktesumme = 0;
+				$punktesumme_gewichtet = 0;
+				$anzahlnoten = 0;
+				foreach($g as $teilnote) {
+					if (is_numeric($teilnote['grade']) || (is_null($teilnote['grade']) && is_numeric($teilnote['points'])))
+					{
+						$notensumme += $teilnote['grade'];
+						$punktesumme += $teilnote['points'];
+						$notensumme_gewichtet += $teilnote['grade'] * $teilnote['weight'];
+						$punktesumme_gewichtet += $teilnote['points'] * $teilnote['weight'];
+						$gewichtsumme += $teilnote['weight'];
+						$anzahlnoten += 1;
+					}
+				}
+
+				
+				// TODO: develop the punkte feature with models
+				// calculate grades points from notenschlüssel
+				if (CIS_GESAMTNOTE_PUNKTE)
+				{
+					if (defined('CIS_GESAMTNOTE_GEWICHTUNG') && CIS_GESAMTNOTE_GEWICHTUNG)
+					{
+						// Lehreinheitsgewichtung
+						$punkte_vorschlag = round($punktesumme_gewichtet / $gewichtsumme, 2);
+						$notenschluessel = new notenschluessel();
+						$note_vorschlag = $notenschluessel->getNote($punkte_vorschlag, $lv_id, $sem_kurzbz);
+					}
+					else
+					{
+						$punkte_vorschlag = round($punktesumme / $anzahlnoten, 2);
+						$notenschluessel = new notenschluessel();
+						$note_vorschlag = $notenschluessel->getNote($punkte_vorschlag, $lv_id, $sem_kurzbz);
+					}
+				}
+				else
+				{
+					if (defined('CIS_GESAMTNOTE_GEWICHTUNG') && CIS_GESAMTNOTE_GEWICHTUNG)
+					{
+						$note_vorschlag = round($notensumme_gewichtet / $gewichtsumme);
+					}
+					else
+					{
+						$note_vorschlag = round($notensumme / $anzahlnoten);
+					}
+				}
+				
+
+				$student->note_vorschlag = $note_vorschlag;
+			}
+		}
+		
+		// get all prüfungen with noten held in that semester in that lva
+		$pruefungen = $this->LePruefungModel->getPruefungenByLvStudiensemester($lv_id, $sem_kurzbz);
+		$pruefungenData = getData($pruefungen);
+		
+		$this->terminateWithSuccess(array($studentenData, $pruefungenData, DOMAIN, $grades));
+	}
+
+	/**
+	 * GET METHOD
+	 * returns List of all available & active NotenOptions 
+	 */
+	public function getNoten() {
+		$this->load->model('education/Note_model', 'NoteModel');
+
+		$result = $this->NoteModel->getAllActive();
+		$noten = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($noten);
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'lv_id', 'sem_kurzbz', 'password', 'noten'
+	 * Notenfreigabe method which checks the users password as a security measure.
+	 * Tries to load Lehrveranstaltung, Studiengang and Person via Model in order to validate the coherency of input parameters
+	 * lv_id & sem_kurzbz in relation to the noten array delivered.
+	 * Updates the LvGesamtnote note, aswell as freigabedatum, which is key in the logic of the freigegeben/offen/changed notenStatus
+	 * Along this process builds a html table to be placed in a confirmation email (uid only and full variant depending on config)
+	 * which is being sent to the Lektor, aswell as the assigned Assistenz.
+	 */
+	public function saveStudentenNoten() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'sem_kurzbz') || !property_exists($result, 'lv_id') || 
+			!property_exists($result, 'password') || !property_exists($result, 'noten')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+		
+		if(!$this->AuthLib->checkUserAuthByUsernamePassword(getAuthUID(), $result->password)->retval) {
+			$this->terminateWithError($this->p->t('global', 'wrongPassword'), 'general');
+		}
+		
+		$lv_id = $result->lv_id;
+		$sem_kurzbz = $result->sem_kurzbz;
+		
+		$ret = [];
+		
+		$res = $this->LehrveranstaltungModel->load($lv_id);
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError($this->p->t('benotungstool', 'noValidLvFoundForId', [$lv_id]));
+		}
+
+		$lv = getData($res)[0];
+
+		$studiengang_kz = $lv->studiengang_kz;
+		$res = $this->StudiengangModel->load($studiengang_kz);
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError($this->p->t('benotungstool', 'noValidStudiengangFoundForId', [$studiengang_kz]));
+		}
+		$sg = getData($res)[0];
+		$lvaFullName = $sg->kurzbzlang . ' ' . $lv->semester . '.Semester
+					' . $lv->bezeichnung . " - " .$lv->lehrform_kurzbz. " " . $lv->orgform_kurzbz . " - " . $sem_kurzbz;
+		
+		$emails = explode(', ', $sg->email);
+		
+
+		$res = $this->PersonModel->load(getAuthPersonId());
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError($this->p->t('benotungstool', 'noValidPersonFoundForId', [getAuthPersonId()]));
+		}
+		$pers = getData($res)[0];
+		$lektorFullName = $pers->anrede.' '.$pers->vorname.' '.$pers->nachname; //.' ('.$pers->kurzbz.')';
+
+		
+		$res = $this->StudienplanModel->getStudienplanByLvaSemKurzbz($lv_id, $sem_kurzbz);
+		$data = getData($res);
+		$studienplan_bezeichnung = '';
+		foreach ($data as $row) {
+			$studienplan_bezeichnung .= $row->bezeichnung . ' ';
+		}
+		$betreff = $this->p->t('benotungstool','notenfreigabe').' ' . $lv->bezeichnung . ' ' . $lv->orgform_kurzbz . ' - ' . $studienplan_bezeichnung;
+		
+		$studlist = "<table border='1'><tr>";
+
+		if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE) {
+			$studlist .= "<td><b>" . $this->p->t('person','personenkennzeichen') . "</b></td>\n
+			<td><b>" . $this->p->t('lehre','studiengang') . "</b></td>\n
+			<td><b>" . $this->p->t('benotungstool','c4nachname') . "</b></td>\n
+			<td><b>" . $this->p->t('benotungstool','c4vorname') . "</b></td>\n";
+			$studlist .= "<td><b>" . $this->p->t('benotungstool','c4grade') . "</b></td>\n";
+			$studlist .= "<td><b>" . $this->p->t('ui','bearbeitetVon') . "</b></td></tr>\n";
+		} else {
+			$studlist .= "<td><b>" . $this->p->t('person','uid') . "</b></td></tr>\n";
+		}
+		
+		foreach($result->noten as $note) {
+
+			$resultLVGes = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, $note->uid, $sem_kurzbz);
+
+			if (!isError($resultLVGes) && hasData($resultLVGes))
+			{
+				$lvgesamtnote = getData($resultLVGes)[0];
+
+				if ($lvgesamtnote->benotungsdatum > $lvgesamtnote->freigabedatum)
+				{
+
+					$id = $this->LvgesamtnoteModel->update(
+						[$lvgesamtnote->student_uid, $lvgesamtnote->studiensemester_kurzbz, $lvgesamtnote->lehrveranstaltung_id],
+						array(
+							'note' => $note->note,
+							'freigabevon_uid' => getAuthUID(),
+							'freigabedatum' => date("Y-m-d H:i:s"),
+							'updateamum' => date("Y-m-d H:i:s"),
+							'updatevon' => getAuthUID()
+						)
+					);
+
+					if($id) {
+						$res = $this->LvgesamtnoteModel->load($id->retval);
+						if(hasData($res)) {
+							$lvgesamtnote = getData($res)[0];
+							$ret[] = array('uid' => $note->uid, 'freigabedatum' => $lvgesamtnote->freigabedatum, 'benotungsdatum' => $lvgesamtnote->benotungsdatum);
+						}
+					}
+					 
+					if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE)
+					{
+						$studlist .= "<tr><td>" . trim($note->matrikelnr) . "</td>";
+						$studlist .= "<td>" . trim($note->kuerzel) . "</td>";
+						$studlist .= "<td>" . trim($note->nachname) . "</td>";
+						$studlist .= "<td>" . trim($note->vorname) . "</td>";
+
+						// TODO: if defined(CIS_PUNKTE) ...
+						$studlist .= "<td>" .$note->noteBezeichnung. "</td>";
+
+						$studlist .= "<td>" . $lvgesamtnote->mitarbeiter_uid;
+						if ($lvgesamtnote->updatevon != '')
+							$studlist .= " (" . $lvgesamtnote->updatevon . ")";
+						$studlist .= "</td></tr>";
+					} else {
+						$studlist .= "<tr><td>" . trim($note->uid) . "</td></tr>\n";
+					}
+				}
+			}
+		}
+		$studlist .= "</table>";
+
+		// always send the mail, config toggles data contents
+		$this->sendEmail($lektorFullName, $lvaFullName, count($result->noten), $emails, $studlist, $betreff);
+		
+		$this->terminateWithSuccess($ret);
+	}
+
+	
+	private function sendEmail($lektorFullName, $lvaFullName, $notenCount, $emailAdressen, $studlist, $betreff)
+	{
+		$emailAdressen[] = getAuthUID() . "@" . DOMAIN; // also send mail to lektors own adress
+		$adressen = implode(";", $emailAdressen);
+		
+		foreach ($emailAdressen as $email)
+		{
+			// Prepare mail content
+			$body_fields = array(
+				'lektor' => $lektorFullName,
+				'lvaname' => $lvaFullName,
+				'studlist' => $studlist,
+				'neuenotencount' => $notenCount,
+				'adressen' => $adressen
+			);
+
+			// Send mail
+			sendSanchoMail(
+				'Notenfreigabe',
+				$body_fields,
+				$email,
+				$betreff
+			);
+		}
+
+	}
+
+	/**
+	 * GET METHOD
+	 * should return Notenvorschlag for single Students, not yet implemented since it is not needed anywhere right now,
+	 * but could be useful later on.
+	 */
+	public function getNotenvorschlagStudent() {
+		// TODO: Notenvorschlag laden allgemeiner Endpunkt, der im Backend mit Logik (z.B. Moodle) angepasst werden kann.
+		
+		$this->terminateWithSuccess();
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'datum', 'lva_id', 'student_uid', 'note'
+	 * Inserts or updates a pruefung for lva & student_uid at given datum (YYYY-MM-DD). When creating a new
+	 * Pruefung, sets the provided (Prüfungs-) Note.
+	 * Updates the LvGesamtnote of student.
+	 * Can return 1 or 2 Prüfungen, since the original grade before the first prüfung is being saved as "Termin1" when
+	 * a "Termin2" is being created.
+	 */
+	public function saveStudentPruefung() { // einzelne pruefung speichern
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'datum') || !property_exists($result, 'lva_id') ||
+			!property_exists($result, 'student_uid') || !property_exists($result, 'note')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$student_uid = $result->student_uid;
+		$note = $result->note;
+		$punkte = null;
+		$datum = $result->datum;
+		$lva_id = $result->lva_id;
+		$lehreinheit_id = $result->lehreinheit_id;
+		
+		$stsem = $result->sem_kurzbz;
+		$typ = $result->typ;
+		
+		$jetzt = date("Y-m-d H:i:s");
+		
+		// nachpruefungeintragen.php script calls query on campus.student_lehrveranstaltung to find a
+		// lehreinheit_id for lva_id -> lehreinheit should be determined prior to that in new benotungstool
+		// by retrieving it from students row in campus.vw_student_lehrveranstaltung earlier on
+		
+//		$lehreinheit_id = getLehreinheit($db, $lvid, $student_uid, $stsem);
+//		$lehreinheit_id = $result->lehreinheit_id;
+		
+		$punkte = null;
+
+//		if($punkte!='')
+//		{
+//			// Bei Punkteeingabe wird die Note nochmals geprueft und ggf korrigiert
+//			$notenschluessel = new notenschluessel();
+//			$note_pruef = $notenschluessel->getNote($punkte, $lva_id, $stsem);
+//			if($note_pruef!=$note)
+//			{
+//				$note = $note_pruef;
+//				$note_dirty=true;
+//			}
+//		}
+
+		// TODO: more sophisticated empty check
+		if($note=='')
+			$note = 9;
+		
+
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$res = $this->LehrveranstaltungModel->load($lva_id);
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError('Keine gültige Lehrveranstaltung gefunden für ID: '.$lva_id);
+		}
+		
+		$studiengang_kz = getData($res)[0]->studiengang_kz;
+		$res = $this->StudiengangModel->load($studiengang_kz);
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError('Kein gültiger Studiengang gefunden für ID: '.$studiengang_kz);
+		}
+		
+		$pruefungenChanged = $this->savePruefungstermin($typ, $student_uid, $lva_id, $stsem, $lehreinheit_id, $note, $punkte, $datum);
+		
+		//Gesamtnote updaten
+		$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lva_id, $student_uid, $stsem);
+		if(!isError($result) && !hasData($result)) {
+			
+			$id = $this->LvgesamtnoteModel->insert(
+				array(
+					'student_uid' => $student_uid,
+					'lehrveranstaltung_id' => $lva_id,
+					'studiensemester_kurzbz' => $stsem,
+					'note' => $note,
+					'punkte' => $punkte,
+					'mitarbeiter_uid' => getAuthUID(),
+					'benotungsdatum' => $jetzt,
+					'freigabedatum' => null,
+					'freigabevon_uid' => null,
+					'bemerkung' => null,
+					'updateamum' => null,
+					'updatevon' => null,
+					'insertamum' => $jetzt,
+					'insertvon' => getAuthUID()
+				)
+			);
+			if($id) {
+				$res = $this->LvgesamtnoteModel->load($id->retval);
+				if(hasData($res)) $lvgesamtnote = getData($res)[0];
+			}
+		}
+		else if(!isError($result) && hasData($result))
+		{
+			$lvgesamtnote = getData($result)[0];
+
+			$id = $this->LvgesamtnoteModel->update(
+				[$lvgesamtnote->student_uid, $lvgesamtnote->studiensemester_kurzbz, $lvgesamtnote->lehrveranstaltung_id],
+				array(
+					'note' => $note,
+					'punkte' => $punkte,
+					'benotungsdatum' => $jetzt,
+					'updateamum' => $jetzt,
+					'updatevon' => getAuthUID()
+				)
+			);
+
+			if($id) {
+				$res = $this->LvgesamtnoteModel->load($id->retval);
+				if(hasData($res)) $lvgesamtnote = getData($res)[0];
+			}
+			
+		}
+		
+		$savedPruefung = $pruefungenChanged['savedPruefung'] ?? null;
+		$extraPruefung = $pruefungenChanged['extraPruefung'] ?? null;
+
+		$savedPruefungData = count($savedPruefung) > 0 ? $savedPruefung[0] : null;
+		$extraPruefungData = count($extraPruefung) > 0 ? $extraPruefung[0] : null;
+		
+		$this->terminateWithSuccess(array($savedPruefungData, $lvgesamtnote, $extraPruefungData));
+	}
+
+	/**
+	 * private helper method to update/insert pruefungstermine 
+	 */
+	private function savePruefungstermin($typ, $student_uid, $lva_id, $stsem, $lehreinheit_id, $note, $punkte, $datum) 
+	{
+
+		$status = [];
+		
+		// send $grades reference to moodle addon
+		Events::trigger(
+			'getEntschuldigungsStatusForStudentOnDate',
+			function & () use (&$status)
+			{
+				return $status;
+			},
+			[
+				'student_uid' => $student_uid,
+				'datum' => $datum
+			]
+		);
+		
+		if(count($status) > 0 && $status[0] == true) {
+			$note = 17; //entschuldigt
+		}
+		
+		$jetzt = date("Y-m-d H:i:s");
+		
+		$pruefungenChanged = [];
+		
+		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+		
+		if($typ == "Termin2" && defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2) 
+		{
+			
+			// Wenn eine Nachprüfung angelegt wird, wird zuerst eine Pruefung mit 1. Termin angelegt welche für die ursprüngliche Note
+			// vor den Prüfungsantritten zählt
+			
+			$result1 = $this->LePruefungModel->getPruefungenByUidTypLvStudiensemester($student_uid, "Termin1", $lva_id, $stsem);
+			
+			// if there is a termin 1 entry already do nothing
+			if(!isError($result1) && hasData($result1)) {
+
+			} else if(!isError($result1) && !hasData($result1)) {
+				// new entry termin1
+
+				$resultLV = $this->LvgesamtnoteModel->getLvGesamtNoten($lva_id, $student_uid, $stsem);
+				
+				// update Termin1 note
+				if (hasData($resultLV))
+				{
+					$lvgesamtnote = getData($resultLV)[0];
+					$pr_note = $lvgesamtnote->note;
+					$pr_punkte = $lvgesamtnote->punkte;
+					$benotungsdatum = $lvgesamtnote->benotungsdatum;
+				}
+				else if(!hasData($resultLV))// set Termin1 note to "noch nicht eingetragen"
+				{
+					$pr_note = 9; 
+					$pr_punkte = null;
+					$benotungsdatum = $jetzt;
+				}
+				
+				$id = $this->LePruefungModel->insert(
+					array(
+						'lehreinheit_id' => $lehreinheit_id,
+						'student_uid' => $student_uid,
+						'mitarbeiter_uid' => getAuthUID(),
+						'note' => $pr_note,
+//						'punkte' => $pr_punkte,
+						'pruefungstyp_kurzbz' => "Termin1",
+						'datum' => $benotungsdatum,
+						'anmerkung' => "",
+						'insertamum' => $jetzt,
+						'insertvon' => getAuthUID(),
+						'updateamum' => null,
+						'updatevon' => null,
+						'ext_id' => null
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['extraPruefung'] = getData($res);
+				}
+			}
+			
+			
+			// Die Pruefung wird als Termin2 eingetragen
+			$result2 = $this->LePruefungModel->getPruefungenByUidTypLvStudiensemester($student_uid, "Termin2", $lva_id, $stsem);
+			// if there is a termin 2 entry already update it
+			if(!isError($result2) && hasData($result2)) {
+				// update
+				$termin2 = getData($result2)[0];
+				$id = $this->LePruefungModel->update(
+					$termin2->pruefung_id,
+					array(
+						'updateamum' => $jetzt,
+						'updatevon' => getAuthUID(),
+						'note' => $note,
+//						'punkte' => $punkte,
+						'datum' => $datum,
+						'anmerkung' => ""
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['savedPruefung'] = getData($res);
+				}
+
+			} else if(!isError($result2) && !hasData($result2)) {
+				// new entry termin 2
+
+				$id = $this->LePruefungModel->insert(
+					array(
+						'lehreinheit_id' => $lehreinheit_id,
+						'student_uid' => $student_uid,
+						'mitarbeiter_uid' => getAuthUID(),
+						'note' => $note,
+//						'punkte' => null,//$punkte,
+						'pruefungstyp_kurzbz' => $typ,
+						'datum' => $datum,
+						'anmerkung' => "",
+						'insertamum' => $jetzt,
+						'insertvon' => getAuthUID(),
+						'updateamum' => null,
+						'updatevon' => null,
+						'ext_id' => null
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['savedPruefung'] = getData($res);
+				}
+			}
+
+		} else if($typ == "Termin3" && defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3) 
+		{
+
+			$result3 = $this->LePruefungModel->getPruefungenByUidTypLvStudiensemester($student_uid, "Termin3", $lva_id, $stsem);
+
+			if(!isError($result3) && hasData($result3)) {
+				// update
+				$termin3 = getData($result3)[0];
+
+				$id = $this->LePruefungModel->update(
+					$termin3->pruefung_id,
+					array(
+						'updateamum' => $jetzt,
+						'updatevon' => getAuthUID(),
+						'note' => $note,
+//						'punkte' => $punkte,
+						'datum' => $datum,
+						'anmerkung' => ""
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['savedPruefung'] = getData($res);
+				}
+
+			} else if(!isError($result3) && !hasData($result3)) {
+				// insert new termin3
+
+				$id = $this->LePruefungModel->insert(
+					array(
+						'lehreinheit_id' => $lehreinheit_id,
+						'student_uid' => $student_uid,
+						'mitarbeiter_uid' => getAuthUID(),
+						'note' => $note,
+//						'punkte' => null,//$punkte,
+						'pruefungstyp_kurzbz' => $typ,
+						'datum' => $datum,
+						'anmerkung' => "",
+						'insertamum' => $jetzt,
+						'insertvon' => getAuthUID(),
+						'updateamum' => null,
+						'updatevon' => null,
+						'ext_id' => null
+					)
+				);
+				if($id) {
+					$res = $this->LePruefungModel->load($id->retval);
+					if(hasData($res)) $pruefungenChanged['savedPruefung'] = getData($res);
+				}
+				
+			}
+		} else {
+			$this->terminateWithError($this->p->t('benotungstool', 'wrongPruefungType', [$student_uid, $typ]), 'general');
+		}
+		
+		return $pruefungenChanged;
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'sem_kurzbz', 'lv_id', 'student_uid', 'note'
+	 * Method that sets lv_note of student in lva and semester from provided Points/Grade Selection.
+	 * Updates the note & benotungsdatum, which is key in the noten state offen/freigegeben/changed
+	 */
+	public function saveNotenvorschlag() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'lv_id') || !property_exists($result, 'sem_kurzbz') ||
+			!property_exists($result, 'student_uid') || !property_exists($result, 'note')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$lv_id = $result->lv_id;
+		$student_uid = $result->student_uid;
+		$sem_kurzbz = $result->sem_kurzbz;
+		$note = $result->note;
+
+		$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, $student_uid, $sem_kurzbz);
+
+		if(!isError($result) && hasData($result)) {
+			$lvgesamtnote = getData($result)[0];
+			
+			$id = $this->LvgesamtnoteModel->update(
+				[$lvgesamtnote->student_uid, $lvgesamtnote->studiensemester_kurzbz, $lvgesamtnote->lehrveranstaltung_id],
+				array(
+					'note' => $note,
+					'punkte' => null,
+					'benotungsdatum' => date("Y-m-d H:i:s"),
+					'updateamum' => date("Y-m-d H:i:s"),
+					'updatevon' => getAuthUID()
+				)
+			);
+
+			if($id) {
+				$res = $this->LvgesamtnoteModel->load($id->retval);
+				if(hasData($res)) $lvgesamtnote = getData($res)[0];
+			}
+		} else if(!isError($result) && !hasData($result)) {
+			$id = $this->LvgesamtnoteModel->insert(
+				array(
+					'student_uid' => $student_uid,
+					'lehrveranstaltung_id' => $lv_id,
+					'studiensemester_kurzbz' => $sem_kurzbz,
+					'note' => $note,
+					'punkte' => null,
+					'mitarbeiter_uid' => getAuthUID(),
+					'benotungsdatum' => date("Y-m-d H:i:s"),
+					'freigabedatum' => null,
+					'freigabevon_uid' => null,
+					'bemerkung' => null,
+					'updateamum' => null,
+					'updatevon' => null,
+					'insertamum' => date("Y-m-d H:i:s"),
+					'insertvon' => getAuthUID()
+				)
+			);
+			if($id) {
+				$res = $this->LvgesamtnoteModel->load($id->retval);
+				if(hasData($res)) $lvgesamtnote = getData($res)[0];
+			}
+		}
+		
+		$this->terminateWithSuccess(array($lvgesamtnote));
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'sem_kurzbz', 'lv_id', 'noten'
+	 * Bulk variant of saveNotenvorschlag, used when importing grades from csv.
+	 */
+	public function saveNotenvorschlagBulk() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'lv_id') || !property_exists($result, 'sem_kurzbz') ||
+			!property_exists($result, 'noten')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$lv_id = $result->lv_id;
+		$sem_kurzbz = $result->sem_kurzbz;
+		$noten = $result->noten;
+		
+		$retLvNoten = [];
+		
+		foreach($noten as $note)
+		{
+
+			$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, $note->uid, $sem_kurzbz);
+
+			if(!isError($result) && hasData($result)) {
+				$lvgesamtnote = getData($result)[0];
+
+				$id = $this->LvgesamtnoteModel->update(
+					[$lvgesamtnote->student_uid, $lvgesamtnote->studiensemester_kurzbz, $lvgesamtnote->lehrveranstaltung_id],
+					array(
+						'note' => trim($note->note),
+						'punkte' => null,
+						'benotungsdatum' => date("Y-m-d H:i:s"),
+						'updateamum' => date("Y-m-d H:i:s"),
+						'updatevon' => getAuthUID()
+					)
+				);
+
+				if($id) {
+					$res = $this->LvgesamtnoteModel->load($id->retval);
+					if(hasData($res)) $lvgesamtnote = getData($res)[0];
+				}
+			} else if(!isError($result) && !hasData($result)) {
+				$id = $this->LvgesamtnoteModel->insert(
+					array(
+						'student_uid' => $note->uid,
+						'lehrveranstaltung_id' => $lv_id,
+						'studiensemester_kurzbz' => $sem_kurzbz,
+						'note' => trim($note->note),
+						'punkte' => null,
+						'mitarbeiter_uid' => getAuthUID(),
+						'benotungsdatum' => date("Y-m-d H:i:s"),
+						'freigabedatum' => null,
+						'freigabevon_uid' => null,
+						'bemerkung' => null,
+						'updateamum' => null,
+						'updatevon' => null,
+						'insertamum' => date("Y-m-d H:i:s"),
+						'insertvon' => getAuthUID()
+					)
+				);
+				if($id) {
+					$res = $this->LvgesamtnoteModel->load($id->retval);
+					if(hasData($res)) $lvgesamtnote = getData($res)[0];
+				}
+			}
+
+			$retLvNoten[] = $lvgesamtnote;
+		}
+
+		$this->terminateWithSuccess($retLvNoten);
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'uids', 'datum'
+	 * Bulk variant of saveStudentPruefung, used when creating a new Prüfung for several students. Always sets note to
+	 * "noch nicht eingetragen" for the created Prüfung.
+	 */
+	public function createPruefungen() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'uids') || !property_exists($result, 'datum')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$uids = $result->uids;
+		$datum = $result->datum;
+		$lva_id = $result->lva_id;
+		
+		$stsem = $result->sem_kurzbz;
+		
+		$ret = [];
+		
+		foreach ($uids as $student) {
+			$student_uid = $student->uid;
+			$typ = $student->typ;
+			$note = 9; //$result->note; // TODO: parameterize for import maybe
+			$punkte = ''; // TODO: check punkte feature
+
+			$lehreinheit_id = $student->lehreinheit_id;
+			$ret[$student->uid] = $this->savePruefungstermin($typ, $student_uid, $lva_id, $stsem, $lehreinheit_id, $note, $punkte, $datum);
+		}
+
+		$this->terminateWithSuccess($ret);
+	}
+
+	/**
+	 * POST METHOD
+	 * expects 'lv_id', 'sem_kurzbz', 'pruefungen'
+	 * Bulk variant of saveStudentPruefung, used when importing pruefungsdata from csv with available noten.
+	 */
+	public function savePruefungenBulk() {
+		$result = $this->getPostJSON();
+
+		if(!property_exists($result, 'lv_id') || !property_exists($result, 'sem_kurzbz') ||
+			!property_exists($result, 'pruefungen')) {
+			$this->terminateWithError($this->p->t('global', 'missingParameters'), 'general');
+		}
+
+		$lv_id = $result->lv_id;
+		$sem_kurzbz = $result->sem_kurzbz;
+		$pruefungen = $result->pruefungen;
+		
+		$ret = [];
+
+		foreach ($pruefungen as $pruefung) {
+			$student_uid = $pruefung->uid;
+			$typ = $pruefung->typ;
+			$note = $pruefung->note; // TODO: parameterize for import maybe
+			$datum = $pruefung->datum;
+			$punkte = ''; // TODO: check punkte feature
+
+			$lehreinheit_id = $pruefung->lehreinheit_id;
+			$ret[$student_uid] = $this->savePruefungstermin($typ, $student_uid, $lv_id, $sem_kurzbz, $lehreinheit_id, $note, $punkte, $datum);
+		}
+		
+		$this->terminateWithSuccess($ret);
+	}
+
+}
+

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

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

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

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

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

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

application/controllers/api/frontend/v1/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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,86 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Config extends FHCAPI_Controller
+{
+	private $_ci;
+	private $_uid;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'set' => ['admin:r', 'assistenz:r'],
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_setAuthUID();
+
+		$this->loadPhrases([
+			'lehre'
+		]);
+
+		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
+		$this->_ci->load->library('PermissionLib');
+
+	}
+
+
+	public function get()
+	{
+		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
+			$this->terminateWithSuccess([]);
+
+		$ignore_kollision = $this->_ci->variablelib->getVar('ignore_kollision');
+		$ignore_zeitsperre = $this->_ci->variablelib->getVar('ignore_zeitsperre');
+		$ignore_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung');
+
+		$config['ignore_kollision'] = [
+			"type" => "checkbox",
+			"label" => 'ignore_kollision',
+			"value" => $ignore_kollision,
+		];
+
+		$config['ignore_zeitsperre'] = [
+			"type" => "checkbox",
+			"label" => 'ignore_zeitsperre',
+			"value" => $ignore_zeitsperre,
+		];
+
+		$config['ignore_reservierung'] = [
+			"type" => "checkbox",
+			"label" => 'ignore_reservierung',
+			"value" => $ignore_reservierung,
+		];
+
+		$this->terminateWithSuccess($config);
+	}
+	public function set()
+	{
+		if (!($this->permissionlib->isBerechtigt('basis/tempus')) && !($this->permissionlib->isBerechtigt('lv-plan')))
+			$this->terminateWithSuccess([]);
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+
+		foreach (['ignore_kollision','ignore_zeitsperre','ignore_reservierung'] as $variable)
+		{
+			if ($this->_ci->input->post($variable) !== null)
+			{
+				$this->VariableModel->update(array('uid' => $this->_uid, 'name' => $variable), array('wert' => $this->input->post($variable)));
+
+			}
+		}
+
+		$this->terminateWithSuccess();
+	}
+
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid)
+			show_error('User authentification failed');
+	}
+}

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

@@ -15,6 +15,7 @@ class Gruppe extends FHCAPI_Controller
 			'getBenutzerSearch' => ['admin:r', 'assistenz:r'],
 			'getAllSearch' => ['admin:r', 'assistenz:r'],
 			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
+			'getGruppe' => ['admin:r', 'assistenz:r'],
 		]);
 
 		$this->_ci = &get_instance();
@@ -67,7 +68,7 @@ class Gruppe extends FHCAPI_Controller
 
 		$this->checkPermission($lehreinheit_id);
 
-		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, !($lehrverband === 'false'));
+		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, $lehrverband === true || $lehrverband === 'true');
 
 		if (isError($result))
 			$this->terminateWithError(getError($result));
@@ -75,6 +76,71 @@ class Gruppe extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	public function getGruppe()
+	{
+		$lehrverband = $this->input->post('lehrverband');
+
+		$gruppen_result = array();
+
+		if ($lehrverband === false)
+		{
+			$gruppen_result = $this->_ci->GruppeModel->loadWhere(array(
+				'studiengang_kz' => $this->input->post('stg_kz'),
+				'gruppe_kurzbz' => $this->input->post('gruppe_kurzbz'),
+				'aktiv' => true
+			));
+		}
+		else if ($lehrverband === true)
+		{
+
+			if (!isEmptyString($this->input->post('verband')))
+			{
+				$this->LehrverbandModel->db->where('verband', $this->input->post('verband'));
+			}
+			else
+			{
+				$this->LehrverbandModel->db->group_start();
+				$this->LehrverbandModel->db->where("trim(verband) = ''");
+				$this->LehrverbandModel->db->or_where("verband IS NULL");
+				$this->LehrverbandModel->db->group_end();
+			}
+
+			if (!isEmptyString($this->input->post('gruppe')))
+			{
+				$this->LehrverbandModel->db->where('gruppe', $this->input->post('gruppe'));
+			}
+			else
+			{
+				$this->LehrverbandModel->db->group_start();
+				$this->LehrverbandModel->db->where("trim(gruppe) = ''");
+				$this->LehrverbandModel->db->or_where("gruppe IS NULL");
+				$this->LehrverbandModel->db->group_end();
+			}
+
+			if (!isEmptyString((string)$this->input->post('semester')))
+			{
+				$this->LehrverbandModel->db->where('semester', $this->input->post('semester'));
+			}
+			else
+			{
+
+				$this->LehrverbandModel->db->group_start();
+				$this->LehrverbandModel->db->where("semester = ''");
+				$this->LehrverbandModel->db->or_where("semester IS NULL");
+				$this->LehrverbandModel->db->group_end();
+			}
+
+			$gruppen_result = $this->LehrverbandModel->loadWhere(array('studiengang_kz' => $this->input->post('stg_kz'), 'aktiv' => true));
+		}
+
+		if (!hasData($gruppen_result))
+			return $this->terminateWithError('No group found');
+
+		$gruppen_array = getData($gruppen_result)[0];
+
+		$this->terminateWithSuccess($gruppen_array->gid);
+	}
+
 	public function getByLehreinheit($lehreinheit_id = null)
 	{
 		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id))
@@ -118,17 +184,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/lv/Lektor.php

@@ -134,9 +134,14 @@ class Lektor extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		if (isset($formData['semesterstunden']) && (!is_numeric($formData['semesterstunden']) || $formData['semesterstunden'] === ''))
+		$nullable_fields = array('semesterstunden', 'stundensatz', 'planstunden');
+
+		foreach ($nullable_fields as $nullable_field)
 		{
-			$formData['semesterstunden'] = null;
+			if (isset($formData[$nullable_field]) && (!is_numeric($formData[$nullable_field]) || $formData[$nullable_field] === ''))
+			{
+				$formData[$nullable_field] = null;
+			}
 		}
 
 		$lehreinheit_permission = $this->checkPermission($lehreinheit_id, array('admin', 'assistenz', 'lv-plan'));
@@ -144,6 +149,9 @@ class Lektor extends FHCAPI_Controller
 		if (!$lehreinheit_permission)
 			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
 
+		if (!is_null($this->getLektorVertrag($lehreinheit_id, $mitarbeiter_uid)) && (array_key_exists('mitarbeiter_uid', $formData) && $mitarbeiter_uid !== $formData['mitarbeiter_uid']))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
+
 		$result = $this->_ci->lektorlib->updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $formData);
 
 		if (isError($result)) $this->terminateWithError(getError($result));
@@ -154,7 +162,7 @@ class Lektor extends FHCAPI_Controller
 	{
 		$value = str_replace(',', '.', $value);
 
-		if (!is_numeric($value))
+		if (!is_numeric($value) && $value !== "")
 		{
 			$this->form_validation->set_message('_check_decimal', 'Das Feld {field} muss eine Zahl sein.');
 			return false;

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

@@ -0,0 +1,84 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Noten extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getCertificate' => 'student/noten:r',
+			'getTeacherProposal' => 'student/noten:r',
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load Phrases
+		$this->loadPhrases([
+			'stv',
+			'person',
+			'lehre'
+		]);
+	}
+
+	public function getCertificate($lv_id, $studiensemester_kurzbz = null)
+	{
+		if (is_null($lv_id) || !ctype_digit((string)$lv_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->load->model('education/lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$result = $this->LehrveranstaltungModel->loadWhere([
+			'lehrveranstaltung_id' => $lv_id
+		]);
+
+		$lehrveranstaltung = $this->getDataOrTerminateWithError($result);
+
+		if (!$lehrveranstaltung)
+			$this->terminateWithSuccess([]);
+
+		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$result = $this->ZeugnisnoteModel->getZeugnisnoten(null, $studiensemester_kurzbz, $lehrveranstaltung[0]->lehrveranstaltung_id);
+
+		$grades = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($grades);
+	}
+
+	public function getTeacherProposal($lv_id, $studiensemester_kurzbz = null)
+	{
+		if (is_null($lv_id) || !ctype_digit((string)$lv_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->load->model('education/lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$result = $this->LehrveranstaltungModel->loadWhere([
+			'lehrveranstaltung_id' => $lv_id
+		]);
+
+		$lehrveranstaltung = $this->getDataOrTerminateWithError($result);
+
+		if (!$lehrveranstaltung)
+			$this->terminateWithSuccess([]);
+
+		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$result = $this->LvgesamtnoteModel->getLvGesamtNoten($lv_id, null, $studiensemester_kurzbz);
+
+		$grades = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($grades);
+	}
+
+}

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

@@ -27,7 +27,8 @@ class Setup extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getTabs' => ['admin:r', 'assistenz:r'],
+			'getLETabs' => ['admin:r', 'assistenz:r'],
+			'getLVTabs' => ['admin:r', 'assistenz:r'],
 			'getStudiensemester' => ['admin:r', 'assistenz:r'],
 			'getSprache' => ['admin:r', 'assistenz:r'],
 			'getRaumtyp' => ['admin:r', 'assistenz:r'],
@@ -41,9 +42,10 @@ class Setup extends FHCAPI_Controller
 		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
 
 		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
+		$this->_ci->load->helper('hlp_document');
 	}
 
-	public function getTabs()
+	public function getLETabs()
 	{
 		$tabs['details'] = array (
 			'title' =>  'Details',
@@ -60,6 +62,11 @@ class Setup extends FHCAPI_Controller
 			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Lektor.js'),
 			'config' => []
 		);
+		$tabs['termine'] = array (
+			'title' =>  'Termine',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Termine.js',
+			'config' => []
+		);
 		$tabs['notiz'] = array (
 			'title' =>  'Notizen',
 			'component' => absoluteJsImportUrl('public/js/components/LVVerwaltung/Tabs/Notiz.js'),
@@ -68,6 +75,28 @@ class Setup extends FHCAPI_Controller
 		$this->terminateWithSuccess($tabs);
 	}
 
+	public function getLVTabs()
+	{
+		$tabs['termine'] = array (
+			'title' =>  'Termine',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/LVTermine.js',
+			'config' => []
+		);
+		$tabs['noten'] = array (
+			'title' =>  'Noten',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Noten.js',
+			'config' => [
+				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
+				'edit' => 'both', // Possible values: both|header|inline
+				'delete' => 'inline', // Possible values: both|header|inline
+				'documents' => 'inline', // Possible values: both|header|inline
+				'documentslist' => gradesDocumentsList(),
+				'semesterSelect' => false
+			]
+		);
+		$this->terminateWithSuccess($tabs);
+	}
+
 	public function getStudiensemester()
 	{
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');

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

@@ -126,8 +126,6 @@ class StgTree extends FHCAPI_Controller
 				$this->StudienordnungModel->addDistinct();
 				$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
 				$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
-				$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS orgform_kurzbz");
-				$this->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
 				$this->StudienordnungModel->addSelect("TRUE as leaf", false);
 
 				$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');

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

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

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

@@ -301,6 +301,7 @@ class Config extends FHCAPI_Controller
 
 	public function student()
 	{
+		$this->load->helper('hlp_document');
 		$result = [];
 		$config = $this->config->item('tabs');
 
@@ -376,9 +377,9 @@ class Config extends FHCAPI_Controller
 			'config' => [
 				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
 				'edit' => 'both', // Possible values: both|header|inline
-				'delete' => 'both', // Possible values: both|header|inline
-				'documents' => 'both', // Possible values: both|header|inline
-				'documentslist' => $this->gradesDocumentsList()
+				'delete' => 'inline', // Possible values: both|header|inline
+				'documents' => 'inline', // Possible values: both|header|inline
+				'documentslist' => gradesDocumentsList()
 			]
 		];
 
@@ -622,188 +623,6 @@ class Config extends FHCAPI_Controller
 		] + $this->kontoColumns();
 	}
 
-	/**
-	 * Helper function to generate the default documentslist config for the
-	 * grades tab.
-	 *
-	 * The resulting array consists of elements which are associative arrays
-	 * that can have the following entries:
-	 * title			(required) on the first level this can be HTML code.
-	 * permissioncheck	(optional) an URL to an FHCAPI endpoint which returns
-	 * 						true or false.
-	 * link				(optional) an URL that will be called if "action" and
-	 * 						"children" are not defined.
-	 * action			(optional) an associative array that describes an
-	 * 						POST action that will be called if "children" is
-	 * 						not defined.
-	 * 						It can have the following entries:
-	 * - url			(required) an URL to an FHCAPI endpoint.
-	 * - post			(optional) an associative array with the POST data to
-	 * 						be sent.
-	 * - response		(optional) a string that will be displayed on success.
-	 * children			(optional) an array of child elements
-	 *
-	 * All strings that start with { and end with } in the URLs and the
-	 * actions post parameter will be replaced with the corresponding
-	 * attribute of the current dataset (e.G: {uid} will be replaced with the
-	 * uid of the current dataset)
-	 *
-	 * @return array
-	 */
-	protected function gradesDocumentsList()
-	{
-		$permissioncheck = site_url("api/frontend/v1/documents/permissionAlternativeFormat/{studiengang_kz}");
-
-		$title_ger = $this->p->t("global", "deutsch");
-		$title_eng = $this->p->t("global", "englisch");
-		$title_ff = $this->p->t("stv", "document_certificate");
-		$title_lv = $this->p->t("stv", "document_coursecertificate");
-
-		$link_ff = "documents/export/" .
-			"zertifikat.rdf.php/" .
-			"Zertifikat" .
-			"?stg_kz={studiengang_kz_lv}" .
-			"&uid={uid}" .
-			"&ss={studiensemester_kurzbz}" .
-			"&lvid={lehrveranstaltung_id}";
-		$link_lv_ger = "documents/export/" .
-			"lehrveranstaltungszeugnis.rdf.php/" .
-			"LVZeugnis" .
-			"?stg_kz={studiengang_kz}" .
-			"&uid={uid}" .
-			"&ss={studiensemester_kurzbz}" .
-			"&lvid={lehrveranstaltung_id}";
-		$link_lv_eng = "documents/export/" .
-			"lehrveranstaltungszeugnis.rdf.php/" .
-			"LVZeugnisEng" .
-			"?stg_kz={studiengang_kz}" .
-			"&uid={uid}" .
-			"&ss={studiensemester_kurzbz}" .
-			"&lvid={lehrveranstaltung_id}";
-
-		$archive_url = "api/frontend/v1/documents/archiveSigned";
-		$archive_response = $this->p->t("stv", "document_signed_and_archived");
-		$archive_post_ff = [
-			"xml" => "zertifikat.rdf.php",
-			"xsl" => "Zertifikat",
-			"stg_kz" => "{studiengang_kz_lv}",
-			"uid" => "{uid}",
-			"ss" => "{studiensemester_kurzbz}",
-			"lvid" => "{lehrveranstaltung_id}"
-		];
-		$archive_post_lv_ger = [
-			"xml" => "lehrveranstaltungszeugnis.rdf.php",
-			"xsl" => "LVZeugnis",
-			"stg_kz" => "{studiengang_kz}",
-			"uid" => "{uid}",
-			"ss" => "{studiensemester_kurzbz}",
-			"lvid" => "{lehrveranstaltung_id}"
-		];
-		$archive_post_lv_eng = [
-			"xml" => "lehrveranstaltungszeugnis.rdf.php",
-			"xsl" => "LVZeugnisEng",
-			"stg_kz" => "{studiengang_kz}",
-			"uid" => "{uid}",
-			"ss" => "{studiensemester_kurzbz}",
-			"lvid" => "{lehrveranstaltung_id}"
-		];
-
-		$list = [
-			[
-				'title' => '<i class="fa fa-download" title="' . $this->p->t("stv", "document_download") . '"></i>',
-				'children' => [
-					[
-						'title' => $title_ff,
-						'link' => site_url($link_ff)
-					],
-					[
-						'title' => $title_lv,
-						'children' => [
-							[
-								'title' => $title_ger,
-								'link' => site_url($link_lv_ger),
-								'children' => [
-									[
-										'title' => 'PDF',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_ger)
-									],
-									[
-										'title' => 'DOC',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_ger . "&output=doc")
-									],
-									[
-										'title' => 'ODT',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_ger . "&output=odt")
-									]
-								]
-							],
-							[
-								'title' => $title_eng,
-								'link' => site_url($link_lv_eng),
-								'children' => [
-									[
-										'title' => 'PDF',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_eng)
-									],
-									[
-										'title' => 'DOC',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_eng . "&output=doc")
-									],
-									[
-										'title' => 'ODT',
-										'permissioncheck' => $permissioncheck,
-										'link' => site_url($link_lv_eng . "&output=odt")
-									]
-								]
-							]
-						]
-					]
-				]
-			],
-			[
-				'title' => '<i class="fas fa-archive" title="' . $this->p->t("stv", "document_archive") . '"></i>',
-				'children' => [
-					[
-						'title' => $title_ff,
-						'action' => [
-							'url' => site_url($archive_url),
-							'post' => $archive_post_ff,
-							'response' => $archive_response
-						]
-					],
-					[
-						'title' => $title_lv,
-						'children' => [
-							[
-								'title' => $title_ger,
-								'action' => [
-									'url' => site_url($archive_url),
-									'post' => $archive_post_lv_ger,
-									'response' => $archive_response
-								]
-							],
-							[
-								'title' => $title_eng,
-								'action' => [
-									'url' => site_url($archive_url),
-									'post' => $archive_post_lv_eng,
-									'response' => $archive_response
-								]
-							]
-						]
-					]
-				]
-			]
-		];
-
-		return $list;
-	}
-
 	/**
 	 * Sort tab list
 	 *

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

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

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

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

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

@@ -34,7 +34,7 @@ class LvTermine extends FHCAPI_Controller
 
 	//TODO Build own lib or combine with Controller Stundenplan.php
 	//here use of logic of Stundenplan.php, extended with parameters uid, grouping, and used dbTable
-	public function getStundenplan($uid, $start_date = null, $end_date = null, $groupConsecutiveHours = false, $dbStundenplanTable = "stundenplan")
+	public function getStundenplan($uid, $start_date = null, $end_date = null, $dbStundenplanTable = "stundenplan", $groupConsecutiveHours = false)
 	{
 		$student_uid = $uid;
 		$semester_range = $this->studienSemesterErmitteln($start_date, $end_date);
@@ -80,13 +80,6 @@ class LvTermine extends FHCAPI_Controller
 
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 		$this->terminateWithSuccess($stundenplan_data);
-
-		$this->expand_object_information($stundenplan_data);
-
-		$this->returnObj['$stundenplan_query'] = $stundenplan_query;
-		$this->returnObj['$student_lehrverband'] = $student_lehrverband;
-		$this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
-		$this->terminateWithSuccess($stundenplan_data);
 	}
 
 	public function getStudiensemester()

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

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

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

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

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

@@ -1,124 +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'],
-			'updateCollision' => ['admin:r', 'assistenz:r'],
-		]);
-
-		// Load Phrases
-		$this->loadPhrases([
-			'ui',
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-		$this->_ci->load->model('system/Variable_model', 'VariableModel');
-		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
-	}
-
-	public function get()
-	{
-		$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->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();
-	}
-
-	public function updateCollision()
-	{
-		$original_ignore = $this->_ci->variablelib->getVar('ignore_kollision');
-		$this->_ci->VariableModel->setVariable(
-			getAuthUID(),
-			'ignore_kollision',
-			$original_ignore === 'true' ? 'false' : 'true'
-		);
-	}
-
-}

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

@@ -1,228 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Coursepicker extends FHCAPI_Controller
-{
-	private $_ci;
-	public function __construct()
-	{
-		parent::__construct([
-			'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 getByStg()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('studiengaenge[]',"studiengaenge","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$studiengaenge = $this->input->post('studiengaenge');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-
-		$this->_ci->LehreinheitModel->addSelect('
-			tbl_lehreinheit.lehreinheit_id,
-			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', 'tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id');
-		$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');
-
-		$this->_ci->LehreinheitModel->db->group_start();
-		$first = true;
-		foreach ($studiengaenge as $studiengang)
-		{
-			if ($first)
-				$this->_ci->LehreinheitModel->db->group_start();
-			else
-			{
-				$this->_ci->LehreinheitModel->db->or_group_start();
-			}
-			$first = false;
-
-			$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.studiengang_kz', $studiengang['studiengang_kz']);
-
-			if (isset($studiengang['semester']))
-				$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.semester', $studiengang['semester']);
-
-			if (isset($studiengang['orgform_kurzbz']))
-				$this->_ci->LehreinheitModel->db->where('tbl_lehrveranstaltung.orgform_kurzbz', $studiengang['orgform_kurzbz']);
-
-			$this->_ci->LehreinheitModel->db->group_end();
-		}
-		$this->_ci->LehreinheitModel->db->group_end();
-
-		$result = $this->_ci->LehreinheitModel->loadWhere(array(
-			'tbl_lehrform.verplanen' => true,
-			'tbl_lehreinheit.studiensemester_kurzbz' => $studiensemester_kurzbz
-		));
-
-		$result = hasData($result) ? getData($result) : array();
-
-		$lehreinheit_ids = array_values(array_unique(array_column($result, 'lehreinheit_id')));
-
-		$offen_map = array();
-		if (!empty($lehreinheit_ids))
-		{
-			$offen_result = $this->_ci->LehreinheitModel->getOffeneStunden($lehreinheit_ids);
-			if (hasData($offen_result))
-			{
-				foreach (getData($offen_result) as $row)
-				{
-					$offen_map[$row->lehreinheit_id . '_' . $row->mitarbeiter_uid] = $row;
-				}
-			}
-		}
-
-		$grouped = array();
-
-		foreach ($result as $row)
-		{
-			$lehreinheit_id = $row->lehreinheit_id;
-			if (!isset($grouped[$lehreinheit_id]))
-			{
-				$grouped[$lehreinheit_id] = (object)array(
-					'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' => $lehreinheit_id,
-					'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[$lehreinheit_id];
-
-			$group->lektoren[$row->lektor_uid] = (object)array(
-				'uid' => $row->lektor_uid,
-				'kurzbz' => trim($row->lektor),
-				'name' => $row->vorname . ' ' . $row->nachname,
-			);
-
-			$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;
-
-			$offen_key = $lehreinheit_id . '_' . $row->lektor_uid;
-			$offen = isset($offen_map[$offen_key]) ? $offen_map[$offen_key] : null;
-			$verplant_wert = $offen ? $offen->verplant : 0;
-			$offenestunden_wert = $offen ? $offen->offenestunden : 0;
-
-			$group->verplant[] = $verplant_wert;
-			$group->offenestunden[] = $offenestunden_wert;
-			$group->verplant_gesamt += $verplant_wert;
-
-			$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($values) > 1)
-			$formatted .= ' ?';
-
-		return $formatted;
-	}
-
-
-}

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

@@ -1,47 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Favorites extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => self::PERM_LOGGED,
-			'set' => self::PERM_LOGGED
-		]);
-
-		// Load models
-		$this->load->model('system/Variable_model', 'VariableModel');
-	}
-
-	public function index()
-	{
-		$result = $this->VariableModel->getVariables(getAuthUID(), ['tempus_favorites']);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			$this->terminateWithSuccess(null);
-		else
-			$this->terminateWithSuccess(isset($data['tempus_favorites']) ? $data['tempus_favorites'] : null);
-	}
-
-	public function set()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$favorites = $this->input->post('favorites');
-
-		$result = $this->VariableModel->setVariable(getAuthUID(), 'tempus_favorites', $favorites);
-
-		$this->getDataOrTerminateWithError($result);
-		
-		$this->terminateWithSuccess(true);
-	}
-}

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

@@ -1,37 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Info extends FHCAPI_Controller
-{
-
-	private $_ci;
-
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'getStudiengaenge' => self::PERM_LOGGED,
-		]);
-
-		$this->_ci =& get_instance();
-
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->loadPhrases([
-			'ui'
-		]);
-
-	}
-
-	public function getStudiengaenge()
-	{
-		$this->_ci->StudiengangModel->addDistinct();
-		$this->_ci->StudiengangModel->addSelect('studiengang_kz');
-		$this->_ci->StudiengangModel->addSelect("CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name");
-
-		$result = $this->getDataOrTerminateWithError($this->_ci->StudiengangModel->load());
-		$this->terminateWithSuccess($result);
-	}
-}

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

@@ -1,438 +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,
-			'getCalendarHours' => 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',
-			'calculateMultiWeekPlan' => 'lehre/lvplan:rw',
-			'confirmMultiWeekPlan' => 'lehre/lvplan:rw',
-			'addToKalenderEvent' => '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->_ci->load->library('KalenderSyncLib');
-		$this->_ci->load->library('RaumvorschlagLib');
-		$this->loadPhrases([
-			'ui'
-		]);
-		$this->_ci->load->config('tempus');
-
-
-		$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 getCalendarHours()
-	{
-		$calender_start = $this->_ci->config->item('calendar_start') ?? 7;
-		$calender_end = $this->_ci->config->item('calendar_end') ?? 23;
-
-		$this->terminateWithSuccess(array(
-			'start' => $calender_start,
-			'end' => $calender_end
-		));
-	}
-
-	public function getPlan()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$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->post('start_date', TRUE);
-		$end_date = $this->_ci->input->post('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),  $result->code);
-
-		$this->terminateWithSuccess();
-	}
-
-	public function getRaumvorschlag()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-
-		$filter = $this->_checkFilter(self::ALLOWED_ROOM_FILTER);
-		$this->terminateWithSuccess($this->_ci->raumvorschlaglib->getVorschlaege($filter->kalender_id));
-	}
-
-	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(getData($result));
-	}
-
-	public function sync()
-	{
-		$result = $this->_ci->kalendersynclib->sync();
-		$this->terminateWithSuccess(getData($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(getData($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(getData($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(getData($result));
-	}
-
-	public function calculateMultiWeekPlan()
-	{
-		$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->calculateMultiWeekPlan($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function confirmMultiWeekPlan()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('plan[]',"plan","required");
-		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$plan = $this->_ci->input->post('plan', TRUE);
-		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->confirmMultiWeekPlan($plan, $lehreinheit_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-	public function addToKalenderEvent()
-	{
-		$this->_ci->form_validation->set_data($_POST);
-		$this->_ci->form_validation->set_rules('target_kalender_id',"target_kalender_id","required");
-		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$target_kalender_id = $this->_ci->input->post('target_kalender_id', TRUE);
-		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
-
-		$result = $this->_ci->kalenderlib->addToKalenderEvent($target_kalender_id, $lehreinheit_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess(getData($result));
-	}
-
-
-	private function _checkFilter($filters)
-	{
-		$filter_valid = true;
-		$filter_object = new stdClass();
-		foreach ($filters as $filter)
-		{
-			if ($this->_ci->input->post($filter))
-			{
-				$filter_valid = true;
-				$filter_object->$filter = $this->_ci->input->post($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/KalenderSync.php

@@ -1,298 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-
-class KalenderSync extends FHCAPI_Controller
-{
-	private $_ci;
-
-	const ALLOWED_STATUS = ['preview', 'live'];
-	public function __construct()
-	{
-		parent::__construct([
-			'getSyncs' => ['admin:r', 'assistenz:r'],
-			'loadSync' => ['admin:r', 'assistenz:r'],
-			'add' => ['admin:r', 'assistenz:r'],
-			'start' => ['admin:r', 'assistenz:r'],
-			'delete' => ['admin:r', 'assistenz:r'],
-			'updateSync' => ['admin:r', 'assistenz:r'],
-			'getStudienplan' => ['admin:r', 'assistenz:r'],
-			'getSyncStatus' => ['admin:r', 'assistenz:r'],
-		]);
-
-		$this->loadPhrases([
-			'lehre',
-		]);
-
-		$this->_ci = &get_instance();
-		$this->_ci->load->library('form_validation');
-		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->_ci->load->model('ressource/Kalendersyncstatus_model', 'KalendersyncstatusModel');
-		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
-		$this->_ci->load->library('KalenderSyncLib');
-	}
-
-	public function getSyncs()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-		$studiensemester_kurzbz = $this->_ci->input->get('studiensemester_kurzbz', TRUE);
-
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('tbl_kalender_syncstatus.*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS sync_status_kurzbz, tbl_organisationseinheit.bezeichnung as oebezeichnung, tbl_studienplan.bezeichnung as studienplanbezeichnung');
-		$this->_ci->KalenderStatusModel->addJoin('lehre.tbl_kalender_status', 'tbl_kalender_syncstatus.sync_status_kurzbz = tbl_kalender_status.status_kurzbz');
-		$this->_ci->KalenderStatusModel->addJoin('public.tbl_organisationseinheit', 'tbl_kalender_syncstatus.oe_kurzbz = tbl_organisationseinheit.oe_kurzbz');
-		$this->_ci->KalenderStatusModel->addJoin('lehre.tbl_studienplan', 'tbl_kalender_syncstatus.studienplan_id = tbl_studienplan.studienplan_id', 'LEFT');
-
-		$data = $this->_ci->KalendersyncstatusModel->loadWhere(array('studiensemester_kurzbz' => $studiensemester_kurzbz));
-
-		if (isError($data))
-			$this->terminateWithError(getError($data));
-
-		$this->terminateWithSuccess(getData($data));
-	}
-
-	public function delete()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('kalender_syncstatus_id', 'kalender_syncstatus_id', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$kalender_syncstatus_id = $this->input->post('kalender_syncstatus_id');
-
-		$result = $this->_ci->KalendersyncstatusModel->load($kalender_syncstatus_id);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		if (!hasData($result))
-			$this->terminateWithError($this->p->t('lehre', 'errorDeleting'));
-
-		$del_result = $this->_ci->KalendersyncstatusModel->delete(getData($result)[0]->kalender_syncstatus_id);
-
-		if (isError($del_result))
-			$this->terminateWithError(getError($del_result));
-		$this->terminateWithSuccess($del_result);
-	}
-
-	public function loadSync()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('kalender_syncstatus_id',"kalender_syncstatus_id","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-		$kalender_syncstatus_id = $this->_ci->input->get('kalender_syncstatus_id', TRUE);
-		$data = $this->_ci->KalendersyncstatusModel->loadWhere(array('kalender_syncstatus_id' => $kalender_syncstatus_id));
-		if (isError($data))
-			$this->terminateWithError(getError($data));
-
-		$this->terminateWithSuccess(getData($data)[0]);
-	}
-
-	public function getSyncStatus()
-	{
-		$language = getUserLanguage() == 'German' ? 0 : 1;
-
-		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS bezeichnung, status_kurzbz');
-		$this->_ci->KalenderStatusModel->db->where_in('status_kurzbz', self::ALLOWED_STATUS);
-		$data = $this->_ci->KalenderStatusModel->load();
-
-		if (isError($data))
-			$this->terminateWithError(getError($data));
-
-		$this->terminateWithSuccess(getData($data));
-	}
-
-
-	public function add()
-	{
-		$formData = $this->input->post('formData');
-
-		$this->_ci->form_validation->set_data($formData);
-
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$ausbildungssemester = isEmptyString($formData['ausbildungssemester']) ? null : $formData['ausbildungssemester'];
-		$studienplan_id = isEmptyString($formData['studienplan_id']) ? null : $formData['studienplan_id'];
-
-		$existing = $this->_checkIfExist(
-			$formData['oe_kurzbz'],
-			$formData['studiensemester_kurzbz'],
-			$ausbildungssemester,
-			$studienplan_id
-		);
-
-		if (isError($existing))
-			$this->terminateWithError(getError($existing));
-
-		if (hasData($existing))
-		{
-			$this->terminateWithError('Es existiert bereits ein Eintrag.');
-		}
-
-		$result = $this->_ci->KalendersyncstatusModel->insert(
-			array(
-				'oe_kurzbz' => $formData['oe_kurzbz'],
-				'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
-				'datum_bis' => $formData['datum_bis'],
-				'studienplan_id' => $studienplan_id,
-				'ausbildungssemester' => $ausbildungssemester,
-				'sync_status_kurzbz' => $formData['sync_status_kurzbz'],
-				'mail' => $formData['mail'],
-				'insertvon' => getAuthUID()
-			)
-		);
-
-		$this->terminateWithSuccess($result);
-	}
-
-
-	public function start()
-	{
-		$formData = $this->input->post('formData');
-
-		$this->_ci->form_validation->set_data($formData);
-
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$result = $this->_ci->kalendersynclib->runManual($formData['oe_kurzbz'], $formData['studiensemester_kurzbz'], $formData['ausbildungssemester'], $formData['studienplan_id'], $formData['mail'], $formData['datum_bis'], $formData['sync_status_kurzbz']);
-
-		if (isError($result))
-			$this->terminateWithError(getError($result));
-
-		$this->terminateWithSuccess($result);
-	}
-	public function updateSync()
-	{
-		$formData = $this->input->post('formData');
-
-		$this->_ci->form_validation->set_data($formData);
-
-		$this->_ci->form_validation->set_rules('kalender_syncstatus_id',"kalender_syncstatus_id","required");
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-		$this->_ci->form_validation->set_rules('studiensemester_kurzbz',"studiensemester_kurzbz","required");
-		$this->_ci->form_validation->set_rules('sync_status_kurzbz',"sync_status_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$ausbildungssemester = isEmptyString($formData['ausbildungssemester']) ? null : $formData['ausbildungssemester'];
-		$studienplan_id = isEmptyString($formData['studienplan_id']) ? null : $formData['studienplan_id'];
-
-		$existing = $this->_checkIfExist(
-			$formData['oe_kurzbz'],
-			$formData['studiensemester_kurzbz'],
-			$ausbildungssemester,
-			$studienplan_id,
-			$formData['kalender_syncstatus_id']
-		);
-
-		if (isError($existing))
-			$this->terminateWithError(getError($existing));
-
-		if (hasData($existing))
-		{
-			$this->terminateWithError('Es existiert bereits ein Eintrag.');
-		}
-
-		$this->_ci->KalendersyncstatusModel->update(
-			array('kalender_syncstatus_id' => $formData['kalender_syncstatus_id']),
-			array(
-				'oe_kurzbz' => $formData['oe_kurzbz'],
-				'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
-				'datum_bis' => $formData['datum_bis'],
-				'studienplan_id' => $studienplan_id,
-				'ausbildungssemester' => $ausbildungssemester,
-				'sync_status_kurzbz' => $formData['sync_status_kurzbz'],
-				'mail' => $formData['mail'],
-				'updatevon' => getAuthUID(),
-				'updateamum' => date('c'),
-			)
-		);
-	}
-	public function getStudienplan()
-	{
-		$this->_ci->form_validation->set_data($_GET);
-		$this->_ci->form_validation->set_rules('oe_kurzbz',"oe_kurzbz","required");
-
-		if($this->_ci->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
-
-		$oe_kurzbz = $this->_ci->input->get('oe_kurzbz', TRUE);
-		$studiensemester_kurzbz = $this->_ci->input->get('studiensemester_kurzbz', TRUE);
-		$ausbildungssemester = $this->_ci->input->get('ausbildungssemester', TRUE);
-
-		$this->_ci->StudiengangModel->addJoin('tbl_organisationseinheit', 'oe_kurzbz');
-		$is_studiengang = $this->_ci->StudiengangModel->loadWhere(array('oe_kurzbz' => $oe_kurzbz));
-
-		if (hasData($is_studiengang) && !isEmptyString($studiensemester_kurzbz))
-		{
-			$studiengang = getData($is_studiengang)[0];
-
-			$studienplaene = $this->_ci->StudienplanModel->getStudienplaeneBySemester(
-				$studiengang->studiengang_kz,
-				$studiensemester_kurzbz,
-				isEmptyString($ausbildungssemester) ? null : $ausbildungssemester
-			);
-
-
-			$data = $this->getDataOrTerminateWithError($studienplaene);
-
-			$unique = array();
-			foreach ($data as $row)
-			{
-				$unique[$row->studienplan_id] = (object) array(
-					'studienplan_id' => $row->studienplan_id,
-					'studienordnung_id' => $row->studienordnung_id,
-					'bezeichnung' => $row->bezeichnung,
-					'orgform_kurzbz' => $row->orgform_kurzbz
-				);
-			}
-
-			$this->terminateWithSuccess(array_values($unique));
-		}
-		$this->terminateWithSuccess();
-	}
-
-	private function _checkIfExist($oe_kurzbz, $studiensemester_kurzbz, $ausbildungssemester, $studienplan_id, $kalender_syncstatus_id = null)
-	{
-		$this->_ci->KalendersyncstatusModel->db->where('oe_kurzbz', $oe_kurzbz);
-		$this->_ci->KalendersyncstatusModel->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
-
-		if (is_null($ausbildungssemester))
-			$this->_ci->KalendersyncstatusModel->db->where('ausbildungssemester IS NULL', null, false);
-		else
-			$this->_ci->KalendersyncstatusModel->db->where('ausbildungssemester', $ausbildungssemester);
-
-		if (is_null($studienplan_id))
-			$this->_ci->KalendersyncstatusModel->db->where('studienplan_id IS NULL', null, false);
-		else
-			$this->_ci->KalendersyncstatusModel->db->where('studienplan_id', $studienplan_id);
-
-		if (!is_null($kalender_syncstatus_id))
-			$this->_ci->KalendersyncstatusModel->db->where('kalender_syncstatus_id !=', $kalender_syncstatus_id);
-		return $this->_ci->KalendersyncstatusModel->load();
-	}
-
-}

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(getError($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($result);
-	}
-
-
-	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/jobs/AbgabetoolJob.php

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

application/controllers/jobs/AntragJob.php

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

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

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

application/controllers/system/MigrateKalender.php

@@ -1,495 +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 CLI_Controller
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$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, $bis = null, $studiengang_kz = null)
-	{
-		if (is_null($von))
-			return error('Parameter "von" ist erforderlich');
-
-		if (is_null($bis))
-			$bis = '2100-12-31';
-
-		$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,
-					array_agg(DISTINCT sp.lehreinheit_id) AS lehreinheit_id,
-					array_agg(DISTINCT 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_in('stundenplandev_id', $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);
-					}
-				}
-			}
-		}
-	}
-
-	public function migrateReservierung($von, $bis = null, $ort_kurzbz = null)
-	{
-		if (is_null($von))
-			return error('Parameter "von" ist erforderlich');
-
-		if (is_null($bis))
-			$bis = '2100-12-31';
-
-		$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, r.studiengang_kz)::text) AS svg_kombis,
-							array_agg(DISTINCT r.ort_kurzbz) AS ort_kurzbz,
-							MIN(r.studiengang_kz) AS studiengang_kz,
-							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;";
-
-		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_in('reservierung_id', $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')
-		{
-			$lehreinheit_ids = is_array($block->lehreinheit_id) ? $block->lehreinheit_id : explode(',', $block->lehreinheit_id);
-			foreach ($lehreinheit_ids as $lehreinheit_id)
-			{
-				$leResult = $this->KalenderLehreinheitModel->insert(
-					array (
-						'kalender_id' => $kalender_id,
-						'lehreinheit_id'=> $lehreinheit_id
-					)
-				);
-
-				if (!isSuccess($leResult))
-					return null;
-			}
-		}
-		else if ($typ === 'reservierung')
-		{
-			$eventResult = $this->KalenderEventModel->insert(array(
-				'kalender_id' => $kalender_id,
-				'titel' => $block->titel,
-				'beschreibung' => $block->beschreibung
-			));
-
-			if (!isSuccess($eventResult))
-				return null;
-
-			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 null;
-
-			$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, $stg_kz) = explode(',', $kombi_str);
-
-				$sem = trim($sem) === '' ? null : trim($sem);
-				$verb = trim($verb) === '' ? null : trim($verb);
-				$grp = trim($grp) === '' ? null : trim($grp);
-				$stg_kz = trim($stg_kz) === '' ? null : trim($stg_kz);
-
-				if (is_null($sem) && is_null($verb) && is_null($grp) && is_null($stg_kz))
-					continue;
-
-				$this->KalenderEventTeilnehmerModel->insert(array(
-					'kalender_id' => $kalender_id,
-					'studiengang_kz' => $stg_kz,
-					'semester' => $sem,
-					'verband' => $verb,
-					'gruppe' => $grp,
-					'studiensemester_kurzbz' => $studiensemester_kurzbz,
-					'rolle_kurzbz' => 'teilnehmer'
-				));
-			}
-		}
-
-		$orte = is_array($block->ort_kurzbz) ? $block->ort_kurzbz : explode(',', $block->ort_kurzbz ?? '');
-
-		foreach ($orte as $ort)
-		{
-			$ort = trim($ort);
-			if (!empty($ort))
-			{
-				$this->KalenderOrtModel->insert(
-					array (
-						'kalender_id' => $kalender_id,
-						'ort_kurzbz' => $ort
-					)
-				);
-			}
-		}
-
-		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
-			)
-		);
-
-		$orte = is_array($block->ort_kurzbz) ? $block->ort_kurzbz : explode(',', $block->ort_kurzbz ?? '');
-		$orte = array_filter(array_map('trim', $orte));
-
-		$this->KalenderOrtModel->delete(array('kalender_id' => $kalender_id));
-
-		foreach ($orte as $ort)
-		{
-			$this->KalenderOrtModel->insert(
-				array (
-					'kalender_id' => $kalender_id,
-					'ort_kurzbz' => $ort
-				)
-			);
-		}
-	}
-
-	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,7 +417,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$notiz_id = $this->input->post('notiz_id');
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
-		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || public.tbl_notiz_dokument.dms_id AS preview');
 
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
 		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');

application/helpers/hlp_document_helper.php

@@ -0,0 +1,188 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Helper function to generate the default documentslist config for the
+ * grades tab.
+ *
+ * The resulting array consists of elements which are associative arrays
+ * that can have the following entries:
+ * title			(required) on the first level this can be HTML code.
+ * permissioncheck	(optional) an URL to an FHCAPI endpoint which returns
+ * 						true or false.
+ * link				(optional) an URL that will be called if "action" and
+ * 						"children" are not defined.
+ * action			(optional) an associative array that describes an
+ * 						POST action that will be called if "children" is
+ * 						not defined.
+ * 						It can have the following entries:
+ * - url			(required) an URL to an FHCAPI endpoint.
+ * - post			(optional) an associative array with the POST data to
+ * 						be sent.
+ * - response		(optional) a string that will be displayed on success.
+ * children			(optional) an array of child elements
+ *
+ * All strings that start with { and end with } in the URLs and the
+ * actions post parameter will be replaced with the corresponding
+ * attribute of the current dataset (e.G: {uid} will be replaced with the
+ * uid of the current dataset)
+ *
+ * @return array
+ */
+function gradesDocumentsList()
+{
+	$ci =& get_instance();
+	$ci->load->library('PhrasesLib', array('stv'), 'p');
+
+	$permissioncheck = site_url("api/frontend/v1/documents/permissionAlternativeFormat/{studiengang_kz}");
+
+	$title_ger = $ci->p->t("global", "deutsch");
+	$title_eng = $ci->p->t("global", "englisch");
+	$title_ff = $ci->p->t("stv", "document_certificate");
+	$title_lv = $ci->p->t("stv", "document_coursecertificate");
+
+	$link_ff = "documents/export/" .
+		"zertifikat.rdf.php/" .
+		"Zertifikat" .
+		"?stg_kz={studiengang_kz_lv}" .
+		"&uid={uid}" .
+		"&ss={studiensemester_kurzbz}" .
+		"&lvid={lehrveranstaltung_id}";
+	$link_lv_ger = "documents/export/" .
+		"lehrveranstaltungszeugnis.rdf.php/" .
+		"LVZeugnis" .
+		"?stg_kz={studiengang_kz}" .
+		"&uid={uid}" .
+		"&ss={studiensemester_kurzbz}" .
+		"&lvid={lehrveranstaltung_id}";
+	$link_lv_eng = "documents/export/" .
+		"lehrveranstaltungszeugnis.rdf.php/" .
+		"LVZeugnisEng" .
+		"?stg_kz={studiengang_kz}" .
+		"&uid={uid}" .
+		"&ss={studiensemester_kurzbz}" .
+		"&lvid={lehrveranstaltung_id}";
+
+	$archive_url = "api/frontend/v1/documents/archiveSigned";
+	$archive_response = $ci->p->t("stv", "document_signed_and_archived");
+	$archive_post_ff = [
+		"xml" => "zertifikat.rdf.php",
+		"xsl" => "Zertifikat",
+		"stg_kz" => "{studiengang_kz_lv}",
+		"uid" => "{uid}",
+		"ss" => "{studiensemester_kurzbz}",
+		"lvid" => "{lehrveranstaltung_id}"
+	];
+	$archive_post_lv_ger = [
+		"xml" => "lehrveranstaltungszeugnis.rdf.php",
+		"xsl" => "LVZeugnis",
+		"stg_kz" => "{studiengang_kz}",
+		"uid" => "{uid}",
+		"ss" => "{studiensemester_kurzbz}",
+		"lvid" => "{lehrveranstaltung_id}"
+	];
+	$archive_post_lv_eng = [
+		"xml" => "lehrveranstaltungszeugnis.rdf.php",
+		"xsl" => "LVZeugnisEng",
+		"stg_kz" => "{studiengang_kz}",
+		"uid" => "{uid}",
+		"ss" => "{studiensemester_kurzbz}",
+		"lvid" => "{lehrveranstaltung_id}"
+	];
+
+	$list = [
+		[
+			'title' => '<i class="fa fa-download" title="' . $ci->p->t("stv", "document_download") . '"></i>',
+			'children' => [
+				[
+					'title' => $title_ff,
+					'link' => site_url($link_ff)
+				],
+				[
+					'title' => $title_lv,
+					'children' => [
+						[
+							'title' => $title_ger,
+							'link' => site_url($link_lv_ger),
+							'children' => [
+								[
+									'title' => 'PDF',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_ger)
+								],
+								[
+									'title' => 'DOC',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_ger . "&output=doc")
+								],
+								[
+									'title' => 'ODT',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_ger . "&output=odt")
+								]
+							]
+						],
+						[
+							'title' => $title_eng,
+							'link' => site_url($link_lv_eng),
+							'children' => [
+								[
+									'title' => 'PDF',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_eng)
+								],
+								[
+									'title' => 'DOC',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_eng . "&output=doc")
+								],
+								[
+									'title' => 'ODT',
+									'permissioncheck' => $permissioncheck,
+									'link' => site_url($link_lv_eng . "&output=odt")
+								]
+							]
+						]
+					]
+				]
+			]
+		],
+		[
+			'title' => '<i class="fas fa-archive" title="' . $ci->p->t("stv", "document_archive") . '"></i>',
+			'children' => [
+				[
+					'title' => $title_ff,
+					'action' => [
+						'url' => site_url($archive_url),
+						'post' => $archive_post_ff,
+						'response' => $archive_response
+					]
+				],
+				[
+					'title' => $title_lv,
+					'children' => [
+						[
+							'title' => $title_ger,
+							'action' => [
+								'url' => site_url($archive_url),
+								'post' => $archive_post_lv_ger,
+								'response' => $archive_response
+							]
+						],
+						[
+							'title' => $title_eng,
+							'action' => [
+								'url' => site_url($archive_url),
+								'post' => $archive_post_lv_eng,
+								'response' => $archive_response
+							]
+						]
+					]
+				]
+			]
+		]
+	];
+
+	return $list;
+}

application/libraries/AntragLib.php

@@ -128,7 +128,7 @@ class AntragLib
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
 		// NOTE(chris): get last status that is not pause
-		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,
@@ -1657,7 +1657,7 @@ class AntragLib
 
 		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where);
 		if (isError($result))
-			return $result;
+		return $result;
 
 		if (!hasData($result))
 			return error($this->_ci->p->t('studierendenantrag', "error_no_antrag_found", ['id' => $studierendenantrag_id]));
@@ -1709,7 +1709,6 @@ class AntragLib
 		$result->statustyp = $antrag->statustyp;
 		$result->status_insertvon = $antrag->status_insertvon;
 		$result->grund = $antrag->grund;
-		$result->status_grund = $antrag->status_grund;
 		$result->studierendenantrag_id = $antrag->studierendenantrag_id;
 		$result->typ = $antrag->typ;
 		$result->datum = $antrag->datum;

application/libraries/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 = array_merge($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,171 +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');
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-	}
-
-	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/>';
-
-		//TODO (david) richtigen Empfänger
-		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/KalenderSyncLib.php

@@ -1,336 +0,0 @@
-<?php
-
-if (! defined("BASEPATH")) exit("No direct script access allowed");
-
-class KalenderSyncLib
-{
-	private $_ci;
-
-	private $status_map = array(
-		'preview' => array('planning', 'sync_preview'),
-		'live' => array('planning', 'sync_preview', 'preview', 'sync_live')
-	);
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->model('ressource/Kalendersyncstatus_model', 'KalendersyncstatusModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-	}
-
-	public function run($studiensemester_kurzbz)
-	{
-		$this->_ci->KalendersyncstatusModel->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
-
-		$configs = $this->_ci->KalendersyncstatusModel->load();
-
-		if (isError($configs))
-			return $configs;
-
-		if (!hasData($configs))
-			return success([]);
-
-		$results = [];
-		$mail_infos_gesamt = [];
-
-		foreach (getData($configs) as $config)
-		{
-
-			$ziel_status = isEmptyString($config->sync_status_kurzbz) ? 'live' : $config->sync_status_kurzbz;
-
-			$relevante_stati = array_merge($this->status_map[$ziel_status], array('todelete'));
-
-			$kalender_ids_result = $this->getKalenderIds(
-				$config->oe_kurzbz,
-				$config->studiensemester_kurzbz,
-				$relevante_stati,
-				$config->ausbildungssemester,
-				$config->studienplan_id,
-				$config->datum_bis
-			);
-
-			if (isError($kalender_ids_result))
-				return $kalender_ids_result;
-
-			$kalender_ids = getData($kalender_ids_result);
-
-			$sync_result = $this->_syncKalenderIds($kalender_ids, $ziel_status);
-
-			if (isError($sync_result))
-				return $sync_result;
-
-			$sync_data = getData($sync_result);
-
-			if ((bool) $config->mail)
-				$mail_infos_gesamt = array_merge($mail_infos_gesamt, $sync_data['mail_infos']);
-
-			$results[] = [
-				'kalender_syncstatus_id' => $config->kalender_syncstatus_id,
-				'oe_kurzbz' => $config->oe_kurzbz,
-				'ausbildungssemester' => $config->ausbildungssemester,
-				'studienplan_id' => $config->studienplan_id,
-				'ziel_status' => $ziel_status,
-				'mail' => (bool) $config->mail,
-				'synced' => $sync_data['synced']
-			];
-		}
-
-		if (!empty($mail_infos_gesamt))
-		{
-			$this->_ci->load->library('KalenderNotificationLib');
-			$this->_ci->kalendernotificationlib->sendMails($mail_infos_gesamt);
-		}
-
-		return success($results);
-	}
-
-	public function runManual($oe_kurzbz, $studiensemester_kurzbz, $ausbildungssemester = null, $studienplan_id = null, $mail = true, $datum_bis = null, $ziel_status = 'live')
-	{
-		$relevante_stati = array_merge($this->status_map[$ziel_status], array('todelete'));
-
-		$kalender_ids_result = $this->getKalenderIds(
-			$oe_kurzbz,
-			$studiensemester_kurzbz,
-			$relevante_stati,
-			$ausbildungssemester,
-			$studienplan_id,
-			$datum_bis
-		);
-
-		if (isError($kalender_ids_result))
-			return $kalender_ids_result;
-
-		$kalender_ids = getData($kalender_ids_result);
-
-		$sync_result = $this->_syncKalenderIds($kalender_ids, $ziel_status);
-
-		if (isError($sync_result))
-			return $sync_result;
-
-		$sync_data = getData($sync_result);
-
-		if ($mail && !empty($sync_data['mail_infos']))
-		{
-			$this->_ci->load->library('KalenderNotificationLib');
-			$this->_ci->kalendernotificationlib->sendMails($sync_data['mail_infos']);
-		}
-
-		return success(['synced' => $sync_data['synced']]);
-	}
-
-	public function sync()
-	{
-		$this->_ci->KalenderModel->addSelect('tbl_kalender.*, tbl_kalender_ort.ort_kurzbz, tbl_kalender_ort.location');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->db->where_in('status_kurzbz', array('sync_live', 'sync_preview', 'todelete'));
-		$this->_ci->KalenderModel->addOrder('tbl_kalender.kalender_id', 'DESC');
-		$to_update = $this->_ci->KalenderModel->load();
-
-		if (isError($to_update))
-			return $to_update;
-
-		if (!hasData($to_update))
-			return success(['synced' => 0]);
-
-		$mail_infos = [];
-		$synced = 0;
-
-		foreach (getData($to_update) as $entry)
-		{
-			if ($entry->status_kurzbz === 'todelete')
-			{
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'deleted'));
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'deleted', 'notify' => array('lektor', 'student'));
-				$synced++;
-			}
-
-			if ($entry->status_kurzbz === 'sync_preview')
-			{
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'preview'));
-				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, true);
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'preview', 'notify' => array('lektor'));
-				$synced++;
-			}
-
-			if ($entry->status_kurzbz === 'sync_live')
-			{
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'live'));
-				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, false);
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'live', 'notify' => array('lektor', 'student'));
-				$synced++;
-			}
-		}
-
-		$this->_ci->load->library('KalenderNotificationLib');
-		$this->_ci->kalendernotificationlib->sendMails($mail_infos);
-
-		return success(['synced' => $synced]);
-	}
-
-	public function getKalenderIds($oe_kurzbz, $studiensemester_kurzbz, $status_kurzbz_list, $ausbildungssemester = null, $studienplan_id = null, $datum_bis = null)
-	{
-		if (empty($status_kurzbz_list))
-			return success([]);
-
-		$studiengang_result = $this->_getStudiengang($oe_kurzbz);
-
-		if (isError($studiengang_result))
-			return $studiengang_result;
-
-		$studiengang_kz = getData($studiengang_result);
-
-		$this->_ci->KalenderModel->addDistinct('tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addSelect('tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'tbl_kalender.kalender_id = tbl_kalender_lehreinheit.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'tbl_kalender_lehreinheit.lehreinheit_id = tbl_lehreinheit.lehreinheit_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehrveranstaltung', 'tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id');
-
-		//TODO (david) oe_kurzbz rekursiv?
-		if (!is_null($studiengang_kz))
-			$this->_ci->KalenderModel->db->where('tbl_lehrveranstaltung.studiengang_kz', $studiengang_kz);
-		else
-			$this->_ci->KalenderModel->db->where('tbl_lehrveranstaltung.oe_kurzbz', $oe_kurzbz);
-
-		$this->_ci->KalenderModel->db->where('tbl_lehreinheit.studiensemester_kurzbz', $studiensemester_kurzbz);
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.status_kurzbz', $status_kurzbz_list);
-
-		$this->_ci->KalenderModel->db->where('NOT EXISTS (
-				SELECT 1 FROM lehre.tbl_kalender nachfolger
-				WHERE nachfolger.vorgaenger_kalender_id = tbl_kalender.kalender_id)', null, false);
-
-		if (!is_null($studienplan_id))
-		{
-			$this->_ci->KalenderModel->addJoin('lehre.tbl_studienplan_lehrveranstaltung', 'tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id');
-			$this->_ci->KalenderModel->db->where('tbl_studienplan_lehrveranstaltung.studienplan_id', $studienplan_id);
-		}
-
-		if (!is_null($ausbildungssemester))
-			$this->_ci->KalenderModel->db->where('tbl_lehrveranstaltung.semester', $ausbildungssemester);
-
-		if (!is_null($datum_bis))
-		{
-			$end_date = date('Y-m-d', strtotime($datum_bis . ' +1 day'));
-			$this->_ci->KalenderModel->db->where('tbl_kalender.von <', $end_date);
-		}
-
-		$result = $this->_ci->KalenderModel->load();
-
-		if (isError($result))
-			return $result;
-
-		if (!hasData($result))
-			return success([]);
-
-		return success(array_column(getData($result), 'kalender_id'));
-	}
-
-
-	private function _archiveVorgaenger($vorgaenger_kalender_id, $stop_at_live = false)
-	{
-		if (!$vorgaenger_kalender_id) return;
-
-		$current_id = $vorgaenger_kalender_id;
-
-		while ($current_id)
-		{
-			$vorgaenger = $this->_ci->KalenderModel->load(array('kalender_id' => $current_id));
-			if (!hasData($vorgaenger)) return;
-
-			$vorgaenger = getData($vorgaenger)[0];
-
-			if ($stop_at_live && $vorgaenger->status_kurzbz === 'live')
-				return;
-
-			if (in_array($vorgaenger->status_kurzbz, array('preview', 'live')))
-			{
-				$this->_ci->KalenderModel->update(
-					array('kalender_id' => $current_id),
-					array('status_kurzbz' => 'archived')
-				);
-			}
-
-			$current_id = $vorgaenger->vorgaenger_kalender_id;
-		}
-	}
-
-	private function _syncKalenderIds($kalender_ids, $ziel_status)
-	{
-		if (empty($kalender_ids))
-			return success(['synced' => 0, 'mail_infos' => []]);
-
-		$this->_ci->KalenderModel->addSelect('tbl_kalender.*, tbl_kalender_ort.ort_kurzbz, tbl_kalender_ort.location');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
-		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
-		$this->_ci->KalenderModel->addOrder('tbl_kalender.kalender_id', 'DESC');
-		$to_update = $this->_ci->KalenderModel->load();
-
-		if (isError($to_update))
-			return $to_update;
-
-		if (!hasData($to_update))
-			return success(['synced' => 0, 'mail_infos' => []]);
-
-		$mail_infos = [];
-		$synced = 0;
-
-		foreach (getData($to_update) as $entry)
-		{
-			if ($entry->status_kurzbz === 'todelete')
-			{
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'deleted'));
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'deleted', 'notify' => array('lektor', 'student'));
-				$synced++;
-				continue;
-			}
-
-			if ($ziel_status === 'preview' && in_array($entry->status_kurzbz, array('planning', 'sync_preview')))
-			{
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'preview'));
-				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, true);
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'preview', 'notify' => array('lektor'));
-				$synced++;
-				continue;
-			}
-
-			if ($ziel_status === 'live' && in_array($entry->status_kurzbz, array('planning', 'sync_preview', 'sync_live')))
-			{
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'live'));
-				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, false);
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'live', 'notify' => array('lektor', 'student'));
-				$synced++;
-				continue;
-			}
-
-			if ($ziel_status === 'live' && $entry->status_kurzbz === 'preview')
-			{
-				$current = getData($this->_ci->KalenderModel->load(array('kalender_id' => $entry->kalender_id)))[0];
-				if ($current->status_kurzbz === 'archived')
-					continue;
-
-				$this->_ci->KalenderModel->update(array('kalender_id' => $entry->kalender_id), array('status_kurzbz' => 'live'));
-				$this->_archiveVorgaenger($entry->vorgaenger_kalender_id, false);
-				$mail_infos[] = array('entry' => $entry, 'new_status' => 'live', 'notify' => array('lektor', 'student'));
-				$synced++;
-			}
-		}
-
-		return success(['synced' => $synced, 'mail_infos' => $mail_infos]);
-	}
-
-
-	private function _getStudiengang($oe_kurzbz)
-	{
-		$this->_ci->StudiengangModel->addJoin('tbl_organisationseinheit', 'oe_kurzbz');
-		$result = $this->_ci->StudiengangModel->loadWhere(array('oe_kurzbz' => $oe_kurzbz));
-
-		if (isError($result))
-			return $result;
-
-		if (!hasData($result))
-			return success(null);
-
-		return success(getData($result)[0]->studiengang_kz);
-	}
-}

application/libraries/LektorLib.php

@@ -17,7 +17,12 @@ class LektorLib
 		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 		$this->_ci->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->_ci->load->model('ressource/Zeitsperre_model', 'ZeitsperreModel');
+		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
+		$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+
 		$this->_ci->load->library('PhrasesLib', array('lehre'));
+		$this->_ci->load->library('VariableLib', ['uid' => getAuthUID()]);
 	}
 
 	public function addLektorToLehreinheit($lehreinheit_id, $mitarbeiter_uid)
@@ -78,10 +83,13 @@ class LektorLib
 
 	public function updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $new_data)
 	{
+		$old_uid = $mitarbeiter_uid;
+		$new_uid = isset($new_data['mitarbeiter_uid']) ? $new_data['mitarbeiter_uid'] : $mitarbeiter_uid;
+
 		$this->_ci->LehreinheitmitarbeiterModel->addSelect('lehre.tbl_lehreinheitmitarbeiter.*, lehre.tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.studiengang_kz');
 		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
 		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
-		$lehreinheit_result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+		$lehreinheit_result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $old_uid));
 
 		if (isError($lehreinheit_result)) return $lehreinheit_result;
 
@@ -89,27 +97,47 @@ class LektorLib
 
 		$lehreinheit = getData($lehreinheit_result)[0];
 
+		$semesterstunden_alt = $lehreinheit->semesterstunden;
+		$semesterstunden_neu = isset($new_data['semesterstunden']) ? $new_data['semesterstunden'] : $semesterstunden_alt;
+		$bismelden_neu = isset($new_data['bismelden']) ? $new_data['bismelden'] : $lehreinheit->bismelden;
+		$neue_stunden_eingerechnet = (bool)$bismelden_neu;
+		$alte_stunden_eingerechnet = (bool)$lehreinheit->bismelden;
+		$stundenplan_update = false;
 
-		//TODO kollision check, wird vorerst nicht implementiert -> nur über das FAS möglich
-		if (isset($new_data['mitarbeiter_uid']) && $new_data['mitarbeiter_uid'] !== $mitarbeiter_uid)
+		if ($old_uid !== $new_uid)
 		{
-			$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
-			$this->_ci->StundenplandevModel->addGroupBy('stundenplandev_id');
-			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
-			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
-			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
-
-			if (hasData($verplant))
-				return error($this->_ci->phraseslib->t("lehre", "lektorbereitsverplant"));
-
-			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_data['mitarbeiter_uid'], 'lehreinheit_id' => $lehreinheit_id));
+			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_uid, 'lehreinheit_id' => $lehreinheit_id));
 
 			if (hasData($lehreinheit_data))
 				return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));
 
+			$this->_ci->StundenplandevModel->addGroupBy('stundenplandev_id');
+			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
+			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $old_uid));
+
+			if (hasData($verplant))
+			{
+				$kollision = $this->hasKollision(getData($verplant), $new_uid);
+
+				$ignore_kollision = $this->_ci->variablelib->getVar('ignore_kollision');
+
+				if ($kollision === false || $ignore_kollision == 'true')
+				{
+					$stundenplan_update = true;
+				}
+				else if (is_array($kollision))
+				{
+					return error( "Änderung fehlgeschlagen! Die Änderung des Lektors führt zu ".count($kollision)." Kollision(en) im LV-Plan. Deaktivieren Sie die Kollisionspruefung oder wenden Sie sich an die LV-Planung!\n zB. $kollision[0]");
+				}
+				else
+				{
+					return error($kollision);
+				}
+			}
 		}
+
 		$warning = '';
-		if (isset($new_data['semesterstunden']))
+		if (($semesterstunden_neu !== '' && $semesterstunden_alt !== '') && (($semesterstunden_neu > $semesterstunden_alt) || $neue_stunden_eingerechnet))
 		{
 			$studiengang_result = $this->_ci->StudiengangModel->loadWhere(array('studiengang_kz' => $lehreinheit->studiengang_kz));
 			if (isError($studiengang_result)) return $studiengang_result;
@@ -120,7 +148,7 @@ class LektorLib
 			if (isError($studiensemester_result)) return $studiensemester_result;
 			$studiensemester = getData($studiensemester_result)[0];
 
-			$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
+			$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($new_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
 
 			$echter_dv = false;
 
@@ -129,83 +157,78 @@ class LektorLib
 				$echter_dv = true;
 			}
 
-			$neue_stunden_eingerechnet = isset($new_data['bismelden']) ? $new_data['bismelden'] : $lehreinheit->bismelden;
-			$alte_stunden_eingerechnet = $lehreinheit->bismelden;
+			$stundengrenze_result = $this->_ci->OrganisationseinheitModel->getStundengrenze($studiengang->oe_kurzbz, $echter_dv);
+			if (isError($stundengrenze_result)) return $stundengrenze_result;
 
-			if (($new_data['semesterstunden'] > $lehreinheit->semesterstunden) || $neue_stunden_eingerechnet)
+			$stundengrenze = getData($stundengrenze_result)[0];
+
+			$oe_result = $this->_ci->OrganisationseinheitModel->getChilds($stundengrenze->oe_kurzbz);
+			$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array();
+
+			if ($alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt) + {$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu)}) as summe");
+			else if ($alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($semesterstunden_alt)) as summe");
+			else if (!$alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) + ({$this->_ci->LehreinheitmitarbeiterModel->db->escape($semesterstunden_neu)})) as summe");
+			else if (!$alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
+				$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden)) as summe");
+
+			$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
+			$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+			$this->_ci->LehreinheitmitarbeiterModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+
+			$this->_ci->LehreinheitmitarbeiterModel->db->where('mitarbeiter_uid', $new_uid);
+			$this->_ci->LehreinheitmitarbeiterModel->db->where('studiensemester_kurzbz', $lehreinheit->studiensemester_kurzbz);
+			$this->_ci->LehreinheitmitarbeiterModel->db->where('bismelden', true);
+			$this->_ci->LehreinheitmitarbeiterModel->db->where('lower(mitarbeiter_uid) NOT LIKE', '_dummy%');
+
+			if (count($oe_array) > 0)
 			{
-				$stundengrenze_result = $this->_ci->OrganisationseinheitModel->getStundengrenze($studiengang->oe_kurzbz, $echter_dv);
-				if (isError($stundengrenze_result)) return $stundengrenze_result;
-
-				$stundengrenze = getData($stundengrenze_result)[0];
-
-				$oe_result = $this->_ci->OrganisationseinheitModel->getChilds($stundengrenze->oe_kurzbz);
-				$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array('');
-
-				if ($alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
-					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($lehreinheit->semesterstunden) + {$this->_ci->LehreinheitmitarbeiterModel->db->escape($new_data['semesterstunden'])}) as summe");
-				else if ($alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
-					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($lehreinheit->semesterstunden)) as summe");
-				else if (!$alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
-					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) + ({$this->_ci->LehreinheitmitarbeiterModel->db->escape($new_data['semesterstunden'])})) as summe");
-				else if (!$alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
-					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden)) as summe");
-
-				$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
-				$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
-				$this->_ci->LehreinheitmitarbeiterModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-
-				$this->_ci->LehreinheitmitarbeiterModel->db->where('mitarbeiter_uid', (isset($new_data['mitarbeiter_uid']) ? $new_data['mitarbeiter_uid'] : $mitarbeiter_uid));
-				$this->_ci->LehreinheitmitarbeiterModel->db->where('studiensemester_kurzbz', $lehreinheit->studiensemester_kurzbz);
-				$this->_ci->LehreinheitmitarbeiterModel->db->where('bismelden', true);
-				$this->_ci->LehreinheitmitarbeiterModel->db->where('lower(mitarbeiter_uid) NOT LIKE', '_dummy%');
-
 				$this->_ci->LehreinheitmitarbeiterModel->db->where_in('tbl_studiengang.oe_kurzbz', $oe_array);
+			}
 
+			if(defined('FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE')
+				&& is_array(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE)
+				&& count(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE) > 0)
+			{
+				$this->_ci->LehreinheitmitarbeiterModel->db->where_not_in('tbl_studiengang.oe_kurzbz', FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE);
+			}
 
-				if(defined('FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE')
-					&& is_array(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE)
-					&& count(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE) > 0)
+			$summe_result = $this->_ci->LehreinheitmitarbeiterModel->load();
+
+			if (isError($summe_result)) return $summe_result;
+
+			if (!hasData($summe_result)) return error('Fehler beim Ermitteln der Gesamtstunden');
+
+			$summe = getData($summe_result)[0]->summe;
+
+			if ($summe > $stundengrenze->stunden)
+			{
+				if (!$echter_dv && (!$this->_ci->permissionlib->isBerechtigt('admin')))
 				{
-					$this->_ci->LehreinheitmitarbeiterModel->db->where_not_in('tbl_studiengang.oe_kurzbz', FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE);
+					if (!$this->LehrauftragAufFirma($new_uid))
+						return error("ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden NICHT gespeichert!\n\n");
+				}
+				else
+				{
+					$warning .= "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden gespeichert!\n\n";
 				}
 
-				$summe_result = $this->_ci->LehreinheitmitarbeiterModel->load();
+				$stunden_limit_result = $this->getStundenInstitut($new_uid, $lehreinheit->studiensemester_kurzbz, $oe_array);
 
-				if (isError($summe_result)) return $summe_result;
-
-				if (!hasData($summe_result)) return error('Fehler beim Ermitteln der Gesamtstunden');
-
-				$summe = getData($summe_result)[0]->summe;
-
-				if ($summe > $stundengrenze->stunden)
+				if (hasData($stunden_limit_result))
 				{
-
-					if (!$echter_dv && (!$this->_ci->permissionlib->isBerechtigt('admin')))
+					$stunden_limit_array = getData($stunden_limit_result);
+					foreach ($stunden_limit_array as $stunden_limit)
 					{
-						if (!$this->LehrauftragAufFirma(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid))
-							return error("ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden NICHT gespeichert!\n\n");
-					}
-					else
-					{
-						$warning .= "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden gespeichert!\n\n";
-					}
-
-					$stunden_limit_result = $this->getStundenInstitut($mitarbeiter_uid, $lehreinheit->studiensemester_kurzbz, $oe_array);
-
-					if (hasData($stunden_limit_result))
-					{
-						$stunden_limit_array = getData($stunden_limit_result);
-						foreach ($stunden_limit_array as $stunden_limit)
-						{
-							$warning .= $stunden_limit->summe . ' Stunden ' . $stunden_limit->bezeichnung . "\n";
-						}
+						$warning .= $stunden_limit->summe . ' Stunden ' . $stunden_limit->bezeichnung . "\n";
 					}
 				}
 			}
 		}
 
-		$benutzer_result = $this->_ci->BenutzerModel->load(array(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid));
+		$benutzer_result = $this->_ci->BenutzerModel->load(array($new_uid));
 
 		if (isError($benutzer_result)) return $benutzer_result;
 
@@ -227,12 +250,23 @@ class LektorLib
 			'bismelden'
 		);
 
+		$nullable_fields = array('stundensatz', 'semesterstunden', 'planstunden');
+
 		$updateData = array();
 		foreach ($updatableFields as $field)
 		{
-			$value = isset($new_data[$field]) ? $new_data[$field] : null;
+			if (!array_key_exists($field, $new_data))
+			{
+				continue;
+			}
 
-			if ($value !== null)
+			$value = $new_data[$field];
+
+			if (in_array($field, $nullable_fields))
+			{
+				$updateData[$field] = $value;
+			}
+			elseif ($value !== null)
 			{
 				$updateData[$field] = $value;
 			}
@@ -240,10 +274,24 @@ class LektorLib
 		$updateData['updatevon'] = getAuthUID();
 		$updateData['updateamum'] = date('Y-m-d H:i:s');
 
-		$result = $this->_ci->LehreinheitmitarbeiterModel->update(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid), $updateData);
+		$result = $this->_ci->LehreinheitmitarbeiterModel->update(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $old_uid), $updateData);
 
 		if (isError($result)) return $result;
 
+		if ($stundenplan_update)
+		{
+			$update_result = $this->_ci->StundenplandevModel->update([
+				'lehreinheit_id' => $lehreinheit_id,
+				'mitarbeiter_uid' => $old_uid,
+			], [
+				'mitarbeiter_uid' => $new_uid,
+				'updateamum' => date('Y-m-d H:i:s'),
+				'updatevon' => getAuthUID()
+			]);
+
+			if (isError($update_result)) return $update_result;
+		}
+
 		if ($warning !== '') return success(['warning' => $warning]);
 
 		return success('Erfolgreich geupdated');
@@ -347,4 +395,52 @@ class LektorLib
 		$this->_ci->LehreinheitmitarbeiterModel->addGroupBy('tbl_studiengang.bezeichnung');
 		return $this->_ci->LehreinheitmitarbeiterModel->load();
 	}
+
+	private function hasKollision($stunden, $mitarbeiter)
+	{
+		$kollision = array();
+
+		$ignore_zeitsperre = $this->_ci->variablelib->getVar('ignore_zeitsperre');
+		$ignore_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung');
+
+		foreach ($stunden as $stunde)
+		{
+			$stundenplan_result = $this->_ci->StundenplandevModel->lektorHasStundenplandevEintrag($mitarbeiter, $stunde->datum, $stunde->stunde);
+
+			if (isError($stundenplan_result))
+				return $stundenplan_result;
+
+			if (hasData($stundenplan_result))
+			{
+				$stundenplan_result = getData($stundenplan_result)[0];
+				$kollision[] = "Kollision stundenplandev: $stundenplan_result->stundenplandev_id|$stundenplan_result->lektor|$stundenplan_result->ort_kurzbz|$stundenplan_result->stg_kurzbz-$stundenplan_result->semester$stundenplan_result->verband$stundenplan_result->gruppe$stundenplan_result->gruppe_kurzbz - $stundenplan_result->datum/$stundenplan_result->stunde";
+			}
+			else
+			{
+				if ($ignore_zeitsperre == 'false' && (!defined('KOLLISIONSFREIE_USER') || !in_array($mitarbeiter, unserialize(KOLLISIONSFREIE_USER))))
+				{
+					$zeitsperre_result = $this->_ci->ZeitsperreModel->checkIfZeitsperreExists($mitarbeiter, $stunde->datum, $stunde->stunde);
+
+					if (hasData($zeitsperre_result))
+					{
+						$zeitsperre_result = getData($zeitsperre_result)[0];
+						$kollision[] = "Kollision (Zeitsperre): $zeitsperre_result->zeitsperre_id|$zeitsperre_result->mitarbeiter_uid|$zeitsperre_result->zeitsperretyp_kurzbz - $zeitsperre_result->vondatum/$zeitsperre_result->vonstunde|$zeitsperre_result->bisdatum/$zeitsperre_result->bisstunde";
+					}
+				}
+
+				if ($ignore_reservierung == 'false' && (!defined('KOLLISIONSFREIE_USER') || !in_array($mitarbeiter, unserialize(KOLLISIONSFREIE_USER))))
+				{
+					$reservierung_result = $this->_ci->ReservierungModel->lektorHasReservierung($mitarbeiter, $stunde->datum, $stunde->stunde);
+
+					if (hasData($reservierung_result))
+					{
+						$reservierung_result = getData($reservierung_result)[0];
+						$kollision[] = "Kollision (Reservierung): $reservierung_result->reservierung_id|$reservierung_result->uid|$reservierung_result->ort_kurzbz|$reservierung_result->stg_kurzbz-$reservierung_result->semester$reservierung_result->verband$reservierung_result->gruppe$reservierung_result->gruppe_kurzbz - $reservierung_result->datum/$reservierung_result->stunde";
+					}
+				}
+			}
+		}
+
+		return isEmptyArray($kollision) ? false : $kollision;
+	}
 }

application/libraries/ProfilLib.php

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

application/libraries/RaumvorschlagLib.php

@@ -1,275 +0,0 @@
-<?php
-
-if (! defined("BASEPATH")) exit("No direct script access allowed");
-
-use CI3_Events as Events;
-
-class RaumvorschlagLib
-{
-	private $_ci;
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
-		$this->_ci->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
-		$this->_ci->load->model('ressource/Kalender_Event_model', 'KalenderEventModel');
-		$this->_ci->load->model('ressource/Kalender_Event_Teilnehmer_model', 'KalenderEventTeilnehmerModel');
-		$this->_ci->load->model('ressource/Kalender_Ort_model', 'KalenderOrtModel');
-		$this->_ci->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->_ci->load->model('education/LehreinheitMitarbeiter_model', 'LehreinheitMitarbeiterModel');
-		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
-		$this->_ci->load->model('organisation/gruppe_model', 'GruppeModel');
-		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-
-		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
-		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
-
-		$this->_ci->load->library('CollisionChecker');
-		$this->_ci->load->library('KalenderLib');
-		$this->_ci->load->library('PhrasesLib', array('ui'));
-	}
-
-
-	public function getVorschlaege($kalender_id)
-	{
-		$event = $this->_ci->kalenderlib->getByKalenderId($kalender_id);
-		$event = $event[0];
-
-		$lektor_uids = array_column($event->lektor, 'mitarbeiter_uid');
-		$gruppen_kurzbz = array_values(array_filter(array_column($event->gruppe, 'gruppe_kurzbz')));
-
-		$lehrverband_gruppen = array_values(array_filter($event->gruppe, function($gruppe)
-		{
-			return empty($gruppe['gruppe_kurzbz']);
-		}));
-
-		$tages_events = $this->_ci->kalenderlib->getForRaumvorschlag(
-			$event->datum,
-			$event->datum,
-			$lektor_uids,
-			$gruppen_kurzbz,
-			$lehrverband_gruppen
-		);
-
-		$lektor_davor = $this->_getEventDavor($tages_events, $event->isostart, $lektor_uids, 'lektor');
-		$gruppen_davor = $this->_getEventDavor($tages_events, $event->isostart, $gruppen_kurzbz, 'gruppe');
-
-		$lektor_davor_ort = $lektor_davor ? $this->_getOrtDetails($lektor_davor->ort_kurzbz) : null;
-		$gruppen_davor_ort = $gruppen_davor ? $this->_getOrtDetails($gruppen_davor->ort_kurzbz) : null;
-
-		$kandidaten = $this->_getRaumkandidaten($event);
-		if (empty($kandidaten)) return [];
-
-
-		$ratings = [];
-		foreach ($kandidaten as $raum)
-		{
-			$rating = ['ort_kurzbz' => $raum->ort_kurzbz, 'score' => 100, 'details' => []];
-			$this->_rateLektor($rating, $raum, $lektor_davor_ort);
-			$this->_rateGruppen($rating, $raum, $gruppen_davor_ort);
-
-			Events::trigger('room_rating',
-				function & () use (&$rating) {
-					return $rating;
-				},
-				$raum,
-				$event
-			);
-			$ratings[] = $rating;
-		}
-
-		usort($ratings, function($a, $b)
-		{
-			return $b['score'] - $a['score'];
-		});
-
-		return $ratings;
-
-	}
-
-	private function _getOrtDetails($ort_kurzbz_array)
-	{
-		$ort_kurzbz_array = (array) $ort_kurzbz_array;
-		if (empty($ort_kurzbz_array)) return [];
-		$this->_ci->OrtModel->addSelect('ort_kurzbz, stockwerk, standort_id');
-		$this->_ci->OrtModel->db->where_in('ort_kurzbz', $ort_kurzbz_array);
-		$result = $this->_ci->OrtModel->load();
-
-		return hasData($result) ? getData($result) : [];
-	}
-
-	private function _rateLektor(&$rating, $raum, $lektor_davor_orte)
-	{
-		if (empty($lektor_davor_orte)) return;
-
-		foreach ($lektor_davor_orte as $ort)
-		{
-			if ($ort->ort_kurzbz === $raum->ort_kurzbz)
-			{
-				$rating['score'] += 20;
-				$rating['details'][] = '+20 ' . $this->_ci->phraseslib->t('ui', 'lecturer_already_here');
-				return;
-			}
-		}
-
-		$gleiches_gebaeude = array_filter($lektor_davor_orte, function($ort) use ($raum)
-		{
-			return $ort->standort_id === $raum->standort_id;
-		});
-
-		if (empty($gleiches_gebaeude))
-		{
-			$rating['score'] -= 20;
-			$rating['details'][] = '-20 '. $this->_ci->phraseslib->t('ui', 'lecturer_building_change');
-			return;
-		}
-
-		$diffs = array_map(function($ort) use ($raum)
-		{
-			return abs($ort->stockwerk - $raum->stockwerk);
-		}, $gleiches_gebaeude);
-
-		$diff = min($diffs);
-
-		if ($diff > 0)
-		{
-			$rating['score'] -= $diff * 5;
-			$rating['details'][] = '-' . ($diff * 5) . ' ' . $this->_ci->phraseslib->t('ui', 'lecturer_floor_change');
-		}
-	}
-
-	private function _rateGruppen(&$rating, $raum, $gruppen_davor_orte)
-	{
-		if (empty($gruppen_davor_orte)) return;
-
-		foreach ($gruppen_davor_orte as $ort)
-		{
-			if ($ort->ort_kurzbz === $raum->ort_kurzbz)
-			{
-				$rating['score'] += 10;
-				$rating['details'][] = '+10 ' . $this->_ci->phraseslib->t('ui', 'student_already_here');
-				return;
-			}
-		}
-
-		$gleiches_gebaeude = array_filter($gruppen_davor_orte, function($ort) use ($raum)
-		{
-			return $ort->standort_id === $raum->standort_id;
-		});
-
-		if (empty($gleiches_gebaeude))
-		{
-			$rating['score'] -= 20;
-			$rating['details'][] = '-20 '. $this->_ci->phraseslib->t('ui', 'student_building_change');
-			return;
-		}
-
-		$diffs = array_map(function($ort) use ($raum)
-		{
-			return abs($ort->stockwerk - $raum->stockwerk);
-		}, $gleiches_gebaeude);
-
-		$diff = min($diffs);
-
-		if ($diff > 0)
-		{
-			$rating['score'] -= $diff * 5;
-			$rating['details'][] = '-' . ($diff * 5) . ' '. $this->_ci->phraseslib->t('ui', 'student_floor_change');
-		}
-	}
-
-	private function _getEventDavor($events, $von, $uids, $type)
-	{
-		$kandidat = null;
-
-		foreach ($events as $event)
-		{
-			if ($event->isoend > $von)
-				continue;
-
-			//Wenn zwischen zwei Events eine 30+ Minuten Pause liegt, wird das Event davor nicht berücksichtigt
-			if ((strtotime($von) - strtotime($event->isoend)) > 30 * 60)
-				continue;
-
-			if (empty($event->ort_kurzbz))
-				continue;
-
-			if ($type === 'lektor')
-				$event_uids = array_column($event->lektor, 'mitarbeiter_uid');
-			else
-				$event_uids = array_column($event->gruppe, 'gruppe_kurzbz');
-
-			if (empty(array_intersect($event_uids, $uids)))
-				continue;
-
-			if ($kandidat === null || $event->isoend > $kandidat->isoend)
-				$kandidat = $event;
-		}
-
-		return $kandidat;
-	}
-
-	private function _getRaumkandidaten($event)
-	{
-		$lehreinheit = $this->_ci->LehreinheitModel->load($event->lehreinheit_id[0]);
-		if (!hasData($lehreinheit)) return [];
-		$lehreinheit = getData($lehreinheit)[0];
-
-		$this->_ci->KalenderModel->addSelect('tbl_kalender_ort.ort_kurzbz');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id');
-		$this->_ci->KalenderModel->db->where('tbl_kalender.von <', $event->isoend);
-		$this->_ci->KalenderModel->db->where('tbl_kalender.bis >', $event->isostart);
-		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['deleted']);
-		$this->_ci->KalenderModel->db->where('tbl_kalender_ort.ort_kurzbz IS NOT NULL', null, false);
-		$belegte = $this->_ci->KalenderModel->load();
-
-		$belegte_orte = hasData($belegte) ? array_column(getData($belegte), 'ort_kurzbz') : [];
-
-		if (empty($lehreinheit->raumtyp))
-		{
-			$raeume = $this->_getFreieRaeume(null, $belegte_orte);
-			return hasData($raeume) ? getData($raeume) : [];
-		}
-
-		$vorschlaege = [];
-
-		$raeume = $this->_getFreieRaeume($lehreinheit->raumtyp, $belegte_orte);
-		if (hasData($raeume))
-			$vorschlaege = getData($raeume);
-
-		if (count($vorschlaege) < 5 && !empty($lehreinheit->raumtypalternativ))
-		{
-			$bereits_gefunden = array_merge($belegte_orte, array_column($vorschlaege, 'ort_kurzbz'));
-			$alternativ = $this->_getFreieRaeume($lehreinheit->raumtypalternativ, $bereits_gefunden);
-
-			if (!isError($alternativ) && hasData($alternativ))
-				$vorschlaege = array_merge($vorschlaege, getData($alternativ));
-		}
-
-		return $vorschlaege;
-	}
-
-	private function _getFreieRaeume($raumtyp, $belegte_orte)
-	{
-		$this->_ci->OrtModel->addSelect('ort_kurzbz, stockwerk, standort_id');
-		$this->_ci->OrtModel->addJoin('public.tbl_ortraumtyp', 'ort_kurzbz');
-		$this->_ci->OrtModel->db->where('raumtyp_kurzbz', $raumtyp);
-		$this->_ci->OrtModel->db->where('aktiv', true);
-		$this->_ci->OrtModel->db->where("ort_kurzbz NOT LIKE '\_%'", null, false);
-
-		if (!empty($belegte_orte))
-			$this->_ci->OrtModel->db->where_not_in('ort_kurzbz', $belegte_orte);
-		$this->_ci->OrtModel->addOrder('hierarchie, ort_kurzbz');
-
-		return $this->_ci->OrtModel->load();
-	}
-
-
-
-
-
-
-
-}

application/libraries/StundenplanLib.php

@@ -40,16 +40,13 @@ class StundenplanLib
 	 * @return stdClass
 	 * @access public
 	 */
-	public function getEventsUser($start, $end, $uid = null)
+	public function getEventsUser($start, $end)
 	{
 		$this->_ci =& get_instance();
 
 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		if (!$uid) {
-			$uid = getAuthUID();
-		}
-		
+		$uid = getAuthUID();
 		if (is_null($uid))
 			return error("No UID");
 		
@@ -184,6 +181,21 @@ class StundenplanLib
 		return success($stundenplan_data);
 	}
 
+	public function getEventsByLE($lehreinheit_id, $start, $end, $stundenplan)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		return $this->_ci->StundenplanModel->getStundenplanLE($lehreinheit_id, $start, $end, $stundenplan);
+	}
+
+	public function getEventsByLV($lehrveranstaltung_id, $start, $end, $stundenplan)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		return $this->_ci->StundenplanModel->getStundenplanLV($lehrveranstaltung_id, $start, $end, $stundenplan);
+	}
 	/**
 	 * Get stundenplan for a room
 	 *
@@ -220,7 +232,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
 	{
 		$this->_ci =& get_instance();
 
@@ -231,14 +243,14 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? getAuthUID()));
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
 
 		if ($is_mitarbeiter && empty($ort_kurzbz)) {
 			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 		}
 		
 		if (isError($reservierungen))
@@ -360,10 +372,7 @@ class StundenplanLib
 				if (isError($ort_content_object)) {
 					return error(getData($ort_content_object));
 				}
-				$ort_content_object_data = getData($ort_content_object);
-				$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
-					? $ort_content_object_data[0]
-					: null;
+				$ort_content_object = getData($ort_content_object)[0];
 				if($ort_content_object) {
 					$item->ort_content_id = $ort_content_object->content_id;
 				}
@@ -451,24 +460,6 @@ class StundenplanLib
 		return success($ferienEventsFlattened);
 	}
 
-	public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
-		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
-		if (isError($stundenplan_data))
-			return $stundenplan_data;
-		$stundenplan_data = getData($stundenplan_data) ?? [];
-
-		$function_error = $this->expandObjectInformation($stundenplan_data);
-		if ($function_error)
-			return $function_error;
-
-		return success($stundenplan_data);
-	}
-
 	// start of the private functions ########################################################################################################
 
 	// function used to sort an array of studiensemester strings

application/libraries/collision/checks/LectureCollisionCheck.php

@@ -1,258 +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'");
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_stunde vonstunde_z', 'vonstunde_z.stunde = z.vonstunde', 'LEFT');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_stunde bisstunde_z', 'bisstunde_z.stunde = z.bisstunde', 'LEFT');
-
-		$this->_ci->KalenderModel->db->where('(z.vondatum + COALESCE(vonstunde_z.beginn, \'00:00\'))::timestamp < tbl_kalender.bis', null, false);
-		$this->_ci->KalenderModel->db->where('(z.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp > tbl_kalender.von', null, false);
-		$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->group_start();
-			$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
-			$this->_ci->KalenderModel->db->or_where('mitarbeiter_uid IS NULL', null, false);
-		$this->_ci->KalenderModel->db->group_end();
-
-		$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 [
-				'message' => $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)) . ')',
-				'errorCode' => 'lector_collision',
-			];
-		}, 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 [
-				'message' => $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)) . ')',
-				'errorCode' => 'reservation_collision',
-			];
-		}, getData($result));
-	}
-
-	private function _checkZeitsperre($uids, $data)
-	{
-		if ($this->_ci->variablelib->getVar('ignore_zeitsperre') === 'true') return [];
-
-		$this->_ci->ZeitsperreModel->addSelect('mitarbeiter_uid, vondatum, vonstunde_z.beginn as von_beginn, bisdatum, bisstunde_z.ende as bis_ende');
-		$this->_ci->ZeitsperreModel->addJoin('lehre.tbl_stunde vonstunde_z', 'vonstunde_z.stunde = tbl_zeitsperre.vonstunde', 'LEFT');
-		$this->_ci->ZeitsperreModel->addJoin('lehre.tbl_stunde bisstunde_z', 'bisstunde_z.stunde = tbl_zeitsperre.bisstunde', 'LEFT');
-		$this->_ci->ZeitsperreModel->db->where('zeitsperretyp_kurzbz !=', 'ZVerfueg');
-		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.vondatum + COALESCE(vonstunde_z.beginn, \'00:00\'))::timestamp <', $data->bis);
-		$this->_ci->ZeitsperreModel->db->where('(tbl_zeitsperre.bisdatum + COALESCE(bisstunde_z.ende, \'23:59\'))::timestamp >', $data->von);
-
-		$this->_ci->ZeitsperreModel->db->where_in('mitarbeiter_uid', $uids);
-		$result = $this->_ci->ZeitsperreModel->load();
-
-		if (isError($result) || !hasData($result)) return [];
-
-		return array_map(function($row)
-		{
-			return [
-				'message' => $this->_ci->phraseslib->t('ui', 'ma_zeitsperre_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->vondatum . ' ' . $row->von_beginn)) . ' - ' . date('d.m.Y H:i', strtotime($row->bisdatum . ' ' . $row->bis_ende)) . ')',
-				'errorCode' => 'absences_collision',
-			];
-		}, getData($result));
-	}
-
-}

application/libraries/collision/checks/RoomCollisionCheck.php

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

application/libraries/stv/StudentListLib.php

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

application/libraries/vertragsbestandteil/AbstractBestandteil.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

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

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

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

application/models/content/Content_model.php

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

application/models/dashboard/Bookmark_model.php

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

application/models/dashboard/Dashboard_model.php

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

application/models/education/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 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 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
+			  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

@@ -314,6 +314,28 @@ EOSQL;
 		return $this->execQuery($query, $params);
 	}
 
+	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]);
+	}
+
 
 	public function getOes($lehreinheit_id)
 	{
@@ -395,77 +417,6 @@ EOSQL;
 		return $this->execReadOnlyQuery($qry, $params);
 	}
 
-	public function getOffeneStunden($lehreinheit_ids)
-	{
-		if (!is_array($lehreinheit_ids))
-			$lehreinheit_ids = [$lehreinheit_ids];
-
-		if (empty($lehreinheit_ids))
-			return success([]);
-
-		$db = new DB_Model();
-		$placeholders = implode(',', array_fill(0, count($lehreinheit_ids), '?'));
-
-		$qry = "WITH eventdauer AS (
-					SELECT
-						tbl_kalender_lehreinheit.lehreinheit_id,
-						tbl_kalender.von,
-						tbl_kalender.bis,
-						tbl_kalender.kalender_id
-					FROM lehre.tbl_lehreinheit
-							JOIN lehre.tbl_kalender_lehreinheit USING(lehreinheit_id)
-							JOIN lehre.tbl_kalender USING(kalender_id)
-					WHERE tbl_lehreinheit.lehreinheit_id IN ($placeholders)
-					GROUP BY tbl_kalender_lehreinheit.lehreinheit_id, tbl_kalender.von, tbl_kalender.bis, tbl_kalender.kalender_id
-				),
-				raster AS (
-					SELECT
-						eventdauer.lehreinheit_id,
-						eventdauer.kalender_id,
-						eventdauer.von,
-						eventdauer.bis,
-						vonstunde.stunde AS vonstunde_nr,
-						bisstunde.stunde AS bisstunde_nr
-					FROM eventdauer
-						LEFT JOIN lehre.tbl_stunde vonstunde ON eventdauer.von::time = vonstunde.beginn
-						LEFT JOIN lehre.tbl_stunde bisstunde ON eventdauer.bis::time = bisstunde.ende
-				),
-				unterrichtsdauer AS (
-					SELECT
-						raster.lehreinheit_id,
-						raster.kalender_id,
-						sum(EXTRACT(EPOCH FROM (LEAST(stunde.ende, raster.bis::time) - GREATEST(stunde.beginn, raster.von::time))) / 60) AS minuten
-					FROM raster JOIN lehre.tbl_stunde stunde ON stunde.beginn < raster.bis::time AND stunde.ende > raster.von::time
-					WHERE raster.vonstunde_nr IS NULL OR raster.bisstunde_nr IS NULL
-					GROUP BY raster.lehreinheit_id, raster.kalender_id
-				),
-				verplantestunden AS (
-					SELECT raster.lehreinheit_id, raster.kalender_id,
-						CASE
-							WHEN raster.vonstunde_nr IS NOT NULL AND raster.bisstunde_nr IS NOT NULL
-								THEN (raster.bisstunde_nr - raster.vonstunde_nr + 1)
-							ELSE coalesce(unterrichtsdauer.minuten, 0) / 45
-						END AS verplantestunde
-					FROM raster LEFT JOIN unterrichtsdauer ON unterrichtsdauer.lehreinheit_id = raster.lehreinheit_id AND unterrichtsdauer.kalender_id = raster.kalender_id
-				),
-				verplant_gesamt AS (
-					SELECT lehreinheit_id, SUM(verplantestunde) AS verplant
-					FROM verplantestunden
-					GROUP BY lehreinheit_id
-				)
-				SELECT
-					lema.lehreinheit_id,
-					lema.mitarbeiter_uid,
-					lema.planstunden,
-					ROUND(coalesce(verplant_gesamt.verplant, 0), 2) AS verplant,
-					ROUND((lema.planstunden - coalesce(verplant_gesamt.verplant, 0)), 2) AS offenestunden
-				FROM lehre.tbl_lehreinheitmitarbeiter lema
-					LEFT JOIN verplant_gesamt ON verplant_gesamt.lehreinheit_id = lema.lehreinheit_id
-				WHERE lema.lehreinheit_id IN ($placeholders)";
-
-		return $db->execReadOnlyQuery($qry, array_merge($lehreinheit_ids, $lehreinheit_ids));
-	}
-
 	private function getLVTmp($stg_kz = null)
 	{
 		$qry = "SELECT DISTINCT ON(lehrveranstaltung_id) *, 

application/models/education/Lehreinheitgruppe_model.php

@@ -341,7 +341,7 @@ class Lehreinheitgruppe_model extends DB_Model
 		$this->db->where('lehreinheit_id', $lehreinheit_id);
 		$this->db->where('studiengang_kz', $gruppen_array->studiengang_kz);
 
-		if (!isEmptyString($gruppen_array->semester))
+		if (!isEmptyString((string)$gruppen_array->semester))
 		{
 			$this->db->where('semester', $gruppen_array->semester);
 		}
@@ -444,30 +444,37 @@ class Lehreinheitgruppe_model extends DB_Model
 										) 
 									ELSE tbl_gruppe.beschreibung
 								END AS beschreibung");
-		$this->addSelect("CASE 
-									WHEN tbl_lehreinheitgruppe.gruppe_kurzbz IS NULL THEN 
-										(
-											SELECT EXISTS (
-												SELECT 1 
-												FROM lehre.tbl_stundenplandev
-												WHERE lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
-													AND studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
-													AND semester = tbl_lehreinheitgruppe.semester
-													AND TRIM(COALESCE(verband, '')) = TRIM(tbl_lehreinheitgruppe.verband)
-													AND TRIM(COALESCE(gruppe, '')) = TRIM(tbl_lehreinheitgruppe.gruppe)
-													AND (gruppe_kurzbz IS NULL OR gruppe_kurzbz = '')
-											)
-										)
-									ELSE 
+		$this->addSelect("
+									CASE
+										WHEN trim(COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, '')) = '' THEN
 										(
 											SELECT EXISTS (
 												SELECT 1
-												FROM lehre.tbl_stundenplandev
-												WHERE lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
-													AND gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
+												FROM lehre.tbl_stundenplandev sp
+												WHERE sp.lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
+													AND sp.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+													AND sp.semester = tbl_lehreinheitgruppe.semester
+													AND trim(COALESCE(sp.verband, '')) = trim(COALESCE(tbl_lehreinheitgruppe.verband, ''))
+													AND trim(COALESCE(sp.gruppe, ''))  = trim(COALESCE(tbl_lehreinheitgruppe.gruppe, ''))
+													AND trim(COALESCE(sp.gruppe_kurzbz, '')) = ''
 											)
 										)
-								END AS verplant");
+									ELSE
+										(
+											SELECT EXISTS (
+												SELECT 1
+												FROM lehre.tbl_stundenplandev sp
+												WHERE sp.lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
+													AND sp.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+													AND sp.semester = tbl_lehreinheitgruppe.semester
+													AND trim(COALESCE(sp.verband, '')) = trim(COALESCE(tbl_lehreinheitgruppe.verband, ''))
+													AND trim(COALESCE(sp.gruppe, ''))  = trim(COALESCE(tbl_lehreinheitgruppe.gruppe, ''))
+													AND trim(COALESCE(sp.gruppe_kurzbz, '')) = trim(COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, ''))
+											)
+										)
+										END AS verplant
+									");
+
 		$this->addJoin('tbl_studiengang', 'studiengang_kz', 'LEFT');
 		$this->addJoin('public.tbl_gruppe', 'gruppe_kurzbz', 'LEFT');
 

application/models/education/Lehrveranstaltung_model.php

@@ -317,7 +317,9 @@ 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)
@@ -1054,6 +1056,26 @@ 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));
+	}
+
 	public function getLvsByOrganization($oe_kurzbz)
 	{
 		$qry="
@@ -1245,7 +1267,7 @@ class Lehrveranstaltung_model extends DB_Model
 	{
 		return "
 		SELECT
-				lehrveranstaltung_id, tbl_lehrveranstaltung.kurzbz as lv_kurzbz, tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung, bezeichnung_english as lv_bezeichnung_english, studiengang_kz,
+				distinct on (lehrveranstaltung_id) lehrveranstaltung_id, tbl_lehrveranstaltung.kurzbz as lv_kurzbz, tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung, bezeichnung_english as lv_bezeichnung_english, studiengang_kz,
 				tbl_studienplan_lehrveranstaltung.semester, tbl_lehrveranstaltung.sprache,
 				ects as lv_ects, semesterstunden, anmerkung, lehre, lehreverzeichnis as lv_lehreverzeichnis, tbl_lehrveranstaltung.aktiv,
 				planfaktor as lv_planfaktor, planlektoren as lv_planlektoren, planpersonalkosten as lv_planpersonalkosten,

application/models/education/Lvgesamtnote_model.php

@@ -29,10 +29,14 @@ class Lvgesamtnote_model extends DB_Model
 		$this->addSelect("lv.bezeichnung AS lehrveranstaltung_bezeichnung");
 		$this->addSelect("lv.studiengang_kz");
 		$this->addSelect("UPPER(stg.typ || stg.kurzbz) AS studiengang");
+		$this->addSelect("person.vorname");
+		$this->addSelect("person.nachname");
 
 		$this->addJoin("lehre.tbl_note n", "note");
 		$this->addJoin("lehre.tbl_lehrveranstaltung lv", "lehrveranstaltung_id");
 		$this->addJoin("public.tbl_studiengang stg", "studiengang_kz");
+		$this->addJoin("public.tbl_benutzer benutzer", "uid = student_uid", "LEFT");
+		$this->addJoin("public.tbl_person person", "person_id", "LEFT");
 
 		$this->db->where($this->dbTable . ".freigabedatum <", "NOW()", false);
 

application/models/education/Paabgabe_model.php

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

application/models/education/Projektarbeit_model.php

@@ -149,6 +149,8 @@ class Projektarbeit_model extends DB_Model
 			lehre.tbl_projektarbeit.abstract as abstract,
 			lehre.tbl_projektarbeit.abstract_en as abstract_en,
 			lehre.tbl_projektarbeit.insertamum as insertamum,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
 			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
 		
 		FROM lehre.tbl_projektarbeit
@@ -167,7 +169,7 @@ class Projektarbeit_model extends DB_Model
 			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
 		  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')) as base
 		ORDER BY insertamum DESC";
-				
+
 		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
 	}
 
@@ -187,10 +189,7 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabetyp.benotbar, 
 					campus.tbl_paabgabe.abgabedatum,
-					campus.tbl_paabgabe.insertvon,
-					campus.tbl_paabgabe.insertamum,
-					campus.tbl_paabgabe.updatevon,
-					campus.tbl_paabgabe.updateamum
+					campus.tbl_paabgabe.insertvon
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
 				ORDER BY campus.tbl_paabgabe.datum";
@@ -210,18 +209,7 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabe.abgabedatum,
-					campus.tbl_paabgabe.insertvon,
-					campus.tbl_paabgabe.updatevon,
-					campus.tbl_paabgabe.insertamum,
-					campus.tbl_paabgabe.updateamum,
-					(SELECT p.vorname || ' ' || p.nachname
-						FROM public.tbl_benutzer b
-						JOIN public.tbl_person p USING(person_id)
-						WHERE b.uid = campus.tbl_paabgabe.insertvon) AS insertvon_fullname,
-					(SELECT p.vorname || ' ' || p.nachname
-					FROM public.tbl_benutzer b
-						JOIN public.tbl_person p USING(person_id)
-						WHERE b.uid = campus.tbl_paabgabe.updatevon) AS updatevon_fullname
+					campus.tbl_paabgabe.insertvon
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE campus.tbl_paabgabe.projektarbeit_id IN ?
 				ORDER BY campus.tbl_paabgabe.datum";
@@ -230,13 +218,16 @@ class Projektarbeit_model extends DB_Model
 	}
 
 	public function getProjektbetreuerAnrede($bperson_id) {
-		$qry_betr="SELECT DISTINCT ON(public.tbl_person.person_id) trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first, anrede
-			FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
-			WHERE public.tbl_person.person_id= ?";
+		$qry_betr="SELECT distinct trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first,
+						public.tbl_mitarbeiter.mitarbeiter_uid, anrede
+						FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
+						JOIN public.tbl_benutzer ON(public.tbl_benutzer.person_id=public.tbl_person.person_id)
+						JOIN public.tbl_mitarbeiter ON(public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid)
+						WHERE public.tbl_person.person_id= ?";
 
 		return $this->execReadOnlyQuery($qry_betr, [$bperson_id]);
 	}
-	
+
 	public function getProjektbetreuerEmail($projektarbeit_id) {
 		$qry = "SELECT (
 				   SELECT kontakt
@@ -254,12 +245,11 @@ class Projektarbeit_model extends DB_Model
 				 LEFT JOIN public.tbl_benutzer ben USING (person_id)
 				 LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid = ma.mitarbeiter_uid
 		WHERE (ben.aktiv OR ben.aktiv IS NULL)
-				AND projektarbeit_id = ?
-				AND lehre.tbl_projektbetreuer.betreuerart_kurzbz = ANY('{Begutachter, Betreuer, Erstbetreuer,Erstbegutachter,Senatsvorsitz}')";
+		  AND projektarbeit_id = ?";
 
 		return $this->execReadOnlyQuery($qry, [$projektarbeit_id]);
 	}
-	
+
 	public function getProjektbetreuerEmailByPersonID($person_id) {
 		$qry = "SELECT (
 				   SELECT kontakt
@@ -309,142 +299,34 @@ class Projektarbeit_model extends DB_Model
 	 * Get a List of Projektarbeiten of a mitarbeiter with zuordnung
 	 * used by the mitarbeiter cis4 abgabetool.
 	 */
-	public function getMitarbeiterProjektarbeiten($person_id, $showAll){
-		$qry = "WITH secondary_betreuer AS (
-				SELECT DISTINCT ON (pb.projektarbeit_id)
-					pb.projektarbeit_id,
-					pb.person_id                  AS zweitbetreuer_person_id,
-					b.uid						  AS zweitbetreuer_benutzer_uid,
-					pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
-					ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
-					p.titelpre                    AS zweitbetreuer_titelpre,
-					p.vorname                     AS zweitbetreuer_vorname,
-					p.nachname                    AS zweitbetreuer_nachname,
-					p.titelpost                   AS zweitbetreuer_titelpost,
-					trim(
-							COALESCE(p.titelpre, '')  || ' ' ||
-							COALESCE(p.vorname, '')   || ' ' ||
-							COALESCE(p.nachname, '')  || ' ' ||
-							COALESCE(p.titelpost, '')
-					)                             AS zweitbetreuer_full_name
-				FROM lehre.tbl_projektbetreuer pb
-						 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
-						 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
-						 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
-				WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
-				ORDER BY pb.projektarbeit_id
-			),
-			primary_betreuer AS (
-				SELECT DISTINCT ON (pb.projektarbeit_id)
-				pb.projektarbeit_id,
-				pb.person_id                  AS betreuer_person_id,
-				pb.betreuerart_kurzbz         AS betreuer_betreuerart_kurzbz,
-				ba.beschreibung               AS betreuer_betreuerart_beschreibung,
-				p.titelpre                    AS betreuer_titelpre,
-				p.vorname                     AS betreuer_vorname,
-				p.nachname                    AS betreuer_nachname,
-				p.titelpost                   AS betreuer_titelpost,
-				trim(
-					COALESCE(p.titelpre, '')  || ' ' ||
-					COALESCE(p.vorname, '')   || ' ' ||
-					COALESCE(p.nachname, '')  || ' ' ||
-					COALESCE(p.titelpost, '')
-				)  							  AS betreuer_full_name
-				FROM lehre.tbl_projektbetreuer pb
-				JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
-				LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
-				LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
-				WHERE pb.betreuerart_kurzbz = ANY('{Begutachter, Betreuer, Erstbetreuer,Erstbegutachter,Senatsvorsitz}')
-				ORDER BY pb.projektarbeit_id
-		)
-	
-		SELECT
-			*
-		FROM
-			(SELECT DISTINCT ON (tbl_projektarbeit.projektarbeit_id) 
-				 student_person.vorname, student_person.nachname, 
-					tbl_studiengang.typ, tbl_studiengang.kurzbz,
-					tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, 
-					tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
-					student_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid,
-		
-					lehre.tbl_projektarbeit.sprache,
-					 lehre.tbl_projektarbeit.seitenanzahl,
-					 lehre.tbl_projektarbeit.kontrollschlagwoerter,
-					 lehre.tbl_projektarbeit.schlagwoerter,
-					 lehre.tbl_projektarbeit.schlagwoerter_en,
-					 lehre.tbl_projektarbeit.abstract,
-					 lehre.tbl_projektarbeit.abstract_en,
-					 lehre.tbl_projektarbeit.insertamum,
-					 
-					 (
-						 SELECT orgform_kurzbz
-						 FROM public.tbl_prestudentstatus
-						 WHERE prestudent_id = (
-							 SELECT prestudent_id FROM public.tbl_student
-							 WHERE student_uid = student_benutzer.uid LIMIT 1
-						 )
-						 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-						 LIMIT 1
-					 ) AS organisationsform,
-					 (
-						 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
-										 tbl_prestudentstatus.orgform_kurzbz,
-										 tbl_studiengang.orgform_kurzbz)
-						 FROM public.tbl_prestudent
-							JOIN       public.tbl_prestudentstatus USING (prestudent_id)
-							JOIN       public.tbl_studiensemester  USING (studiensemester_kurzbz)
-							JOIN       public.tbl_studiengang      USING (studiengang_kz)
-							LEFT JOIN  lehre.tbl_studienplan        USING (studienplan_id)
-						 WHERE prestudent_id = public.tbl_student.prestudent_id
-						 ORDER BY tbl_prestudentstatus.datum DESC
-						 LIMIT 1
-					 ) AS orgform,
-					 (
-						 SELECT status_kurzbz
-						 FROM public.tbl_prestudentstatus
-						 WHERE prestudent_id = public.tbl_student.prestudent_id
-						 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-						 LIMIT 1
-					 ) AS studienstatus,
-		
-					pb.betreuer_person_id,
-					pb.betreuer_betreuerart_kurzbz,
-					pb.betreuer_betreuerart_beschreibung,
-					pb.betreuer_titelpre,
-					pb.betreuer_vorname,
-					pb.betreuer_nachname,
-					pb.betreuer_titelpost,
-					pb.betreuer_full_name,
-					
-					sb.zweitbetreuer_person_id,
-					sb.zweitbetreuer_benutzer_uid,
-					sb.zweitbetreuer_betreuerart_kurzbz,
-					sb.zweitbetreuer_betreuerart_beschreibung,
-					sb.zweitbetreuer_titelpre,
-					sb.zweitbetreuer_vorname,
-					sb.zweitbetreuer_nachname,
-					sb.zweitbetreuer_titelpost,
-					sb.zweitbetreuer_full_name
-			FROM lehre.tbl_projektarbeit
-					LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
-					LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
-					LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-					LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
-					LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
-					LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
-					LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
-					LEFT JOIN  lehre.tbl_projektbetreuer              USING (projektarbeit_id)
-					LEFT JOIN  primary_betreuer      pb               ON pb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
-					LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
-			WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-	    AND (pb.betreuer_person_id = ? OR sb.zweitbetreuer_person_id = ?)
-						".($showAll?'':' AND student_benutzer.aktiv AND lehre.tbl_projektarbeit.note IS NULL ')."
+	public function getMitarbeiterProjektarbeiten($uid, $showAll){
+		$qry = "SELECT
+					*
+				FROM
+					(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
+							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
+							tbl_projektbetreuer.person_id as betreuer_person_id, tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid
+					 FROM lehre.tbl_projektarbeit
+							  LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
+							  LEFT JOIN lehre.tbl_betreuerart using(betreuerart_kurzbz)
+							  LEFT JOIN public.tbl_benutzer on(uid=student_uid)
+							  LEFT JOIN public.tbl_student on(public.tbl_benutzer.uid=public.tbl_student.student_uid)
+							  LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
+							  LEFT JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
+							  LEFT JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+							  LEFT JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
+							  LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+					 WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+					   AND tbl_projektbetreuer.person_id IN (SELECT person_id FROM public.tbl_benutzer
+															 WHERE public.tbl_benutzer.person_id=lehre.tbl_projektbetreuer.person_id
+															   AND public.tbl_benutzer.uid= ? )
+						 ".($showAll?'':' AND public.tbl_benutzer.aktiv AND lehre.tbl_projektarbeit.note IS NULL ')."
 							AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Zweitbegutachter', 'Erstbetreuer', 'Senatsvorsitz', 'Senatsmitglied')
-					ORDER BY tbl_projektarbeit.projektarbeit_id, betreuerart_kurzbz desc) as xy
+					 ORDER BY tbl_projektarbeit.projektarbeit_id, betreuerart_kurzbz desc) as xy
 				ORDER BY nachname;";
 
-		return $this->execReadOnlyQuery($qry, array($person_id, $person_id));
+		return $this->execReadOnlyQuery($qry, array($uid));
 	}
 
 	/**
@@ -461,262 +343,298 @@ class Projektarbeit_model extends DB_Model
 		
 		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
 	}
-	
-	
+
+
 	public function getProjektarbeitenForStudiengang($studiengang_kz, $benotet) {
-		$new_qry = "WITH secondary_betreuer AS (
-			SELECT DISTINCT ON (pb.projektarbeit_id)
-				pb.projektarbeit_id,
-				pb.person_id                  AS zweitbetreuer_person_id,
-				pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
-				ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
-				p.titelpre                    AS zweitbetreuer_titelpre,
-				p.vorname                     AS zweitbetreuer_vorname,
-				p.nachname                    AS zweitbetreuer_nachname,
-				p.titelpost                   AS zweitbetreuer_titelpost,
-				trim(
-						COALESCE(p.titelpre, '')  || ' ' ||
-						COALESCE(p.vorname, '')   || ' ' ||
-						COALESCE(p.nachname, '')  || ' ' ||
-						COALESCE(p.titelpost, '')
-				)                             AS zweitbetreuer_full_name
-			FROM lehre.tbl_projektbetreuer pb
-					 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
-					 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
-					 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
-			WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
-			ORDER BY pb.projektarbeit_id  -- DISTINCT ON needs this to be deterministic
-		)
-		
-		SELECT DISTINCT ON (tmp.projektarbeit_id)
-			*,
-			campus.get_betreuer_details(tmp.zweitbetreuer_person_id) AS zweitbetreuer_full_name,
-			campus.get_betreuer_details(tmp.betreuer_person_id)      AS erstbetreuer_full_name
-		FROM (
-			 SELECT DISTINCT ON (tbl_projektarbeit.projektarbeit_id)
-				 tbl_projektarbeit.projekttyp_kurzbz,
-				 tbl_projektarbeit.titel,
-				 tbl_projektarbeit.projektarbeit_id,
-				 tbl_studiengang.typ,
-				 tbl_studiengang.kurzbz,
-				 student_benutzer.uid                         AS student_uid,
-				 student_person.vorname                       AS student_vorname,
-				 student_person.nachname                      AS student_nachname,
-				 public.tbl_student.matrikelnr,
-				 tbl_lehreinheit.studiensemester_kurzbz,
-				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
-				 betreuer_person.titelpre                     AS betreuer_titelpre,
-				 betreuer_person.vorname                      AS betreuer_vorname,
-				 betreuer_person.nachname                     AS betreuer_nachname,
-				 betreuer_person.titelpost                    AS betreuer_titelpost,
-				 lehre.tbl_projektbetreuer.betreuerart_kurzbz AS betreuerart,
-				 lehre.tbl_projektbetreuer.person_id          AS betreuer_person_id,
-				 lehre.tbl_projektarbeit.sprache,
-				 lehre.tbl_projektarbeit.seitenanzahl,
-				 lehre.tbl_projektarbeit.kontrollschlagwoerter,
-				 lehre.tbl_projektarbeit.schlagwoerter,
-				 lehre.tbl_projektarbeit.schlagwoerter_en,
-				 lehre.tbl_projektarbeit.abstract,
-				 lehre.tbl_projektarbeit.abstract_en,
-				 lehre.tbl_projektarbeit.insertamum,
-				 lehre.tbl_projektarbeit.note,
-	
-				 sb.zweitbetreuer_person_id,
-				 sb.zweitbetreuer_betreuerart_kurzbz,
-				 sb.zweitbetreuer_betreuerart_beschreibung,
-				 sb.zweitbetreuer_full_name,
-				 sb.zweitbetreuer_titelpre,
-				 sb.zweitbetreuer_vorname,
-				 sb.zweitbetreuer_nachname,
-				 sb.zweitbetreuer_titelpost,
-	
-				 (
-					 SELECT orgform_kurzbz
-					 FROM public.tbl_prestudentstatus
-					 WHERE prestudent_id = (
-						 SELECT prestudent_id FROM public.tbl_student
-						 WHERE student_uid = student_benutzer.uid LIMIT 1
-					 )
-					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					 LIMIT 1
-				 ) AS organisationsform,
-				 (
-					 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
-									 tbl_prestudentstatus.orgform_kurzbz,
-									 tbl_studiengang.orgform_kurzbz)
-					 FROM public.tbl_prestudent
-						JOIN       public.tbl_prestudentstatus USING (prestudent_id)
-						JOIN       public.tbl_studiensemester  USING (studiensemester_kurzbz)
-						JOIN       public.tbl_studiengang      USING (studiengang_kz)
-						LEFT JOIN  lehre.tbl_studienplan        USING (studienplan_id)
-					 WHERE prestudent_id = public.tbl_student.prestudent_id
-					 ORDER BY tbl_prestudentstatus.datum DESC
-					 LIMIT 1
-				 ) AS orgform,
-				 (
-					 SELECT status_kurzbz
-					 FROM public.tbl_prestudentstatus
-					 WHERE prestudent_id = public.tbl_student.prestudent_id
-					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					 LIMIT 1
-				 ) AS studienstatus
-	
-			 FROM lehre.tbl_projektarbeit
-				  LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
-				  LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
-				  LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-				  LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
-				  LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
-				  LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
-				  LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
-				  LEFT JOIN  lehre.tbl_projektbetreuer              USING (projektarbeit_id)
-				  LEFT JOIN  public.tbl_person     betreuer_person  ON betreuer_person.person_id  = lehre.tbl_projektbetreuer.person_id
-				  LEFT JOIN  public.tbl_benutzer   betreuer_benutzer ON betreuer_person.person_id = betreuer_benutzer.person_id
-				  LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
-	
-			 WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
-			 	AND student_benutzer.aktiv
-			 	AND lehre.tbl_projektbetreuer.betreuerart_kurzbz IN (
-																		'Erstbegutachter', 'Begutachter', 'Betreuer', 'Erstbetreuer', 'Senatsvorsitz'
-					 )
-			 	AND public.tbl_studiengang.studiengang_kz = ?";
-		
-					if($benotet == 0) {
-						$new_qry .= " AND lehre.tbl_projektarbeit.note IS NULL ";
-					} else if ($benotet == 1) {
-						$new_qry .= " AND lehre.tbl_projektarbeit.note IS NOT NULL ";
-					}
-					 
-			 	$new_qry .= " ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
+		$new_qry = "SELECT DISTINCT ON(tmp.projektarbeit_id) *, campus.get_betreuer_details(tmp.zweitbetreuer_person_id) as zweitbetreuer_full_name, campus.get_betreuer_details(tmp.betreuer_person_id) as erstbetreuer_full_name
+       		FROM(
+			   SELECT
+				   DISTINCT ON(tbl_projektarbeit.projektarbeit_id)
+				   tbl_projektarbeit.projekttyp_kurzbz,
+				   tbl_projektarbeit.titel,
+				   tbl_projektarbeit.projektarbeit_id,
+				   tbl_studiengang.typ, tbl_studiengang.kurzbz,
+				   student_benutzer.uid as student_uid,
+				   student_person.vorname as student_vorname,
+				   student_person.nachname as student_nachname,
+				   tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
+				   betreuer_benutzer.uid as betreuer_benutzer_uid,
+				   betreuer_person.titelpre as betreuer_titelpre,
+				   betreuer_person.vorname as betreuer_vorname,
+				   betreuer_person.nachname as betreuer_nachname,
+				   betreuer_person.titelpost as betreuer_titelpost,
+				   lehre.tbl_projektbetreuer.betreuerart_kurzbz as betreuerart,
+				   lehre.tbl_projektbetreuer.person_id as betreuer_person_id,
+				   lehre.tbl_projektarbeit.sprache               as sprache,
+				   lehre.tbl_projektarbeit.seitenanzahl          as seitenanzahl,
+				   lehre.tbl_projektarbeit.kontrollschlagwoerter as kontrollschlagwoerter,
+				   lehre.tbl_projektarbeit.schlagwoerter         as schlagwoerter,
+				   lehre.tbl_projektarbeit.schlagwoerter_en      as schlagwoerter_en,
+				   lehre.tbl_projektarbeit.abstract              as abstract,
+				   lehre.tbl_projektarbeit.abstract_en           as abstract_en,
+				   lehre.tbl_projektarbeit.insertamum            as insertamum,
+				   lehre.tbl_projektarbeit.note					 as note,
+				   (
+					   SELECT orgform_kurzbz
+					   FROM tbl_prestudentstatus
+					   WHERE prestudent_id = (SELECT prestudent_id
+											  FROM tbl_student
+											  WHERE student_uid = student_benutzer.uid
+											  LIMIT 1)
+					   ORDER BY datum DESC, insertamum DESC, ext_id DESC
+					   LIMIT 1
+				   )
+					   as organisationsform,
+				   (
+					   SELECT person_id
+					   FROM lehre.tbl_projektbetreuer
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_person_id,
+				   (
+					   SELECT betreuerart_kurzbz
+					   FROM lehre.tbl_projektbetreuer
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_betreuerart_kurzbz,
+				   (
+					   SELECT tbl_betreuerart.beschreibung
+					   FROM lehre.tbl_projektbetreuer
+								JOIN lehre.tbl_betreuerart USING (betreuerart_kurzbz)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_betreuerart_beschreibung,
+				   (
+					   SELECT trim(COALESCE(titelpre, '') || ' ' || COALESCE(vorname, '') || ' ' || COALESCE(nachname, '') || ' ' ||
+								   COALESCE(titelpost, ''))
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_full_name,
+			       (
+					   SELECT titelpre
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_titelpre,
+			       (
+					   SELECT vorname
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_vorname,
+			       (
+					   SELECT nachname
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_nachname,
+			       (
+					   SELECT titelpost
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_titelpost,
+			       (
+					   SELECT
+						   COALESCE(tbl_studienplan.orgform_kurzbz,
+									tbl_prestudentstatus.orgform_kurzbz, tbl_studiengang.orgform_kurzbz) as
+							   orgform
+					   FROM
+						   public.tbl_prestudent
+							   JOIN public.tbl_prestudentstatus USING(prestudent_id)
+							   JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+							   JOIN public.tbl_studiengang USING(studiengang_kz)
+							   LEFT JOIN lehre.tbl_studienplan USING(studienplan_id)
+					   WHERE
+						   prestudent_id=tbl_student.prestudent_id
+					   ORDER BY tbl_prestudentstatus.datum DESC LIMIT 1
+				   ) as orgform,
+				   (SELECT status_kurzbz FROM public.tbl_prestudentstatus
+					WHERE prestudent_id=tbl_student.prestudent_id
+					ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as studienstatus
+			   FROM lehre.tbl_projektarbeit
+						LEFT JOIN public.tbl_benutzer student_benutzer ON (student_benutzer.uid = lehre.tbl_projektarbeit.student_uid)
+						LEFT JOIN public.tbl_person student_person ON (student_benutzer.person_id = student_person.person_id)
+						LEFT JOIN public.tbl_student on(student_benutzer.uid = public.tbl_student.student_uid)
+						LEFT JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
+						LEFT JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+						LEFT JOIN public.tbl_studiengang ON (public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz)
+						LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+						LEFT JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+						LEFT JOIN public.tbl_person betreuer_person ON (betreuer_person.person_id = lehre.tbl_projektbetreuer.person_id)
+						LEFT JOIN public.tbl_benutzer betreuer_benutzer ON (betreuer_person.person_id = betreuer_benutzer.person_id)
+			   WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
+				 AND student_benutzer.aktiv AND (
+				     lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' 
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Betreuer'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbetreuer'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Senatsvorsitz'
+				     )
+				 AND public.tbl_studiengang.studiengang_kz = ?";
+
+			     if($benotet == 0) {
+					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NULL ";
+				 } else if ($benotet == 1) {
+					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NOT NULL ";
+				 }
+
+			   $new_qry .= " ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
 		   ) as tmp";
-		
+
 		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
 	}
 
-	public function getProjektarbeitenForStudent($student_uid) {
-		$new_qry = "WITH secondary_betreuer AS (
-			SELECT DISTINCT ON (pb.projektarbeit_id)
-				pb.projektarbeit_id,
-				pb.person_id                  AS zweitbetreuer_person_id,
-				pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
-				ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
-				p.titelpre                    AS zweitbetreuer_titelpre,
-				p.vorname                     AS zweitbetreuer_vorname,
-				p.nachname                    AS zweitbetreuer_nachname,
-				p.titelpost                   AS zweitbetreuer_titelpost,
-				trim(
-						COALESCE(p.titelpre, '')  || ' ' ||
-						COALESCE(p.vorname, '')   || ' ' ||
-						COALESCE(p.nachname, '')  || ' ' ||
-						COALESCE(p.titelpost, '')
-				)                             AS zweitbetreuer_full_name
-			FROM lehre.tbl_projektbetreuer pb
-					 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
-					 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
-					 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
-			WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
-			ORDER BY pb.projektarbeit_id  -- DISTINCT ON needs this to be deterministic
-		)
-		
-		SELECT DISTINCT ON (tmp.projektarbeit_id)
-			*,
-			campus.get_betreuer_details(tmp.zweitbetreuer_person_id) AS zweitbetreuer_full_name,
-			campus.get_betreuer_details(tmp.betreuer_person_id)      AS erstbetreuer_full_name
-		FROM (
-			 SELECT DISTINCT ON (tbl_projektarbeit.projektarbeit_id)
-				 tbl_projektarbeit.projekttyp_kurzbz,
-				 tbl_projektarbeit.titel,
-				 tbl_projektarbeit.projektarbeit_id,
-				 tbl_studiengang.typ,
-				 tbl_studiengang.kurzbz,
-				 student_benutzer.uid                         AS student_uid,
-				 student_person.vorname                       AS student_vorname,
-				 student_person.nachname                      AS student_nachname,
-				 public.tbl_student.matrikelnr,
-				 tbl_lehreinheit.studiensemester_kurzbz,
-				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
-				 betreuer_person.titelpre                     AS betreuer_titelpre,
-				 betreuer_person.vorname                      AS betreuer_vorname,
-				 betreuer_person.nachname                     AS betreuer_nachname,
-				 betreuer_person.titelpost                    AS betreuer_titelpost,
-				 lehre.tbl_projektbetreuer.betreuerart_kurzbz AS betreuerart,
-				 lehre.tbl_projektbetreuer.person_id          AS betreuer_person_id,
-				 lehre.tbl_projektarbeit.sprache,
-				 lehre.tbl_projektarbeit.seitenanzahl,
-				 lehre.tbl_projektarbeit.kontrollschlagwoerter,
-				 lehre.tbl_projektarbeit.schlagwoerter,
-				 lehre.tbl_projektarbeit.schlagwoerter_en,
-				 lehre.tbl_projektarbeit.abstract,
-				 lehre.tbl_projektarbeit.abstract_en,
-				 lehre.tbl_projektarbeit.insertamum,
-				 lehre.tbl_projektarbeit.note,
-	
-				 sb.zweitbetreuer_person_id,
-				 sb.zweitbetreuer_betreuerart_kurzbz,
-				 sb.zweitbetreuer_betreuerart_beschreibung,
-				 sb.zweitbetreuer_full_name,
-				 sb.zweitbetreuer_titelpre,
-				 sb.zweitbetreuer_vorname,
-				 sb.zweitbetreuer_nachname,
-				 sb.zweitbetreuer_titelpost,
-	
-				 (
-					 SELECT orgform_kurzbz
-					 FROM public.tbl_prestudentstatus
-					 WHERE prestudent_id = (
-						 SELECT prestudent_id FROM public.tbl_student
-						 WHERE student_uid = student_benutzer.uid LIMIT 1
-					 )
-					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					 LIMIT 1
-				 ) AS organisationsform,
-				 (
-					 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
-									 tbl_prestudentstatus.orgform_kurzbz,
-									 tbl_studiengang.orgform_kurzbz)
-					 FROM public.tbl_prestudent
-						JOIN       public.tbl_prestudentstatus USING (prestudent_id)
-						JOIN       public.tbl_studiensemester  USING (studiensemester_kurzbz)
-						JOIN       public.tbl_studiengang      USING (studiengang_kz)
-						LEFT JOIN  lehre.tbl_studienplan        USING (studienplan_id)
-					 WHERE prestudent_id = public.tbl_student.prestudent_id
-					 ORDER BY tbl_prestudentstatus.datum DESC
-					 LIMIT 1
-				 ) AS orgform,
-				 (
-					 SELECT status_kurzbz
-					 FROM public.tbl_prestudentstatus
-					 WHERE prestudent_id = public.tbl_student.prestudent_id
-					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					 LIMIT 1
-				 ) AS studienstatus
-	
-			 FROM lehre.tbl_projektarbeit
-				  LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
-				  LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
-				  LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-				  LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
-				  LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
-				  LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
-				  LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
-				  LEFT JOIN  lehre.tbl_projektbetreuer              USING (projektarbeit_id)
-				  LEFT JOIN  public.tbl_person     betreuer_person  ON betreuer_person.person_id  = lehre.tbl_projektbetreuer.person_id
-				  LEFT JOIN  public.tbl_benutzer   betreuer_benutzer ON betreuer_person.person_id = betreuer_benutzer.person_id
-				  LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id
-	
-			 WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
-			 	AND student_benutzer.aktiv
-			 	AND lehre.tbl_projektbetreuer.betreuerart_kurzbz IN (
-																		'Erstbegutachter', 'Begutachter', 'Betreuer', 'Erstbetreuer', 'Senatsvorsitz'
-					 )
-			 	AND public.tbl_student.student_uid = ?
-			 ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
-		   ) as tmp";
-
-		return $this->execReadOnlyQuery($new_qry, array($student_uid));
-	}
-	
 	/**
+	 * Prüft ob Projektarbeit aktuell ist (also zurzeit online bewertet wird).
+	 * @param $projektarbeit_id
+	 * @return boolean
+	 */
+	public function projektarbeitIsCurrent($projektarbeit_id) {
+		$version = $this->getVersion($projektarbeit_id);
+		// paarbeit sollte nur ab einem Studiensemester online bewertet werden
+		return $version === null ? null : $version->isCurrent;
+	}
+
+	/**
+	 * Holt sich Version der Projektarbeit.
+	 * Liefert auch mit, ob die Version die aktuellste ist.
+	 * z.B.: Masterarbeiten waren ab der Änderung zur Gewichtung der Punkte aktuell,
+	 * Bachelorarbeiten waren ab dem Umstieg auf das Online Beurteilungsformular aktuell.
+	 * @param $projektarbeit_id
+	 * @return objekt mit Versionsinfo, null im Fehlerfall
+	 */
+	private function getVersion($projektarbeit_id) {
+		$_versions_query = array(
+			'Diplom' => array(
+				'SS2025',
+				'SS2023',
+				'SS2022'
+			),
+			'Others' => array(
+				'SS2025',
+				'SS2022',
+			)
+		);
+
+		$_versions_check = array(
+			'Diplom' => array(
+				'SS2025' => 3,
+				'SS2023' => 2,
+				'SS2022' => 1
+			),
+			'Others' => array(
+				'SS2025' => 2,
+				'SS2022' => 1
+			)
+		);
+
+		// paarbeit sollte nur ab einem Studiensemester online bewertet werden
+		$qry="
+			SELECT
+				CASE
+					WHEN semesters_diplom.studiensemester_kurzbz IS NOT NULL
+					THEN semesters_diplom.studiensemester_kurzbz
+					ELSE semesters.studiensemester_kurzbz 
+				END AS version_studiensemester_kurzbz,
+				pa.projekttyp_kurzbz
+			FROM
+				lehre.tbl_projektarbeit pa
+				JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
+				LEFT JOIN (
+					SELECT
+						start, studiensemester_kurzbz
+					FROM
+						public.tbl_studiensemester
+					WHERE
+						studiensemester_kurzbz IN ?
+				) semesters ON sem.start >= semesters.start AND pa.projekttyp_kurzbz <> 'Diplom'
+				LEFT JOIN (
+					SELECT
+						start, studiensemester_kurzbz
+					FROM
+						public.tbl_studiensemester
+					WHERE
+						studiensemester_kurzbz IN ?
+				) semesters_diplom ON sem.start >= semesters_diplom.start AND pa.projekttyp_kurzbz = 'Diplom'
+			WHERE
+				projektarbeit_id = ?
+			ORDER BY
+				semesters.start DESC, semesters_diplom.start DESC
+			LIMIT 1";
+
+		$resultociniBambini = $this->execReadOnlyQuery($qry, array($_versions_query['Others'], $_versions_query['Diplom'], $projektarbeit_id));
+
+		if(hasData($resultociniBambini)) {
+			$data =	getData($resultociniBambini);
+			if(count($data) > 0) {
+				$row = $data[0];
+
+				// known project types
+				if (isset($_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz]))
+				{
+					$row->versionNumber = $_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz];
+					$row->isCurrent =
+						$_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz]
+						== max($_versions_check[$row->projekttyp_kurzbz]);
+
+				}
+				elseif (isset($_versions_check['Others'][$row->version_studiensemester_kurzbz]))
+				{
+					$row->versionNumber = $_versions_check['Others'][$row->version_studiensemester_kurzbz];
+					$row->isCurrent =
+						$_versions_check['Others'][$row->version_studiensemester_kurzbz]
+						== max($_versions_check['Others']);
+				}
+				else
+				{
+					$row->isCurrent = false;
+					$row->versionNumber = 0;
+				}
+				return $row;
+
+			} else {
+				return null;
+			}
+		} else {
+			return null;
+		}
+	}
+
+	/*
 	 *
 	 * @param
 	 * @return object success or error

application/models/education/Pruefung_model.php

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

application/models/education/Studierendenantrag_model.php

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

application/models/education/Studierendenantragstatus_model.php

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

application/models/education/Zeugnisnote_model.php

@@ -148,7 +148,7 @@ class Zeugnisnote_model extends DB_Model
 	 *
 	 * @return object
 	 */
-	public function getZeugnisnoten($student_uid, $studiensemester_kurzbz)
+	public function getZeugnisnoten($student_uid, $studiensemester_kurzbz, $lehrveranstaltung_id = null)
 	{
 		$params = array();
 		$where='';
@@ -163,6 +163,11 @@ class Zeugnisnote_model extends DB_Model
 			$where.=" AND vw_student_lehrveranstaltung.studiensemester_kurzbz= ?";
 			$params[] = $studiensemester_kurzbz;
 		}
+		if($lehrveranstaltung_id != null)
+		{
+			$where .= " AND vw_student_lehrveranstaltung.lehrveranstaltung_id = ?";
+			$params[] = $lehrveranstaltung_id;
+		}
 
 		$where2='';
 
@@ -176,6 +181,11 @@ class Zeugnisnote_model extends DB_Model
 			$where2 .= " AND studiensemester_kurzbz= ?";
 			$params[] = $studiensemester_kurzbz;
 		}
+		if($lehrveranstaltung_id != null)
+		{
+			$where2 .=" AND lehrveranstaltung_id = ?";
+			$params[] = $lehrveranstaltung_id;
+		}
 
 		$qry = "SELECT
 			a.*,
@@ -188,7 +198,10 @@ class Zeugnisnote_model extends DB_Model
 			lv.semester AS semester_lv,
 			lv.ects AS ects_lv,
 			lv.zeugnis,
-			lv.bezeichnung_english AS lehrveranstaltung_bezeichnung_english
+			lv.bezeichnung_english AS lehrveranstaltung_bezeichnung_english,
+			s.verband,
+			person.vorname,
+			person.nachname
 		FROM (
 			SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
 				   vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
@@ -231,6 +244,8 @@ class Zeugnisnote_model extends DB_Model
 			ORDER BY sort
 		) a
 		LEFT JOIN public.tbl_student s ON (a.uid = s.student_uid)
+		LEFT JOIN public.tbl_benutzer benutzer ON benutzer.uid = s.student_uid
+		LEFT JOIN public.tbl_person person ON benutzer.person_id = person.person_id
 		LEFT JOIN public.tbl_studiengang stg1 ON (s.studiengang_kz = stg1.studiengang_kz)
 		LEFT JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
 		LEFT JOIN public.tbl_studiengang stg2 ON (lv.studiengang_kz = stg2.studiengang_kz)";

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();
-	}
 }