manage default myLv layout mode via localStorage; actions row takes remaining space via fitDataStretch and wraps around into new row if action buttons take up too much space; added tabulator persistence on TableBuilt event; slight watcher adjustments to combat race conditions; loading spinner while tabulatorUuid has not been defined yet -> maybe worth improving but seems to work fine;

application/config/studierendenantrag.php

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

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

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

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

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

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

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

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

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

application/controllers/api/frontend/v1/stv/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,11 +623,10 @@ class Students extends FHCAPI_Controller
 			}
 		}
 
-
 		$this->addFilter($studiensemester_kurzbz);
 
-		$result = $this->studentlistlib->execute($studiensemester_kurzbz);
-
+		$result = $this->PrestudentModel->loadWhere($where);
+		
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -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,187 @@ 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');
+		$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');
+
+		$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
+
+
+		$this->PrestudentModel->addSelect("b.uid");
+		$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		$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/components/Cis/Mylv.php

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

application/controllers/jobs/AntragJob.php

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

application/controllers/lehre/Studierendenantrag.php

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

application/core/Notiz_Controller.php

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

application/libraries/AntragLib.php

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

application/libraries/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/education/Lehrveranstaltung_model.php

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

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

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

application/models/education/Studierendenantragstatus_model.php

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

application/models/organisation/Studiengang_model.php

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

application/models/organisation/Studiensemester_model.php

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

application/models/person/Benutzerfunktion_model.php

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

application/models/system/Message_model.php

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

application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php

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

application/models/vertragsbestandteil/Vertragsbestandteil_model.php

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

application/views/Studentenverwaltung.php

@@ -62,7 +62,6 @@ $configArray = [
 			logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 			:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
-			auth-uid="<?= getAuthUID()?>"
 			>
 		</router-view>
 	</div>

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

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

application/views/system/infocenter/infocenterData.php

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

application/views/system/infocenter/onboardingData.php

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

cis/private/info/service_uebersicht.php

@@ -46,13 +46,12 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
 	<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
 	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
+	<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
 	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 	<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>';
 
-	include('../../../include/meta/jquery.php');
-	include('../../../include/meta/jquery-tablesorter.php');
-
 const MOODLE_ADDON_KURZBZ = 'moodle';
 
 // Load Addons to get Moodle_Path
@@ -72,7 +71,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\',\'filter\']
+					widgets: [\'zebra\']
 				});
 			}
 		);
@@ -152,9 +151,8 @@ foreach($service->result as $row)
 		$person = new person();
 		$person->getPersonFromBenutzer($row->operativ_uid);
 		$operativ = $person->nachname.' '.$person->vorname;
-		$oeBez = new organisationseinheit($row->oe_kurzbz);
 		echo '<tr>';
-		echo '<td>',$oeBez->bezeichnung,'</td>';
+		echo '<td>',$row->oe_kurzbz,'</td>';
 		echo '<td><b>'.$row->bezeichnung.'</b></td>';
 		echo '<td>',$row->beschreibung,'</td>';
 		echo '<td><nobr><a href="../profile/index.php?uid='.$row->design_uid.'">',$design,'</a></nobr></td>';

cis/private/lehre/notenliste.xls.php

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

cis/testtool/frage.php

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

cis/testtool/gebietfertig.php

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

cis/testtool/login.php

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

cis/testtool/menu.php

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

config/global.config-default.inc.php

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

content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php

@@ -342,8 +342,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 		<vbox>
 			<checkbox id="mitarbeiter-entwicklungsteam-detail-checkbox-neu" checked="true" hidden="true" />
 			<textbox id="mitarbeiter-entwicklungsteam-detail-textbox-studiengang" hidden="true" />
-			<textbox id="mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id" hidden="true" />
-
 			<groupbox id="mitarbeiter-entwicklungsteam-detail-groupbox" flex="1">
 				<caption label="Details" />
 				<grid id="mitarbeiter-entwicklungsteam-detail-grid" style="margin:4px;" flex="1">

content/mitarbeiter/mitarbeiteroverlay.js.php

@@ -1708,7 +1708,6 @@ function MitarbeiterEntwicklungsteamSelect()
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value=studiengang_kz;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value=beginn;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value=ende;
-	document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value=entwicklungsteam_id;
 	MitarbeiterEntwicklungsteamDetailDisableFields(false);
 }
 
@@ -1726,7 +1725,6 @@ function MitarbeiterEntwicklungsteamSpeichern()
 	studiengang_kz_old = document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value;
 	beginn = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value;
 	ende = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value;
-	entwicklungsteam_id = document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value;
 
 	if(studiengang_kz=='')
 	{

content/statistik/notenspiegel_erweitert.php

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

content/student/studentoverlay.js.php

@@ -3555,14 +3555,6 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredential_2':
 		case 'microcredential_3':
 		case 'microcredential_4':
-		case 'microdegree_1':
-		case 'microdegree_2':
-		case 'microdegree_3':
-		case 'microdegree_4':
-		case 'microdegreeabschluss_1':
-		case 'microdegreeabschluss_2':
-		case 'microdegreeabschluss_3':
-		case 'microdegreeabschluss_4':
 			xml = 'microcredential.xml.php';
 			break;
 			

include/benutzerberechtigung.class.php

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

include/entwicklungsteam.class.php

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

include/konto.class.php

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

include/lehreinheitmitarbeiter.class.php

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

include/pruefling.class.php

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

locale/de-AT/testtool.php

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

locale/en-US/testtool.php

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

public/css/Studentenverwaltung.css

@@ -197,6 +197,10 @@ html.fs_huge {
 	margin-bottom: -1px;
 }
 
+.tiny-90 div.tox.tox-tinymce {
+	height: 90% !important;
+}
+
 /* slim begin */
 .stv .form-label {
 	margin-bottom: .15rem;

public/css/components/MyLv.css

@@ -6,3 +6,13 @@
 	color: var(--fhc-myLv-disabled) !important;
 	cursor: default;
 }
+
+/* adjustment to have bs5 dropdownmenus rendered properly over a tabulator table */
+.mylv-semester-table .tabulator-cell {
+	overflow: unset;
+}
+
+.mylv-semester-table .tabulator-cell .action-col {
+	/*min-height: 2.5rem;*/
+	align-items: flex-start; /* so wrapped rows don't stretch vertically */
+}

public/js/api/factory/addons.js

@@ -21,5 +21,20 @@ export default {
 			method: 'get',
 			url: `/api/frontend/v1/LvMenu/getLvMenu/${lvid}/${studiensemester_kurzbz}`
 		};
+	},
+	getMultipleLvMenu(lvas, studiensemester_kurzbz) {
+		// format params for backend bulk function
+		const lvMenuOptionList = lvas.map(lva => {
+			return {
+				lvid: lva.lehrveranstaltung_id,
+				studiensemester_kurzbz
+			}
+		})
+		
+		return {
+			method: 'post',
+			url: `/api/frontend/v1/LvMenu/getMultipleLvMenu`,
+			params: { lvMenuOptionList }
+		};
 	}
 };

public/js/api/factory/messages/messages.js

