spout 2.7 install for large excel exports

Merge branch 'feature-70376/Lohnguide'
handle case where old value or new value and not both are null explicitly in markDirty Method
2026-06-01 20:29:29 +00:00 · 2026-05-20 13:26:29 +02:00 · 2026-05-13 11:53:14 +02:00 · 2026-05-13 11:42:25 +02:00 · 2026-05-13 11:16:18 +02:00 · 2026-05-13 11:15:07 +02:00
66 changed files with 2010 additions and 1821 deletions
@@ -64,9 +64,6 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
-//Routes for Lvplan Verband and page for dropdown Stg/Semester/Verband/Gruppe
-$route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';
-$route['Cis/OverviewLvPlan/.*'] = 'Cis/OverviewLvPlan/index/$1';

 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
@@ -1,39 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class OverviewLvPlan extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-
-		$viewData = array(
-			'uid'=>getAuthUID(),
-			'timezone' => $this->config->item('timezone')
-		);
-
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'OverviewLvPlan']);
-	}
-}
@@ -1,39 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class StgOrgLvPlan extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		
-		$viewData = array(
-			'uid'=>getAuthUID(),
-			'timezone' => $this->config->item('timezone')
-		);
-		
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'StgOrgLvPlan']);
-	}
-}
@@ -41,12 +41,7 @@ class LvPlan extends FHCAPI_Controller
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
-			'getLv' => self::PERM_LOGGED,
-			'eventsStgOrg' => self::PERM_LOGGED,
-			'fetchFerienEvents' => self::PERM_LOGGED,
-			'getStudiengaenge' => self::PERM_LOGGED,
-			'getLehrverband' => self::PERM_LOGGED,
-
+			'getLv' => self::PERM_LOGGED
 		]);

        $this->load->library('LogLib');
@@ -88,7 +83,7 @@ class LvPlan extends FHCAPI_Controller
 		// form validation
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());

@@ -105,7 +100,7 @@ class LvPlan extends FHCAPI_Controller

 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
-
+		

 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -114,49 +109,6 @@ class LvPlan extends FHCAPI_Controller
 		));
 	}

-	/**
-	 * fetches LvPlan for studiengang / semester / verband / gruppe
-	 *
-	 * @access public
-	 */
-	public function eventsStgOrg()
-	{
-		$this->load->library('StundenplanLib');
-
-		// form validation
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-		//$this->form_validation->set_rules('stg_kz', "stg_kz", "required"); //no validation show empty calendar
-
-		if (!$this->form_validation->run())
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-			$stgOrgEvents = [];
-			$ferienEvents = [];
-		}
-
-		else
-		{
-			$start_date = $this->input->post('start_date', true);
-			$end_date = $this->input->post('end_date', true);
-			$stg_kz = $this->input->post('stg_kz', true);
-			$sem = $this->input->post('sem', true);
-			$verband = $this->input->post('verband', true);
-			$gruppe = $this->input->post('gruppe', true);
-
-			$result = $this->stundenplanlib->getEventsStgOrg($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe);
-			$stgOrgEvents = $this->getDataOrTerminateWithError($result);
-
-			$result = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $stg_kz);
-			$ferienEvents = $this->getDataOrTerminateWithError($result);
-		}
-
-		$this->terminateWithSuccess(array_merge(
-			$stgOrgEvents,
-			$ferienEvents
-		));
-	}
-
 	/**
 	 * fetches LvPlan and Ferien events together for the lv
 	 *
@@ -185,6 +137,7 @@ class LvPlan extends FHCAPI_Controller

 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		

 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -334,48 +287,6 @@ class LvPlan extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current($result));
 	}

-	public function getStudiengaenge()
-	{
-		$this->load->model('organisation/Studiengang_model','StudiengangModel');
-
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$result = $this->StudiengangModel->loadWhere([
-			'aktiv' => true
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
-	public function getLehrverband($studiengang_kz, $semester=null, $verband=null)
-	{
-		$this->load->model('organisation/Lehrverband_model','LehrverbandModel');
-
-		$where = [
-			'aktiv' => true,
-			'studiengang_kz' => $studiengang_kz,
-		];
-
-		if ($semester !== null  && $semester !== 'null' && $semester !== 'undefined') {
-			$where['semester'] = $semester;
-		}
-		if ($verband !== null  && $verband !== 'null' && $verband !== 'undefined') {
-			$where['verband'] = $verband;
-		}
-
-		$this->LehrverbandModel->addOrder('studiengang_kz');
-		$this->LehrverbandModel->addOrder('semester');
-		$this->LehrverbandModel->addOrder('verband');
-		$this->LehrverbandModel->addOrder('gruppe');
-		$result = $this->LehrverbandModel->loadWhere($where);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
 	/**
 	 * fetch moodle events
 	 *
@@ -427,7 +338,7 @@ class LvPlan extends FHCAPI_Controller

 		$currentStudiensemester = $this->StudiensemesterModel->getByDate($start_date);
 		$currentStudiensemester = $this->getDataOrTerminateWithError($currentStudiensemester);
-
+		
 		if ($currentStudiensemester) {
 			$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;

@@ -436,7 +347,7 @@ class LvPlan extends FHCAPI_Controller
 				"studiensemester_kurzbz" => $studentsemester_kurzbz
 			]);
 			$studiengang = $this->getDataOrTerminateWithError($studiengang);
-
+			
 			if ($studiengang)
 				$studiengang_kz = current($studiengang)->studiengang_kz;
 			else
@@ -446,7 +357,7 @@ class LvPlan extends FHCAPI_Controller
 		}

 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
-
+		
 		return $this->getDataOrTerminateWithError($ferienEvents);
 	}
 }
@@ -42,14 +42,22 @@ class Messages extends FHCAPI_Controller
 		]);
 	}

-	public function getMessages($id, $type_id, $size, $page)
+	public function getMessages($id, $type_id, $size=null, $page=null)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}

-		$offset = $size * ($page - 1);
-		$limit = $size;
+		if(!(is_null($size) && is_null($page)))
+		{
+			$offset = $size * ($page - 1);
+			$limit = $size;
+		}
+		else
+		{
+			$offset = null;
+			$limit = null;
+		}

 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);

@@ -78,52 +78,32 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);

 		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
-
-		$arrayAccepted = [];
 		$person_id = $this->_getPersonId($prestudent_id);

-		$docNames = array_map(function ($item) {
-			return $item->dokument_kurzbz;
-		}, $resultPreDoc);
+		$mergedArray = [];

-		foreach($docNames as $doc)
+		foreach ($resultPreDoc as $pre)
 		{
-			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
+			$result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);

 			if (isError($result))
-			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
+
 			if (hasData($result))
 			{
-				$data = getData($result);
-				foreach ($data as $value)
+				foreach (getData($result) as $doc)
 				{
-					array_push($arrayAccepted, $value);
+					$merged = clone $doc;
+					$merged->docdatum = $pre->docdatum;
+					$merged->insertvonma = $pre->insertvonma;
+					$merged->bezeichnung = $pre->bezeichnung;
+					$mergedArray[] = $merged;
 				}
 			}
-		}
-
-		//Mapping with document_kurzbz
-		$preDocMap = [];
-		foreach ($resultPreDoc as $pre) {
-			$preDocMap[$pre->dokument_kurzbz] = $pre;
-		}
-
-		$mergedArray = [];
-		foreach ($arrayAccepted as $doc) {
-			$merged = clone $doc;
-
-			if (isset($preDocMap[$doc->dokument_kurzbz])) {
-				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
-				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
-				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
-			} else {
-				$merged->akzeptiertdatum = null;
-				$merged->akzeptiertvon = null;
+			else
+			{
+				$mergedArray[] = $pre;
 			}
-
-			$mergedArray[] = $merged;
 		}

 		$this->terminateWithSuccess($mergedArray);
@@ -48,7 +48,8 @@ class Konto extends FHCAPI_Controller

 		// Load language phrases
 		$this->loadPhrases([
-			'konto'
+			'konto',
+			'lehre'
 		]);
 	}

@@ -112,7 +113,7 @@ class Konto extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function getBuchungstypen()
+	public function getBuchungstypen($studiensemester_kurzbz = null)
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');

@@ -122,6 +123,7 @@ class Konto extends FHCAPI_Controller

 		$data = $this->getDataOrTerminateWithError($result);

+		$this->_getOEHBeitrag($data, $studiensemester_kurzbz);
 		$this->terminateWithSuccess($data);
 	}

@@ -494,4 +496,43 @@ class Konto extends FHCAPI_Controller

 		$this->terminateWithSuccess();
 	}
+
+	private function _getOEHBeitrag(&$data, $studiensemester_kurzbz = null)
+	{
+		if (is_null($studiensemester_kurzbz))
+		{
+			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+			$studiensemester_akt = $this->variablelib->getVar('semester_aktuell');
+		}
+		else
+		{
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			if ($this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+				$studiensemester_akt = $studiensemester_kurzbz;
+			else
+				$this->terminateWithError($this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
+		$oehBeitrag = $this->OehbeitragModel->getByStudiensemester($studiensemester_akt);
+
+		$oehStandardbetrag = null;
+		if (hasData($oehBeitrag))
+		{
+			$oeh = getData($oehBeitrag)[0];
+			$summe = ($oeh->studierendenbeitrag + $oeh->versicherung) * -1;
+			$oehStandardbetrag = number_format((float)$summe, 2, '.', '');
+		}
+
+		if ($oehStandardbetrag !== null)
+		{
+			$data = array_map(function ($buchungstyp) use ($oehStandardbetrag) {
+				if (isset($buchungstyp->buchungstyp_kurzbz) && (strtolower($buchungstyp->buchungstyp_kurzbz) === 'oeh'))
+				{
+					$buchungstyp->standardbetrag = $oehStandardbetrag;
+				}
+				return $buchungstyp;
+			}, $data);
+		}
+	}
 }
@@ -417,6 +417,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$notiz_id = $this->input->post('notiz_id');

 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || public.tbl_notiz_dokument.dms_id AS preview');

 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
 		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
@@ -128,7 +128,7 @@ class AntragLib
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
 		// NOTE(chris): get last status that is not pause
-		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,
@@ -445,24 +445,6 @@ class StundenplanLib
 		return success($ferienEventsFlattened);
 	}

-	public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
-		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
-		if (isError($stundenplan_data))
-			return $stundenplan_data;
-		$stundenplan_data = getData($stundenplan_data) ?? [];
-
-		$function_error = $this->expandObjectInformation($stundenplan_data);
-		if ($function_error)
-			return $function_error;
-
-		return success($stundenplan_data);
-	}
-
 	// start of the private functions ########################################################################################################

 	// function used to sort an array of studiensemester strings
@@ -40,7 +40,9 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {		
+		} else if(is_null($old_value) xor is_null($new_value)) {
+			$this->modifiedcolumns[$columnname] = $columnname;
+		} else if($old_value != $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}
@@ -3,6 +3,7 @@ namespace vertragsbestandteil;

 use Exception;
 use vertragsbestandteil\VertragsbestandteilStunden;
+use vertragsbestandteil\VertragsbestandteilLohnguide;

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

+			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilLohnguide_model',
+					'VertragsbestandteilLohnguide_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilLohnguide_model;
+				break;
+
 			default:
 				throw new Exception('Unknown vertragsbestandteil_kurzbz '
 					. $vertragsbestandteil_kurzbz);
@@ -10,6 +10,7 @@ require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
 require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
 require_once __DIR__ . '/VertragsbestandteilFreitext.php';
 require_once __DIR__ . '/VertragsbestandteilKarenz.php';
+require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';

@@ -0,0 +1,161 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilLohnguide extends Vertragsbestandteil
+{
+	protected $stellenbezeichnung;
+	protected $vordienstzeit;
+	protected $fachrichtung_kurzbz;
+	protected $modellstelle_kurzbz;
+	protected $kommentar_person;
+	protected $kommentar_modellstelle;
+
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
+	}
+
+	public function getStellenbezeichnung()
+	{
+		return $this->stellenbezeichnung;
+	}
+
+	public function setStellenbezeichnung($stellenbezeichnung): self
+	{
+		$this->markDirty('stellenbezeichnung', $this->stellenbezeichnung, $stellenbezeichnung);
+		$this->stellenbezeichnung = $stellenbezeichnung;
+		return $this;
+	}
+
+	public function getVordienstzeit()
+	{
+		return $this->vordienstzeit;
+	}
+
+	public function setVordienstzeit($vordienstzeit): self
+	{
+		$this->markDirty('vordienstzeit', $this->vordienstzeit, $vordienstzeit);
+		$this->vordienstzeit = $vordienstzeit;
+		return $this;
+	}
+
+	public function getFachrichtung_kurzbz()
+	{
+		return $this->fachrichtung_kurzbz;
+	}
+
+	public function setFachrichtung_kurzbz($fachrichtung_kurzbz): self
+	{
+		$this->markDirty('fachrichtung_kurzbz', $this->fachrichtung_kurzbz, $fachrichtung_kurzbz);
+		$this->fachrichtung_kurzbz = $fachrichtung_kurzbz;
+		return $this;
+	}
+
+	public function getModellstelle_kurzbz()
+	{
+		return $this->modellstelle_kurzbz;
+	}
+
+	public function setModellstelle_kurzbz($modellstelle_kurzbz): self
+	{
+		$this->markDirty('modellstelle_kurzbz', $this->modellstelle_kurzbz, $modellstelle_kurzbz);
+		$this->modellstelle_kurzbz = $modellstelle_kurzbz;
+		return $this;
+	}
+
+	public function getKommentar_person()
+	{
+		return $this->kommentar_person;
+	}
+
+	public function setKommentar_person($kommentar_person): self
+	{
+		$this->markDirty('kommentar_person', $this->kommentar_person, $kommentar_person);
+		$this->kommentar_person = $kommentar_person;
+		return $this;
+	}
+
+	public function getKommentar_modellstelle()
+	{
+		return $this->kommentar_modellstelle;
+	}
+
+	public function setKommentar_modellstelle($kommentar_modellstelle): self
+	{
+		$this->markDirty('kommentar_modellstelle', $this->kommentar_modellstelle, $kommentar_modellstelle);
+		$this->kommentar_modellstelle = $kommentar_modellstelle;
+		return $this;
+	}
+
+	
+	
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->fachrichtung_kurzbz) && $this->setFachrichtung_kurzbz($data->fachrichtung_kurzbz);
+		isset($data->stellenbezeichnung) && $this->setStellenbezeichnung($data->stellenbezeichnung);
+		isset($data->vordienstzeit) && $this->setVordienstzeit($data->vordienstzeit);
+		isset($data->modellstelle_kurzbz) && $this->setModellstelle_kurzbz($data->modellstelle_kurzbz);
+		isset($data->kommentar_person) && $this->setKommentar_person($data->kommentar_person);
+		isset($data->kommentar_modellstelle) && $this->setKommentar_modellstelle($data->kommentar_modellstelle);
+		$this->fromdb = false;
+	}
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'stellenbezeichnung' => $this->getStellenbezeichnung(),
+			'vordienstzeit' => $this->getVordienstzeit(),
+			'fachrichtung_kurzbz' => $this->getFachrichtung_kurzbz(),
+			'modellstelle_kurzbz' => $this->getModellstelle_kurzbz(),
+			'kommentar_person' => $this->getKommentar_person(),
+			'kommentar_modellstelle' => $this->getKommentar_modellstelle(),
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		modellstelle_kurzbz: {$this->getModellstelle_kurzbz()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	public function validate()
+	{
+		$value = $this->vordienstzeit;
+
+		if ($value === null || $value === '') {
+			$result = null;   // allow null value 
+		} else {
+			$result = filter_var($value, FILTER_VALIDATE_INT, [
+				'options' => [
+					'min_range' => 0,
+					'max_range' => 100
+				]
+			]);
+
+			if ($result === false) {				
+				$this->validationerrors[] = 'Vordienstjahre muss eine ganze Zahl (0 bis 100) enthalten oder leer sein.';
+			}
+		}
+		
+		return parent::validate();
+	} 
+}
@@ -402,14 +402,17 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit
+				lehre.tbl_lehreinheit le
 				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
 				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
 				JOIN public.tbl_person p using (person_id) 
 			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id= ?
-				AND tbl_lehreinheit.studiensemester_kurzbz = ?
+				le.lehrveranstaltung_id= ?
+				AND le.studiensemester_kurzbz = ?
 				AND lehrfunktion_kurzbz = 'LV-Leitung'
+				AND lema.mitarbeiter_uid NOT like '_Dummy%' 
+			  	AND b.aktiv = TRUE 
+			  	AND p.aktiv = TRUE
            ORDER BY 
                lema.insertamum DESC
 			LIMIT 1
@@ -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 >= NOW() - INTERVAL ?
-		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
-		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-
+		WHERE (campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
+			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
+			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+		
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}

@@ -108,7 +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 >= NOW() - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
@@ -594,7 +594,10 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
+			. $this->dbTable . ".bezeichnung, ', ', "
+			. "UPPER(" . $this->dbTable . ".typ), "
+			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");

 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(
@@ -261,6 +261,42 @@ class Benutzerfunktion_model extends DB_Model
    }


+	/**
+	 * Get active Kompetenzfeldleitung bei UID.
+	 *
+	 * @param $uid
+	 * @return array|stdClass|null
+	 */
+	public function getKFLByUID($uid)
+	{
+		$query = '
+            SELECT
+			  	bf.uid,
+				bf.oe_kurzbz,
+  				oe.organisationseinheittyp_kurzbz
+            FROM
+			  	public.tbl_benutzerfunktion bf
+				JOIN public.tbl_organisationseinheit oe USING (oe_kurzbz)
+  				JOIN public.tbl_benutzer b USING (uid)
+            WHERE
+                b.uid = ?
+              	AND b.aktiv = TRUE
+                AND funktion_kurzbz = \'Leitung\'
+               	AND organisationseinheittyp_kurzbz = \'Kompetenzfeld\'
+              	AND (datum_von IS NULL OR datum_von <= now())
+              	AND (datum_bis IS NULL OR datum_bis >= now())
+        ';
+
+		$parameters_array = array();
+		if (is_string($uid))
+		{
+			$parameters_array[] = $uid;
+		}
+
+		return $this->execQuery($query, $parameters_array);
+	}
+
+
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);
@@ -388,84 +388,6 @@ class Stundenplan_model extends DB_Model
 		
 		ORDER BY datum, beginn", [$start_date, $end_date, $ma_uid]);
 	}
-
-	/**
-	 * queries Stundenplan and filters by studiengang, semester, verband gruppe
-	 *
-	 * @return void
-	 */
-	public function getStundenplanStudiengang($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe) {
-
-		$qry_params = [$start_date, $end_date, $stg_kz];
-
-		$qry = "
-		SELECT
-			'lehreinheit' as type, beginn, ende, datum,
-			CONCAT(lehrfach,'-',lehrform) as topic,
-			array_agg(DISTINCT lektor) as lektor,
-			array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
-			string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
-			array_agg(DISTINCT lehreinheit_id) as lehreinheit_id,
-			titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
-		FROM
-			(
-				SELECT unr,datum,beginn, ende,
-					   CASE
-						   WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
-						   ELSE sp.lektor
-						   END as lektor,
-					   CASE
-						   WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
-						   ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/'))
-						   END as gruppen_kuerzel,
-					   (SELECT bezeichnung
-						FROM public.tbl_organisationseinheit
-						WHERE oe_kurzbz IN(
-							SELECT oe_kurzbz
-							FROM lehre.tbl_lehrveranstaltung
-							WHERE lehrveranstaltung_id = sp.lehrveranstaltung_id
-						)) as organisationseinheit,
-					   sp.ort_kurzbz, sp.studiengang_kz, sp.titel,sp.lehreinheit_id,sp.lehrfach_id,sp.anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
-				FROM (
-						 SELECT sp.*
-						 FROM lehre.vw_stundenplan sp
-						 WHERE
-							 sp.datum >= ?
-						   AND sp.datum <= ?
-					 ) sp
-						 JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
-						WHERE studiengang_kz = ? ";
-
-		if($sem != NULL)
-		{
-			$qry_params[] = $sem;
-			$qry .= " AND (semester = ? OR semester IS NULL)";
-		}
-		if($verband != NULL)
-		{
-			$qry_params[] = $verband;
-			$qry .= " AND (verband = ? OR verband IS NULL OR verband = '0' OR verband = '')";
-		}
-		if($gruppe != NULL)
-		{
-			$qry_params[] = $gruppe;
-			$qry .= " AND (gruppe = ? OR gruppe IS NULL	OR gruppe = '0' OR gruppe = '')	";
-		}
-		$qry.= " AND (
-			gruppe_kurzbz is null OR EXISTS(
-			   SELECT 1
-			  FROM
-				public.tbl_gruppe WHERE gruppe_kurzbz = sp.gruppe_kurzbz AND direktinskription = false
-			)
-		  )";
-
-		$qry.= "	) as subquery
-
-		GROUP BY unr, datum, beginn, ende,  titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
-		ORDER BY datum, beginn; ";
-
-		return $this->execReadOnlyQuery($qry, $qry_params);
-	}
 	
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
@@ -242,6 +242,7 @@ 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
@@ -310,11 +311,12 @@ class Message_model extends DB_Model
 				public.tbl_person pr on pr.person_id = fm.recipient_id
 			order by
 				m.insertamum DESC
-			limit ?
-			offset ?;
+			{$limitoffset}
 EOSQL;

-		$parametersArray = array($person_id, $person_id, $limit, $offset);
+		$parametersArray = $limitoffset
+			? array($person_id, $person_id, $limit, $offset)
+			: array($person_id, $person_id);

 		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
@@ -325,7 +327,7 @@ EOSQL;
 		$data = getData($data);
 		if($data)
 		{
-			$count = ceil($data[0]->total_msgs / $limit);
+			$count = is_null($limit) ? 1 : ceil($data[0]->total_msgs / $limit);
 		}

 		return success(['data' => $data, 'count' => $count]);
@@ -0,0 +1,11 @@
+<?php
+
+class VertragsbestandteilLohnguide_model extends DB_Model
+{
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'hr.tbl_vertragsbestandteil_lohnguide';
+		$this->pk = 'vertragsbestandteil_id';
+	}
+}
@@ -37,7 +37,8 @@ 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
+				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice,
+				lg.stellenbezeichnung, lg.vordienstzeit, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
 			FROM
 				hr.tbl_vertragsbestandteil v
 			LEFT JOIN
@@ -63,6 +64,8 @@ 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;
 	}
@@ -46,12 +46,13 @@ 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
@@ -71,7 +72,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\']
+					widgets: [\'zebra\',\'filter\']
 				});
 			}
 		);
@@ -151,8 +152,9 @@ 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>',$row->oe_kurzbz,'</td>';
+		echo '<td>',$oeBez->bezeichnung,'</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>';
@@ -293,7 +293,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;

-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px;">';
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
 			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}