@@ -17,16 +17,13 @@
 
 export default {
 	getMessages(params) {
-		let url = 'api/frontend/v1/messages/messages/getMessages'
-				+ '/' + params.id
-				+ '/' + params.type;
-			if(params.size && params.page) {
-				url += '/' + params.size
-				+ '/' + params.page;
-			}
 		return {
 			method: 'get',
-			url: url
+			url: 'api/frontend/v1/messages/messages/getMessages/'
+				+ params.id + '/'
+				+ params.type + '/'
+				+ params.size + '/'
+				+ params.page
 		};
 	},
 	getVorlagen(){

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

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

public/js/apps/Dashboard/Fhc.js

@@ -5,7 +5,7 @@ import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
 import MyLvPlan from "../../components/Cis/LvPlan/Personal.js";
-import MylvStudent from "../../components/Cis/Mylv/Student.js";
+import Mylv from "../../components/Cis/Mylv/MyLv.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
 import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
 import CmsNews from "../../components/Cis/Cms/News.js";
@@ -21,6 +21,7 @@ import Studium from "../../components/Cis/Studium/Studium.js";
 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
 import {capitalize} from "../../helpers/StringHelpers.js";
+import ApiAuthinfo from "../../api/factory/authinfo.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -149,7 +150,7 @@ const router = VueRouter.createRouter({
 		{
 			path: `/Cis/MyLv/:studiensemester?`,
 			name: 'MyLv',
-			component: MylvStudent,
+			component: Mylv,
 			props: true,
 		},
 		{
@@ -231,6 +232,9 @@ const app = Vue.createApp({
 	data: () => ({
 		appSideMenuEntries: {},
 		renderers: null,
+		uid: '',
+		isStudent: null,
+		isMitarbeiter: null
 	}),
 	components: {},
 	computed: {
@@ -244,7 +248,10 @@ const app = Vue.createApp({
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
 			renderers: Vue.computed(() => this.renderers),
-			isMobile: this.isMobile
+			isMobile: this.isMobile,
+			uid: Vue.computed(() => this.uid),
+			isStudent: Vue.computed(() => this.isStudent),
+			isMitarbeiter: Vue.computed(() => this.isMitarbeiter)
 		}	
 	},
 	methods: {
@@ -321,6 +328,14 @@ const app = Vue.createApp({
 					this.renderers[rendertype].calendarEvent = calendarEvent;
 				}
 			});
+
+		await this.$api
+			.call(ApiAuthinfo.getAuthInfo())
+			.then(res => {
+				this.uid = res.data.uid;
+				this.isMitarbeiter = res.data.isMitarbeiter;
+				this.isStudent = res.data.isStudent;
+			});
 	},
 	mounted() {
 		document.addEventListener('click', this.handleClick);

public/js/components/Cis/Mylv/LvMenu.js

@@ -1,5 +1,6 @@
 
 export default {
+	name: 'LvMenu',
 	props:{
 		menu:{
 			type:Array,

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

@@ -4,7 +4,7 @@ import LvMenu from "./LvMenu.js";
 import ApiAddons from '../../../api/factory/addons.js';
 
 export default  {
-  
+	name: 'LvUebersicht',
     props:{
         event:{
             type:Object,

public/js/components/Cis/Mylv/MyLv.js

@@ -1,25 +1,37 @@
-import MylvSemester from "./Semester.js";
-import Phrasen from "../../../mixins/Phrasen.js";
+import MylvSemesterCards from "./Semester.js";
+import MylvTable from "./Table.js";
+import ApiAddons from "../../../api/factory/addons.js"
 
 // TODO(chris): phrase: global/studiensemester_auswaehlen
 // TODO(chris): phrase: next & prev +aria-label
 
 export default {
+	name: 'MyLv',
 	components: {
-		MylvSemester
+		MylvSemesterCards,
+		MylvTable
 	},
-	mixins: [
-		Phrasen
-	],
 	data: () => {
 		return {
 			firstLoad: true,
 			studiensemester: null,
 			lvs: {},
-			currentSemester: null
+			currentSemester: null,
+			mode: localStorage.getItem('myLvaDefaultMode') ?? 'cards'
 		};
 	},
+	provide() {
+		return {
+			type: Vue.computed(() => this.type),
+		}
+	},
+	inject: ['isStudent', 'isMitarbeiter'],
 	computed: {
+		type() {
+			if(this.isStudent) return 'student'
+			if(this.isMitarbeiter) return 'employee'
+			return null
+		},
 		ready() {
 			return this.studiensemester !== null && (!this.firstLoad || this.current.lvs !== null);
 		},
@@ -34,7 +46,22 @@ export default {
 				axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Lvs/' + this.currentSemester).then(res => {
 					this.lvs[this.currentSemester].lvs = res.data.retval || [];
 					this.firstLoad = false;
-				});
+					
+					this.lvs[this.currentSemester].lvs.forEach(lv=>{
+
+						this.$api.call(ApiAddons.getLvMenu(lv.lehrveranstaltung_id, this.currentSemester)).then(res => {
+							if(res.data) {
+								
+								const lvProp = this.lvs[this.currentSemester].lvs.find(lv2 => lv2.lehrveranstaltung_id == lv.lehrveranstaltung_id)
+								lvProp.menu = res.data
+								
+							}
+						})
+						
+					})
+					
+
+				})
 			}
 			return this.lvs[this.currentSemester];
 		},
@@ -67,6 +94,10 @@ export default {
 		}
 	},
 	methods: {
+		clickMode(evt, mode) {
+			localStorage.setItem('myLvaDefaultMode', mode)
+			this.mode = mode
+		},
 		prevSem() {
 			this.$refs.studiensemester.selectedIndex--;
 			this.$refs.studiensemester.dispatchEvent(new Event('change', { bubbles: true }));
@@ -99,7 +130,7 @@ export default {
 
 	<h2>{{$p.t('lehre/myLV')}}</h2>
 	<hr>
-	<div class="mylv-student" v-if="ready">
+	<div class="mylv" v-if="ready">
 		<div v-if="currentSemester" class="row justify-content-center mb-3">
 			<div class="col-auto d-none">
 				<label class="col-form-label">{{$p.t('lehre/studiensemester')}}</label>
@@ -117,13 +148,34 @@ export default {
 					</button>
 				</div>
 			</div>
+			<div class=" col-auto my-lva-modes">
+				<div class="d-flex gap-1 justify-content-end" role="group">
+					<button
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'cards'}"
+						@click="clickMode($event, 'cards')"
+					>
+						<i class="fa fa-grip"></i>
+					</button>
+					<button
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'table'}"
+						@click="clickMode($event, 'table')"
+					>
+						<i class="fa fa-table"></i>
+					</button>
+				</div>
+			</div>
 		</div>
 		<div class="alert alert-danger" role="alert" v-else>
 			{{$p.t('lehre/noLvFound')}}
 		</div>
-		<mylv-semester v-bind="current"/>
+		<mylv-semester-cards v-if="mode == 'cards'" v-bind="current"/>
+		<mylv-table v-else-if="mode == 'table'" v-bind="current"/>
 	</div>
-	<div class="mylv-student text-center" v-else>
+	<div class="mylv text-center" v-else>
 		<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 	</div>`
 };

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

@@ -1,6 +1,7 @@
 import MylvSemesterStudiengang from "./Semester/Studiengang.js";
 
 export default {
+	name: 'Semester',
 	components: {
 		MylvSemesterStudiengang
 	},
@@ -36,7 +37,8 @@ export default {
 			return this.lvs.filter(lv => lv.studiengang_kz == studiengang.studiengang_kz && lv.semester == studiengang.semester);
 		}
 	},
-	template: `<div class="mylv-semester" v-if="ready">
+	template: `
+	<div class="mylv-semester" v-if="ready">
 		<mylv-semester-studiengang v-for="studiengang in studiengaenge" :key="studiengang.studiengang_kz" v-bind="studiengang" :lvs="lvsForStudiengang(studiengang)"/>
 	</div>
 	<div class="mylv-semester text-center" v-else>

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

@@ -2,6 +2,7 @@ import MylvSemesterStudiengangLv from "./Studiengang/Lv.js";
 import Phrasen from "../../../../mixins/Phrasen.js";
 
 export default {
+	name: 'Studiengang',
 	components: {
 		MylvSemesterStudiengangLv
 	},
@@ -31,7 +32,8 @@ export default {
 			return lv.benotung ? lv.znote || lv.lvnote || null : null;
 		}
 	},
-	template: `<div class="card mb-3">
+	template: `
+	<div class="card mb-3">
 		<div class="card-body">
 			<h4 class="card-title mb-3">{{$p.user_language.value === 'English' ? sg_bezeichnung_eng : bezeichnung}} - {{kuerzel}}
 				<small>{{semester}}.{{$p.t('lehre/semester')}}</small>

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

@@ -1,7 +1,4 @@
 import LvPruefungen from "./Lv/Pruefungen.js";
-import LvInfo from "./Lv/Info.js";
-import Phrasen from "../../../../../mixins/Phrasen.js";
-import LvUebersicht from "../../LvUebersicht.js";
 
 import ApiLehre from '../../../../../api/factory/lehre.js';
 import ApiAddons from '../../../../../api/factory/addons.js';
@@ -9,15 +6,11 @@ import ApiAddons from '../../../../../api/factory/addons.js';
 // TODO(chris): L10n
 
 export default {
-	components:{
-		LvUebersicht,
-	},
-	mixins: [
-		Phrasen
-	],
-	inject: ['studien_semester'],
+	name: 'Lv',
+	inject: ['studien_semester', 'type'],
 	props: {
-		lehrveranstaltung_id: Number,
+		lehrveranstaltung_id: [Number, String],
+		semesterstunden: [Number, String],
 		bezeichnung: String,
 		bezeichnung_eng: String,
 		module: String,
@@ -35,13 +28,13 @@ export default {
 		ects: String,
 		incoming: Number,
 		positiv: Boolean,
-		note_index: String
+		note_index: String,
+		menu: [Array, String]
 	},
 	data: () => {
 		return {
 			pruefungenData: null,
 			info: null,
-			menu: null,
 			preselectedMenuItem: null,
 		}
 	},
@@ -65,12 +58,6 @@ export default {
 		emptyMenu(){
 			return !this.menu || !Array.isArray(this.menu) || Array.isArray(this.menu) && this.menu.length == 0;
 		},
-		bodyStyle() {return {};
-			/*const bodyStyle = {};
-			if (this.farbe)
-				bodyStyle['background-color'] = '#' + this.farbe;
-			return bodyStyle;*/
-		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
 			if(this.benotung && this.znotebez?.length) {
@@ -84,7 +71,6 @@ export default {
 		},
 	},
 	methods: {
-		
 		fetchMenu(lehrveranstaltung_id = this.lehrveranstaltung_id, studien_semester = this.studien_semester) {
 			return this.$api
 				.call(ApiAddons.getLvMenu(lehrveranstaltung_id, studien_semester))
@@ -96,28 +82,18 @@ export default {
 					this.menu = [];
 				});
 		},
-
+		c4_target(menuItem) {
+			if (menuItem.c4_moodle_links?.length > 0) return null;
+			return menuItem.c4_target ?? null;
+		},
 		c4_link(menuItem) {
 			if (!menuItem) return null;
 			if (Array.isArray(menuItem.c4_moodle_links) && menuItem.c4_moodle_links.length) {
 				return '#';
-			}
-			else {
+			} else {
 				return menuItem.c4_link ?? null;
 			}
 		},
-		openLvOption(menuItem){
-			if (menuItem.id == "core_menu_mailanstudierende"){
-				window.location.href = menuItem.c4_link;
-			} else if (menuItem.id == "core_menu_digitale_anwesenheitslisten") {
-				window.location.href = menuItem.c4_link;
-			} else{
-				this.preselectedMenuItem = menuItem;
-				Vue.nextTick(() => {
-					this.$refs.lvUebersicht.show();
-				});
-			}
-		},
 		openPruefungen() {
 			// early return if the pruefungenData is empty or not set
 			if (!this.LvHasPruefungenInformation) return;
@@ -126,75 +102,65 @@ export default {
 				pruefungenData: this.pruefungenData, 
 				bezeichnung: this.bezeichnung
 			});
-		},
-		openInfos() {
-			if (!this.info) {
-				this.info = true;
-				// TODO(chris): load all this params on ajax?
-				LvInfo.popup({
-					lehrveranstaltung_id: this.lehrveranstaltung_id, 
-					bezeichnung: this.bezeichnung,
-					bezeichnung_eng: this.bezeichnung_eng,
-					studiengang_kuerzel: this.studiengang_kuerzel,
-					semester: this.semester,
-					studien_semester: this.studien_semester,
-					orgform_kurzbz: this.orgform_kurzbz,
-					sprache: this.sprache,
-					ects: this.ects,
-					incoming: this.incoming
-				}).then(() => this.info = false).catch(() => this.info = false);
-			}
-		}
-	},
-	watch:{
-		studien_semester(newValue){
-			this.fetchMenu(this.lehrveranstaltung_id, newValue);
 		}
 	},
 	created() {
-		this.$api
-			.call(ApiLehre.getStudentPruefungen(this.lehrveranstaltung_id))
-			.then(res => res.data)
-			.then(pruefungen => {
-				this.pruefungenData = pruefungen;
-			}); 
+		if(this.type == 'student') {
+			this.$api
+				.call(ApiLehre.getStudentPruefungen(this.lehrveranstaltung_id))
+				.then(res => res.data)
+				.then(pruefungen => {
+					this.pruefungenData = pruefungen;
+				});
+		}
 	},
-	mounted() {
-		this.fetchMenu(this.lehrveranstaltung_id, this.studien_semester);
-	},
-	template: /*html*/`<div class="mylv-semester-studiengang-lv card">
-		<lv-uebersicht ref="lvUebersicht" :preselectedMenu="preselectedMenuItem" :event="{
-			lehrveranstaltung_id: lehrveranstaltung_id,
-			studiensemester_kurzbz:studien_semester,
-			lehrfach_bez:studien_semester,
-			stg_kurzbzlang:studien_semester,
-		}"/>
-
+	template: /*html*/`
+	<div class="mylv-semester-studiengang-lv card">
 		<div class="p-2" :class="is_organisatorische_einheit?'':'card-header'">
 			<!-- {{module}} if the module of the lv is important then query the module from the api endpoint for LV-->
 			<h6 class="fw-bold" v-if="is_organisatorische_einheit" >{{ $p.t('lehre/organisationseinheit') }}:</h6>
 			<h6 class="mb-0">{{$p.user_language.value === 'English' ? bezeichnung_eng : bezeichnung}}</h6>
 		</div>
-		<div v-if="!emptyMenu" class="card-body " :style="bodyStyle">
+		<div v-if="!emptyMenu" class="card-body ">
 			<template v-if="menu">
 				<ul class="list-group border-top-0 border-bottom-0 rounded-0">
-					<li :type="menuItem.c4_link ? 'button' : null" v-for="menuItem in menu" class="list-group-item border-0 " >
-						<div class="d-flex flex-row"  :data-bs-toggle="menuItem.c4_moodle_links?.length ? 'dropdown' : null">
+					<li :type="menuItem.c4_link ? 'button' : null" 
+						v-for="(menuItem, index) in menu" :key="index" class="list-group-item border-0 " >
+						<div class="d-flex flex-row">
 							<div class="mx-4">
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
-							<a
+							<a :id="menuItem.name"
 							class="fhc-body text-decoration-none text-truncate"
-							:id="'moodle_links_'+lehrveranstaltung_id"
-							:class="{ 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }"
+							:class="{ 'unavailable':!menuItem.c4_link }"
 							:target="menuItem.c4_target"
 							:href="c4_link(menuItem) ? c4_link(menuItem) : null">
 								{{ menuItem.phrase ? $p.t(menuItem.phrase) : menuItem.name}}
 							</a>
+							
+							<div v-if="(menuItem.c4_moodle_links?.length || menuItem.c4_linkList?.length) && menuItem.c4_link" class="dropdown">
+								<button 
+									class="btn btn-sm dropdown-toggle dropdown-toggle-split border-0" 
+									type="button" 
+									data-bs-toggle="dropdown" 
+									aria-expanded="false">
+									<span class="visually-hidden">Toggle Dropdown</span>
+								</button>
+					
+								<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu dropdown-menu p-0">
+									<li v-for="item in menuItem.c4_moodle_links" :key="item.url">
+									   <a class="dropdown-item border-bottom" :href="item.url" target="#">{{ item.lehrform }}</a>
+									</li>
+								</ul>
+								
+								<ul v-else class="dropdown-menu dropdown-menu p-0">
+									<li v-for="([text, link], i) in menuItem.c4_linkList" :key="i">
+									   <a class="dropdown-item border-bottom" :href="link" target="#">{{ text }}</a>
+									</li>
+								</ul>
 							</div>
-							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
-								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>
-							</ul>
+				
+					   </div>
 					</li>
 				</ul>
 			</template>
@@ -204,7 +170,7 @@ export default {
 				</div>
 			</template>
 		</div>
-		<div v-if="!emptyMenu" class="card-footer">
+		<div v-if="!emptyMenu && type == 'student'" class="card-footer">
 			<div class="row">
 				<!-- template for the LV if there are multiple pruefungen -->
 				<template v-if="LvHasPruefungenInformation">
@@ -222,5 +188,12 @@ export default {
 				</template>
 			</div>
 		</div>
+		<div v-else-if="!emptyMenu && type == 'employee'" class="card-footer">
+			<div class="row">
+				<div class="col-auto">
+					<span class="ps-1">{{ $p.t('lehre/semesterstunden') }}: {{ semesterstunden }}</span>
+				</div>
+			</div>
+		</div>
 	</div>`
 };

public/js/components/Cis/Mylv/Table.js

@@ -0,0 +1,345 @@
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+
+export default {
+	name: 'MylvTable',
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		semester: [String],
+		lvs: Array,
+	},
+	data() {
+		return {
+			phrasenPromise: null,
+			phrasenResolved: false,
+			tabulatorUuid: null,
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			mylvTableOptions: {
+				height: Vue.ref(400),
+				index: 'lehrveranstaltung_id',
+				layout: 'fitDataStretch',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				columns: [
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('lehre/studiengang'))), field: 'sg_bezeichnung', widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('global/bezeichnung'))), field: 'bezeichnung', widthGrow: 2},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('lehre/orgform'))), field: 'orgform_kurzbz', widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('lehre/kurzbz'))), field: 'studiengang_kuerzel', widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('lehre/semesterstunden'))), field: 'semesterstunden', 
+						bottomCalc: this.semesterstundenCalc, widthGrow: 1, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('global/actions'))), headerSort: false,
+						field: 'menu', formatter: this.actionFormatter, widthGrow: 1, tooltip: this.spoofingFunc}
+				],
+				persistence: false,
+				persistenceID: "mylv_2026_04_17"
+			},
+			mylvTableEventHandlers: [
+				
+			]
+		}
+	},
+	computed: {
+		ready() { return this.lvs !== null; },
+	},
+	methods: {
+		semesterstundenCalc(values, data) {
+			let sum = 0
+			values.forEach(val => {
+				sum += Number(val)
+			})
+			return sum
+		},
+		spoofingFunc() {
+			// intentionally send empty tooltip info so tabulator tooltip doesnt get rendered but hover event propagates
+			// to individual button tooltips
+			return ''
+		},
+		c4_link(menuItem) {
+			if (!menuItem) return null;
+			if (Array.isArray(menuItem.c4_moodle_links) && menuItem.c4_moodle_links.length) {
+				return '#';
+			} else {
+				return menuItem.c4_link ?? null;
+			}
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		actionFormatter(cell) {
+			let container = document.createElement('div');
+			container.className = "d-flex gap-2";
+
+			const data = cell.getData()
+			if(data.menu && data.menu.length) {
+				
+				container.className = "d-flex flex-wrap gap-2"
+
+				data.menu.forEach((lvLink) => {
+					// render dropdown if we have a link and some some linklist
+					const hasDropdown = (lvLink.c4_moodle_links?.length || lvLink.c4_linkList?.length) && lvLink.c4_link;
+
+					if (hasDropdown) {
+						// button group
+						const group = document.createElement('div');
+						group.className = 'btn-group';
+
+						// main action button
+						const button= this.createActionButton(lvLink)
+
+						// toggle button
+						const toggle = document.createElement('button');
+						toggle.className = 'btn btn-sm dropdown-toggle dropdown-toggle-split border-0';
+						toggle.type = 'button';
+						toggle.dataset.bsToggle = 'dropdown'; // uses absolute position which gets clipped by tabulator
+						toggle.ariaExpanded = 'false';
+						toggle.innerHTML = '<span class="visually-hidden">Toggle Dropdown</span>';
+
+						// dropdown menu
+						const dropMenu = document.createElement('ul');
+						dropMenu.className = 'dropdown-menu dropdown-menu p-0';
+						
+						// moodle links have priority to be dropdown items but both can be!
+						const items = lvLink.c4_moodle_links?.length
+							? lvLink.c4_moodle_links.map(item => ({ text: item.lehrform, href: item.url }))
+							: lvLink.c4_linkList.map(([text, link]) => ({ text, href: link }));
+						
+						
+						items.forEach(({ text, href }) => {
+							const li = document.createElement('li');
+							const a = document.createElement('a');
+							a.className = 'dropdown-item border-bottom';
+							a.href = href;
+							a.target = '#';
+							a.textContent = text;
+							li.appendChild(a);
+							dropMenu.appendChild(li);
+						});
+
+						group.appendChild(button);
+						group.appendChild(toggle);
+						group.appendChild(dropMenu);
+						container.appendChild(group);
+						
+					} else {
+						container.appendChild(this.createActionButton(lvLink));
+					}
+
+				})
+				
+			}
+
+			return container;
+		},
+		createActionButton(lvLink){
+			const button = document.createElement('a');
+			button.className = 'fhc-body text-decoration-none text-truncate';
+			if (!lvLink.c4_link) button.classList.add('unavailable');
+			button.id = `${lvLink.name}_${lvLink.lehrveranstaltung_id}`;
+
+			const icon = lvLink.c4_icon2 ?? 'fa-solid fa-pen-to-square';
+			const label = lvLink.phrase ? this.$p.t(lvLink.phrase) : lvLink.name;
+			button.title = label;
+			button.innerHTML = `<i class="${icon}"></i><span style="margin-left:2px;">${label}</span>`;
+
+			button.addEventListener('click', (event) => {
+				event.preventDefault();
+				const url = this.c4_link(lvLink);
+				if (url) {
+					const target = lvLink.c4_target || '_blank';
+					if (target === '_blank') {
+						window.open(url, '_blank', 'noopener,noreferrer');
+					} else {
+						window.location.href = url;
+					}
+				} else {
+					console.warn("Link is unavailable for:", lvLink.name);
+				}
+			});
+			return button
+		},
+		loadState() {
+			return JSON.parse(localStorage.getItem(this.mylvTableOptions.persistenceID) || "null");
+		},
+		saveState(table) {
+			// avoid storing state after first restore part happened
+			if(!this.stateRestored) return
+			const rawLayout = table.getColumnLayout();
+			const state = {
+				columns: rawLayout.map(col => ({
+					field: col.field,
+					visible: col.visible,
+					width: col.width,
+				})),
+				sort: table.getSorters().map(s => ({
+					field: s.field,
+					dir: s.dir,
+				})),
+				filters: table.getFilters(),
+				headerFilters: table.getHeaderFilters()
+			};
+
+			localStorage.setItem(this.mylvTableOptions.persistenceID, JSON.stringify(state));
+		},
+		handleTableBuilt() {
+			const table = this.$refs.mylvTable.tabulator
+
+			this.tableBuiltResolve()
+
+			table.on("columnMoved", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnResized", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnVisibilityChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("filterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("headerFilterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("dataSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("sortersChanged", () => {
+				this.saveState(table);
+			});
+
+			const saved = this.loadState();
+
+			table.on("renderComplete", () => {
+				if(!this.stateRestored) {
+
+					if (saved?.columns && !this.colLayoutRestored) {
+						const layout = saved.columns.map(col => ({
+							field: col.field,
+							width: col.width,
+							visible: col.visible,
+							// add more if needed, but keep it simple
+						}));
+
+						table.setColumnLayout(layout);
+
+						this.colLayoutRestored = true;
+					}
+
+					if (saved?.filters && !this.filtersRestored) {
+						this.filtersRestored = true // instantly avoid retriggers
+						table.setFilter(saved.filters);
+					}
+					if (saved?.headerFilters && !this.headerFiltersRestored) {
+						this.headerFiltersRestored = true // instantly avoid retriggers
+						for (let hf of saved.headerFilters) {
+							table.setHeaderFilterValue(hf.field, hf.value);
+						}
+					}
+
+					if (saved?.sort?.length && !this.sortRestored) {
+						this.sortRestored = true;
+
+						setTimeout(() => {
+							const sortList = saved.sort.map(s => {
+								const col = table.columnManager.findColumn(s.field);
+								if (!col) {
+									return null;
+								}
+								return { column: col, dir: s.dir };
+							}).filter(Boolean);
+
+							table.setSort(sortList);
+						}, 100);
+					}
+					this.stateRestored = true
+
+				}
+
+			});
+		},
+		async setupData() {
+			this.$refs.mylvTable.tabulator.setData(this.lvs);
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+			
+			this.setupData()
+			
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			const h = window.visualViewport.height - rect.top - 50
+			if(this.$refs.mylvTable) {
+				this.$refs.mylvTable.$refs.table.style.setProperty('height', h+'px')
+
+				// necessary so the wrapping action row resolves to the full rowHeight required
+				// without the redraw here actions past the initial rowHeight would be clipped off
+				this.$refs.mylvTable.tabulator.redraw(true)
+			}
+
+		}
+	},
+	created() {
+		this.phrasenPromise = this.$p.loadCategory(['global', 'lehre', 'lvinfo'])
+		this.phrasenPromise.then(()=> {this.phrasenResolved = true})	
+	},
+	mounted() {
+		this.setupMounted()	
+	},
+	watch: {
+		lvs: {
+			async handler(newVal) {
+				await this.tableBuiltPromise;
+				if(!this.$refs.mylvTable?.tabulator) return
+				
+				this.$refs.mylvTable.tabulator.setData(newVal);
+
+				const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+				const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+				if(!tableDataSet) return
+				const rect = tableDataSet.getBoundingClientRect();
+
+				const h = window.visualViewport.height - rect.top - 50
+				if(this.$refs.mylvTable) {
+					this.$refs.mylvTable.$refs.table.style.setProperty('height', h+'px')
+				}
+			},
+			deep: true
+		}
+	},
+	template: `
+	<div class="mylv-semester-table" v-if="ready">
+		 <core-filter-cmpt
+			v-if="phrasenResolved"
+			@uuidDefined="handleUuidDefined"
+			:title="''"
+			ref="mylvTable"
+			:tabulator-options="mylvTableOptions"
+			:tabulator-events="mylvTableEventHandlers"
+			@tableBuilt="handleTableBuilt"
+			tableOnly
+			:sideMenu="false"
+		 />
+	</div>
+	<div v-if="tabulatorUuid === null" class="text-center d-flex justify-content-center align-items-center h-100" >
+		<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+	</div>
+	`
+};

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

@@ -70,8 +70,8 @@ export const Raumsuche =  {
 				handler: async () => {
 					this.tableBuiltResolve()
 				}
-			}
-			]};
+			}]
+		};
 	},
 	methods: {
 		tableResolve(resolve) {

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

@@ -2,6 +2,7 @@ import LvUebersicht from "../Mylv/LvUebersicht.js";
 
 
 export default {
+	name: 'Studium',
 	data(){
 		return {
 			studienSemester :[],

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

@@ -63,7 +63,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				min_height: 300,
+				//height: 800,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',
@@ -133,7 +133,6 @@ export default {
 			return this.$api
 				.call(ApiMessages.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
-					this.editor.setContent(response.data.text);
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
 				}).catch(this.$fhcAlert.handleSystemError);
@@ -204,6 +203,24 @@ export default {
 		},
 	},
 	watch: {
+		'formData.body': {
+			handler(newVal) {
+				const tinymcsVal = this.editor.getContent();
+
+				if (newVal && tinymcsVal != newVal) {
+					//Inhalt des Editors aktualisieren
+					this.editor.setContent(newVal);
+				}
+			}
+		},
+		'formData.vorlage_kurzbz': {
+			handler(newVal){
+				if (newVal && newVal != null) {
+					this.formData.subject = newVal;
+					return this.getDataVorlage(newVal);
+				}
+			}
+		},
 		messageId: {
 			immediate: true,
 			handler: async function (newMessageId) {
@@ -214,7 +231,6 @@ export default {
 					this.replyData = result.data;
 
 					if (this.replyData.length > 0) {
-						this.editor.setContent(this.replyData[0].replyBody);
 						this.formData.subject = this.replyData[0].replySubject;
 						this.formData.body = this.replyData[0].replyBody;
 						this.formData.relationmessage_id = newMessageId;
@@ -274,6 +290,19 @@ export default {
 
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+
+		//case of reply
+		if(this.messageId) {
+			this.$api
+				.call(ApiMessages.getReplyData(this.messageId))
+				.then(result => {
+					this.replyData = result.data;
+					this.formData.subject = this.replyData[0].replySubject;
+					this.formData.body = this.replyData[0].replyBody;
+					this.formData.relationmessage_id = this.messageId;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	async mounted() {
 		this.initTinyMCE();
@@ -313,7 +342,7 @@ export default {
 
 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2 align-content-start" ref="formMessage">
+						<form-form class="row g-3 mt-2 h-100" ref="formMessage">
 
 							<div class="row mb-3">
 
@@ -338,7 +367,7 @@ export default {
 							</div>
 
 							<!--Tiny MCE-->
-							<div class="row mb-3 tiny-90">
+							<div class="row mb-3 h-100 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"

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

@@ -62,18 +62,9 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				min_height: 300,
+				//height: 800,
 				//plugins: ['lists'],
-				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
-				plugins: 'link',
-				link_context_toolbar: true,
-				automatic_uploads: true,
-				default_link_target: "_blank",
-				link_title: true,
-				target_list: [
-					{ title: 'New tab', value: '_blank' },
-					{ title: 'Same tab', value: '_self' }
-				],
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
 				style_formats: [
 					{title: 'Blocks', block: 'div'},
 					{title: 'Paragraph', block: 'p'},
@@ -107,8 +98,7 @@ export default {
 			return this.$api
 				.call(ApiMessages.sendMessage(this.typeId, data))
 				.then(response => {
-					if(this.openMode == "inSamePage")
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideTemplate();
 					this.resetForm();
 					this.messageSent = true;
@@ -124,17 +114,19 @@ export default {
 			return this.$api
 				.call(ApiMessages.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
-					this.editor.setContent(response.data.text);
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
 				}).catch(this.$fhcAlert.handleSystemError);
 		},
 		getPreviewText(){
+			console.log("subj" + this.formData.subject);
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
 			data.append('ids', JSON.stringify(this.id));
 
+			console.log("subj" + this.formData.subject);
+
 			return this.$api
 				.call(ApiMessages.getPreviewText(
 					this.typeId, data))
@@ -203,7 +195,6 @@ export default {
 				.call(ApiMessages.getReplyData(messageId))
 				.then(result => {
 					this.replyData = result.data;
-					this.editor.setContent(this.replyData[0].replyBody);
 					this.formData.subject = this.replyData[0].replySubject;
 					this.formData.body = this.replyData[0].replyBody;
 					this.formData.relationmessage_id = messageId;
@@ -211,6 +202,27 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
+	watch: {
+		'formData.body': {
+			handler(newVal) {
+				const tinymcsVal = this.editor.getContent();
+
+				if (newVal && tinymcsVal != newVal) {
+					//Inhalt des Editors aktualisieren
+					this.editor.setContent(newVal);
+				}
+			}
+		},
+		'formData.vorlage_kurzbz': {
+			handler(newVal){
+
+				if (newVal && newVal != null) {
+					this.formData.subject = newVal;
+					return this.getDataVorlage(newVal);
+				}
+			}
+		},
+	},
 	created(){
 		const missingparamsmsgs = [];
 		if(!this.typeId)
@@ -279,8 +291,17 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		//case of reply
-		if(this.messageId) {
+		if(this.messageId != null) {
 			this.loadReplyData(this.messageId);
+/*			this.$api
+				.call(ApiMessages.getReplyData(this.messageId))
+				.then(result => {
+					this.replyData = result.data;
+					this.formData.subject = this.replyData[0].replySubject;
+					this.formData.body = this.replyData[0].replyBody;
+					this.formData.relationmessage_id = this.messageId;
+				})
+				.catch(this.$fhcAlert.handleSystemError);*/
 		}
 
 	},
@@ -478,10 +499,10 @@ export default {
 						
 						<div class="row">
 							<div class="col-6" style="border-right: 1px">
-								You can safely close this window/tab.
+								You can safely close this window.
 							</div>
 							<div class="col-6">
-								Fenster/Reiter kann geschlossen werden!
+								Sie können dieses Fenster schließen.
 							</div>
 						</div>
 				</div>

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

@@ -30,7 +30,6 @@ export default {
 			personId: null,
 			layoutColumnsOnNewData:	false,
 			height: '400',
-			arePhrasesLoaded: false
 		}
 	},
 	methods: {
@@ -66,14 +65,7 @@ export default {
 		buildTreemap(messages) {
 			if (!messages || !messages.data || messages.data.length === 0)
 			{
-				if(this.tabulatorOptions.pagination)
-				{
-					return {data: [], last_page: 0};
-				}
-				else
-				{
-					return [];
-				}
+				return {data: [], last_page: 0};
 			}
 
 			const last_page = messages.meta.count;
@@ -114,15 +106,7 @@ export default {
 				// to avoid endless loop
 				if (iteration > messages.length) break;
 			}
-
-			if(this.tabulatorOptions.pagination)
-			{
-				return {data: messageNested, last_page: last_page};
-			}
-			else
-			{
-				return messageNested;
-			}
+			return {data: messageNested, last_page: last_page};
 		},
 		loadAjaxCall(url, config, params){
 			return this.$api.call(
@@ -196,7 +180,7 @@ export default {
 						],
 						formatter: (cell, formatterParams) => {
 							const key = formatterParams[cell.getValue()];
-							return this.$p?.t?.('messages', key) || key;
+							return this.$p.t('messages', key);
 						},
 					},
 					{
@@ -268,7 +252,7 @@ export default {
 						frozen: true
 					}
 				],
-				pagination: false,
+				pagination: true,
 				paginationMode: "remote",
 				paginationSize: 15,
 				paginationInitialPage: 1,
@@ -306,6 +290,8 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
+						await this.$p.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz']);
+
 						const setHeader = (field, text) => {
 							const col = this.$refs.table.tabulator.getColumn(field);
 							if (!col) return;
@@ -356,12 +342,6 @@ export default {
 				});*/
 	},
 	created(){
-		this.$p
-			.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz'])
-			.then(() => {
-				this.arePhrasesLoaded = true;
-			});
-
 		if(this.typeId != 'person_id' && Array.isArray(this.id) && this.id.length === 1) {
 			const params = {
 				id: this.id,
@@ -386,7 +366,6 @@ export default {
 				<!--table-->
 				<div class="col-sm-6 pt-1">
 					<core-filter-cmpt
-						v-if="arePhrasesLoaded"
 						ref="table"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
@@ -419,7 +398,6 @@ export default {
 				<div class="col-sm-12 pt-6">
 					<core-filter-cmpt
 						ref="table"
-						v-if="arePhrasesLoaded"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
 						table-only

public/js/components/Messages/Messages.js

@@ -82,16 +82,14 @@ export default {
 				this.$refs.modalMsg.show();
 			}
 			else if (this.openMode == "inSamePage"){
+				console.log("in same Page");
 				this.isVisibleDiv = true;
+				if(messageId)
+					this.$refs.templateNewDivMessage.loadReplyData(messageId);
+				else
+					this.$refs.templateNewDivMessage.resetForm();
 
-				this.$nextTick(() => {
-					if(messageId)
-						this.$refs.templateNewDivMessage.loadReplyData(messageId);
-					else
-						this.$refs.templateNewDivMessage.resetForm();
-
-					this.$refs.templateNewDivMessage.showTemplate();
-				});
+				this.$refs.templateNewDivMessage.showTemplate();
 			}
 			else
 				console.log("no valid openMode");

public/js/components/Studierendenantrag/Form/Unterbrechung.js

@@ -90,17 +90,6 @@ export default {
 								msg,
 								severity: this.statusSeverity
 							});
-
-							if (this.data.status === 'Abgelehnt' &&  this.data?.status_grund?.trim())
-							{
-								this.$emit('setInfos', [
-									{
-										title: this.$p.t('studierendenantrag', 'status_grund_abgelehnt'),
-										body: this.data.status_grund,
-										severity: this.statusSeverity
-									}
-								]);
-							}
 						}
 						return result;
 					}

public/js/components/Studierendenantrag/Leitung.js

@@ -18,8 +18,7 @@ export default {
 	},
 	props: {
 		stgL: Array,
-		stgA: Array,
-		abmeldung_enabled: Boolean
+		stgA: Array
 	},
 	data() {
 		return {
@@ -256,7 +255,6 @@ export default {
 		<leitung-actions
 			:stg-a="stgkzA"
 			:stg-l="stgkzL"
-			:abmeldung_enabled="abmeldung_enabled"
 			:selectedData="selectedData"
 			:columns="columns"
 			@reload="reload"

public/js/components/Studierendenantrag/Leitung/Actions.js

@@ -10,8 +10,7 @@ export default {
 		selectedData: Array,
 		columns: Array,
 		stgL: Array,
-		stgA: Array,
-		abmeldung_enabled: Boolean,
+		stgA: Array
 	},
 	emits: [
 		'reload',
@@ -65,7 +64,7 @@ export default {
 	template: `
 	<div class="studierendenantrag-leitung-actions fhc-table-actions d-flex flex-wrap justify-content-between mb-2">
 		<div class="d-flex align-items-center gap-2">
-			<actions-new v-if="abmeldung_enabled" @reload="$emit('reload')"></actions-new>
+			<actions-new @reload="$emit('reload')"></actions-new>
 			<button type="button" class="btn btn-outline-secondary" @click="$emit('reload')" :title="$p.t('table','reload')">
 				<i class="fa-solid fa-rotate-right"></i>
 			</button>

public/js/components/Studierendenantrag/Leitung/Table.js

@@ -55,7 +55,7 @@ export default {
 			return this.$api
 				.call(ApiStudstatusLeitung.getHistory(this.lastHistoryClickedId))
 				.then(res => {
-					this.historyData = res.data;
+					this.historyData = res.data.sort((a, b) => a.insertamum > b.insertamum);
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},

public/js/components/Stv/Studentenverwaltung.js

@@ -57,8 +57,7 @@ export default {
 		url_mode: String,
 		url_prestudent_id: String,
 		url_tab: String,
-		url_studiengang: String,
-		authUid: String
+		url_studiengang: String
 	},
 	provide() {
 		return {
@@ -92,7 +91,6 @@ export default {
 			hasZGVMasterPermission: this.permissions['student/editMakkZgv'],
 			hasZGVDoctorPermission: this.permissions['student/editDokZgv'],
 			hasBismeldenPermission: this.permissions['student/editBismelden'],
-			authUid: this.authUid
 
 		}
 	},

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

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

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

@@ -1,14 +1,6 @@
-import { splitMailsHelper } from "../../../../helpers/EmailHelpers.js";
-import { splitMailLinks } from "../../../../helpers/EmailHelpers.js";
-import FormInput from "../../../Form/Input.js";
-import FormForm from "../../../Form/Form.js";
-
+import { splitMailsHelper } from "../../../../helpers/EmailHelpers.js"
 export default {
 	name: "Kontaktieren",
-	components: {
-		FormInput,
-		FormForm
-	},
 	computed: {
 		internMails() {
 			if (this.modelValue.mail_intern)
@@ -29,150 +21,38 @@ export default {
 	props: {
 		modelValue: Object
 	},
-	inject: {
-		authUid: {
-			from: 'authUid',
-			required: true
-		},
-	},
-	data(){
-		return {
-			mailLinks: [],
-			showMailDialog: false,
-			showDivKomp: false
-		}
-	},
+
 	methods: {
 		internMail(event) {
 			if (this.internMails.length)
 			{
-				splitMailsHelper(this.internMails, event, null, this.$fhcAlert, this.$p, this.authUid)
+				splitMailsHelper(this.internMails, event, null, this.$fhcAlert, this.$p)
 			}
 		},
 		privateMail(event) {
 			if (this.privateMails.length)
 			{
-				splitMailsHelper(this.privateMails, event, null, this.$fhcAlert, this.$p, this.authUid)
+				splitMailsHelper(this.privateMails, event, null, this.$fhcAlert, this.$p)
 			}
-		},
-		createMailLinks(event, mailGroup){
-			let recipients = mailGroup == 'private' ? this.privateMails : this.internMails;
-			this.mailLinks = splitMailLinks(
-				recipients,
-				"",
-				event.ctrlKey || event.metaKey,
-				this.authUid
-			);
-
-			this.showMailDialog = true;
-		},
-		handleMailLink(event){
-			window.open(event.target.href, '_blank', 'noopener');
-		},
-		reset(){
-			this.showMailDialog = false;
-		},
-		onSwitchChange(){
-			if (this.showDivKomp) {
-				console.log("zeigen");
-			}
-			else {
-				console.log("nicht zeigen");
-			}
-
-		},
-		showKompatiblitymode(){
-			this.showDivKomp = !this.showDivKomp;
 		}
 	},
 	template: `
-	<div class="core-kontaktieren>
-		<div id="elementID"></div>
-
-		<div class="d-flex justify-content-end pb-3">
-			<form-input
-				container-class="form-switch mb-0"
-				type="checkbox"
-				:label="$p.t('ui/kompatibilityMode_Sogo')"
-				v-model="showDivKomp"
-				@change="onSwitchChange"
-				>
-			</form-input>
-		</div>
-
-		<div  v-if="!showDivKomp">
-			<div class="row">
-				<div class="col-lg-2">
-					<button class="btn btn-primary mb-2" @click="internMail($event)" :title="$p.t('stv', 'bccEMail')">
-						<i class="fa-solid fa-mail"></i> {{$p.t('stv', 'internEMail')}}
-					</button>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-lg-2">
-					<button class="btn btn-primary mb-2" @click="privateMail($event)" :title="$p.t('stv', 'bccEMail')">
-						<i class="fa-solid fa-mail"></i> {{$p.t('stv', 'privateEMail')}}
-					</button>
-				</div>
+	<div>
+	<div id="elementID"></div>
+		<div class="row">
+			<div class="col-lg-2">
+				<button class="btn btn-primary mb-2" @click="internMail($event)" :title="$p.t('stv', 'bccEMail')">
+					<i class="fa-solid fa-mail"></i> {{$p.t('stv', 'internEMail')}}
+				</button>
 			</div>
 		</div>
-
-		<div v-if="showDivKomp">
-
-			<div v-if="!showMailDialog" class="row">
-				<div class="col-lg-2">
-					<button class="btn btn-secondary mb-2" @click="createMailLinks($event, 'intern')" :title="$p.t('stv', 'bccEMail')">
-						<i class="fa-solid fa-mail"></i> {{$p.t('stv', 'internEMail')}} (SOGO)
-					</button>
-				</div>
+		
+		<div class="row">
+			<div class="col-lg-2">
+				<button class="btn btn-primary mb-2" @click="privateMail($event)" :title="$p.t('stv', 'bccEMail')">
+					<i class="fa-solid fa-mail"></i> {{$p.t('stv', 'privateEMail')}}
+				</button>
 			</div>
-			<div v-if="!showMailDialog" class="row">
-				<div class="col-lg-2">
-					<button class="btn btn-secondary mb-2" @click="createMailLinks($event, 'private')" :title="$p.t('stv', 'bccEMail')">
-						<i class="fa-solid fa-mail"></i> {{$p.t('stv', 'privateEMail')}} (SOGO)
-					</button>
-				</div>
-			</div>
-
-			<div v-if="showMailDialog" class="mt-3">
-					<div v-if="mailLinks.length > 1" class="mt-2">
-						<p>{{$p.t('stv', 'zuvieleEMails')}}</p>
-
-						<div
-							v-for="(link,index) in mailLinks"
-							:key="index"
-							class="mb-2">
-							<a
-								:href="link"
-								@click.prevent="handleMailLink"
-								>
-									Email {{ index + 1 }}
-							</a>
-						</div>
-							<a
-								class="btn btn-outline-secondary m-2"
-								@click.prevent="reset"
-								>
-									<span class="fa-solid fa-rotate-right" :title="this.$p.t('ui','zurueck')" ></span>
-							</a>
-					</div>
-					<div v-else>
-							<a
-								:href="mailLinks[0]"
-								@click.prevent="handleMailLink"
-								class="btn btn-primary m-2"
-								>
-									{{$p.t('ui', 'openInMailClient')}}
-							</a>
-							<a
-								class="btn btn-outline-secondary m-2"
-								@click.prevent="reset"
-								>
-									<span class="fa-solid fa-rotate-right" :title="this.$p.t('ui','zurueck')" ></span>
-							</a>
-					</div>
-			</div>
-
 		</div>
-	`
+	</div>`
 };

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

@@ -83,8 +83,6 @@ export default {
 				});
 		},
 		open() {
-
-			this.getBuchungstypen(this.currentSemester);
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
@@ -107,7 +105,7 @@ export default {
 			const text = typ.standardtext || '';
 			const creditpoints = typ.credit_points || '';
 
-			if (!this.data.betrag || this.data.betrag == '-0.00' || this.data.betrag !== amount)
+			if (!this.data.betrag || this.data.betrag == '-0.00')
 				this.data.betrag = amount;
 
 			if (!this.data.buchungstext)
@@ -115,18 +113,7 @@ export default {
 
 			if (this.config.showCreditpoints && (this.data.credit_points == '0.00' || this.data.credit_points === null))
 				this.data.credit_points = creditpoints;
-		},
-		getBuchungstypen(studiensemester_kurzbz)
-		{
-			this.$api
-				.call(ApiKonto.getBuchungstypen(studiensemester_kurzbz))
-				.then(result => {
-					this.lists.buchungstypen = result.data;
-					if (this.data.buchungstyp_kurzbz)
-						this.checkDefaultBetrag(this.data.buchungstyp_kurzbz);
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
+		}
 	},
 	template: `
 	<core-form ref="form" class="stv-details-konto-edit" @submit.prevent="save">
@@ -179,7 +166,6 @@ export default {
 				<form-input
 					type="select"
 					v-model="data.studiensemester_kurzbz"
-					@change="getBuchungstypen(data.studiensemester_kurzbz)"
 					name="studiensemester_kurzbz"
 					:label="$p.t('lehre/studiensemester')"
 					>

public/js/components/Vertraege/List/Details.js

@@ -41,8 +41,8 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title: "Betrag", field: "betrag", headerFilter: true,
+					{title: "Typ", field: "type"},
+					{title: "Betrag", field: "betrag",
 						formatter: function(cell) {
 							let value = cell.getValue();
 							if (value == null) {
@@ -51,14 +51,14 @@ export default {
 							return parseFloat(value).toFixed(2);
 						}
 					},
-					{title: "Bezeichnung", field: "bezeichnung", headerFilter: true},
-					{title: "Studiensemester", field: "studiensemester_kurzbz", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title: "Pruefung_id", field: "pruefung_id", visible: false, headerFilter: true},
-					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false, headerFilter: true},
-					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false, headerFilter: true},
-					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true, headerFilter: true},
-					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false, headerFilter: true},
-					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true}, //just for testing
+					{title: "Bezeichnung", field: "bezeichnung"},
+					{title: "Studiensemester", field: "studiensemester_kurzbz"},
+					{title: "Pruefung_id", field: "pruefung_id", visible: false},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
+					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 50,
@@ -110,10 +110,10 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '250',
+				height: '200',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
-				persistenceID: 'core-contracts-details-2026050501'
+				persistenceID: 'core-contracts-details-2026021701'
 			},
 			tabulatorEvents: [
 				{
@@ -137,7 +137,7 @@ export default {
 
 						setHeader('type', this.$p.t('global', 'typ'));
 						setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
-						setHeader('lehreinheit_id', this.$p.t('lehre', 'lehreinheit_id'));
+						setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
 						setHeader('betrag', this.$p.t('ui', 'betrag'));
 						setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
 						setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));

public/js/components/Vertraege/List/Status.js

@@ -47,13 +47,12 @@ export default {
 					this.endpoint.getStatiOfContract(this.person_id, this.vertrag_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'core-contracts-status-2026050501',
+				persistenceID: 'core-contracts-status-2026021701',
 				columns: [
-					{title: "Status", field: "bezeichnung", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Status", field: "bezeichnung"},
 					{
 						title: "Datum",
 						field: "datum",
-						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr); // Convert to Date object
@@ -67,15 +66,14 @@ export default {
 							});
 						}
 					},
-					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true},
-					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false, headerFilter: true},
-					{title: "User", field: "mitarbeiter_uid", visible: false, headerFilter: true},
-					{title: "insertvon", field: "insertvon", visible: false, headerFilter: true},
+					{title: "vertrag_id", field: "vertrag_id", visible: false},
+					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false},
+					{title: "User", field: "mitarbeiter_uid", visible: false},
+					{title: "insertvon", field: "insertvon", visible: false},
 					{
 						title: "insertamum",
 						field: "insertamum",
 						visible: false,
-						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -89,12 +87,11 @@ export default {
 							});
 						}
 					},
-					{title: "updatevon", field: "updatevon", visible: false, headerFilter: true},
+					{title: "updatevon", field: "updatevon", visible: false},
 					{
 						title: "updateamum",
 						field: "updateamum",
 						visible: false,
-						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -151,7 +148,7 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '250',
+				height: '200',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 			},

public/js/components/Vertraege/List/Unassigned.js

@@ -30,11 +30,10 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type", width: 100, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Typ", field: "type", width: 100},
 					{
 						title: "Betrag",
 						field: "betrag1",
-						headerFilter: true,
 						formatter: function(cell) {
 							let value = cell.getValue();
 							if (value == null) {
@@ -42,29 +41,28 @@ export default {
 							}
 							return parseFloat(value).toFixed(2);
 						}},
-					{title: "Bezeichnung", field: "bezeichnung", width: 150, headerFilter: true},
-					{title: "Studiensemester", field: "studiensemester_kurzbz",  width: 160, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false, headerFilter: true},
-					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false, headerFilter: true},
-					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true, headerFilter: true},
-					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false, headerFilter: true},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false, headerFilter: true},
-					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true}, //just for testing
+					{title: "Bezeichnung", field: "bezeichnung", width: 150},
+					{title: "Studiensemester", field: "studiensemester_kurzbz",  width: 160},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
+					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
 					{
 						title: "VertragsstundenStudiensemester",
 						field: "vertragsstunden_studiensemester_kurzbz",
-						visible: false,
-						headerFilter: true
+						visible: false
 					},
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: 250,
+				height: 150,
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				selectableRowsRollingSelection: false, //only allow multiselect with STRG
 				index: "lehreinheit_id",
-				persistenceID: 'core-contracts-unassigned-2026050501'
+				persistenceID: 'core-contracts-unassigned-2026021701'
 			},
 			tabulatorEvents: [
 				{
@@ -102,7 +100,7 @@ export default {
 
 							setHeader('type', this.$p.t('global', 'typ'));
 							setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
-							setHeader('lehreinheit_id', this.$p.t('lehre', 'lehreinheit_id'));
+							setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
 							setHeader('betrag1', this.$p.t('ui', 'betrag'));
 							setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
 							setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));

public/js/components/Vertraege/Vertraege.js

@@ -20,6 +20,9 @@ export default {
 		ContractStati
 	},
 	inject: {
+/*		cisRoot: {
+			from: 'cisRoot'
+		},*/
 		hasSchreibrechte: {
 			from: 'hasSchreibrechte',
 			default: false
@@ -51,9 +54,9 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Bezeichnung", field: "bezeichnung", width: 300, headerFilter: true},
+					{title: "Bezeichnung", field: "bezeichnung", width: 300},
 					{
-						title: "Betrag", field: "betrag", width: 100, headerFilter: true,
+						title: "Betrag", field: "betrag", width: 100,
 						formatter: function (cell) {
 							let value = cell.getValue();
 
@@ -63,13 +66,12 @@ export default {
 							return parseFloat(value).toFixed(2);
 						}
 					},
-					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title: "Status", field: "status", width: 100, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125},
+					{title: "Status", field: "status", width: 100},
 					{
 						title: "Vertragsdatum",
 						field: "vertragsdatum",
 						width: 128,
-						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -80,11 +82,11 @@ export default {
 							});
 						}
 					},
-					{title: "VertragId", field: "vertrag_id", visible: false, headerFilter: true},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false, headerFilter: true},
-					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false, headerFilter: true},
-					{title: "Anmerkung", field: "anmerkung", visible: false, headerFilter: true},
-					{title: "isAbgerechnet", field: "isabgerechnet", visible: false, headerFilter: true},
+					{title: "VertragId", field: "vertrag_id", visible: false},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
+					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false},
+					{title: "Anmerkung", field: "anmerkung", visible: false},
+					{title: "isAbgerechnet", field: "isabgerechnet", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150,
@@ -138,13 +140,11 @@ export default {
 					columns: true,
 					filter: false //to avoids js errors
 				},
-				persistenceID: 'core-contracts-2026050501',
+				persistenceID: 'core-contracts-2026021701',
 			};
 			return options;
 		},
 		tabulatorEvents() {
-			const vm = this;
-
 			const events = [
 				{
 					event: 'tableBuilt',
@@ -177,11 +177,28 @@ export default {
 						setHeader('actions', this.$p.t('global', 'aktionen'));
 					}
 				},
+/*				{
+					//is just enabled for ADDON Injection KU: MultiprintHonorarvertrag
+					//(maybe enable also for ADDON FH Burgenland: MultiAccept later)
+					event: 'rowClick',
+					handler: (e, row) => {
+						if (this.dataPrintHonorar != null && this.dataPrintHonorar.multiselect != null) {
+							const selectedContract = row.getData().vertrag_id;
+							const status = row.getData().status;
+							const bezeichnung =	row.getData().bezeichnung;
+
+							this.toggleRowClick(selectedContract, status, bezeichnung);
+						}
+					}
+				},*/
 				{
 					event: 'rowClick',
-					handler: function (e, row) {
+					handler: (e, row) => {
+						if (!this.dataPrintHonorar?.multiselect) return;
+
 						const { vertrag_id, status, bezeichnung, vertragstyp_bezeichnung } = row.getData();
-						vm.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
+
+						this.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
 					}
 				},
 				{
@@ -225,6 +242,8 @@ export default {
 		person_id() {
 			this.$refs.table.reloadTable();
 			this.arraySelectedContracts = [];
+/*			if(this.dataPrintHonorar?.multiselect)
+				this.dataPrintHonorar.multiselect = [];*/
 		},
 	},
 	methods: {
@@ -251,6 +270,7 @@ export default {
 				)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					//window.scrollTo(0, 0);
 					this.reload();
 					this.contractSelected.vertrag_id = null;
 				})
@@ -498,9 +518,19 @@ export default {
 					'content/pdfExport.php?xml=' + this.dataPrintHonorar.xml + '&xsl=' + this.dataPrintHonorar.xsl + '&mitarbeiter_uid=' + this.mitarbeiter_uid + vertragString + '&output=pdf&uid=' + this.mitarbeiter_uid;
 			window.open(linkToPdf, '_blank');
 		},
+/*		toggleRowClick(contractId, status, bezeichnung) {
+			const index = this.arraySelectedContracts.findIndex(
+				([id]) => id === contractId
+			);
+			if (index !== -1) {
+				this.arraySelectedContracts.splice(index, 1);
+			} else {
+				this.arraySelectedContracts.push([contractId, status, bezeichnung]);
+			}
+		},*/
 		toggleRowClick(event, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung) {
+			if (!this.dataPrintHonorar?.multiselect) return;
 
-			const isMulti = this.dataPrintHonorar?.multiselect === true;
 			const isCtrl = event.ctrlKey || event.metaKey;
 
 			const entry = {
@@ -510,29 +540,28 @@ export default {
 				vertragstyp_bezeichnung
 			};
 
-			// allow MultiSelect just in case event multiActionPrintHonorarvertrag
-			const allowMultiClick = isMulti && isCtrl;
-
-			if (!allowMultiClick) {
+			// Single click
+			if (!isCtrl) {
 				this.arraySelectedContracts = [entry];
-
-				//just mark last selected row as selected
-				this.$refs.table.tabulator.deselectRow();
-				this.$refs.table.tabulator.selectRow(vertrag_id);
 				return;
 			}
 
+			// CTRL / CMD → toggle
 			const index = this.arraySelectedContracts.findIndex(
 				e => e.vertrag_id === vertrag_id
 			);
 
 			if (index === -1) {
 				this.arraySelectedContracts.push(entry);
+				//this.arraySelectedContracts.push([entry.vertrag_id, entry.status, entry.bezeichnung, entry.vertragstyp_bezeichnung]);
 			} else {
 				this.arraySelectedContracts.splice(index, 1);
 			}
-
-		}
+		},
+/*		clearSelection(){
+			this.arraySelectedContracts = [];
+			this.$refs.table.tabulator.deselectRow();
+		}*/
 	},
 	created() {
 		Promise.all([
@@ -558,6 +587,88 @@ export default {
 		});
 		this.getFormattedDate();
 	},
+	/*
+	TODO(Manu) delete after check
+
+		<div class="row mb-3">
+			<form-input
+				type="DatePicker"
+				:label="$p.t('vertrag/datum_vertrag')"
+				name="vertragsdatum"
+				v-model="formData.vertragsdatum"
+				auto-apply
+				:enable-time-picker="false"
+				format="dd.MM.yyyy"
+				preview-format="dd.MM.yyyy"
+				:teleport="true"
+				>
+			</form-input>
+		</div>
+
+		<div class="row mb-3">
+			<form-input
+				type="text"
+				:label="$p.t('ui/bezeichnung')"
+				name="bezeichnung"
+				v-model="formData.bezeichnung"
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				type="select"
+				:label="$p.t('global/typ')"
+				v-model="formData.vertragstyp_kurzbz"
+				name="vertragstyp_kurzbz"
+				>
+				<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+				<option
+					v-for="entry in listContractTypes"
+					:key="entry.vertragstyp_kurzbz"
+					:value="entry.vertragstyp_kurzbz"
+					>
+					{{entry.bezeichnung}}
+				</option>
+			</form-input>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				:label="$p.t('ui/betrag')"
+				name="betrag"
+				v-model="formData.betrag"
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3" v-if="!statusNew">
+			<form-input
+				type="text"
+				:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+				name="vertragsstunden"
+				v-model="formData.vertragsstunden"
+				disabled
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3" v-if="!statusNew">
+			<form-input
+				type="text"
+				:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+				name="vertragsstunden_studiensemester_kurzbz"
+				v-model="formData.vertragsstunden_studiensemester_kurzbz"
+				disabled
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				type="textarea"
+				:label="$p.t('global/anmerkung')"
+				name="anmerkung"
+				v-model="formData.anmerkung"
+				>
+			</form-input>
+		</div>
+	 */
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">
 

public/js/helpers/EmailHelpers.js

@@ -1,7 +1,4 @@
-
-
-
-export async function splitMailsHelper(mails, event, subject, alertPluginRef, phrasenPluginRef, uidCC= "") {
+export async function splitMailsHelper(mails, event, subject, alertPluginRef, phrasenPluginRef) {
 	let splititem = ",";
 	let maillist = mails.join(splititem);
 	let mailto = "";
@@ -29,9 +26,7 @@ export async function splitMailsHelper(mails, event, subject, alertPluginRef, ph
 			maillist = "";
 		}
 
-		let mailadressUid = uidCC + '@technikum-wien.at';
-
-		let mailLink = useBcc ? `mailto:${mailadressUid}?cc=${mailadressUid}&bcc=${mailto}` : `mailto:${mailto}`;
+		let mailLink = useBcc ? `mailto:?bcc=${mailto}` : `mailto:${mailto}`;
 		if(subject && typeof subject === 'string') mailLink += `?subject=${subject}`
 		if (firstrun)
 		{
@@ -45,80 +40,6 @@ export async function splitMailsHelper(mails, event, subject, alertPluginRef, ph
 				window.location.href = mailLink;
 			}
 		}
+
 	}
-}
-
-
-/**
- * just splits the list of mails
- *
- * @param mails emailadresses
- * @param subject subject
- * @param useBcc useBcc
- * @returns array of links for splitted mails
- */
-export function splitMailLinks(mails, subject = "", useBcc = false, uidCC= "", maxLength = 2024) {
-	if (!Array.isArray(mails) || mails.length === 0) {
-		return [];
-	}
-
-	const separator = ",";
-	const encodedSubject = subject ? encodeURIComponent(subject) : "";
-
-	// reserve space for the subject parameter
-	const subjectLength = encodedSubject
-		? `?subject=${encodedSubject}`.length
-		: 0;
-
-	const limit = maxLength - subjectLength;
-
-	const links = [];
-	let currentRecipients = [];
-
-	for (const mail of mails) {
-		if (!mail) continue;
-
-		const testRecipients = [...currentRecipients, mail];
-		const recipientString = testRecipients.join(separator);
-
-		if (recipientString.length > limit && currentRecipients.length > 0) {
-
-			links.push(createMailto(
-				currentRecipients.join(separator),
-				encodedSubject,
-				useBcc,
-				uidCC
-			));
-
-			currentRecipients = [mail];
-		}
-		else {
-			currentRecipients.push(mail);
-		}
-	}
-
-	if (currentRecipients.length > 0) {
-		links.push(createMailto(
-			currentRecipients.join(separator),
-			encodedSubject,
-			useBcc,
-			uidCC
-		));
-	}
-
-	return links;
-}
-
-function createMailto(recipients, encodedSubject, useBcc, uidCC) {
-	let mailadressUid = uidCC + '@technikum-wien.at';
-
-	let link = useBcc
-		? `mailto:${encodeURIComponent(mailadressUid)}?cc=${encodeURIComponent(mailadressUid)}&bcc=${encodeURIComponent(recipients)}`
-		: `mailto:${encodeURIComponent(recipients)}`;
-
-	if (encodedSubject) {
-		link += `${useBcc ? "&" : "?"}subject=${encodedSubject}`;
-	}
-
-	return link;
-}
+}

rdf/diplomasupplement.xml.php

@@ -705,72 +705,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		}
 		echo ' </anrechnungen>';
 
-		//Berufliche Kompetenzen
-		$studienplan = new studienplan();
-		$studienplan->loadStudienplan($studienplan_id);
-		$regelstudiendauer = $studienplan->regelstudiendauer;
-		$studienplan_ects = $studienplan->ects_stpl;
-		$ects_berufliche_kompetenzen = 0;
-
-		//bei masterlehrgängen und $studienplan_ects >= 120 ECTS: Andruck der beruflichen Kompetenzen, wenn die Lv angerechnet wurde
-		//TODO(Manu) check if rule still valid
-		if ($row->typ == 'l' && $regelstudiendauer >= 4)
-		{
-			$ects_berufliche_kompetenzen = 0;
-			echo '<berufliche_kompetenzen>';
-			echo '<header_berufliche_kompetenz>Validierung von beruflich erworbenen Kompetenzen</header_berufliche_kompetenz>';
-
-			$qry_sem_0="
-				SELECT
-					lehrveranstaltung_id,
-					lehrform_kurzbz,
-					sws,
-					lehre.tbl_lehrveranstaltung.bezeichnung,
-					bezeichnung_english,
-					ects,
-					benotungsdatum,
-					note,
-					positiv,
-					offiziell,
-					note.anmerkung
-				FROM
-					lehre.tbl_zeugnisnote zeugnis
-					JOIN lehre.tbl_note note USING(note)
-					JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-					JOIN public.tbl_student student USING(student_uid)
-				WHERE
-				    student_uid =".$db->db_add_param($uid_arr[$i])."
-				AND
-					lehre.tbl_lehrveranstaltung.semester = '0'
-					";
-
-			if($result_sem_0 = $db->db_query($qry_sem_0))
-			{
-				while ($row_sem_0 = $db->db_fetch_object($result_sem_0))
-				{
-					$benotungsdatum = $datum->formatDatum($row_sem_0->benotungsdatum, 'd/m/Y');
-					$note = $db->db_parse_bool($row_sem_0->offiziell) ?  $row_sem_0->anmerkung : $row_sem_0->note;
-					$ects_berufliche_kompetenzen += $row_sem_0->ects;
-
-					echo '<lv_sem0>
-						<lv_id>' . $row_sem_0->lehrveranstaltung_id . '</lv_id>
-						<lehrform_kurzbz>' . $row_sem_0->lehrform_kurzbz . '</lehrform_kurzbz>
-						<bezeichnung><![CDATA[' . $row_sem_0->bezeichnung . ']]></bezeichnung>
-						<bezeichnung_englisch><![CDATA[' . $row_sem_0->bezeichnung_english . ']]></bezeichnung_englisch>
-						<sws_lv>'.$row_sem_0->sws.'</sws_lv>
-						<ects>'.$row_sem_0->ects.'</ects>
-						<note_positiv>'.$db->db_parse_bool($row_sem_0->positiv).'</note_positiv>
-						<note>'.$note.'</note>
-						<benotungsdatum>'.$benotungsdatum.'</benotungsdatum>
-						</lv_sem0>';
-				}
-			}
-			echo '<ects_berufliche_kompetenz>'.$ects_berufliche_kompetenzen.'</ects_berufliche_kompetenz>';
-			echo '</berufliche_kompetenzen>';
-		}
-
 		echo "<studiensemester>";
-
 		for($start = $semesterNumberStart; $start <= $semesterNumberEnd; $start++)
 		{
 			$semester_ects = 0;
@@ -793,7 +728,6 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 				AND zeugnis = true
 				AND status.ausbildungssemester = ".$db->db_add_param($start)."
 				AND status.status_kurzbz NOT IN('Unterbrecher', 'Interessent','Bewerber','Aufgenommener','Abgewiesener','Wartender')
-				--AND	lehre.tbl_lehrveranstaltung.semester != '0'
 			ORDER BY datum ASC";
 
 			$semester_kurzbz = array();
@@ -842,7 +776,6 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			WHERE
 				student_uid = ".$db->db_add_param($uid_arr[$i])."
 				AND zeugnis = true
-				AND	lehre.tbl_lehrveranstaltung.semester != '0'
 				AND studiensemester_kurzbz in (".$sqlStudent->implode4SQL($aktuellesSemester).")";
 
 			if (defined('ZEUGNISNOTE_NICHT_ANZEIGEN'))
@@ -1201,19 +1134,10 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 					}
 				}
 			}
-
 			echo '<ects_gesamt>'.$semester_ects.'</ects_gesamt>';
 			echo '<ects_gesamt_positiv>'.$semester_ects_positiv.'</ects_gesamt_positiv>';
 			echo "</semesters>";
 		}
-
-		//TODO(Manu) check if rule still valid
-		if ($row->typ == 'l' && $regelstudiendauer >= 4)
-		{
-			$ects_total += $ects_berufliche_kompetenzen;
-			$ects_total_positiv += $ects_berufliche_kompetenzen;
-		}
-
 		echo "</studiensemester>";
 		echo " <ects_total>$ects_total</ects_total>";
 		echo " <ects_total_positiv>$ects_total_positiv</ects_total_positiv>";

skin/styles/tw.css

@@ -450,18 +450,18 @@ td.MarkLine
 td.HeaderTesttool /*fuer die Button-Optik beim Testtool*/
 {
 	color: #FFFFFF;
-	background-color: #71787D;
+	background-color: #00639C;
 	white-space:nowrap;
 	line-height: 25px;
 	box-shadow: inset 0 0 2px #FFFFFF;
-	padding: 0 10px;
+	padding: 10px;
 	width: 170px;
 }
 td.HeaderTesttoolSTG /*fuer die Button-Optik der Quereinstiegs-Studiengänge beim Testtool*/
 {
 	color: white;
 	border: 2px solid #73a9d6;
-	padding: 0 10px;
+	padding: 10px;
 	max-width: 100px;
 	overflow: hidden;
 	text-overflow: ellipsis;

system/dbupdate_3.4.php

@@ -93,8 +93,6 @@ require_once('dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php')
 require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
 require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 require_once('dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php');
-require_once('dbupdate_3.4/70376_lohnguide.php');
-require_once('dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -242,11 +240,6 @@ $tabellen=array(
 	"hr.tbl_valorisierung_instanz" => array("updateamum", "oe_kurzbz", "valorisierungsdatum", "valorisierung_kurzbz", "beschreibung", "ausgewaehlt", "updatevon", "valorisierung_instanz_id"),
 	"hr.tbl_valorisierung_instanz_methode" => array("valorisierung_instanz_id", "valorisierung_methode_kurzbz", "beschreibung", "valorisierung_methode_parameter"),
 	"hr.tbl_valorisierung_methode" => array("beschreibung", "valorisierung_methode_kurzbz"),
-	"hr.tbl_lohnguide_jobfamilie" => array("jobfamilie_kurzbz", "bezeichnung", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_lohnguide_modellfunktion" => array("modellfunktion_kurzbz", "bezeichnung", "jobfamilie_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_lohnguide_modellstelle" => array("modellstelle_kurzbz", "bezeichnung", "grade", "modellfunktion_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_lohnguide_fachrichtung" => array("fachrichtung_kurzbz", "bezeichnung", "aktiv", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),	
 	"lehre.tbl_abschlussbeurteilung"  => array("abschlussbeurteilung_kurzbz","bezeichnung","bezeichnung_english","sort"),
 	"lehre.tbl_abschlusspruefung"  => array("abschlusspruefung_id","student_uid","vorsitz","pruefer1","pruefer2","pruefer3","abschlussbeurteilung_kurzbz","akadgrad_id","pruefungstyp_kurzbz","datum","uhrzeit","sponsion","anmerkung","updateamum","updatevon","insertamum","insertvon","ext_id","note","protokoll","endezeit","pruefungsantritt_kurzbz","freigabedatum"),
 	"lehre.tbl_abschlusspruefung_antritt"  => array("pruefungsantritt_kurzbz","bezeichnung","bezeichnung_english","sort"),

system/dbupdate_3.4/62063_lv_evaluierung.php

@@ -1,19 +1,6 @@
 <?php
 if (! defined('DB_NAME')) exit('No direct script access allowed');
 
-if ($result = @$db->db_query("SELECT 1 FROM system.tbl_app WHERE app='lvevaluierung' LIMIT 1"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "INSERT INTO system.tbl_app (app) VALUES ('lvevaluierung');";
-
-		if(!$db->db_query($qry))
-			echo '<strong>system.tbl_app: '.$db->db_last_error().'</strong><br>';
-		else
-			echo ' system.tbl_app: lvevaluierung hinzugefügt<br>';
-	}
-}
-
 //Add column evaluierung to lehre.tbl_lehrveranstaltung
 if(!@$db->db_query("SELECT evaluierung FROM lehre.tbl_lehrveranstaltung LIMIT 1"))
 {
@@ -25,4 +12,4 @@ if(!@$db->db_query("SELECT evaluierung FROM lehre.tbl_lehrveranstaltung LIMIT 1"
 		echo '<strong>lehre.tbl_lehrveranstaltung '.$db->db_last_error().'</strong><br>';
 	else
 		echo '<br>Spalte evaluierung zu Tabelle lehre.tbl_lehrveranstaltung hinzugefügt';
-}
+}

system/dbupdate_3.4/70376_lohnguide.php

@@ -1,357 +0,0 @@
-<?php
-if (! defined('DB_NAME')) exit('No direct script access allowed');
-
-if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_lohnguide_jobfamilie' AND table_schema='hr'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_jobfamilie (
-    jobfamilie_kurzbz character varying(32) NOT NULL,
-    bezeichnung varchar(64) NOT NULL,
-    aktiv boolean DEFAULT FALSE,
-    sort smallint,
-    insertvon character varying(32) NOT NULL,
-    insertamum timestamp without time zone DEFAULT now() NOT NULL,
-    updatevon character varying(32),
-    updateamum timestamp without time zone,
-    CONSTRAINT tbl_lohnguide_jobfamilie_pkey PRIMARY KEY (jobfamilie_kurzbz)
-);
-
-GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_jobfamilie TO vilesci;
-
-INSERT INTO hr.tbl_lohnguide_jobfamilie(jobfamilie_kurzbz, bezeichnung,aktiv, sort, insertvon, insertamum) VALUES
-('FÜHRUNG','Führung',true,1,'system',NOW()),
-('AKADEMIA','Akademia',true,2,'system',NOW()),
-('VERWALTUNG','Verwaltung',true,3,'system',NOW()),
-('TECHNIK','Technik',true,4,'system',NOW()),
-('IT_SOFTWARE','IT & Software',true,5,'system',NOW()),
-('TECHN_DIENSTE','Technische Dienste',true,6,'system',NOW())
-ON CONFLICT (jobfamilie_kurzbz) DO NOTHING;
-		";
-
-		if (! $db->db_query($qry))
-			echo '<strong>Lohnguide Jobfamilie: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'hr.tbl_lohnguide_jobfamilie wurde neu erstellt<br>';
-	}
-}
-
-if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_lohnguide_modellfunktion' AND table_schema='hr'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellfunktion (
-    modellfunktion_kurzbz character varying(32) NOT NULL,
-    bezeichnung varchar(64) NOT NULL,
-    jobfamilie_kurzbz character varying(32) NOT NULL,
-    aktiv boolean DEFAULT FALSE,
-    sort smallint,
-    insertvon character varying(32) NOT NULL,
-    insertamum timestamp without time zone DEFAULT now() NOT NULL,
-    updatevon character varying(32),
-    updateamum timestamp without time zone,
-    CONSTRAINT tbl_lohnguide_modellfunktion_pkey PRIMARY KEY (modellfunktion_kurzbz),
-	CONSTRAINT tbl_lohnguide_modellfunktion_jobfamilie_fk FOREIGN KEY (jobfamilie_kurzbz) REFERENCES hr.tbl_lohnguide_jobfamilie (jobfamilie_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE
-);
-
-GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_modellfunktion TO vilesci;
-
-INSERT INTO hr.tbl_lohnguide_modellfunktion(modellfunktion_kurzbz, bezeichnung, jobfamilie_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
-('ABTEILUNGSLEITUNG','Abteilungsleitung','FÜHRUNG',true,1,'system',NOW()),
-('GF','Geschäftsführung','FÜHRUNG',true,2,'system',NOW()),
-('KOMPETENZFELDLEITER','Kompetenzfeldleiter*in','FÜHRUNG',true,3,'system',NOW()),
-('DEPARTMENTSLEITER','Departmentsleiter*in','FÜHRUNG',true,4,'system',NOW()),
-('FAKULTÄTSLEITER','Fakultätsleiter*in','FÜHRUNG',true,5,'system',NOW()),
-/* Akademia */
-('STUDENTISCHE_MA','Studentische MA','AKADEMIA',true,6,'system',NOW()),
-('JUNIOR_LEC_RES','Junior Lecturer/Researcher','AKADEMIA',true,7,'system',NOW()),
-('LEC_RES','Lecturer/Researcher','AKADEMIA',true,8,'system',NOW()),
-('SEN_LEC_RES','Senior Lecturer/Researcher','AKADEMIA',true,9,'system',NOW()),
-('STUDIENGANGSLEITUNG','Studiengangsleitung','AKADEMIA',true,10,'system',NOW()),
-/* Verwaltung */
-('FK_VERWALTUNG','Fachkraft Verwaltung','VERWALTUNG',true,11,'system',NOW()),
-('SFK_VERWALTUNG','Spezial-Fachkraft Verwaltung','VERWALTUNG',true,12,'system',NOW()),
-('SP_VERWALTUNG','Spezialist:in Verwaltung','VERWALTUNG',true,13,'system',NOW()),
-('EXP_VERWALTUNG','Expert:in Verwaltung','VERWALTUNG',true,14,'system',NOW()),
-/* Technik */
-('FK_TECHNIK','Fachkraft Technik','TECHNIK',true,15,'system',NOW()),
-/* IT & Software */
-('FK_IT','Fachkraft IT & Software','IT_SOFTWARE',true,16,'system',NOW()),
-('SFK_IT','Spezial-Fachkraft IT & Software','IT_SOFTWARE',true,17,'system',NOW()),
-('SP_IT','Spezialist:in IT & Software','IT_SOFTWARE',true,18,'system',NOW()),
-('EXP_IT','Expert:in IT & Software','IT_SOFTWARE',true,19,'system',NOW()),
-/* Technische Dienste */
-('HK_TECHN_DIENSTE','Hilfskraft Technische Dienste','TECHN_DIENSTE',true,20,'system',NOW()),
-('FK_TECHN_DIENSTE','Fachkraft Technische Dienste','TECHN_DIENSTE',true,21,'system',NOW()),
-('SFK_TECHN_DIENSTE','Spezial-Fachkraft Technische Dienste','TECHN_DIENSTE',true,22,'system',NOW())
-ON CONFLICT (modellfunktion_kurzbz) DO NOTHING;
-
-
-		";
-
-		if (! $db->db_query($qry))
-			echo '<strong>Lohnguide Modellfunktion: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'hr.tbl_lohnguide_modellfunktion wurde neu erstellt<br>';
-	}
-}
-
-if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_lohnguide_modellstelle' AND table_schema='hr'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellstelle (
-    modellstelle_kurzbz character varying(32) NOT NULL,
-    bezeichnung varchar(128) NOT NULL,
-	code character varying(32) NOT NULL,
-    grade int NOT NULL,
-    modellfunktion_kurzbz character varying(32) NOT NULL,
-    aktiv boolean DEFAULT FALSE,
-    sort smallint,
-    insertvon character varying(32) NOT NULL,
-    insertamum timestamp without time zone DEFAULT now() NOT NULL,
-    updatevon character varying(32),
-    updateamum timestamp without time zone,
-    CONSTRAINT tbl_lohnguide_modellstelle_pkey PRIMARY KEY (modellstelle_kurzbz),
-	CONSTRAINT tbl_lohnguide_modellstelle_modellfunktion_fk FOREIGN KEY (modellfunktion_kurzbz) REFERENCES hr.tbl_lohnguide_modellfunktion (modellfunktion_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE
-);
-
-GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_modellstelle TO vilesci;
-
-
--- FÜHRUNG
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz,bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
-('ABTL_1_4', 'Abteilungsleitung 1/4',  '111',  16, 'ABTEILUNGSLEITUNG', true,  1, 'system', NOW()),
-('ABTL_2A_4', 'Abteilungsleitung 2a/4', '112a', 17, 'ABTEILUNGSLEITUNG', true,  2, 'system', NOW()),
-('ABTL_2B_4', 'Abteilungsleitung 2b/4', '112b', 17, 'ABTEILUNGSLEITUNG', true,  3, 'system', NOW()),
-('ABTL_3A_4', 'Abteilungsleitung 3a/4', '113a', 18, 'ABTEILUNGSLEITUNG', true,  4, 'system', NOW()),
-('ABTL_3B_4', 'Abteilungsleitung 3b/4', '113b', 18, 'ABTEILUNGSLEITUNG', true,  5, 'system', NOW()),
-('ABTL_4_4', 'Abteilungsleitung 4/4',  '114',  19, 'ABTEILUNGSLEITUNG', true,  6, 'system', NOW()),
-('GF_1_2', 'Geschäftsführung 1/2',   '121',  22, 'GF',                true,  7, 'system', NOW()),
-('GF_2_2', 'Geschäftsführung 2/2',   '122',  23, 'GF',                true,  8, 'system', NOW()),
-('KOMFL_1_1', 'Kompetenzfeldleiter*in 1/1', '131', 15, 'KOMPETENZFELDLEITER', true,  9, 'system', NOW()),
-('DEPL_1_1', 'Departmentleiter*in 1/1',    '141', 18, 'DEPARTMENTSLEITER',   true, 10, 'system', NOW()),
-('FAKL_1_1', 'Fakultätsleiter*in 1/1',     '151', 20, 'FAKULTÄTSLEITER',     true, 11, 'system', NOW())
-ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-
--- AKADEMIA
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
-('STUDENTISCHE_MA_1_1', 'Studentische MA 1/1',            '211',  5,  'STUDENTISCHE_MA',  true, 12, 'system', NOW()),
-('JUNIOR_LEC_RES_1_2', 'Junior Lecturer/Researcher 1/2', '221',  8,  'JUNIOR_LEC_RES',   true, 13, 'system', NOW()),
-('JUNIOR_LEC_RES_2_2', 'Junior Lecturer/Researcher 2/2', '222',  9,  'JUNIOR_LEC_RES',   true, 14, 'system', NOW()),
-('LEC_RES_1_2', 'Lecturer/Researcher 1/2',        '231',  11, 'LEC_RES',          true, 15, 'system', NOW()),
-('LEC_RES_2_2', 'Lecturer/Researcher 2/2',        '232',  12, 'LEC_RES',          true, 16, 'system', NOW()),
-('SEN_LEC_RES_1_2', 'Senior Lecturer/Researcher 1/2', '241',  13, 'SEN_LEC_RES',      true, 17, 'system', NOW()),
-('SEN_LEC_RES_2_2', 'Senior Lecturer/Researcher 2/2', '242',  14, 'SEN_LEC_RES',      true, 18, 'system', NOW()),
-('STGL_1_2', 'Studiengangsleitung 1/2',        '251',  15, 'STUDIENGANGSLEITUNG', true, 19, 'system', NOW()),
-('STGL_2_2', 'Studiengangsleitung 2/2',        '252',  16, 'STUDIENGANGSLEITUNG', true, 20, 'system', NOW())
-ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-
--- VERWALTUNG
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
-('FK_VERWALTUNG_1_3', 'Fachkraft Verwaltung 1/3',            '311',  4,  'FK_VERWALTUNG',  true, 21, 'system', NOW()),
-('FK_VERWALTUNG_2A_3', 'Fachkraft Verwaltung 2a/3',           '312a', 5,  'FK_VERWALTUNG',  true, 22, 'system', NOW()),
-('FK_VERWALTUNG_2B_3', 'Fachkraft Verwaltung 2b/3',           '312b', 5,  'FK_VERWALTUNG',  true, 23, 'system', NOW()),
-('FK_VERWALTUNG_3_3', 'Fachkraft Verwaltung 3/3',            '313',  6,  'FK_VERWALTUNG',  true, 24, 'system', NOW()),
-('SFK_VERWALTUNG_1_4', 'Spezial-Fachkraft Verwaltung 1/4',   '321',  7,  'SFK_VERWALTUNG', true, 25, 'system', NOW()),
-('SFK_VERWALTUNG_2A_4', 'Spezial-Fachkraft Verwaltung 2a/4',  '322a', 8,  'SFK_VERWALTUNG', true, 26, 'system', NOW()),
-('SFK_VERWALTUNG_2B_4', 'Spezial-Fachkraft Verwaltung 2b/4',  '322b', 8,  'SFK_VERWALTUNG', true, 27, 'system', NOW()),
-('SFK_VERWALTUNG_3A_4', 'Spezial-Fachkraft Verwaltung 3a/4',  '323a', 9,  'SFK_VERWALTUNG', true, 28, 'system', NOW()),
-('SFK_VERWALTUNG_3B_4', 'Spezial-Fachkraft Verwaltung 3b/4',  '323b', 9,  'SFK_VERWALTUNG', true, 29, 'system', NOW()),
-('SFK_VERWALTUNG_4_4', 'Spezial-Fachkraft Verwaltung 4/4',   '324',  10, 'SFK_VERWALTUNG', true, 30, 'system', NOW()),
-('SP_VERWATLTUNG_1_4', 'Spezialist:in Verwaltung 1/4',       '331',  11, 'SP_VERWALTUNG',  true, 31, 'system', NOW()),
-('SP_VERWATLTUNG_2A_4', 'Spezialist:in Verwaltung 2a/4',      '332a', 12, 'SP_VERWALTUNG',  true, 32, 'system', NOW()),
-('SP_VERWATLTUNG_2B_4', 'Spezialist:in Verwaltung 2b/4',      '332b', 12, 'SP_VERWALTUNG',  true, 33, 'system', NOW()),
-('SP_VERWATLTUNG_3A_4', 'Spezialist:in Verwaltung 3a/4',      '333a', 13, 'SP_VERWALTUNG',  true, 34, 'system', NOW()),
-('SP_VERWATLTUNG_3B_4', 'Spezialist:in Verwaltung 3b/4',      '333b', 13, 'SP_VERWALTUNG',  true, 35, 'system', NOW()),
-('SP_VERWATLTUNG_4_4', 'Spezialist:in Verwaltung 4/4',       '334',  14, 'SP_VERWALTUNG',  true, 36, 'system', NOW()),
-('EXP_VERWALTUNG_1_1', 'Expert:in Verwaltung 1/1',           '341',  15, 'EXP_VERWALTUNG', true, 37, 'system', NOW())
-ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-
--- TECHNIK
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
-('FK_TECHNIK_1_3', 'Fachkraft Technik 1/3',  '311',  4, 'FK_TECHNIK', true, 38, 'system', NOW()),
-('FK_TECHNIK_2a_3', 'Fachkraft Technik 2a/3', '312a', 5, 'FK_TECHNIK', true, 39, 'system', NOW()),
-('FK_TECHNIK_2b_3','Fachkraft Technik 2b/3', '312b', 5, 'FK_TECHNIK', true, 40, 'system', NOW()),
-('FK_TECHNIK_3_3', 'Fachkraft Technik 3/3',  '313',  6, 'FK_TECHNIK', true, 41, 'system', NOW())
-ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-
--- IT & Software
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
-('FK_IT_1_2', 'Fachkraft IT & Software 1/2',          '411',  5,  'FK_IT',  true, 42, 'system', NOW()),
-('FK_IT_2_2', 'Fachkraft IT & Software 2/2',          '412',  6,  'FK_IT',  true, 43, 'system', NOW()),
-('SFK_IT_1_4', 'Spezial-Fachkraft IT & Software 1/4',  '421',  7,  'SFK_IT', true, 44, 'system', NOW()),
-('SFK_IT_2_4', 'Spezial-Fachkraft IT & Software 2/4',  '422',  8,  'SFK_IT', true, 45, 'system', NOW()),
-('SFK_IT_3_4', 'Spezial-Fachkraft IT & Software 3/4',  '423',  9,  'SFK_IT', true, 46, 'system', NOW()),
-('SFK_IT_4_4', 'Spezial-Fachkraft IT & Software 4/4',  '424',  10, 'SFK_IT', true, 47, 'system', NOW()),
-('SP_IT_1_4', 'Spezialist:in IT & Software 1/4',      '431',  11, 'SP_IT',  true, 48, 'system', NOW()),
-('SP_IT_2A_4', 'Spezialist:in IT & Software 2a/4',     '432a', 12, 'SP_IT',  true, 49, 'system', NOW()),
-('SP_IT_2B_4', 'Spezialist:in IT & Software 2b/4',     '432b', 12, 'SP_IT',  true, 50, 'system', NOW()),
-('SP_IT_3A_4', 'Spezialist:in IT & Software 3a/4',     '433a', 13, 'SP_IT',  true, 51, 'system', NOW()),
-('SP_IT_3B_4', 'Spezialist:in IT & Software 3b/4',     '433b', 13, 'SP_IT',  true, 52, 'system', NOW()),
-('SP_IT_4_4', 'Spezialist:in IT & Software 4/4',      '434',  14, 'SP_IT',  true, 53, 'system', NOW()),
-('EXP_IT_1_1', 'Expert:in IT & Software 1/1',          '441',  15, 'EXP_IT', true, 54, 'system', NOW())
-ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-
--- TECHNISCHE DIENSTE
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
-('HK_TECHN_DIENSTE_1_4', 'Hilfskraft Technische Dienste 1/4',        '511',  1,  'HK_TECHN_DIENSTE',  true, 55, 'system', NOW()),
-('HK_TECHN_DIENSTE_2_4', 'Hilfskraft Technische Dienste 2/4',        '512',  2,  'HK_TECHN_DIENSTE',  true, 56, 'system', NOW()),
-('HK_TECHN_DIENSTE_3_4', 'Hilfskraft Technische Dienste 3/4',        '513',  3,  'HK_TECHN_DIENSTE',  true, 57, 'system', NOW()),
-('HK_TECHN_DIENSTE_4_4', 'Hilfskraft Technische Dienste 4/4',        '514',  4,  'HK_TECHN_DIENSTE',  true, 58, 'system', NOW()),
-('FK_TECHN_DIENSTE_1_2', 'Fachkraft Technische Dienste 1/2',         '521',  5,  'FK_TECHN_DIENSTE',  true, 59, 'system', NOW()),
-('FK_TECHN_DIENSTE_2_2', 'Fachkraft Technische Dienste 2/2',         '522',  6,  'FK_TECHN_DIENSTE',  true, 60, 'system', NOW()),
-('SFK_TECHN_DIENSTE_1_4', 'Spezial-Fachkraft Technische Dienste 1/4', '531',  7,  'SFK_TECHN_DIENSTE', true, 61, 'system', NOW()),
-('SFK_TECHN_DIENSTE_2_4', 'Spezial-Fachkraft Technische Dienste 2/4', '532',  8,  'SFK_TECHN_DIENSTE', true, 62, 'system', NOW()),
-('SFK_TECHN_DIENSTE_3_4', 'Spezial-Fachkraft Technische Dienste 3/4', '533',  9,  'SFK_TECHN_DIENSTE', true, 63, 'system', NOW()),
-('SFK_TECHN_DIENSTE_4_4', 'Spezial-Fachkraft Technische Dienste 4/4', '534',  10, 'SFK_TECHN_DIENSTE', true, 64, 'system', NOW())
-ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-
-		";
-
-		if (! $db->db_query($qry))
-			echo '<strong>Lohnguide Modellstelle: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'hr.tbl_lohnguide_modellstelle wurde neu erstellt<br>';
-	}
-}
-
-if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_lohnguide_fachrichtung' AND table_schema='hr'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_fachrichtung (
-    fachrichtung_kurzbz character varying(32) NOT NULL,
-    bezeichnung varchar(32) NOT NULL,
-    aktiv boolean DEFAULT FALSE,
-    insertvon character varying(32) NOT NULL,
-    insertamum timestamp without time zone DEFAULT now() NOT NULL,
-    updatevon character varying(32),
-    updateamum timestamp without time zone,
-    CONSTRAINT tbl_lohnguide_fachrichtung_pkey PRIMARY KEY (fachrichtung_kurzbz)
-);
-
-GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_fachrichtung TO vilesci;
-
-INSERT INTO hr.tbl_lohnguide_fachrichtung(fachrichtung_kurzbz,bezeichnung,aktiv,insertvon,insertamum) VALUES
-('FA00','Keine Berücksichtigung',true,'system',NOW())
-ON CONFLICT (fachrichtung_kurzbz) DO NOTHING;
-
-		";
-
-		if (! $db->db_query($qry))
-			echo '<strong>Lohnguide Fachrichtung: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'hr.tbl_lohnguide_fachrichtung wurde neu erstellt<br>';
-	
-	}
-}
-
-
-
-if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_vertragsbestandteil_lohnguide' AND table_schema='hr'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-CREATE TABLE IF NOT EXISTS hr.tbl_vertragsbestandteil_lohnguide (
-    vertragsbestandteil_id integer NOT NULL,
-	vordienstzeit int,
-    stellenbezeichnung varchar(255),
-    fachrichtung_kurzbz character varying(32) NOT NULL,
-    modellstelle_kurzbz character varying(32) NOT NULL,
-    kommentar_person text,
-    kommentar_modellstelle text,
-    CONSTRAINT tbl_vertragsbestandteil_lohnguide_pk PRIMARY KEY (vertragsbestandteil_id),
-	CONSTRAINT tbl_vertragsbestandteil_fk FOREIGN KEY (vertragsbestandteil_id) REFERENCES hr.tbl_vertragsbestandteil (vertragsbestandteil_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
-	CONSTRAINT tbl_vertragsbestandteil_lohnguide_fachrichtung_fk FOREIGN KEY (fachrichtung_kurzbz) REFERENCES hr.tbl_lohnguide_fachrichtung (fachrichtung_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
-	CONSTRAINT tbl_vertragsbestandteil_modellstelle_fachrichtung_fk FOREIGN KEY (modellstelle_kurzbz) REFERENCES hr.tbl_lohnguide_modellstelle (modellstelle_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE
-);
-
-COMMENT ON TABLE hr.tbl_vertragsbestandteil_lohnguide IS E'Zuordnung für EU-Entgelttransparenzrichtlinie';
-
-GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_vertragsbestandteil_lohnguide TO vilesci;
-
-
-		";
-
-		if (! $db->db_query($qry))
-			echo '<strong>Vertragsbestandteil Lohnguide: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'hr.tbl_vertragsbestandteil_lohnguide wurde neu erstellt<br>';
-	}
-}
-
-if($result = $db->db_query("SELECT 1 FROM hr.tbl_vertragsbestandteiltyp WHERE vertragsbestandteiltyp_kurzbz = 'lohnguide'"))
-{
-	if($db->db_num_rows($result) === 0)
-	{
-		$qry = "insert into hr.tbl_vertragsbestandteiltyp (vertragsbestandteiltyp_kurzbz,bezeichnung,ueberlappend) values('lohnguide','Lohnguide',false)";
-
-		if(!$db->db_query($qry))
-			echo '<strong>Public Tabelle person: '.$db->db_last_error().'</strong><br>';
-		else
-			echo "<br>Vertragsbestandteiltyp 'lohnguide' hinzugefuegt";
-	}
-}
-
-
-if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE column_name='vordienstzeit' AND table_name='tbl_vertragsbestandteil_lohnguide' AND table_schema='hr'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-			ALTER TABLE 
-				hr.tbl_vertragsbestandteil_lohnguide 
-			ADD COLUMN 
-				vordienstzeit int;
-		";
-		if (! $db->db_query($qry))
-			echo '<strong>Lohnguide: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'Spalte vordienstzeit wurde in hr.tbl_vertragsbestandteil_lohnguide neu erstellt<br>';
-		
-	}
-}
-
-
-if ($result = $db->db_query("SELECT * FROM hr.tbl_gehaltstyp WHERE gehaltstyp_kurzbz='ueberstundenpauschale'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-		INSERT INTO hr.tbl_gehaltstyp
-		    (gehaltstyp_kurzbz, bezeichnung, valorisierung, sort, aktiv, lvexport)
-		VALUES
-		    ('ueberstundenpauschale','Überstundenpauschale', true, 8, true, true);
-		";
-
-		if (! $db->db_query($qry))
-			echo '<strong>Gehaltstyp: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'Gehaltstyp "Überstundenpauschale" erstellt.<br />';
-	}
-}
-
-if ($result = $db->db_query("SELECT * FROM hr.tbl_gehaltstyp WHERE gehaltstyp_kurzbz='sachbezug_pkw'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-		INSERT INTO hr.tbl_gehaltstyp
-		    (gehaltstyp_kurzbz, bezeichnung, valorisierung, sort, aktiv, lvexport)
-		VALUES
-		    ('sachbezug_pkw','Sachbezug PKW', true, 9, true, true);
-		";
-
-		if (! $db->db_query($qry))
-			echo '<strong>Gehaltstyp: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'Gehaltstyp "Sachbezug PKW" erstellt.<br />';
-	}
-}
-		

system/dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php

@@ -1,15 +0,0 @@
-<?php
-if (! defined('DB_NAME')) exit('No direct script access allowed');
-
-if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_benutzerfunktion_uid'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "CREATE INDEX idx_tbl_benutzerfunktion_uid ON public.tbl_benutzerfunktion USING btree (uid)";
-
-		if (! $db->db_query($qry))
-			echo '<strong>idx_tbl_benutzerfunktion_uid: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'Index idx_tbl_benutzerfunktion_uid angelegt<br>';
-	}
-}

system/phrasesupdate.php

@@ -24257,26 +24257,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'studierendenantrag',
-		'phrase' => 'status_grund_abgelehnt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Grund der Ablehnung:',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Reason for rejection:',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -41781,7 +41761,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4fehlerAktualitaetProjektarbeit',
+		'phrase' => 'c4fehlerAktualitaetProjektarbeit ',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -57029,906 +57009,6 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'lektorseiteTitle',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'LV-Evaluation | Übersicht LV-Leitung und Lehrende',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'LV-Evaluation | Overview Course Leader and Lecturers',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipEvaluierungebeneGesamt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Evaluierung der LV erfolgt auf Gesamt-Ebene',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'This course is evaluated at the overall level',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipEvaluierungGruppen',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Evaluierung der LV erfolgt auf Gruppen-Ebene',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'This course is evaluated at group level',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipVerbindlichGewaehlt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'LV-Evaluierung ist verbindlich vorgesehen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Course evaluation is mandatory',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipVerbindlichAbgewaehlt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'LV wird nicht evaluiert (Abwahl durch STGL)',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Course evaluation is disabled (cancelled by STGL)',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipAlleStudierendeAngemailt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Alle Studierenden wurden zur LV-Evaluierung eingeladen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'All students were invited to the course evaluation',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipNichtAlleStudierendenAngemailt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Studierende müssen noch zur LV-Evaluierung eingeladen werden',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Students still have to be invited to the course evaluation',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipRuecklauf',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Abgeschlossene LV-Evaluierungen / zur LV-Evaluierung eingeladene Studierende',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Completed course evaluations / students invited to course evaluation',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipEvaluationNotAvailable',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Ergebnisse LV-Evaluierung und LV-Reflexion noch nicht verfügbar.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Results of course evaluation and course reflection not yet available.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipReflexionNotAvailable',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Ergebnisse LV-Evaluierung noch nicht verfügbar, LV-Reflexion noch nicht möglich.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Results of course evaluation not yet available, course reflection not yet possible.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipEvaluationAvailable',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Ergebnisse LV- Evaluierung verfügbar, LV-Reflexion durchzuführen.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Results of course evaluation available, course reflection required.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipEvaluationReady',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Ergebnisse LV- Evaluierung und LV-Reflexion.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Results of course evaluation and course reflection.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'verbindlich',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'verbindlich',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'mandatory',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'abgewaehlt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'abgewählt',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'disabled',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'enddatum',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Enddatum',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Enddate',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'startdatum',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Startdatum',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Startdate',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'startdatum',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Startdatum',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Startdate',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'gespeichertAmVon',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Gespeichert am {date} von {name}',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Saved on {date} von {name}',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'xEingeladeneStudierende',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => '{x} eingeladene Studierende',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => '{x} invited students',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'studierendeEinladen',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Studierende zur LV-Evaluierung einladen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Invite students to course evaluation',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'xEmailsVersandt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => '{x} E-Mail-Einladungen versandt',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => '{x} invitation emails sent',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'email',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'E-Mail',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'email',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'emailVersandBereit',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Bereit zum Versand der E-Mail-Einladungen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Ready to send inivitation mails',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'bearbeitungNurLehrende',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Bearbeitung nur durch Lehrende*n möglich',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Only lecturer of course can edit',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'bearbeitungNurLvLeitung',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Bearbeitung nur durch LV-Leitung möglich',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Only course leader can edit',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'notAvailableEvaluierungGruppenebene',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'LV-Evaluierung auf Gruppen-Ebene ist nicht verfügbar, da die Zuordnung Studierendenverband zu einer*m Lehrenden nicht eindeutig möglich ist',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Course evaluation at group level is not available, as it is not possible to link a specific student group to one lecturer',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'noChangeGruppenebene',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Entscheidung für Gesamt- oder Gruppen-Ebene kann nicht mehr verändert werden',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Decision for overall or group level can no longer be changed',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'evalPeriodAlreadyStarted',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Evaluierungszeitfenster kann nicht mehr verändert werden, da Studierende bereits eingeladen wurden',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Evaluation response window can no longer be changed, as students have already been invited',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipEvaluierungByLv',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => "Die Evaluierung der LV erfolgt auf Gesamt-Ebene.<br><br>Das Start-und enddatum der LV-Evaluierung kann geändert bzw. angepasst werden, solange die Studierenden noch nicht eingelanden wurden.<br><br>Der Zugriff für Studierende ist auf dieses Evaluierungsfenster beschränkt.",
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => "This course is evaluated at the overall level.<br><br>The start and end dates of the course evaluation can be changed or adjusted as long as the students have not yet been invited.<br><br>Student access is limited to this evaluation response window.",
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipEvaluierungByLe',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => "Die Evaluierung der LV erfolgt auf Gruppen-Ebene.<br><br>Das Start-und enddatum der LV-Evaluierung kann geändert bzw. angepasst werden, solange die Studierenden noch nicht eingelanden wurden.<br><br>Der Zugriff für Studierende ist auf dieses Evaluierungsfenster beschränkt.",
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => "This course is evaluated at the group level.<br><br>The start and end dates of the course evaluation can be changed or adjusted as long as the students have not yet been invited.<br><br>Student access is limited to this evaluation response window.",
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'infoStudierendenlink',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => "Der Versand der E-Mail-Einladung zur LV-Evaluierung ist nur einmalig möglich. Jede*r Studierende*r erhält einen anonymen Zugangslink.",
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => "The email invitation to the course evaluation can only be sent once. Each student receives an anonymous access link.",
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'stglseiteTitle',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'LV-Evaluation | Übersicht Studiengangsleitung',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'LV-Evaluation | Overview Program Director',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'kfseiteTitle',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'LV-Evaluation | Übersicht Kompetenzfeldleitung',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'LV-Evaluation | Overview Head of Competence Center',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'confirmHeader',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Bitte bestätigen Sie:',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Please confirm:',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'malveSubmitBtn',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'MALVE-STGL abschließen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Close MALVE-STGL',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'malveSubmitConfirmMessage',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Ich habe alle LV-Evaluierungen des Studiengangs {studiengang} im {studiensemester} geprüft. Notwendige Maßnahmen für die STG-Weiterentwicklung wurden abgeleitet.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'I have reviewed all the course evaluations for the {studiengang} degree programme in {studiensemester}. The necessary measures for further developing the STG have been identified.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'evaluationsebene',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Evaluationsebene',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Evaluation level',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'confirmHeader',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Bitte bestätigen Sie:',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Please confirm:',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'geprueft',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Geprüft',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Checked',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipGeprueft',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Optional zur besseren persönlichen Übersicht',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Optional for better personal overview.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'lvKeinQuellkurs',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'LV mit keinem Quellkurs verknüpft',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Course not linked to any (Moodle) source template',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'stgWeiterentwicklungBtn',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'STG-Weiterentwicklung',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'STG-Continued Improvement',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipStgWeiterentwicklungBtn',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'MALVE-STGL: Schnittstelle zur Maßnahmenableitung für den STG in OP.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'MALVE-STGL: An interface for deriving measures for the degree programme in OP.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'tooltipLvWeiterentwicklungBtn',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Schnittstelle zur Maßnahmenableitung für die einzelnen LVs in OP.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Interface for deriving measures for individual courses in OP.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'lvevaluierung',
-		'category' => 'global',
-		'phrase' => 'endedatumMussInZukunftLiegen',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Das Endedatum muss mindestens {minutes} Minuten in der Zukunft liegen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'The end date must be at least {minutes} minutes in the future',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	// ### 		DOKUMENTE ERSTELLEN PHRASEN 		END 		###
 	// ### Personen zusammenlegen Phrasen BEGIN
 	array(
@@ -58197,46 +57277,6 @@ I have been informed that I am under no obligation to consent to the transmissio
 		)
 	),
 	// ### Phrases Dashboard Admin END
-	array(
-		'app' => 'core',
-		'category' => 'ui',
-		'phrase' => 'openInMailClient',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'In Mailanwendung öffnen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Open in Mailclient',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'ui',
-		'phrase' => 'kompatibilityMode_Sogo',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Kompatibilitätsmodus für SOGO',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Open in Compatibility mode (SOGO)',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 );
 
 

vilesci/bis/personalmeldung.php

@@ -742,7 +742,7 @@ function _getFunktionscontainer_Funktionscode123456($bisfunktion_arr)
 			$has_oe_lehrgang = !($studiengang->studiengang_kz > 0 && $studiengang->studiengang_kz < 10000);
 
 			// STG, die nicht BIS-bemeldet werden, ueberspringen
-			if (in_array($studiengang->studiengang_kz, BIS_EXCLUDE_STG) || !$studiengang->melderelevant)
+			if (in_array($studiengang->studiengang_kz, BIS_EXCLUDE_STG))
 			{
 				continue;
 			}
@@ -825,7 +825,6 @@ function _addFunktionscontainer_Funktionscode7($uid, $funktion_arr, $stichtag)
 		$entwicklungsteam_arr = array_filter($entwicklungsteam_arr, function ($obj) {
 			return
 				!in_array($obj->studiengang_kz, BIS_EXCLUDE_STG) &&
-				$obj->melderelevant &&
 				$obj->studiengang_kz > 0 &&
 				$obj->studiengang_kz < 10000;
 		});
@@ -890,7 +889,7 @@ function _getLehrecontainer($sws_proStg_arr)
 			$kennzeichen_name = $is_lehrgang ? 'LehrgangNr' : 'StgKz';
 
 			// Lehreobjekt generieren
-			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->melde_studiengang_kz, $lehre_arr))
+			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->studiengang_kz, $lehre_arr))
 			{
 				$lehre_obj = new StdClass();
 
@@ -905,8 +904,8 @@ function _getLehrecontainer($sws_proStg_arr)
 			}
 			else	// Lehrecontainer mit STG schon vorhanden
 			{
-				$lehre_obj_arr = array_filter($lehre_arr, function (&$obj) use ($sws_proStg, $kennzeichen_name) {
-					return isset($obj->{$kennzeichen_name}) && $obj->{$kennzeichen_name} == $sws_proStg->melde_studiengang_kz;
+				$lehre_obj_arr = array_filter($lehre_arr, function (&$obj) use ($sws_proStg) {
+					return $obj->StgKz == $sws_proStg->studiengang_kz;
 				});
 
 				// SWS ergaenzen
@@ -1360,15 +1359,15 @@ function verwendung_exists($bisverwendung, $verwendung_arr)
 
 /**
  * Prueft ob ein Studiengang bereits im Lehre Container vorhanden ist
- * @param $melde_studiengang_kz Studiengangskennzahl
+ * @param $studiengang_kz Studiengangskennzahl
  * @param $lehre_arr Array mit Lehre Objekten
  * @return true wenn der Studiengang bereits existiert
  */
-function lehre_stg_exists($melde_studiengang_kz, $lehre_arr)
+function lehre_stg_exists($studiengang_kz, $lehre_arr)
 {
 	foreach($lehre_arr as $row)
 	{
-		$kennzeichenName = isset($row->LehrgangNr) ? 'LehrgangNr' : 'StgKz';
+		$kennzeichenName = $row->LehrgangNr ?? $row->StgKz;
 		if(isset($row->{$kennzeichenName}) && $row->{$kennzeichenName} == $melde_studiengang_kz)
 			return true;
 	}

vilesci/stammdaten/raum_uebersicht.php

@@ -227,8 +227,7 @@ if (isset($_GET['sendform']))
 	<table class="tablesorter" id="t1">
 	<thead>
 		<tr>
-			<th><button type="button" class="resetsaved" title="Reset Filter">Reset Filter</button>
-				<span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
+			<th><span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
 				'.$tooltiptext.'
 				</span>
 			</th>
@@ -365,10 +364,9 @@ if (isset($_GET['sendform']))
 		$("#t1").tablesorter(
 		{
 			sortList: [[3,0]],
-			widgets: ["saveSort", "zebra", "filter", "stickyHeaders"],
+			widgets: ["zebra", "filter", "stickyHeaders"],
 			headers: { 	0: { filter: false,  sorter: false }},
-			widgetOptions : {	filter_saveFilters : true,
-								filter_functions : {
+			widgetOptions : {	filter_functions : {
 									// Add select menu to this column
 									8 : {
 									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
@@ -383,13 +381,6 @@ if (isset($_GET['sendform']))
 									"False" : function(e, n, f, i, $r, c, data) { return /f/.test(e); }
 									}
 				}}
-		}); 
-
-		$('.resetsaved').click(function()
-		{
-			$("#t1").trigger("filterReset");
-			location.reload(forceGet);
-			return false;
 		});
 	});
 		

vilesci/stammdaten/reihungstest_administration.php

@@ -588,9 +588,7 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 {
 	if(is_numeric($_POST['prestudent_id']) && $_POST['prestudent_id']!='')
 	{
-		$qry="SELECT nachname,vorname,person_id,prestudent_id,tbl_pruefling.pruefling_id,
-       				tbl_pruefling_frage.begintime,bezeichnung,kurzbz,tbl_frage.nummer,level, 
-       				tbl_vorschlag.nummer as antwortnummer, tbl_vorschlag.punkte, tbl_frage.frage_id
+		$qry="SELECT nachname,vorname,person_id,prestudent_id,tbl_pruefling.pruefling_id,tbl_pruefling_frage.begintime,bezeichnung,kurzbz,tbl_frage.nummer,level, tbl_vorschlag.nummer as antwortnummer, tbl_vorschlag.punkte
 				FROM testtool.tbl_antwort
 				JOIN testtool.tbl_vorschlag USING(vorschlag_id)
 				JOIN testtool.tbl_frage USING (frage_id)
@@ -617,7 +615,6 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 						<th>Level</th>
 						<th>Antwort #</th>
 						<th>Punkte</th>
-						<th>FrageID</th>
 					</tr>
 					</thead>
 					<tbody>';
@@ -635,7 +632,6 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 				echo "<td>$row->level</td>";
 				echo "<td>$row->antwortnummer</td>";
 				echo "<td>$row->punkte</td>";
-				echo "<td>$row->frage_id</td>";
 				echo '</tr>';
 			}
 			echo '</tbody></table>';

vilesci/stammdaten/reihungstestverwaltung.php

@@ -837,25 +837,6 @@ if(isset($_GET['excel']))
 		<script src="../../vendor/fgelinas/timepicker/jquery.ui.timepicker.js" type="text/javascript" ></script>
 
 		<script type="text/javascript">
-			$.tablesorter.addParser({
-				id: "customDate",
-				is: function(s) {
-					//return false;
-					//use the above line if you don\'t want table sorter to auto detected this parser
-					// match dd.mm.yyyy e.g. 01.01.2001 as regex
-					//return /\d{1,4}-\d{1,2}-\d{1,2} \d{1,2}:\d{1,2} .*/.test(s);
-					return /\d{1,2}.\d{1,2}.\d{1,4}.*/.test(s);
-				},
-				// replace regex-wildcards and return new date
-				format: function(s) {
-					s = s.replace(/\-/g," ");
-					s = s.replace(/:/g," ");
-					s = s.replace(/\./g," ");
-					s = s.split(" ");
-					return $.tablesorter.formatFloat(new Date(s[2], s[1]-1, s[0]).getTime());
-				},
-				type: "numeric"
-			});
 			$(document).ready(function()
 			{
 				// Check, ob Räume zugeteilt sind oder max_teilnehmer gesetzt ist, wenn "öffentlich" gesetzt wird
@@ -1026,7 +1007,7 @@ if(isset($_GET['excel']))
 						{
 							widgets: ["zebra", "filter", "stickyHeaders"],
 							sortList: [[2,0],[3,0]],
-							headers: {0: { sorter: false},10: { sorter: "customDate"},11: { sorter: "customDate"}},
+							headers: {0: { sorter: false}},
 							widgetOptions: {filter_cssFilter: [
 									"filter_clm_null",
 									"filter_clm_prestudent_id",
@@ -1039,7 +1020,6 @@ if(isset($_GET['excel']))
 									"filter_clm_studienplan",
 									"filter_clm_einstiegssemester",
 									"filter_clm_geburtsdatum",
-									"filter_clm_anmeldedatum",
 									"filter_clm_email",
 									"filter_clm_absolviert"]}
 						});
@@ -1092,7 +1072,6 @@ if(isset($_GET['excel']))
 							'clm_studienplan',
 							'clm_einstiegssemester',
 							'clm_geburtsdatum',
-							"filter_clm_anmeldedatum",
 							'clm_email',
 							'clm_absolviert'];
 						for (var i in arr)
@@ -2718,8 +2697,7 @@ if($reihungstest_id!='')
 					WHERE prestudent_id = tbl_prestudent.prestudent_id
 						AND status_kurzbz = 'Interessent'
 					) LIMIT 1
-			) AS orgform_kurzbz,
-       tbl_rt_person.anmeldedatum
+			) AS orgform_kurzbz
 	FROM PUBLIC.tbl_rt_person
 	JOIN PUBLIC.tbl_person USING (person_id)
 	JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = rt.reihungstest_id)
@@ -2808,7 +2786,6 @@ if($reihungstest_id!='')
 	echo '<div id="clm_studienplan" class="active" onclick="hideColumn(\'clm_studienplan\')">Studienplan</div>';
 	echo '<div id="clm_einstiegssemester" class="active" onclick="hideColumn(\'clm_einstiegssemester\')">Einstiegssemester</div>';
 	echo '<div id="clm_geburtsdatum" class="active" onclick="hideColumn(\'clm_geburtsdatum\')">Geburtsdatum</div>';
-	echo '<div id="clm_anmeldedatum" class="active" onclick="hideColumn(\'clm_anmeldedatum\')">Geburtsdatum</div>';
 	echo '<div id="clm_email" class="active" onclick="hideColumn(\'clm_email\')">EMail</div>';
 	echo '<div id="clm_absolviert" class="active" onclick="hideColumn(\'clm_absolviert\')">Absolvierte Tests <span class="wait"></span></div>';
 	//echo '<div id="clm_ergebnis" class="active" onclick="hideColumn(\'clm_ergebnis\')">Ergebnis <span class="wait"></span></div>';
@@ -2850,7 +2827,6 @@ if($reihungstest_id!='')
 					<th style="display: table-cell" class="clm_studienplan">Studienplan</th>
 					<th style="display: table-cell" class="clm_einstiegssemester">Einstiegssemester</th>
 					<th style="display: table-cell" class="clm_geburtsdatum">Geburtsdatum</th>
-					<th style="display: table-cell" class="clm_anmeldedatum">Anmeldedatum</th>
 					<th style="display: table-cell" class="clm_email">EMail</th>
 					<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
 					<!--<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
@@ -2970,7 +2946,6 @@ if($reihungstest_id!='')
 										<td style="display: table-cell" class="clm_studienplan">'.$db->convert_html_chars($studienplan_bezeichnung).' ('.$row->studienplan_id.')</td>
 										<td style="display: table-cell" class="clm_einstiegssemester">'.$db->convert_html_chars($row->ausbildungssemester).'</td>
 										<td style="display: table-cell" class="clm_geburtsdatum">'.$db->convert_html_chars($row->gebdatum!=''?$datum_obj->convertISODate($row->gebdatum):' ').'</td>
-										<td style="display: table-cell" class="clm_anmeldedatum">'.$db->convert_html_chars($row->anmeldedatum!=''?$datum_obj->convertISODate($row->anmeldedatum):' ').'</td>
 										<td style="display: table-cell; text-align: center" class="clm_email"><a href="mailto:'.$db->convert_html_chars($row->email).'"><img src="../../skin/images/button_mail.gif" name="mail"></a></td>
 										<td style="display: table-cell;" class="clm_absolviert">'.$rt_in_anderen_stg.'</td>
 									</tr>';
@@ -3034,7 +3009,6 @@ if($reihungstest_id!='')
 							<th style="display: table-cell" class="clm_studienplan">Studienplan</th>
 							<th style="display: table-cell" class="clm_einstiegssemester">Einstiegssemester</th>
 							<th style="display: table-cell" class="clm_geburtsdatum">Geburtsdatum</th>
-							<th style="display: table-cell" class="clm_anmeldedatum">Anmeldedatum</th>
 							<th style="display: table-cell" class="clm_email">EMail</th>
 							<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
 							<!--<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
@@ -3154,7 +3128,6 @@ if($reihungstest_id!='')
 									<td style="display: table-cell" class="clm_studienplan">'.$db->convert_html_chars($studienplan_bezeichnung).' ('.$row->studienplan_id.')</td>
 									<td style="display: table-cell" class="clm_einstiegssemester">'.$db->convert_html_chars($row->ausbildungssemester).'</td>
 									<td style="display: table-cell" class="clm_geburtsdatum">'.$db->convert_html_chars($row->gebdatum!=''?$datum_obj->convertISODate($row->gebdatum):' ').'</td>
-									<td style="display: table-cell" class="clm_anmeldedatum">'.$db->convert_html_chars($row->anmeldedatum!=''?$datum_obj->convertISODate($row->anmeldedatum):' ').'</td>
 									<td style="display: table-cell; text-align: center" class="clm_email"><a href="mailto:'.$db->convert_html_chars($row->email).'"><img src="../../skin/images/button_mail.gif" name="mail"></a></td>
 									<td style="display: table-cell;" class="clm_absolviert">'.$rt_in_anderen_stg.'</td>';
 							/*echo	'<td style="display: table-cell; align: right" class="clm_ergebnis">'.($rtergebnis==0?'-':number_format($rtergebnis,2,'.','')).' %</td>