@@ -505,7 +505,8 @@
 		"vuejs/vuedatepicker_js": "7.2.0",
 		"vuejs/vuedatepicker_css": "7.2.0",
 		"vuejs/vuedatepicker_js11": "11.0.1",
-		"vuejs/vuedatepicker_css11": "11.0.1"
+		"vuejs/vuedatepicker_css11": "11.0.1",
+		"box/spout": "^2.7"

 	},
 	"config": {
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "f4f0af4586f46f97d8b6092c1ac0fb3a",
+    "content-hash": "c5b0e5eb7392192a92418412ab1f2ed2",
    "packages": [
        {
            "name": "afarkas/html5shiv",
@@ -77,6 +77,79 @@
            },
            "type": "library"
        },
+        {
+            "name": "box/spout",
+            "version": "v2.7.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/box/spout.git",
+                "reference": "3681a3421a868ab9a65da156c554f756541f452b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/box/spout/zipball/3681a3421a868ab9a65da156c554f756541f452b",
+                "reference": "3681a3421a868ab9a65da156c554f756541f452b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-xmlreader": "*",
+                "ext-zip": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.0"
+            },
+            "suggest": {
+                "ext-iconv": "To handle non UTF-8 CSV files (if \"php-intl\" is not already installed or is too limited)",
+                "ext-intl": "To handle non UTF-8 CSV files (if \"iconv\" is not already installed)"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Box\\Spout\\": "src/Spout"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Adrien Loison",
+                    "email": "adrien@box.com"
+                }
+            ],
+            "description": "PHP Library to read and write spreadsheet files (CSV, XLSX and ODS), in a fast and scalable way",
+            "homepage": "https://www.github.com/box/spout",
+            "keywords": [
+                "OOXML",
+                "csv",
+                "excel",
+                "memory",
+                "odf",
+                "ods",
+                "office",
+                "open",
+                "php",
+                "read",
+                "scale",
+                "spreadsheet",
+                "stream",
+                "write",
+                "xlsx"
+            ],
+            "support": {
+                "issues": "https://github.com/box/spout/issues",
+                "source": "https://github.com/box/spout/tree/v2.7.3"
+            },
+            "abandoned": true,
+            "time": "2017-09-25T19:44:35+00:00"
+        },
        {
            "name": "brutusin/json-forms",
            "version": "1.4.0",
@@ -342,6 +342,8 @@ 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">
@@ -1708,6 +1708,7 @@ 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);
 }

@@ -1725,6 +1726,7 @@ 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=='')
 	{
@@ -3555,6 +3555,14 @@ 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;
 			
@@ -364,9 +364,10 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');

 		//laden des Datensatzes
-			$qry = "SELECT *
+			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
 					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))";
@@ -394,6 +395,7 @@ 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;
 			}
@@ -25,6 +25,7 @@
 */
 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
 {
@@ -432,6 +433,8 @@ class konto extends basis_db

 		$qry.=" ORDER BY beschreibung";

+		$oehBeitrag = $this->_getOEHBeitrag();
+
 		if($this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object())
@@ -440,7 +443,15 @@ class konto extends basis_db

 				$typ->buchungstyp_kurzbz = $row->buchungstyp_kurzbz;
 				$typ->beschreibung = $row->beschreibung;
-				$typ->standardbetrag = $row->standardbetrag;
+				if (strtolower($typ->buchungstyp_kurzbz) === 'oeh' && $oehBeitrag)
+				{
+					$typ->standardbetrag = $oehBeitrag;
+				}
+				else
+				{
+					$typ->standardbetrag = $row->standardbetrag;
+				}
+
 				$typ->standardtext = $row->standardtext;
 				$typ->credit_points = $row->credit_points;
 				$typ->aktiv = $this->db_parse_bool($row->aktiv);
@@ -990,6 +1001,43 @@ 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;
+		}
+	}
 }

 ?>
@@ -584,8 +584,9 @@ 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
+				SELECT
+					DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
+					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode, stg.melderelevant
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -598,6 +599,7 @@ 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
 			)
@@ -2,7 +2,6 @@
@import './SvgIcons.css';
@import './components/searchbar/searchbar.css';
@import './components/verticalsplit.css';
-@import './components/horizontalsplit.css';
@import './components/FilterComponent.css';
@import './components/Tabs.css';
@import './components/Notiz.css';
@@ -198,10 +197,6 @@ html.fs_huge {
 	margin-bottom: -1px;
 }

-.tiny-90 div.tox.tox-tinymce {
-	height: 90% !important;
-}
-
 /* slim begin */
 .stv .form-label {
 	margin-bottom: .15rem;
@@ -1,73 +0,0 @@
-:root {
-	--fhc-horizontalsplit-hsplitter-bg-color: var(--fhc-background, #eee);
-	--fhc-horizontalsplit-hsplitter-border-color: var(--fhc-border, #eee);
-	--fhc-horizontalsplit-hsplitter-splitactions-color: var(--fhc-dark, #000);
-}
-
-.horizontalsplit-container {
-	display: flex;
-	flex-direction: row;
-	overflow: hidden;
-	max-height: 100%;
-	padding: 0px;
-}
-
-.horizontalsplitted {
-	overflow: auto;
-	flex-shrink: 0;
-}
-
-.horizontalsplitter {
-	flex-shrink: 0;
-	width: 8px;
-	cursor: col-resize;
-	user-select: none;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.horizontalsplitter.left {
-	border-left: solid 3px var(--fhc-horizontalsplit-hsplitter-border-color);
-}
-
-.horizontalsplitter.right {
-	border-right: solid 3px var(--fhc-horizontalsplit-hsplitter-border-color);
-}
-
-.splitactions.horizontal {
-	background-color: var(--fhc-horizontalsplit-hsplitter-bg-color);
-	color: var(--fhc-horizontalsplit-hsplitter-splitactions-color);
-	display: flex;
-	flex-direction: column;
-	padding: 5px 0 5px 0;
-}
-
-.splitactions.horizontal.left {
-	border-radius: 0 40% 40% 0;
-}
-
-.splitactions.horizontal.right {
-	border-radius: 40% 0 0 40%;
-}
-
-.splitactions.horizontal .splitaction {
-	width: auto;
-	height: 28px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.splitactions.horizontal .splitaction.resize {
-	cursor: col-resize;
-}
-
-#content {
-	padding-top: 0 !important;
-	padding-bottom: 0 !important;
-}
-
-#content > div:first-child {
-	margin-top: 30px;
-}
@@ -92,31 +92,5 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/LvPlan/getLv/' + lehrveranstaltung_id
 		};
-	},
-	eventsStgOrg(start_date, end_date, stg_kz, sem, verband, gruppe) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/lvPlan/eventsStgOrg',
-			params: { start_date, end_date, stg_kz, sem, verband, gruppe }
-		};
-	},
-	getStudiengaenge(){
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/lvPlan/getStudiengaenge'
-		}
-	},
-	getLehrverband(stg_kz, sem){
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}`
-		}
-	},
-	getGruppe(stg_kz, sem, verband){
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/lvPlan/getLehrverband/${stg_kz}/${sem}/${verband}`
-		}
-	},
-
+	}
 };
@@ -17,13 +17,16 @@

 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: 'api/frontend/v1/messages/messages/getMessages/'
-				+ params.id + '/'
-				+ params.type + '/'
-				+ params.size + '/'
-				+ params.page
+			url: url
 		};
 	},
 	getVorlagen(){
@@ -38,6 +38,10 @@ export default {
 		};
 	},
 	insert(params) {
+		if(params.betrag)
+		{
+			params.betrag = params.betrag.replace(',', '.');
+		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/insert',
@@ -52,6 +56,10 @@ export default {
 		};
 	},
 	edit(params) {
+		if(params.betrag)
+		{
+			params.betrag = params.betrag.replace(',', '.');
+		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/update',
@@ -65,10 +73,14 @@ export default {
 			params: { buchungsnr }
 		};
 	},
-	getBuchungstypen() {
+	getBuchungstypen(studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/konto/getBuchungstypen'
+		if (!!studiensemester_kurzbz)
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/konto/getBuchungstypen'
+			url: url
 		};
-	}
+	},
 };
@@ -17,8 +17,6 @@ import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMit
 import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 import Studium from "../../components/Cis/Studium/Studium.js";
-import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
-import OverviewLvPlan from "../../components/Cis/LvPlan/OverviewLvPlan.js";

 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
@@ -199,26 +197,6 @@ const router = VueRouter.createRouter({
 				};
 			}
 		},
-		{
-			path: `/Cis/StgOrgLvPlan/:mode?/:focus_date?/:stgkz?/:sem?/:verband?/:gruppe?`,
-			name: 'StgOrgLvPlan',
-			component: StgOrgLvPlan,
-			props(route) {
-				return {
-					propsViewData: route.params
-				};
-			}
-		},
-		{
-			path: `/Cis/OverviewLvPlan`,
-			name: 'OverviewLvPlan',
-			component: OverviewLvPlan,
-			props(route) {
-				return {
-					propsViewData: route.params
-				};
-			}
-		},
 		{
 			path: `/Cis4`,
 			name: 'Cis4',
@@ -88,15 +88,12 @@ export default {
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;
 			this.$emit('update:range', rangeInterval);
-		},
-		resetEventLoader() {
-			this.reset();
 		}
 	},
 	setup(props, context) {
 		const rangeInterval = Vue.ref(null);
 		
-		const { events, lv, reset } = useEventLoader(rangeInterval, props.getPromiseFunc);
+		const { events, lv } = useEventLoader(rangeInterval, props.getPromiseFunc);

 		Vue.watch(lv, newValue => {
 			context.emit('update:lv', newValue);
@@ -105,8 +102,7 @@ export default {
 		return {
 			rangeInterval,
 			events,
-			lv,
-			reset
+			lv
 		};
 	},
 	created() {
@@ -1,194 +0,0 @@
-import FormForm from '../../Form/Form.js';
-import FormInput from '../../Form/Input.js';
-
-import ApiLvPlan from '../../../api/factory/lvPlan.js';
-
-export default {
-	name: "OverviewLvPlan",
-	components: {
-		FormForm,
-		FormInput,
-	},
-	props: {
-		viewData: Object,
-		propsViewData: Object
-	},
-	data() {
-		return {
-			formData:  {
-				stgkz: null,
-				sem: null,
-				verband: null,
-				gruppe: null,
-			},
-			listStg: [],
-			listSem: [1,2,3,4,5,6,7,8,9,10],
-			listVerband: [],
-			listGroup: [],
-		};
-	},
-	methods: {
-		loadLvPlan() {
-			if (!this.formData.stgkz) {
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
-				return;
-			}
-			if (!this.formData.sem && (this.formData.verband || this.formData.gruppe)) {
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_SemMissing'));
-				return;
-			}
-
-			if (!this.formData.verband && this.formData.gruppe) {
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_VerbandMissing'));
-				return;
-			}
-
-			const params = {
-				mode: this.currentMode,
-				focus_date: this.currentDay,
-				stgkz: this.formData.stgkz,
-				sem: this.formData.sem,
-				verband: this.formData.verband,
-				gruppe: this.formData.gruppe,
-			};
-
-			//ensure logic: no value after a null value in route
-			if (params.sem == null) {
-				params.verband = null;
-				params.gruppe = null;
-			}
-			if (params.verband == null) {
-				params.gruppe = null;
-			}
-
-			//delete all null values to avoid null in router
-			Object.keys(params).forEach(
-				key => params[key] == null && delete params[key]
-			);
-
-			this.$router.push({
-				name: "StgOrgLvPlan",
-				params,
-			});
-		},
-		loadListSem(){
-			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
-		},
-		loadListVerband(){
-			this.$api
-				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.sem, this.formData.verband))
-				.then(result => {
-					const data = result.data;
-					const mappedData = data.map(item => item.verband);
-					this.listVerband = [...new Set(mappedData.filter(v =>
-						v !== null &&
-						v !== undefined &&
-						String(v).trim() !== ""
-					))]
-					.sort();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		loadListGroup(){
-			this.$api
-				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.sem, this.formData.verband))
-				.then(result => {
-					const data = result.data;
-					const mappedData = data.map(item => item.gruppe);
-					this.listGroup =  [...new Set(mappedData.filter(v =>
-						v !== null &&
-						v !== undefined &&
-						String(v).trim() !== ""))]
-						.sort();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-	},
-	computed: {
-		maxSemester(){
-			const currentStg = this.listStg.find(
-				item => item.studiengang_kz === this.formData.stgkz
-			);
-			return currentStg.max_semester;
-		},
-		currentDay() {
-			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
-			return this.propsViewData?.focus_date;
-		},
-	},
-	created(){
-		this.$api
-			.call(ApiLvPlan.getStudiengaenge())
-			.then(result => {
-				this. listStg = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-	},
-	template: `
-	<div cis-lvplan-stg-org-ues d-flex flex-column h-100>
-				<div class="mt-3">
-	 		<form-form class="row row-cols-1 row-cols-md-2 row-cols-lg-4 row-cols-xl-5 g-3 mb-3">
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.stgkz"
-	 				@change="loadListSem(formData.stgkz)"
-	 				>
-					<option :value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
-					<option
-						v-for="stg in listStg"
-						:key="stg.studiengang_kz"
-						:value="stg.studiengang_kz"
-						>
-						{{ stg.kurzbzlang }} ({{ stg.bezeichnung }})
-					</option>
-	 			</form-input>
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.sem"
-	 				@change="loadListVerband()"
-	 				@click="loadListSem(formData.stgkz)"
-	 				>
-						<option :value="null" selected>Semester</option>
-						<option
-							v-for="sem in listSem"
-							:key="sem"
-							:value="sem"
-							>
-							{{ sem }}
-						</option>
-	 			</form-input>
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.verband"
-	 				@change="loadListGroup()"
-	 				>
-	 					<option :value="null" selected>{{ $p.t('lehre/verband') }} </option>
-					<option
-						v-for="verband in listVerband"
-						:key="verband"
-						:value="verband"
-						>
-						{{ verband }}
-					</option>
-	 			</form-input>
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.gruppe"
-	 				>
-	 				<option :value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
-						<option
-							v-for="group in listGroup"
-							:key="group"
-							:value="group"
-							>
-							{{ group }}
-						</option>
-	 			</form-input>
-				<button type="button" class="btn btn-secondary" @click="loadLvPlan">{{ $p.t('LvPlan/loadLvPlan') }}</button>
-
-	 		</form-form>
-	 	</div>
-	 </div>
-	 `,
-};
@@ -1,336 +0,0 @@
-import FormForm from '../../Form/Form.js';
-import FormInput from '../../Form/Input.js';
-import FhcCalendar from "../../Calendar/LvPlan.js";
-
-import ApiLvPlan from '../.././../api/factory/lvPlan.js';
-import ApiAuthinfo from '../../../api/factory/authinfo.js';
-
-export const DEFAULT_MODE_LVPLAN = 'Week';
-
-export default {
-	name: 'LvPlanStgOrg',
-	components: {
-		FormForm,
-		FormInput,
-		FhcCalendar,
-	},
-	props: {
-		viewData: Object,
-		propsViewData: Object
-	},
-	data() {
-		return {
-			localProps: {},
-			studiensemester_kurzbz: null,
-			studiensemester_start: null,
-			studiensemester_ende: null,
-			uid: null,
-			isMitarbeiter: false,
-			isStudent: false,
-			currentStgBezeichnung: null,
-			formData:  {
-				stgkz: null,
-				sem: null,
-				verband: null,
-				gruppe: null,
-			},
-			listStg: [],
-			listSem: [1,2,3,4,5,6,7,8,9,10],
-			listVerband: [],
-			listGroup: [],
-			rangeIntervalFirst: null
-		};
-	},
-	computed: {
-		maxSemester(){
-			const currentStg = this.listStg.find(
-				item => item.studiengang_kz === this.formData.stgkz
-			);
-			return currentStg.max_semester;
-		},
-		currentDay() {
-			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
-			return this.propsViewData?.focus_date;
-		},
-		currentMode() {
-			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
-				return DEFAULT_MODE_LVPLAN;
-			return this.propsViewData?.mode;
-		},
-		downloadLinks() {
-			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
-				return false;
-
-			let type = false;
-			type = this.isStudent ? 'student' : type;
-			type = this.isMitarbeiter ? 'lektor' : type;
-			if (false === type)
-			{
-				return;
-			}
-
-			const opts = { zone: this.viewData.timezone };
-			const start = luxon.DateTime
-				.fromISO(this.studiensemester_start, opts)
-				.toUnixInteger();
-			const ende = luxon.DateTime
-				.fromISO(this.studiensemester_ende, opts)
-				.toUnixInteger();
-
-			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ 'cis/private/lvplan/stpl_kalender.php'
-				+ '?type=' + type
-				+ '&pers_uid=' + this.uid
-				+ '&begin=' + start
-				+ '&ende=' + ende;
-
-			return [
-				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
-				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
-				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
-				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
-			];
-		}
-	},
-	methods: {
-		loadLvPlan(){
-			if(!this.formData.stgkz){
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'chooseStg'));
-				return;
-			}
-
-			if(!this.formData.sem && (this.formData.verband || this.formData.gruppe)){
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_SemMissing'));
-				return;
-			}
-
-			if(!this.formData.verband && this.formData.gruppe){
-				this.$fhcAlert.alertError(this.$p.t('LvPlan', 'error_VerbandMissing'));
-				return;
-			}
-
-			const params = {
-				mode: this.currentMode,
-				focus_date: this.currentDay,
-				stgkz: this.formData.stgkz,
-				sem: this.formData.sem,
-				verband: this.formData.verband,
-				gruppe: this.formData.gruppe,
-			};
-
-			//ensure logic: no value after a null value in route
-			if(params.sem == null)
-			{
-				params.verband = null;
-				params.gruppe = null;
-			}
-			if(params.verband == null) {
-				params.gruppe = null;
-			}
-
-			//delete all null values to avoid null in router
-			Object.keys(params).forEach(
-				key => params[key] == null && delete params[key]
-			);
-
-			this.$router.push({
-				name: "StgOrgLvPlan",
-				params,
-			});
-
-			this.$refs['calendar'].resetEventLoader();
-		},
-		loadListSem(){
-			this.listSem = [...Array(this.maxSemester).keys()].map(i => i + 1);
-		},
-		loadListVerband(){
-			this.$api
-				.call(ApiLvPlan.getLehrverband(this.formData.stgkz, this.formData.semester, this.formData.verband))
-				.then(result => {
-					const data = result.data;
-					const mappedData = data.map(item => item.verband);
-					this.listVerband = [...new Set(mappedData.filter(v =>
-						v !== null &&
-						v !== undefined &&
-						String(v).trim() !== ""
-					))]
-						.sort();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		loadListGroup(){
-			this.$api
-				.call(ApiLvPlan.getGruppe(this.formData.stgkz, this.formData.semester, this.formData.verband))
-				.then(result => {
-					const data = result.data;
-					const mappedData = data.map(item => item.gruppe);
-					this.listGroup =  [...new Set(mappedData.filter(v =>
-						v !== null &&
-						v !== undefined &&
-						String(v).trim() !== ""))]
-						.sort();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		handleChangeDate(day, newMode) {
-			return this.handleChangeMode(newMode, day);
-		},
-		handleChangeMode(newMode, day) {
-			const mode = newMode[0].toUpperCase() + newMode.slice(1);
-			const focus_date = day.toISODate();
-
-			this.$router.push({
-				name: "StgOrgLvPlan",
-				params: {
-					mode,
-					focus_date,
-					stgkz: this.formData.stgkz,
-					sem: this.formData.sem,
-					verband: this.formData.verband,
-					gruppe: this.formData.gruppe,
-				},
-			});
-		},
-		updateRange(rangeInterval) {
-			this.$api
-				.call(ApiLvPlan.studiensemesterDateInterval(
-					rangeInterval.end.startOf('week').toISODate()
-				))
-				.then(res => {
-					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
-					this.studiensemester_start = res.data.start;
-					this.studiensemester_ende = res.data.ende;
-				});
-		},
-		getPromiseFunc(start, end) {
-			return [
-				this.$api.call(ApiLvPlan.eventsStgOrg(start, end, this.formData.stgkz, this.formData.sem, this.formData.verband, this.formData.gruppe))
-			];
-		},
-	},
-	created(){
-		this.$api
-			.call(ApiAuthinfo.getAuthInfo())
-			.then(res => {
-				this.uid = res.data.uid;
-				this.isMitarbeiter = res.data.isMitarbeiter;
-				this.isStudent = res.data.isStudent;
-			});
-
-		this.$api
-			.call(ApiLvPlan.getStudiengaenge())
-			.then(result => {
-				this. listStg = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		if(this.propsViewData) {
-			this.formData.stgkz = this.propsViewData.stgkz ? this.propsViewData.stgkz: null;
-			this.formData.sem = this.propsViewData.sem ? this.propsViewData.sem: null;
-			this.formData.verband = this.propsViewData.verband ? this.propsViewData.verband: null;
-			this.formData.gruppe = this.propsViewData.gruppe ? this.propsViewData.gruppe: null;
-		}
-	},
-	template: `
-	<div class="cis-lvplan-stg-org d-flex flex-column h-100">
-
-		<div class="mt-3">
-	 		<form-form class="row row-cols-1 row-cols-md-2 row-cols-lg-4 row-cols-xl-5 g-3 mb-3">
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.stgkz"
-	 				@change="loadListSem(formData.stgkz)"
-	 				>
-					<option :value="null" selected>{{ $p.t('LvPlan/chooseStg') }}</option>
-					<option
-						v-for="stg in listStg"
-						:key="stg.studiengang_kz"
-						:value="stg.studiengang_kz"
-						>
-						{{ stg.kurzbzlang }} ({{ stg.bezeichnung }})
-					</option>
-	 			</form-input>
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.sem"
-	 				@change="loadListVerband()"
-	 				@click="loadListSem(formData.stgkz)"
-	 				>
-						<option :value="null" selected>Semester</option>
-						<option
-							v-for="sem in listSem"
-							:key="sem"
-							:value="sem"
-							>
-							{{ sem }}
-						</option>
-	 			</form-input>
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.verband"
-	 				@change="loadListGroup()"
-	 				>
-	 					<option :value="null" selected>{{ $p.t('lehre/verband') }} </option>
-					<option
-						v-for="verband in listVerband"
-						:key="verband"
-						:value="verband"
-						>
-						{{ verband }}
-					</option>
-	 			</form-input>
-	 			<form-input
-	 				type="select"
-	 				v-model="formData.gruppe"
-	 				>
-	 				<option :value="null" selected>{{ $p.t('gruppenmanagement/gruppe') }}</option>
-						<option
-							v-for="group in listGroup"
-							:key="group"
-							:value="group"
-							>
-							{{ group }}
-						</option>
-	 			</form-input>
-				<button type="button" class="btn btn-secondary" @click="loadLvPlan">{{ $p.t('LvPlan/loadLvPlan') }}</button>
-
-	 		</form-form>
-	 	</div>
-
-		<fhc-calendar
-			v-show="propsViewData && propsViewData.stgkz"
-			ref="calendar"
-			v-model:lv="formData"
-			:timezone="viewData.timezone"
-			:get-promise-func="getPromiseFunc"
-			:date="currentDay"
-			:mode="currentMode"
-			@update:date="handleChangeDate"
-			@update:mode="handleChangeMode"
-			@update:range="updateRange"
-			class="responsive-calendar"
-		>
-			<div
-				v-if="downloadLinks"
-				class="d-flex gap-1 justify-items-start"
-				>
-				<div v-for="{ title, icon, link } in downloadLinks">
-					<a
-						:href="link"
-						:aria-label="title"
-						class="py-1 btn btn-outline-secondary"
-					>
-						<div class="d-flex flex-column">
-							<i aria-hidden="true" :class="icon"></i>
-							<span style="font-size:.5rem">{{ title }}</span>
-						</div>
-					</a>
-				</div>
-			</div>
-		</fhc-calendar>
-	</div>
-	`,
-
-
-};
@@ -1,187 +0,0 @@
-import FhcCalendar from "../../Calendar/LvPlan.js";
-
-import ApiLvPlan from '../.././../api/factory/lvPlan.js';
-import ApiAuthinfo from '../../../api/factory/authinfo.js';
-
-export const DEFAULT_MODE_LVPLAN = 'Week';
-
-export default {
-	name: 'LvPlanStgOrg',
-	inject: {
-		cisRoot: {
-			from: 'cisRoot'
-		},
-	},
-	components: {
-		FhcCalendar,
-	},
-	props: {
-		viewData: Object,
-		propsViewData: Object
-	},
-	data() {
-		return {
-			studiensemester_kurzbz: null,
-			studiensemester_start: null,
-			studiensemester_ende: null,
-			uid: null,
-			isMitarbeiter: false,
-			isStudent: false,
-			listStg: [],
-			currentStgBezeichnung: null
-		};
-	},
-	computed:{
-		currentDay() {
-			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
-			return this.propsViewData?.focus_date;
-		},
-		currentMode() {
-			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
-				return DEFAULT_MODE_LVPLAN;
-			return this.propsViewData?.mode;
-		},
-		downloadLinks() {
-			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
-				return false;
-
-			let type = false;
-			type = this.isStudent ? 'student' : type;
-			type = this.isMitarbeiter ? 'lektor' : type;
-			if (false === type)
-			{
-				return;
-			}
-
-			const opts = { zone: this.viewData.timezone };
-			const start = luxon.DateTime
-				.fromISO(this.studiensemester_start, opts)
-				.toUnixInteger();
-			const ende = luxon.DateTime
-				.fromISO(this.studiensemester_ende, opts)
-				.toUnixInteger();
-
-			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ 'cis/private/lvplan/stpl_kalender.php'
-				+ '?type=' + type
-				+ '&pers_uid=' + this.uid
-				+ '&begin=' + start
-				+ '&ende=' + ende;
-
-			return [
-				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
-				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
-				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
-				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
-			];
-		}
-	},
-	methods: {
-		handleChangeDate(day, newMode) {
-			return this.handleChangeMode(newMode, day);
-		},
-		handleChangeMode(newMode, day) {
-			const mode = newMode[0].toUpperCase() + newMode.slice(1)
-			const focus_date = day.toISODate();
-
-			this.$router.push({
-				name: "StgOrgLvPlan",
-				params: {
-					mode,
-					focus_date,
-					stgkz: this.propsViewData.stgkz,
-					sem: this.propsViewData.sem,
-					verband: this.propsViewData.verband,
-					gruppe: this.propsViewData.gruppe,
-				}
-			});
-		},
-		updateRange(rangeInterval) {
-			this.$api
-				.call(ApiLvPlan.studiensemesterDateInterval(
-					rangeInterval.end.startOf('week').toISODate()
-				))
-				.then(res => {
-					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
-					this.studiensemester_start = res.data.start;
-					this.studiensemester_ende = res.data.ende;
-				});
-		},
-		getPromiseFunc(start, end) {
-			return [
-				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.propsViewData.stgkz, this.propsViewData.sem, this.propsViewData.verband, this.propsViewData.gruppe)),
-				//local for test
-				/*				this.$api.call(ApiLvPlan.eventsStgOrg(start.toISODate(), end.toISODate(), this.stgkz, this.sem, this.verband, this.gruppe))*/
-			];
-		},
-		backToDropdown(){
-			this.$router.push({
-				name: "OverviewLvPlan",
-			});
-		}
-	},
-	created(){
-		this.$api
-			.call(ApiAuthinfo.getAuthInfo())
-			.then(res => {
-				this.uid = res.data.uid;
-				this.isMitarbeiter = res.data.isMitarbeiter;
-				this.isStudent = res.data.isStudent;
-			});
-
-		if(this.propsViewData.stgkz) {
-			this.$api
-				.call(ApiLvPlan.getStudiengaenge())
-				.then(result => {
-					const currentStg = result.data.find(
-						item => item.studiengang_kz == this.propsViewData.stgkz
-					);
-					this.currentStgBezeichnung = currentStg.kurzbzlang + " - " + currentStg.bezeichnung;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-	},
-	template: `
-	<div class="cis-lvplan-stg-org d-flex flex-column h-100">
-		<h2>{{ $p.t('LvPlan/headerLvPlanLvVerband') }}</h2>
-		<p v-if="propsViewData.stgkz"><span><strong>{{currentStgBezeichnung}}</strong></span>
-			<span v-if="propsViewData.sem" style="margin-left:10px;"> Semester: {{propsViewData.sem}} </span>
-			<span v-if="propsViewData.verband" style="margin-left:10px;"> Verband: {{propsViewData.verband}} </span>
-			<span v-if="propsViewData.gruppe" style="margin-left:10px;"> Gruppe: {{propsViewData.gruppe}} </span>
-			<button class="py-1 btn btn-outline-secondary" :title="this.$p.t('LvPlan', 'backToDropdown')" style="margin-left:10px;"> <i class="fa fa-arrow-left fa-xs" @click="backToDropdown"></i></button>
-		</p>
-		<p v-else>{{ $p.t('LvPlan/noStgProvided') }}</p>
-
-		<fhc-calendar
-			ref="calendar"
-			:timezone="viewData.timezone"
-			:get-promise-func="getPromiseFunc"
-			:date="currentDay"
-			:mode="currentMode"
-			@update:date="handleChangeDate"
-			@update:mode="handleChangeMode"
-			@update:range="updateRange"
-			class="responsive-calendar"
-		>
-			<div
-				v-if="downloadLinks"
-				class="d-flex gap-1 justify-items-start"
-				>
-				<div v-for="{ title, icon, link } in downloadLinks">
-					<a
-						:href="link"
-						:aria-label="title"
-						class="py-1 btn btn-outline-secondary"
-					>
-						<div class="d-flex flex-column">
-							<i aria-hidden="true" :class="icon"></i>
-							<span style="font-size:.5rem">{{ title }}</span>
-						</div>
-					</a>
-				</div>
-			</div>
-		</fhc-calendar>
-	</div>
-	`,
-};
@@ -31,7 +31,7 @@ export default {
 						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
 						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
 					].join(": "));
-				} else {
+				} else {;
 					tooltipArray.push([
 						this.$p.t('lehre/lektor'),
 						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")
@@ -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
-				//height: 800,
+				min_height: 300,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',
@@ -133,6 +133,7 @@ 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);
@@ -203,24 +204,6 @@ 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) {
@@ -231,6 +214,7 @@ 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;
@@ -290,19 +274,6 @@ 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();
@@ -342,7 +313,7 @@ export default {

 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2 h-100" ref="formMessage">
+						<form-form class="row g-3 mt-2 align-content-start" ref="formMessage">

 							<div class="row mb-3">

@@ -367,7 +338,7 @@ export default {
 							</div>

 							<!--Tiny MCE-->
-							<div class="row mb-3 h-100 tiny-90">
+							<div class="row mb-3 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"
@@ -62,9 +62,18 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				//height: 800,
+				min_height: 300,
 				//plugins: ['lists'],
-				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				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' }
+				],
 				style_formats: [
 					{title: 'Blocks', block: 'div'},
 					{title: 'Paragraph', block: 'p'},
@@ -98,7 +107,8 @@ export default {
 			return this.$api
 				.call(ApiMessages.sendMessage(this.typeId, data))
 				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					if(this.openMode == "inSamePage")
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideTemplate();
 					this.resetForm();
 					this.messageSent = true;
@@ -114,19 +124,17 @@ 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))
@@ -195,6 +203,7 @@ 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;
@@ -202,27 +211,6 @@ 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)
@@ -291,17 +279,8 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);

 		//case of reply
-		if(this.messageId != null) {
+		if(this.messageId) {
 			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);*/
 		}

 	},
@@ -499,10 +478,10 @@ export default {
 						
 						<div class="row">
 							<div class="col-6" style="border-right: 1px">
-								You can safely close this window.
+								You can safely close this window/tab.
 							</div>
 							<div class="col-6">
-								Sie können dieses Fenster schließen.
+								Fenster/Reiter kann geschlossen werden!
 							</div>
 						</div>
 				</div>
@@ -30,6 +30,7 @@ export default {
 			personId: null,
 			layoutColumnsOnNewData:	false,
 			height: '400',
+			arePhrasesLoaded: false
 		}
 	},
 	methods: {
@@ -65,7 +66,14 @@ export default {
 		buildTreemap(messages) {
 			if (!messages || !messages.data || messages.data.length === 0)
 			{
-				return {data: [], last_page: 0};
+				if(this.tabulatorOptions.pagination)
+				{
+					return {data: [], last_page: 0};
+				}
+				else
+				{
+					return [];
+				}
 			}

 			const last_page = messages.meta.count;
@@ -106,7 +114,15 @@ export default {
 				// to avoid endless loop
 				if (iteration > messages.length) break;
 			}
-			return {data: messageNested, last_page: last_page};
+
+			if(this.tabulatorOptions.pagination)
+			{
+				return {data: messageNested, last_page: last_page};
+			}
+			else
+			{
+				return messageNested;
+			}
 		},
 		loadAjaxCall(url, config, params){
 			return this.$api.call(
@@ -180,7 +196,7 @@ export default {
 						],
 						formatter: (cell, formatterParams) => {
 							const key = formatterParams[cell.getValue()];
-							return this.$p.t('messages', key);
+							return this.$p?.t?.('messages', key) || key;
 						},
 					},
 					{
@@ -252,7 +268,7 @@ export default {
 						frozen: true
 					}
 				],
-				pagination: true,
+				pagination: false,
 				paginationMode: "remote",
 				paginationSize: 15,
 				paginationInitialPage: 1,
@@ -290,8 +306,6 @@ 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;
@@ -342,6 +356,12 @@ 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,
@@ -366,6 +386,7 @@ export default {
 				<!--table-->
 				<div class="col-sm-6 pt-1">
 					<core-filter-cmpt
+						v-if="arePhrasesLoaded"
 						ref="table"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
@@ -398,6 +419,7 @@ 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
@@ -82,14 +82,16 @@ 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.$refs.templateNewDivMessage.showTemplate();
+				this.$nextTick(() => {
+					if(messageId)
+						this.$refs.templateNewDivMessage.loadReplyData(messageId);
+					else
+						this.$refs.templateNewDivMessage.resetForm();
+
+					this.$refs.templateNewDivMessage.showTemplate();
+				});
 			}
 			else
 				console.log("no valid openMode");
@@ -18,7 +18,6 @@
 import CoreSearchbar from "../searchbar/searchbar.js";
 import NavLanguage from "../navigation/Language.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
-import HorizontalSplit from "../horizontalsplit/horizontalsplit.js";
 import AppMenu from "../AppMenu.js";
 import AppConfig from "../AppConfig.js";
 import StvVerband from "./Studentenverwaltung/Verband.js";
@@ -38,7 +37,6 @@ export default {
 		CoreSearchbar,
 		NavLanguage,
 		VerticalSplit,
-		HorizontalSplit,
 		AppMenu,
 		AppConfig,
 		StvVerband,
@@ -237,10 +235,6 @@ export default {
 					}
 				}
 			}
-		},
-		sidebarCollapsed(newVal) {
-			if(newVal) this.$refs.hSplit.collapseLeft()
-			else this.$refs.hSplit.showBoth()
 		}
 	},
 	methods: {
@@ -638,30 +632,23 @@ export default {
 						</app-menu>
 					</div>
 				</aside>
-				<horizontal-split ref="hSplit" :defaultRatio="[15, 85]">
-					<template #left>
-						<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100  w-100">
-							<div class="offcanvas-header justify-content-end px-1 d-md-none">
-								<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
-							</div>
-							<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
-							<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
-						</nav>
-					</template>
-					<template #right>
-						<main>
-							<vertical-split :defaultRatio="[50, 50]">
-								<template #top>
-									<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
-								</template>
-								<template #bottom>
-									<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
-								</template>
-							</vertical-split>
-						</main>
-					</template>
-				</horizontal-split>
-				
+				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+					<div class="offcanvas-header justify-content-end px-1 d-md-none">
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
+					</div>
+					<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
+				</nav>
+				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+					<vertical-split>
+						<template #top>
+							<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
+						</template>
+						<template #bottom>
+							<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
+						</template>
+					</vertical-split>
+				</main>
 			</div>
 		</div>
 		<app-config ref="config" v-model="appconfig" :endpoints="configEndpoints"></app-config>
@@ -84,6 +84,14 @@ 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: {}
@@ -83,6 +83,8 @@ export default {
 				});
 		},
 		open() {
+
+			this.getBuchungstypen(this.currentSemester);
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
@@ -105,7 +107,7 @@ export default {
 			const text = typ.standardtext || '';
 			const creditpoints = typ.credit_points || '';

-			if (!this.data.betrag || this.data.betrag == '-0.00')
+			if (!this.data.betrag || this.data.betrag == '-0.00' || this.data.betrag !== amount)
 				this.data.betrag = amount;

 			if (!this.data.buchungstext)
@@ -113,7 +115,18 @@ 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">
@@ -166,6 +179,7 @@ export default {
 				<form-input
 					type="select"
 					v-model="data.studiensemester_kurzbz"
+					@change="getBuchungstypen(data.studiensemester_kurzbz)"
 					name="studiensemester_kurzbz"
 					:label="$p.t('lehre/studiensemester')"
 					>
@@ -41,8 +41,8 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type"},
-					{title: "Betrag", field: "betrag",
+					{title: "Typ", field: "type", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Betrag", field: "betrag", headerFilter: true,
 						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"},
-					{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: "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: 'Aktionen', field: 'actions',
 						minWidth: 50,
@@ -110,10 +110,10 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '200',
+				height: '250',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
-				persistenceID: 'core-contracts-details-2026021701'
+				persistenceID: 'core-contracts-details-2026050501'
 			},
 			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('ui', 'lehreinheit_id'));
+						setHeader('lehreinheit_id', this.$p.t('lehre', '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'));
@@ -47,12 +47,13 @@ export default {
 					this.endpoint.getStatiOfContract(this.person_id, this.vertrag_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'core-contracts-status-2026021701',
+				persistenceID: 'core-contracts-status-2026050501',
 				columns: [
-					{title: "Status", field: "bezeichnung"},
+					{title: "Status", field: "bezeichnung", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{
 						title: "Datum",
 						field: "datum",
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr); // Convert to Date object
@@ -66,14 +67,15 @@ export default {
 							});
 						}
 					},
-					{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: "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: "insertamum",
 						field: "insertamum",
 						visible: false,
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -87,11 +89,12 @@ export default {
 							});
 						}
 					},
-					{title: "updatevon", field: "updatevon", visible: false},
+					{title: "updatevon", field: "updatevon", visible: false, headerFilter: true},
 					{
 						title: "updateamum",
 						field: "updateamum",
 						visible: false,
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -148,7 +151,7 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '200',
+				height: '250',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 			},
@@ -30,10 +30,11 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type", width: 100},
+					{title: "Typ", field: "type", width: 100, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{
 						title: "Betrag",
 						field: "betrag1",
+						headerFilter: true,
 						formatter: function(cell) {
 							let value = cell.getValue();
 							if (value == null) {
@@ -41,28 +42,29 @@ export default {
 							}
 							return parseFloat(value).toFixed(2);
 						}},
-					{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: "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: "VertragsstundenStudiensemester",
 						field: "vertragsstunden_studiensemester_kurzbz",
-						visible: false
+						visible: false,
+						headerFilter: true
 					},
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: 150,
+				height: 250,
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				selectableRowsRollingSelection: false, //only allow multiselect with STRG
 				index: "lehreinheit_id",
-				persistenceID: 'core-contracts-unassigned-2026021701'
+				persistenceID: 'core-contracts-unassigned-2026050501'
 			},
 			tabulatorEvents: [
 				{
@@ -100,7 +102,7 @@ export default {

 							setHeader('type', this.$p.t('global', 'typ'));
 							setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
-							setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
+							setHeader('lehreinheit_id', this.$p.t('lehre', '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'));
@@ -20,9 +20,6 @@ export default {
 		ContractStati
 	},
 	inject: {
-/*		cisRoot: {
-			from: 'cisRoot'
-		},*/
 		hasSchreibrechte: {
 			from: 'hasSchreibrechte',
 			default: false
@@ -54,9 +51,9 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Bezeichnung", field: "bezeichnung", width: 300},
+					{title: "Bezeichnung", field: "bezeichnung", width: 300, headerFilter: true},
 					{
-						title: "Betrag", field: "betrag", width: 100,
+						title: "Betrag", field: "betrag", width: 100, headerFilter: true,
 						formatter: function (cell) {
 							let value = cell.getValue();

@@ -66,12 +63,13 @@ export default {
 							return parseFloat(value).toFixed(2);
 						}
 					},
-					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125},
-					{title: "Status", field: "status", width: 100},
+					{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: "Vertragsdatum",
 						field: "vertragsdatum",
 						width: 128,
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -82,11 +80,11 @@ export default {
 							});
 						}
 					},
-					{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: "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: 'Aktionen', field: 'actions',
 						minWidth: 150,
@@ -140,11 +138,13 @@ export default {
 					columns: true,
 					filter: false //to avoids js errors
 				},
-				persistenceID: 'core-contracts-2026021701',
+				persistenceID: 'core-contracts-2026050501',
 			};
 			return options;
 		},
 		tabulatorEvents() {
+			const vm = this;
+
 			const events = [
 				{
 					event: 'tableBuilt',
@@ -177,28 +177,11 @@ 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: (e, row) => {
-						if (!this.dataPrintHonorar?.multiselect) return;
-
+					handler: function (e, row) {
 						const { vertrag_id, status, bezeichnung, vertragstyp_bezeichnung } = row.getData();
-
-						this.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
+						vm.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
 					}
 				},
 				{
@@ -242,8 +225,6 @@ export default {
 		person_id() {
 			this.$refs.table.reloadTable();
 			this.arraySelectedContracts = [];
-/*			if(this.dataPrintHonorar?.multiselect)
-				this.dataPrintHonorar.multiselect = [];*/
 		},
 	},
 	methods: {
@@ -270,7 +251,6 @@ export default {
 				)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-					//window.scrollTo(0, 0);
 					this.reload();
 					this.contractSelected.vertrag_id = null;
 				})
@@ -518,19 +498,9 @@ 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 = {
@@ -540,28 +510,29 @@ export default {
 				vertragstyp_bezeichnung
 			};

-			// Single click
-			if (!isCtrl) {
+			// allow MultiSelect just in case event multiActionPrintHonorarvertrag
+			const allowMultiClick = isMulti && isCtrl;
+
+			if (!allowMultiClick) {
 				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([
@@ -587,88 +558,6 @@ 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">

@@ -1,147 +0,0 @@
-export default {
-	name: 'HorizontalSplit',
-	props: {
-		defaultRatio: {
-			type: Array,
-			default: () => [50, 50]
-		}
-	},
-	data: function () {
-		return {
-			availWidth: 0,
-			leftwidth: 0,
-			rightwidth: 0,
-			mousePosX: 0,
-			resize: false,
-			hsplitterOffset: 0,
-			selfOffsetLeft: 0
-		};
-	},
-	template: `
-    <div ref="horizontalsplit" class="horizontalsplit-container">
-        <div ref="leftpanel" class="horizontalsplitted"
-             :style="{ width: this.leftwidthcss }">
-            <slot name="left">
-                <p>Left Panel</p>
-            </slot>
-        </div>
-        <div ref="hsplitter" class="horizontalsplitter"
-             :class="this.leftOrRightClass" @mousedown="this.dragStart">
-            <div class="splitactions horizontal" :class="this.leftOrRightClass">
-            	<span @click="this.collapseRight" class="splitaction">
-                    <i class="fas fa-angle-right text-muted"></i>
-                </span>
-                <span @dblclick="this.showBoth" class="splitaction resize">
-                    <i class="fas fa-grip-lines-vertical text-muted"></i>
-                </span>
-                <span @click="this.collapseLeft" class="splitaction">
-                    <i class="fas fa-angle-left text-muted"></i>
-                </span>
-            </div>
-        </div>
-        <div ref="rightpanel" class="horizontalsplitted"
-             :style="{ width: this.rightwidthcss }">
-            <slot name="right">
-                <p/>
-            </slot>
-        </div>
-    </div>
-    `,
-	mounted: function () {
-		this.calcWidths();
-		this.trackHorizontalSplitterOffsetLeft();
-		window.addEventListener('resize', this.calcWidths);
-	},
-	updated: function () {
-		this.trackHorizontalSplitterOffsetLeft();
-	},
-	beforeDestroy: function () {
-		window.removeEventListener('resize', this.calcWidths);
-	},
-	methods: {
-		calcWidths: function () {
-			var oldavailWidth = this.availWidth;
-			this.selfOffsetLeft = this.$refs.horizontalsplit.offsetLeft;
-			this.availWidth = this.$refs.horizontalsplit.offsetWidth - this.$refs.hsplitter.offsetWidth;
-
-			if ((this.leftwidth === 0 && this.rightwidth === 0) || oldavailWidth === 0) {
-				this.leftwidth = Math.floor(this.availWidth * (this.defaultRatio[0] / 100));
-			} else {
-				this.leftwidth = Math.floor(((this.leftwidth * 100) / oldavailWidth) / 100 * this.availWidth);
-			}
-			this.rightwidth = this.availWidth - this.leftwidth;
-		},
-		collapseLeft: function () {
-			this.calcWidths();
-			this.leftwidth = 0;
-			this.rightwidth = this.availWidth;
-		},
-		collapseRight: function () {
-			this.calcWidths();
-			this.leftwidth = this.availWidth;
-			this.rightwidth = 0;
-		},
-		showBoth: function () {
-			this.leftwidth = Math.floor(this.availWidth * (this.defaultRatio[0] / 100));
-			this.rightwidth = this.availWidth - this.leftwidth;
-		},
-		isCollapsed: function () {
-			if (this.leftwidth === 0) {
-				return 'left';
-			} else if (this.rightwidth === 0) {
-				return 'right';
-			} else {
-				return false;
-			}
-		},
-		dragStart: function (e) {
-			e.preventDefault();
-			e.stopPropagation();
-			window.addEventListener('mouseup', this.dragEnd);
-			window.addEventListener('mousemove', this.drag);
-			this.resize = true;
-			this.mousePosX = e.clientX;
-		},
-		drag: function (e) {
-			if (!this.resize) {
-				return;
-			}
-			e.preventDefault();
-			e.stopPropagation();
-			var offsetX = e.clientX - this.mousePosX;
-			this.leftwidth = this.leftwidth + offsetX;
-			if (this.leftwidth < 0) {
-				this.leftwidth = 0;
-			}
-			if (this.leftwidth > this.availWidth) {
-				this.leftwidth = this.availWidth;
-			}
-			this.rightwidth = this.availWidth - this.leftwidth;
-			this.mousePosX = e.clientX;
-		},
-		dragEnd: function (e) {
-			e.preventDefault();
-			e.stopPropagation();
-			window.removeEventListener('mousemove', this.drag);
-			window.removeEventListener('mouseup', this.dragEnd);
-			this.resize = false;
-			this.mousePosX = e.clientX;
-		},
-		trackHorizontalSplitterOffsetLeft: function () {
-			this.hsplitterOffset = this.$refs.hsplitter.offsetLeft;
-		}
-	},
-	computed: {
-		leftOrRightClass: function () {
-			return ((this.hsplitterOffset - this.selfOffsetLeft) <= Math.floor(this.availWidth / 2))
-				? 'left'
-				: 'right';
-		},
-		leftwidthcss: function () {
-			return this.leftwidth + 'px';
-		},
-		rightwidthcss: function () {
-			return this.rightwidth + 'px';
-		}
-	}
-};
@@ -1,11 +1,5 @@
 export default {
    name: 'VerticalSplit',
-    props: {
-        defaultRatio: {
-            type: Array,
-            default: () => [50, 50]
-        }
-    },
    data: function() {
      return {          
          availHeight: 0,
@@ -56,22 +50,17 @@ export default {
    updated: function() {
        this.trackVerticalSplitterOffsetTop();
    },
-    beforeDestroy: function () {
-        window.removeEventListener('resize', this.calcHeights);
-    },
    methods: {
        calcHeights: function() {
            var windowheight = window.innerHeight;
            var oldavailHeight = this.availHeight;
            this.selfOffsetTop = this.$refs.verticalsplit.offsetTop;
            this.availHeight = windowheight - this.selfOffsetTop - this.$refs.vsplitter.offsetHeight;
-           
            if( (this.topheight === 0 && this.bottomheight === 0) || oldavailHeight === 0 ) {
-                this.topheight = Math.floor(this.availHeight * (this.defaultRatio[0] / 100));
+                this.topheight = Math.floor(this.availHeight/2);
            } else {
                this.topheight = Math.floor( ((((this.topheight * 100) / oldavailHeight) / 100) * this.availHeight) );
            }
-            
            this.bottomheight = this.availHeight - this.topheight;
        },
        collapseTop: function() {
@@ -85,8 +74,8 @@ export default {
            this.bottomheight = 0;
        },
        showBoth: function() {
-            this.topheight = Math.floor(this.availHeight * (this.defaultRatio[0] / 100));
-            this.bottomheight = this.availHeight - this.topheight
+            this.topheight = Math.floor(this.availHeight/2);
+            this.bottomheight = Math.floor(this.availHeight/2);
        },
        isCollapsed: function() {
            if( this.topheight === 0 ) {
@@ -111,7 +111,7 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 		return mergePromiseArr(getPromiseFunc(start, end), result);
 	};

-	const reload = () => {
+	Vue.watchEffect(() => {
 		const range = Vue.toValue(rangeInterval);
 		if (!(range instanceof luxon.Interval))
 			return;
@@ -132,18 +132,7 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 					}
 				})
 			});
-	};
+	})

-	Vue.watchEffect(reload);
-	
-	const reset = () => {
-		loading_id = 0;
-		events.value = [];
-		loadingEvents.value = [];
-		eventsLoaded.splice(0, eventsLoaded.length);
-
-		reload();
-	}
-
-	return { events: allEvents, lv, reset }
+	return { events: allEvents, lv }
 }
@@ -450,18 +450,18 @@ td.MarkLine
 td.HeaderTesttool /*fuer die Button-Optik beim Testtool*/
 {
 	color: #FFFFFF;
-	background-color: #00639C;
+	background-color: #71787D;
 	white-space:nowrap;
 	line-height: 25px;
 	box-shadow: inset 0 0 2px #FFFFFF;
-	padding: 10px;
+	padding: 0 10px;
 	width: 170px;
 }
 td.HeaderTesttoolSTG /*fuer die Button-Optik der Quereinstiegs-Studiengänge beim Testtool*/
 {
 	color: white;
 	border: 2px solid #73a9d6;
-	padding: 10px;
+	padding: 0 10px;
 	max-width: 100px;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -93,6 +93,7 @@ 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');

 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -240,6 +241,11 @@ $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"),
@@ -1,6 +1,19 @@
 <?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"))
 {
@@ -12,4 +25,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';
-}
+}
@@ -0,0 +1,357 @@
+<?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 />';
+	}
+}
+		
@@ -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))
+			if (in_array($studiengang->studiengang_kz, BIS_EXCLUDE_STG) || !$studiengang->melderelevant)
 			{
 				continue;
 			}
@@ -825,6 +825,7 @@ 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;
 		});
@@ -889,7 +890,7 @@ function _getLehrecontainer($sws_proStg_arr)
 			$kennzeichen_name = $is_lehrgang ? 'LehrgangNr' : 'StgKz';

 			// Lehreobjekt generieren
-			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->studiengang_kz, $lehre_arr))
+			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->melde_studiengang_kz, $lehre_arr))
 			{
 				$lehre_obj = new StdClass();

@@ -904,8 +905,8 @@ function _getLehrecontainer($sws_proStg_arr)
 			}
 			else	// Lehrecontainer mit STG schon vorhanden
 			{
-				$lehre_obj_arr = array_filter($lehre_arr, function (&$obj) use ($sws_proStg) {
-					return $obj->StgKz == $sws_proStg->studiengang_kz;
+				$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;
 				});

 				// SWS ergaenzen
@@ -1359,15 +1360,15 @@ function verwendung_exists($bisverwendung, $verwendung_arr)

 /**
 * Prueft ob ein Studiengang bereits im Lehre Container vorhanden ist
- * @param $studiengang_kz Studiengangskennzahl
+ * @param $melde_studiengang_kz Studiengangskennzahl
 * @param $lehre_arr Array mit Lehre Objekten
 * @return true wenn der Studiengang bereits existiert
 */
-function lehre_stg_exists($studiengang_kz, $lehre_arr)
+function lehre_stg_exists($melde_studiengang_kz, $lehre_arr)
 {
 	foreach($lehre_arr as $row)
 	{
-		$kennzeichenName = $row->LehrgangNr ?? $row->StgKz;
+		$kennzeichenName = isset($row->LehrgangNr) ? 'LehrgangNr' : 'StgKz';
 		if(isset($row->{$kennzeichenName}) && $row->{$kennzeichenName} == $melde_studiengang_kz)
 			return true;
 	}
@@ -227,7 +227,8 @@ if (isset($_GET['sendform']))
 	<table class="tablesorter" id="t1">
 	<thead>
 		<tr>
-			<th><span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
+			<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"/>
 				'.$tooltiptext.'
 				</span>
 			</th>
@@ -364,9 +365,10 @@ if (isset($_GET['sendform']))
 		$("#t1").tablesorter(
 		{
 			sortList: [[3,0]],
-			widgets: ["zebra", "filter", "stickyHeaders"],
+			widgets: ["saveSort", "zebra", "filter", "stickyHeaders"],
 			headers: { 	0: { filter: false,  sorter: false }},
-			widgetOptions : {	filter_functions : {
+			widgetOptions : {	filter_saveFilters : true,
+								filter_functions : {
 									// Add select menu to this column
 									8 : {
 									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
@@ -381,6 +383,13 @@ 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;
 		});
 	});
 		
@@ -588,7 +588,9 @@ 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
+		$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
 				FROM testtool.tbl_antwort
 				JOIN testtool.tbl_vorschlag USING(vorschlag_id)
 				JOIN testtool.tbl_frage USING (frage_id)
@@ -615,6 +617,7 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 						<th>Level</th>
 						<th>Antwort #</th>
 						<th>Punkte</th>
+						<th>FrageID</th>
 					</tr>
 					</thead>
 					<tbody>';
@@ -632,6 +635,7 @@ 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>';
@@ -837,6 +837,25 @@ 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
@@ -1007,7 +1026,7 @@ if(isset($_GET['excel']))
 						{
 							widgets: ["zebra", "filter", "stickyHeaders"],
 							sortList: [[2,0],[3,0]],
-							headers: {0: { sorter: false}},
+							headers: {0: { sorter: false},10: { sorter: "customDate"},11: { sorter: "customDate"}},
 							widgetOptions: {filter_cssFilter: [
 									"filter_clm_null",
 									"filter_clm_prestudent_id",
@@ -1020,6 +1039,7 @@ if(isset($_GET['excel']))
 									"filter_clm_studienplan",
 									"filter_clm_einstiegssemester",
 									"filter_clm_geburtsdatum",
+									"filter_clm_anmeldedatum",
 									"filter_clm_email",
 									"filter_clm_absolviert"]}
 						});
@@ -1072,6 +1092,7 @@ if(isset($_GET['excel']))
 							'clm_studienplan',
 							'clm_einstiegssemester',
 							'clm_geburtsdatum',
+							"filter_clm_anmeldedatum",
 							'clm_email',
 							'clm_absolviert'];
 						for (var i in arr)
@@ -2697,7 +2718,8 @@ if($reihungstest_id!='')
 					WHERE prestudent_id = tbl_prestudent.prestudent_id
 						AND status_kurzbz = 'Interessent'
 					) LIMIT 1
-			) AS orgform_kurzbz
+			) AS orgform_kurzbz,
+       tbl_rt_person.anmeldedatum
 	FROM PUBLIC.tbl_rt_person
 	JOIN PUBLIC.tbl_person USING (person_id)
 	JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = rt.reihungstest_id)
@@ -2786,6 +2808,7 @@ 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>';
@@ -2827,6 +2850,7 @@ 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>
@@ -2946,6 +2970,7 @@ 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>';
@@ -3009,6 +3034,7 @@ 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>
@@ -3128,6 +3154,7 @@ 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>
Author	SHA1	Message	Date
Johann Hoffmann	8f2d268e3e	spout 2.7 install for large excel exports	2026-05-20 13:26:29 +02:00
Harald Bamberger	cb7a0f7669	Merge branch 'feature-70376/Lohnguide'	2026-05-13 11:53:14 +02:00
Harald Bamberger	68d97a5e97	handle case where old value or new value and not both are null explicitly in markDirty Method	2026-05-13 11:42:25 +02:00
Harald Bamberger	d27071528f	revert change to comparision in markDirty Method	2026-05-13 11:16:18 +02:00
Harald Bamberger	17772c3738	Merge branch 'master' into feature-70376/Lohnguide	2026-05-13 11:15:07 +02:00
Harald Bamberger	bbb4f8a01c	Merge branch 'bug-76146/studvw_karteireiter_dokumente_akzeptiert_eintraege_ohne_vorhandenes_dokument'	2026-05-06 16:13:50 +02:00
Harald Bamberger	fdbb93a5c5	bugfix download booking receipt failed. only fetch oehbeitrag from bis.tbl_oehbeitrag if a user is logged in	2026-05-05 14:36:07 +02:00
Harald Bamberger	b7e48633ab	Merge branch 'master' into bug-76146/studvw_karteireiter_dokumente_akzeptiert_eintraege_ohne_vorhandenes_dokument	2026-05-05 13:33:38 +02:00
Harald Bamberger	04dc1eb07b	Merge branch 'bug-76519/StudVW_Messages_Table_column_Stati'	2026-05-05 13:04:58 +02:00
Harald Bamberger	50b229090b	prefetch phrases and then render filter component instead of redrawing the table	2026-05-05 13:04:11 +02:00
Harald Bamberger	2d27a998c4	Merge branch 'bug-76109/VVW_Details_und_Status_not_Loading'	2026-05-05 11:17:49 +02:00
Harald Bamberger	090e535466	add header filters, increase height of tables, use correct category for phrase lehreinheit_id	2026-05-05 11:04:48 +02:00
Harald Bamberger	c4d35181db	Merge branch 'master' into bug-76109/VVW_Details_und_Status_not_Loading	2026-05-05 09:01:49 +02:00
Harald Bamberger	0ac6ef4599	Merge branch 'feature-62607/konto_oh_beitrag_betrag_aus_eigener_tabelle'	2026-05-05 08:46:22 +02:00
Werner Masik	7f13c128f1	allow null value for vordienstzeit; changed comparison in markDirty to !== (because of 0 vs. null issue)	2026-05-04 20:35:51 +02:00
Harald Bamberger	cb60ddcc94	Merge branch 'master' into feature-62607/konto_oh_beitrag_betrag_aus_eigener_tabelle	2026-05-04 15:41:52 +02:00
Harald Bamberger	bd4ced9559	bugfix: comma as decimal separator prevents saving booking, bugfix messages tinymce not resizeable	2026-05-04 14:39:19 +02:00
Andreas Österreicher	a04d2acb86	Fixed Blank on Phrase for Abgabetool	2026-05-04 10:49:33 +02:00
Harald Bamberger	de2aabf00b	readd dokument preview link to api response	2026-05-04 09:30:16 +02:00
ma0068	685fc69e5d	update css and add provisional height	2026-04-30 18:02:38 +02:00
Werner Masik	58a921b500	changed lohnguide kommentar data type to text	2026-04-30 09:47:12 +02:00
Andreas Österreicher	552faefa51	Merge branch 'feature-76108/microdegree_abschlussurkunde'	2026-04-27 08:55:08 +02:00
Harald Bamberger	954397f028	Merge branch 'feature-70376/Lohnguide'	2026-04-22 18:52:51 +02:00
Harald Bamberger	80faa61c91	Merge branch 'master' into feature-70376/Lohnguide	2026-04-22 18:46:57 +02:00
Werner Masik	961ede66a9	lohnguide db update changed	2026-04-22 18:40:22 +02:00
Andreas Österreicher	6fec8382b5	Merge branch 'feature-76554/Personalmeldung_alt_bei_Lehre_nicht_melderelevant_rausfiltern'	2026-04-22 09:15:23 +02:00
Andreas Österreicher	4eb076d115	Fixed Saving of Entwicklungsteam	2026-04-21 17:34:36 +02:00
Harald Bamberger	7427aa87ea	Merge branch 'feature-76545/findAbgabenNewOrUpdatedSinceByAbgabedatumFixTimestampDateComparison'	2026-04-21 17:01:04 +02:00
Johann Hoffmann	85043e57db	added missing parenthesis	2026-04-21 17:00:07 +02:00
Johann Hoffmann	5beddbccb4	changed the where clause to a simpler = CURRENT_DATE comparison -> works the same if the job runs daily and fetches updates of one day/date; has to be changed back in case we want to find updates in a range larger than 1 day in an interval larger than 1 day;	2026-04-21 14:18:45 +02:00
kindlm	e2ae9b88c8	Merge remote-tracking branch 'origin/master'	2026-04-21 12:56:30 +02:00
kindlm	ca3abf9154	Small Style-Fix in Testtool To make headings stand out more clearly from the buttons	2026-04-21 12:56:02 +02:00
Alexei Karpenko	f863c6d728	personalmeldung legacy system: melderelevant is checked for lehre, bugfix: lehre is correctly added if studiengang already has sws	2026-04-20 18:24:30 +02:00
Harald Bamberger	92a2053b42	Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC'	2026-04-20 17:30:14 +02:00
kindlm	70602be54e	SaveSort und Filter-Reset in RaumÜbersicht	2026-04-20 11:30:17 +02:00
kindlm	dac71f597a	Spalte Anmeldedatum in RT-Übersicht Spalte Frage_ID in RT-Administration JQuery und Tabelsorter aus Include in Service_Uebersicht	2026-04-20 11:24:59 +02:00
Johann Hoffmann	3a646ffe77	adapt AbgabeJob relevant queries so they compare with the pgsql date function CURRENT_DATE instead of NOW() to avoid the cutoff from uploads the happened "yesterday but more than 24 hours ago"; also added another "abgabedatum < CURRENT_DATE" condition, to avoid sending this exact case as updates 2 days in a row;	2026-04-20 11:06:06 +02:00
ma0068	26db4a5e7a	adding redraw tabulator and fallback to avoid empty column	2026-04-20 09:31:52 +02:00
Harald Bamberger	98a10a2f55	Merge branch 'feature-69389/AbmeldungSTGL_Anzeige_mit_Studiengangskuerzel'	2026-04-17 12:37:49 +02:00
Harald Bamberger	e48b94b858	studiengangskuerzel statt kurzbzlang	2026-04-17 12:35:55 +02:00
Andreas Österreicher	0ff29ba6af	Merge branch 'epic-56039/LV-Evaluierung'	2026-04-16 13:22:40 +02:00
Harald Bamberger	ba543448ae	Merge branch 'bug-76260/StudVW_Messages_TinyMCE_Cursor_Jumping_TextInput'	2026-04-16 11:26:32 +02:00
Harald Bamberger	f121f9b5a2	deactivate pagination - since potentially msg threads are not shown completely	2026-04-16 11:23:57 +02:00
Harald Bamberger	88b22f5490	revert to v-if to not render element when not necessary and use Vue.nextTick for dependent code	2026-04-15 17:02:58 +02:00
Harald Bamberger	4b7ee9abe1	Merge branch 'feature-70376/Lohnguide'	2026-04-15 15:52:12 +02:00
Cristina	d499619cf3	Added phrase endedatumMussInZukunftLiegen	2026-04-15 13:39:06 +02:00
Cristina	f489153ff3	Merge branch 'master' into epic-56039/LV-Evaluierung	2026-04-15 12:25:05 +02:00
Cristina	9b79a07fa2	Merge branch 'master' of https://github.com/FH-Complete/FHC-Core	2026-04-15 12:24:44 +02:00
Harald Bamberger	6ce14a25d7	Merge branch 'master' into feature-70376/Lohnguide	2026-04-15 11:49:26 +02:00
Werner Masik	c701d92779	fix db_update	2026-04-15 11:15:10 +02:00
Werner Masik	73e03ba901	Gehaltstyp Überstundenpauschale und Sachbezug PKW	2026-04-15 10:44:03 +02:00
ma0068	95a7797ae9	delete unused apicall for mode modal add editor.setContent to function getReplyData readd loadReplyData and use v-show for visibleDiv for mode inSamePage	2026-04-14 15:46:34 +02:00
ma0048	3ce3eff022	fehlendes mapping hinzugefuegt	2026-04-14 09:30:45 +02:00
ma0048	21d80905a2	akzeptierte dokumente anzeigen, auch wenn kein dokument vorhanden ist	2026-04-13 13:04:46 +02:00
Andreas Österreicher	3a91b12f31	Merge branch 'epic-56039/LV-Evaluierung'	2026-04-13 10:39:00 +02:00
ma0048	ea0a249612	micro degree abschlussdokumente hinzugefuegt	2026-04-13 09:14:27 +02:00
ma0068	843894405e	changes for NewDiv remove Watcher for formData Fields add predefault settings for tabulator fields add setContent for Editor change text for closing window/tab show alertSuccess for sending Message just in case of inSamePage	2026-04-10 13:03:24 +02:00
ma0068	8fddbc3a32	delete watcher for formData fields, add setContent for loading Vorlage	2026-04-10 09:15:34 +02:00
Werner Masik	5c463c0866	add vordienstzeit to lohnguide	2026-04-06 22:25:13 +02:00
Werner Masik	423bbd95a6	add vordienstzeit to lohnguide	2026-04-06 22:25:12 +02:00
Cristina	386cc779bf	Merge branch 'master' into epic-56039/LV-Evaluierung	2026-04-02 15:49:20 +02:00
Cristina	08c6d58a50	Merge branch 'master' of https://github.com/FH-Complete/FHC-Core	2026-04-02 14:24:39 +02:00
Cristina	3f53c5feba	Added: method getKFLByUID to get Kompetenzfeldleitung by UID	2026-04-02 14:23:59 +02:00
ma0068	298dbbf400	use context vm for tabulator event, refactor function toggleRowClick, delete unused commented sections	2026-04-02 10:58:49 +02:00
Harald Bamberger	627a52e3d1	Merge branch 'master' into feature-70376/Lohnguide	2026-03-25 09:36:27 +01:00
Harald Bamberger	059b13938e	Merge branch 'master' into feature-70376/Lohnguide	2026-03-18 11:46:27 +01:00
Werner Masik	6b816def31	add lohnguide to vertragsbestandteil SQL	2026-03-05 15:34:51 +01:00
Werner Masik	5fbcf588ed	fix vertragsbestandteil lohnguide	2026-03-05 14:29:56 +01:00
Werner Masik	41b2a6d1d4	added db migration for lohnguide	2026-03-04 10:53:30 +01:00
Werner Masik	e054f1222b	basic model and factory for lohnguide	2026-03-03 11:50:45 +01:00
Cristina	c57eb1b8de	Adapted method getLvLeitung: filter Dummy and allow only active Benutzer/Person	2026-03-02 11:00:05 +01:00
Cristina	d1015956d1	Merge branch 'master' into epic-56039/LV-Evaluierung	2026-02-25 10:54:29 +01:00
Cristina	726fce9fac	Merge branch 'master' of https://github.com/FH-Complete/FHC-Core	2026-02-25 10:52:50 +01:00
Cristina	27a91de5f6	Added app lvevaluierung to system.tbl_app	2026-01-22 15:51:05 +01:00
Cristina	7ccc26c878	Added lvevaluierung phrasen for STGL Übersichtsseite	2026-01-22 15:41:25 +01:00
Cristina	9ebc847e8e	Added lvevaluierung phrasen for Lektoren Übersichtsseite	2026-01-22 14:59:00 +01:00
Cristina	511b04c1f8	Merge branch 'master' into epic-56039/LV-Evaluierung	2026-01-21 18:01:55 +01:00
Cristina	ec90d35e02	Merge branch 'master' of https://github.com/FH-Complete/FHC-Core	2026-01-21 18:01:24 +01:00
ma0068	38e8f91fdf	add kurzbzlang to studentDropdown suggestion	2025-11-25 10:48:57 +01:00
ma0048	ba6224bc78	oeh betrag aus der eigener tabelle holen studentenverwaltung bei jedem studiensemester wechsel fas nur einmalig ueber die variable	2025-09-02 11:18:24 +02:00
cgfhtw	d542cf7720	s&d	2024-08-14 16:20:47 +02:00