diff --git a/application/config/navigation.php b/application/config/navigation.php
index 56d142d08..3680930d0 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -31,6 +31,14 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 20,
 					'requiredPermissions' => 'admin:w'
+				),
+				'bismeldestichtagsverwaltung' => array(
+					'link' => site_url('codex/Bismeldestichtag'),
+					'icon' => '',
+					'description' => 'BIS-Meldestichtagsverwaltung',
+					'expand' => true,
+					'sort' => 30,
+					'requiredPermissions' => 'admin:w'
 				)
 			)
 		),
diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index 159ead759..3f28e5d50 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -110,11 +110,10 @@ $config['abmeldung_job_deadline_date_modifier'] = '+2 weeks';
 
 /**
  * System User - uid of a user that is allowed to set prestudentstatus
- * TODO(chris): DEBUG! CHANGE THIS!
  *
  * @var string
  */
-$config['antrag_job_systemuser'] = 'ma0168';
+$config['antrag_job_systemuser'] = '';
 
 
 /**
@@ -160,3 +159,11 @@ $config['stgkz_blacklist_unterbrechung'] = [];
  * @var array           An array of tbl_studiengang.studiengang_kz's
  */
 $config['stgkz_blacklist_wiederholung'] = [];
+
+/**
+ * Blacklisted noten for negative committee exams
+ * noten with this ids won't be seen as negative
+ *
+ * @var array           An array of noten ids
+ */
+$config['note_blacklist_wiederholung'] = [];
diff --git a/application/controllers/codex/Bismeldestichtag.php b/application/controllers/codex/Bismeldestichtag.php
new file mode 100644
index 000000000..2723b2f7c
--- /dev/null
+++ b/application/controllers/codex/Bismeldestichtag.php
@@ -0,0 +1,140 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Overview on Bismeldestichtage
+ */
+class Bismeldestichtag extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'admin:r',
+				'getStudiensemester' => 'admin:r',
+				'getBismeldestichtage' => 'admin:r',
+				'addBismeldestichtag' => 'admin:rw',
+				'deleteBismeldestichtag' => 'admin:rw'
+			)
+		);
+
+		// Load models
+		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		// Loads phrases system
+		$this->loadPhrases(
+			array(
+				'bismeldestichtag'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function index()
+	{
+		$this->load->view('codex/bismeldestichtag.php');
+	}
+
+	public function getStudiensemester()
+	{
+		// load semester list
+		$semList = array();
+		$this->StudiensemesterModel->addSelect('studiensemester_kurzbz');
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$semRes = $this->StudiensemesterModel->load();
+
+		if (hasData($semRes))
+		{
+			$semList = getData($semRes);
+		}
+
+		// load current semester
+		$currSem = null;
+		$semRes = $this->StudiensemesterModel->getAkt();
+
+		if (hasData($semRes))
+		{
+			$currSem = getData($semRes)[0]->studiensemester_kurzbz;
+		}
+
+		// output data
+		$this->outputJsonSuccess(
+			array('semList' => $semList, 'currSem' => $currSem)
+		);
+	}
+
+	public function getBismeldestichtage()
+	{
+		$this->BismeldestichtagModel->addSelect(
+			'meldestichtag_id, meldestichtag,
+			tbl_bismeldestichtag.studiensemester_kurzbz, sem.start AS semester_start,
+			tbl_bismeldestichtag.insertamum, tbl_bismeldestichtag.insertvon, tbl_bismeldestichtag.updateamum, tbl_bismeldestichtag.updatevon'
+		);
+		$this->BismeldestichtagModel->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz', 'LEFT');
+		$this->BismeldestichtagModel->addOrder('semester_start');
+		$this->BismeldestichtagModel->addOrder('meldestichtag', 'DESC');
+		$this->BismeldestichtagModel->addOrder('meldestichtag_id', 'DESC');
+		$this->outputJson($this->BismeldestichtagModel->load());
+	}
+
+	public function addBismeldestichtag()
+	{
+		// get request data
+		$request = $this->getPostJSON();
+
+		// check request data
+		if (!property_exists($request, 'meldestichtag') || isEmptyString($request->meldestichtag))
+			$this->terminateWithJsonError('Error occured: Meldestichtag missing');
+		if (!property_exists($request, 'studiensemester_kurzbz') || isEmptyString($request->studiensemester_kurzbz))
+			$this->terminateWithJsonError('Error occured: Studiensemester missing');
+
+		$meldestichtag = $request->meldestichtag;
+		$studiensemester_kurzbz = $request->studiensemester_kurzbz;
+
+		// check if Bismeldestichtag already exists
+		$this->BismeldestichtagModel->addSelect('1');
+		$bismeldestichtagRes = $this->BismeldestichtagModel->loadWhere(
+			array('meldestichtag' => $meldestichtag, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
+		);
+
+		// return success if already exists
+		if (hasData($bismeldestichtagRes))
+			$this->outputJsonSuccess('Bismeldestichtag already exists');
+		else
+		{
+			// insert new if Stichtag does not exist
+			$this->outputJson($this->BismeldestichtagModel->insert(
+				array(
+					'meldestichtag' => $request->meldestichtag,
+					'studiensemester_kurzbz' => $request->studiensemester_kurzbz,
+					'insertvon' => getAuthUID()
+				)
+			));
+		}
+	}
+
+	public function deleteBismeldestichtag()
+	{
+		// get request data
+		$request = $this->getPostJSON();
+
+		// check request data
+		if (!property_exists($request, 'meldestichtag_id'))
+			$this->terminateWithJsonError('Error occured: Meldestichtag Id missing');
+
+		$meldestichtag_id = $request->meldestichtag_id;
+
+		// deletetion
+		$this->outputJson($this->BismeldestichtagModel->delete($meldestichtag_id));
+	}
+}
diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index f6b184351..8d333d5b8 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -33,54 +33,28 @@ class Leitung extends FHC_Controller
 
 	public function getActiveStgs()
 	{
-		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
-		$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
-
-		$stgs = [];
-
-		if ($studiengaenge) {
-			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
-
-			if (isError($result))
-				return $this->outputJson($result);
-			$antraege = getData($result) ?: [];
-
-			foreach ($antraege as $antrag) {
-				if (!isset($stgs[$antrag->studiengang_kz])) {
-					$stgs[$antrag->studiengang_kz] = new stdClass();
-					$stgs[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
-					$stgs[$antrag->studiengang_kz]->orgform = $antrag->orgform;
-					$stgs[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
-				}
-			}
+		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
+		$studiengaenge = array_merge($studiengaenge, $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: []);
+		
+		$result = $this->StudierendenantragModel->loadStgsWithAntraege($studiengaenge);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
 		}
-
-		if ($stgsNeuanlage) {
-			$result = $this->StudierendenantragModel->loadForStudiengaenge($stgsNeuanlage);
-
-			if (isError($result))
-				return $this->outputJson($result);
-			$antraege = getData($result) ?: [];
-
-			foreach ($antraege as $antrag) {
-				if (!isset($stgs[$antrag->studiengang_kz])) {
-					$stgs[$antrag->studiengang_kz] = new stdClass();
-					$stgs[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
-					$stgs[$antrag->studiengang_kz]->orgform = $antrag->orgform;
-					$stgs[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
-				}
-			}
-		}
-
-		$this->outputJsonSuccess($stgs);
+		$this->outputJson($result);
 	}
 
-	public function getAntraege($studiengang = null)
+	public function getAntraege($studiengang = null, $extra = null)
 	{
+		if ($studiengang && $studiengang == 'todo') {
+			$studiengang = $extra;
+			$extra = true;
+		} else {
+			$extra = false;
+		}
 
-		if($studiengang)
+		if ($studiengang) {
 			$studiengaenge = [$studiengang];
-		else {
+		} else {
 			$studiengaenge =$this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
 			if(!is_array($studiengaenge))
 				$studiengaenge = [];
@@ -96,7 +70,9 @@ class Leitung extends FHC_Controller
 
 		$antraege = [];
 		if ($studiengaenge) {
-			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
+			$result = $extra
+				? $this->StudierendenantragModel->loadActiveForStudiengaenge($studiengaenge)
+				: $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
 			if (isError($result)) {
 				$this->output->set_status_header(500);
 				return $this->outputJson('Internal Server Error');
diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
index 515771224..418d05f45 100644
--- a/application/controllers/components/Antrag/Wiederholung.php
+++ b/application/controllers/components/Antrag/Wiederholung.php
@@ -76,10 +76,9 @@ class Wiederholung extends FHC_Controller
 			if (isError($result)) {
 				return $this->outputJsonError(getError($result));
 			}
-
 			$data = getData($result);
 
-			$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
+			$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id, $data->datum, $data->studiensemester_kurzbz);
 			// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
 			$pruefungsdata = current(getData($result));
 
diff --git a/application/controllers/components/Filter.php b/application/controllers/components/Filter.php
index ab7e1493e..bde7d7ed7 100644
--- a/application/controllers/components/Filter.php
+++ b/application/controllers/components/Filter.php
@@ -26,6 +26,9 @@ class Filter extends FHC_Controller
 		// Loads authentication library and starts authentication
 		$this->load->library('AuthLib');
 
+		// Loads the FiltersModel
+		$this->load->model('system/Filters_model', 'FiltersModel');
+
 		// Loads the FilterCmptLib with HTTP GET/POST parameters
 		$this->_startFilterCmptLib();
 	}
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 6bd4e29d6..131cfdced 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -96,7 +96,7 @@ class AntragJob extends JOB_Controller
 				}
 				$stgLeitungen[$leitung->uid]['stgs'][] = $antrag->studiengang_kz;
 
-				$result = $this->StudiengangModel->load($antrag->studiengang_kz);
+				$result = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 				if (isError($result))
 				{
 					$this->logError(getError($result));
@@ -165,9 +165,14 @@ class AntragJob extends JOB_Controller
 			}
 
 			$data['table'] = $data['table_' . DEFAULT_LANGUAGE];
+			$data['leitungLink'] = APP_ROOT. 'index.ci.php/lehre/Studierendenantrag/leitung';
+
+			//Mail an Stgl und Assistenz
+			$to = $leitung['Details']->uid . '@' . DOMAIN;
+			$cc = $leitung['Details']->email;
 
 			// NOTE(chris): Sancho mail
-			if (sendSanchoMail("Sancho_Mail_Antrag_Stgl", $data, $leitung['Details']->uid . '@' . DOMAIN, 'Anträge - Aktion(en) erforderlich'))
+			if (sendSanchoMail("Sancho_Mail_Antrag_Stgl", $data, $to, 'Anträge - Aktion(en) erforderlich', DEFAULT_SANCHO_HEADER_IMG, DEFAULT_SANCHO_FOOTER_IMG, '', $cc))
 				$count++;
 		}
 
@@ -209,8 +214,7 @@ class AntragJob extends JOB_Controller
 		$count = 0;
 		foreach ($antraege as $antrag)
 		{
-			$this->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
-			$res = $this->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
+			$res = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 			$stg = '';
 			$orgform = '';
 			if (hasData($res)) {
@@ -282,7 +286,6 @@ class AntragJob extends JOB_Controller
 
 		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed(
 			[
-				null,
 				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
 				Studierendenantragstatus_model::STATUS_REQUESTSENT_2
 			],
@@ -342,9 +345,11 @@ class AntragJob extends JOB_Controller
 		$dateDeadline = new DateTime();
 		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
 
+		$this->StudierendenantragModel->addSelect('tbl_studierendenantrag.studierendenantrag_id');
 		$this->StudierendenantragModel->addSelect('prestudent_id');
 		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
 		$this->StudierendenantragModel->addSelect('s.insertamum');
+		$this->StudierendenantragModel->addSelect('s.insertvon');
 
 		$this->StudierendenantragModel->db->where_in('public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', $this->config->item('antrag_prestudentstatus_whitelist'));
 
@@ -365,51 +370,65 @@ class AntragJob extends JOB_Controller
 
 			foreach ($antraege as $antrag)
 			{
-				$result = $this->prestudentlib->setAbbrecher(
-                    $antrag->prestudent_id,
-                    $antrag->studiensemester_kurzbz,
-                    $insertvon,
-                    'abbrecherStgl',
-                    $antrag->insertamum
-                );
+				$result = $this->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $antrag->studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED,
+					'insertvon' => 'AntragJob'
+				]);
 				if (isError($result))
 					$this->logError(getError($result));
-				else
-				{
-					$count++;
-					$result = $this->PrestudentModel->load($antrag->prestudent_id);
-					if(!hasData($result)) {
-						$this->logWarning('No Prestudent found');
-						continue;
-					}
-					$prestudent = current(getData($result));
-					$result = $this->StudiengangModel->load($prestudent->studiengang_kz);
-					if(!hasData($result)) {
-						$this->logWarning('No Studiengang found');
-						continue;
-					}
-					$studiengang = current(getData($result));
-					$result = $this->PersonModel->loadPrestudent($antrag->prestudent_id);
-					if(!hasData($result))
-					{
-						$this->logWarning('No Person found');
-						continue;
-					}
-					$person = current(getData($result));
-					$email = $studiengang->email;
-					$dataMail = array(
-						'prestudent' => $antrag->prestudent_id,
-						'studiensemester' => $antrag->studiensemester_kurzbz,
-						'name' => trim($person->vorname . ' '. $person->nachname),
-					);
+				else {
+					$deregisterStatus = getData($result);
 
-					if(!sendSanchoMail('Sancho_Mail_Antrag_A_Assist', $dataMail, $email, 'Einspruchsfrist abgelaufen'))
-					{
-						$this->logWarning("Failed to send Notification to " . $email);
+					$result = $this->prestudentlib->setAbbrecher(
+	                    $antrag->prestudent_id,
+	                    $antrag->studiensemester_kurzbz,
+	                    'AntragJob',
+	                    'abbrecherStgl',
+	                    $antrag->insertamum,
+	                    null,
+	                    $antrag->insertvon ?: $insertvon
+	                );
+					if (isError($result)) {
+						$this->StudierendenantragstatusModel->delete($deregisterStatus);
+						$this->logError(getError($result));
+					} else {
+						$count++;
+						$result = $this->PrestudentModel->load($antrag->prestudent_id);
+						if(!hasData($result)) {
+							$this->logWarning('No Prestudent found');
+							continue;
+						}
+						$prestudent = current(getData($result));
+						$result = $this->StudiengangModel->load($prestudent->studiengang_kz);
+						if(!hasData($result)) {
+							$this->logWarning('No Studiengang found');
+							continue;
+						}
+						$studiengang = current(getData($result));
+						$result = $this->PersonModel->loadPrestudent($antrag->prestudent_id);
+						if(!hasData($result))
+						{
+							$this->logWarning('No Person found');
+							continue;
+						}
+						$person = current(getData($result));
+						$email = $studiengang->email;
+						$dataMail = array(
+							'prestudent' => $antrag->prestudent_id,
+							'studiensemester' => $antrag->studiensemester_kurzbz,
+							'name' => trim($person->vorname . ' '. $person->nachname),
+						);
+
+						if(!sendSanchoMail('Sancho_Mail_Antrag_A_Assist', $dataMail, $email, 'Einspruchsfrist abgelaufen'))
+						{
+							$this->logWarning("Failed to send Notification to " . $email);
+						}
 					}
+
 				}
 			}
-			$this->logInfo($count . " Students set to Abbrecher");
+			$this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher");
 		}
 		$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
 	}
@@ -426,40 +445,56 @@ class AntragJob extends JOB_Controller
 		$modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier');
 		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
 
-		if ($modifier_deadline)
-		{
+		$digi_start = $this->config->item('digitalization_start');
+		if ($digi_start) {
+			try {
+				$digi_start = new DateTime($digi_start);
+			} catch(Exception $e) {
+			}
+		}
+
+		if ($modifier_deadline) {
 			$dateDeadline = new DateTime();
 			$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
+			
+			if ($digi_start)
+				$dateDeadline = max($digi_start, $dateDeadline);
+		} else {
+			$dateDeadline = $digi_start ?: null;
 		}
-		else
-			$dateDeadline = null;
 
 		//first request
-		if ($modifier_request_1)
-			$this->sendReminder(
-				'Request1',
-				null,
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-				$dateDeadline,
-				$modifier_request_1,
-				$modifier_deadline,
-				'Aufforderung: Bekanntgabe Wiederholung'
-			);
-		else
+		if ($modifier_request_1) {
+			$dateStichtag = new DateTime();
+			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_1));
+			if (!$dateDeadline || $dateStichtag > $dateDeadline)
+				$this->sendReminder(
+					'Request1',
+					null,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+					$dateDeadline,
+					$dateStichtag,
+					$modifier_deadline,
+					'Aufforderung: Bekanntgabe Wiederholung'
+				);
+		} else
 			$this->logError('Config "wiederholung_job_request_1_date_modifier" nicht gesetzt');
 
 		//second request
-		if ($modifier_request_2)
-			$this->sendReminder(
-				'Request2',
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
-				$dateDeadline,
-				$modifier_request_2,
-				$modifier_deadline,
-				'Reminder Aufforderung: Bekanntgabe Wiederholung'
-			);
-		else
+		if ($modifier_request_2) {
+			$dateStichtag = new DateTime();
+			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_2));
+			if (!$dateDeadline || $dateStichtag > $dateDeadline)
+				$this->sendReminder(
+					'Request2',
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
+					$dateDeadline,
+					$dateStichtag,
+					$modifier_deadline,
+					'Reminder Aufforderung: Bekanntgabe Wiederholung'
+				);
+		} else
 			$this->logError('Config "wiederholung_job_request_2_date_modifier" nicht gesetzt');
 
 		$this->logInfo('Ende Job sendAufforderungWiederholer');
@@ -479,14 +514,11 @@ class AntragJob extends JOB_Controller
 		return $result;
 	}
 
-	protected function sendReminder($name, $status_from, $status_to, $deadline, $date_modifier, $modifier_deadline, $subject)
+	protected function sendReminder($name, $status_from, $status_to, $deadline, $date_stichtag, $modifier_deadline, $subject)
 	{
 		$this->logInfo('Start Job sendAufforderungWiederholer ' . $name);
 
-		$dateStichtag = new DateTime();
-		$dateStichtag->sub(DateInterval::createFromDateString($date_modifier));
-
-		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $dateStichtag, $deadline);
+		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $date_stichtag, $deadline);
 
 		if(isError($result))
 		{
diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
index 431ac5b04..c31ed54c9 100644
--- a/application/controllers/jobs/ReihungstestJob.php
+++ b/application/controllers/jobs/ReihungstestJob.php
@@ -467,7 +467,7 @@ class ReihungstestJob extends JOB_Controller
 		$this->PrestudentstatusModel->addJoin('public.tbl_person', 'person_id');
 
 		$yesterdays_applicants_arr = $this->PrestudentstatusModel->loadWhere('
-			status_kurzbz = \'Interessent\' AND
+			status_kurzbz IN (\'Interessent\', \'Bewerber\') AND
 			typ = \'b\' AND
 			bestaetigtam = current_date - 1
 		');
@@ -730,33 +730,27 @@ class ReihungstestJob extends JOB_Controller
 			tbl_reihungstest.reihungstest_id,
 			tbl_studienplan.studienplan_id,
 			tbl_reihungstest.studiensemester_kurzbz,
-			tbl_studienordnung.studiengang_kz
+			tbl_studienordnung.studiengang_kz,
+			tbl_studienplan.orgform_kurzbz
 		FROM
 			public.tbl_reihungstest
-			JOIN public.tbl_rt_studienplan ON(tbl_rt_studienplan.reihungstest_id=tbl_reihungstest.reihungstest_id)
-			JOIN lehre.tbl_studienplan USING(studienplan_id)
-			JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+				JOIN public.tbl_rt_studienplan ON(tbl_rt_studienplan.reihungstest_id=tbl_reihungstest.reihungstest_id)
+				JOIN lehre.tbl_studienplan USING(studienplan_id)
+				JOIN lehre.tbl_studienordnung USING(studienordnung_id)
 		WHERE
-			NOT EXISTS(
-				SELECT 1 FROM lehre.tbl_studienplan_semester
-				WHERE studienplan_id=tbl_rt_studienplan.studienplan_id
-					AND tbl_studienplan_semester.studiensemester_kurzbz=tbl_reihungstest.studiensemester_kurzbz
+			EXISTS (
+				SELECT studienplan_id
+				FROM lehre.tbl_studienordnung sordnung
+					JOIN lehre.tbl_studienplan USING (studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester USING (studienplan_id)
+				WHERE sordnung.studiengang_kz = tbl_studienordnung.studiengang_kz
+					AND tbl_studienplan_semester.studiensemester_kurzbz = tbl_reihungstest.studiensemester_kurzbz
+					AND tbl_studienplan.studienplan_id NOT IN
+					(
+						SELECT studienplan_id FROM tbl_rt_studienplan WHERE reihungstest_id = tbl_reihungstest.reihungstest_id
+					)
 			)
-			AND tbl_reihungstest.datum >= now()
-			AND NOT EXISTS(
-				SELECT
-					1
-				FROM
-					public.tbl_rt_studienplan rtstp
-					JOIN lehre.tbl_studienplan stp USING(studienplan_id)
-					JOIN lehre.tbl_studienordnung sto USING(studienordnung_id)
-					JOIN lehre.tbl_studienplan_semester stpsem USING(studienplan_id)
-				WHERE
-					sto.studiengang_kz=tbl_studienordnung.studiengang_kz
-					AND rtstp.reihungstest_id=tbl_reihungstest.reihungstest_id
-					AND stpsem.studiensemester_kurzbz=tbl_reihungstest.studiensemester_kurzbz
-			)
-		";
+			AND tbl_reihungstest.datum >= now()";
 
 		$db = new DB_Model();
 		$result_rt = $db->execReadOnlyQuery($qry);
@@ -766,7 +760,9 @@ class ReihungstestJob extends JOB_Controller
 				// find an active studyplan for the same degree program with is valid in this semester
 				$result_stpl = $this->StudienplanModel->getStudienplaeneBySemester(
 					$row_rt->studiengang_kz,
-					$row_rt->studiensemester_kurzbz
+					$row_rt->studiensemester_kurzbz,
+					null,
+					$row_rt->orgform_kurzbz
 				);
 
 				if (hasData($result_stpl)) {
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index fb0d17abb..d6d6b2c50 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -81,42 +81,9 @@ class Studierendenantrag extends FHC_Controller
 
 	public function leitung()
 	{
-		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
-		$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+		$stgL = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
 
-		$stgL = [];
-		if ($studiengaenge) {
-			$result = $this->StudiengangModel->loadWithOrgform($studiengaenge);
-			if (isError($result))
-				return show_error(getError($result));
-			$antraege = getData($result) ?: [];
-
-			foreach ($antraege as $antrag) {
-				if (!isset($stgL[$antrag->studiengang_kz])) {
-					$stgL[$antrag->studiengang_kz] = new stdClass();
-					$stgL[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
-					$stgL[$antrag->studiengang_kz]->orgform = $antrag->orgform;
-					$stgL[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
-				}
-			}
-		}
-
-		$stgA = [];
-		if ($stgsNeuanlage) {
-			$result = $this->StudiengangModel->loadWithOrgform($stgsNeuanlage);
-			if (isError($result))
-				return show_error(getError($result));
-			$antraege = getData($result) ?: [];
-
-			foreach ($antraege as $antrag) {
-				if (!isset($stgA[$antrag->studiengang_kz])) {
-					$stgA[$antrag->studiengang_kz] = new stdClass();
-					$stgA[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
-					$stgA[$antrag->studiengang_kz]->orgform = $antrag->orgform;
-					$stgA[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
-				}
-			}
-		}
+		$stgA = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: [];
 
 		$this->load->view('lehre/Antrag/Leitung/List', [
 			'stgA' => $stgA,
diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
index 1922bacda..3cba756cf 100644
--- a/application/controllers/lehre/anrechnung/RequestAnrechnung.php
+++ b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
@@ -152,10 +152,10 @@ class requestAnrechnung extends Auth_Controller
 			return $this->outputJsonError($this->p->t('anrechnung', 'antragBereitsGestellt'));
 		}
 		
-		// Exit if application is not for actual studysemester
-		if (!self::_applicationIsForActualSS($studiensemester_kurzbz))
+		// Exit if application is a past ( < actual ) studysemester
+		if (self::_applicationIsPastSS($studiensemester_kurzbz))
 		{
-			return $this->outputJsonError($this->p->t('anrechnung', 'antragNurImAktSS'));
+			return $this->outputJsonError($this->p->t('anrechnung', 'antragNichtFuerVerganganeSS'));
 		}
 		
 		// Upload document
@@ -312,18 +312,21 @@ class requestAnrechnung extends Auth_Controller
 	}
 
 	/**
-	 * Check if applications' study semester is actual study semester.
+	 * Check if applications' study semester is < actual study semester.
 	 *
 	 * @param $studiensemester_kurzbz
 	 * @return bool
 	 */
-	private function _applicationIsForActualSS($studiensemester_kurzbz)
+	private function _applicationIsPastSS($studiensemester_kurzbz)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$result = $this->StudiensemesterModel->getNearest();
-		$actual_ss = getData($result)[0]->studiensemester_kurzbz;
+		$actual_ss = getData($result)[0];
 
-		return $studiensemester_kurzbz == $actual_ss;
+		$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
+		$anrechnung_ss = getData($result)[0];
+
+		return $anrechnung_ss->ende < $actual_ss->start;
 	}
 
 	private function _LVhasBlockingGrades($studiensemester_kurzbz, $lehrveranstaltung_id)
diff --git a/application/controllers/system/messages/FASMessages.php b/application/controllers/system/messages/FASMessages.php
index 55d1da25f..e2169af9b 100644
--- a/application/controllers/system/messages/FASMessages.php
+++ b/application/controllers/system/messages/FASMessages.php
@@ -37,7 +37,7 @@ class FASMessages extends Auth_Controller
 
 		// Loads the view to write a new message with a template
 		$this->load->view(
-			'system/messages/htmlWriteTemplate',
+			'system/messages/FAShtmlWriteTemplate',
 			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents)
 		);
  	}
@@ -53,7 +53,7 @@ class FASMessages extends Auth_Controller
 
 		// Loads the view to write a new message with a template
 		$this->load->view(
-			'system/messages/htmlWriteTemplate',
+			'system/messages/FAShtmlWriteTemplate',
 			$this->CLMessagesModel->prepareHtmlWriteTemplatePrestudents($prestudents, $message_id, $recipient_id)
 		);
  	}
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 6cad6c2bf..335bfab27 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -62,6 +62,24 @@ class AntragLib
 			'insertvon' => $insertvon
 		]);
 
+		// NOTE(chris): remove "preabbrecher" statusgrund for Stgl-Abmeldungen if set
+		$res = $this->_ci->StudierendenantragModel->load($antrag_id);
+		if (hasData($res) && current(getData($res))->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL) {
+			$this->_ci->PrestudentstatusModel->addSelect('tbl_status_grund.statusgrund_kurzbz');
+			$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail(current(getData($res))->prestudent_id, '', 'Student');
+			if (hasData($res) && current(getData($res))->statusgrund_kurzbz == 'preabbrecher') {
+				$prestudentstatus = current(getData($res));
+				$this->_ci->PrestudentstatusModel->update([
+					'prestudent_id' => $prestudentstatus->prestudent_id,
+					'status_kurzbz'=>$prestudentstatus->status_kurzbz,
+					'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
+					'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
+				], [
+					'statusgrund_id' => null
+				]);
+			}
+		}
+
 		return $result;
 	}
 
@@ -123,6 +141,8 @@ class AntragLib
 	 */
 	public function approveAbmeldung($studierendenantrag_ids, $insertvon)
 	{
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+
 		$errors = [];
 		foreach ($studierendenantrag_ids as $studierendenantrag_id) {
 			$result = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
@@ -156,7 +176,6 @@ class AntragLib
 				if (hasData($result)) {
 					$studiengang = current(getData($result));
 					$stg = $studiengang->bezeichnung;
-					$orgform = $studiengang->orgform_kurzbz;
 				}
 				if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
 				{
@@ -166,6 +185,7 @@ class AntragLib
 
 					else {
 						$prestudent_status = getData($resultPrestudentStatus)[0];
+						$orgform = $prestudent_status->orgform_kurzbz;
 
 						$vorlage ='Sancho_Mail_Antrag_A_Approve';
 						$subject = $this->_ci->p->t('studierendenantrag', 'mail_subject_A_Approve');
@@ -202,14 +222,14 @@ class AntragLib
 							$data['UID'] = $student->student_uid;
 						}
 
-						$data['Orgform'] = $orgform;
+						$data['Orgform'] = $prestudent_status->orgform;
 						$data['stg'] = $stg;
 
 						// NOTE(chris): Sancho mail
 						sendSanchoMail($vorlage, $data, $prestudent_status->email, $subject);
 					}
 				} else { // ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL)
-					$result = $this->_ci->PrestudentstatusModel->getLastStatus($antrag->prestudent_id, '', 'Student');
+					$result = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id, '', 'Student');
 					if (isError($result))
 					{
 						$errors[] = getError($result);
@@ -221,6 +241,7 @@ class AntragLib
 						continue;
 					}
 					$prestudentstatus = getData($result)[0];
+					$orgform = $prestudentstatus->orgform_kurzbz;
 
 					$result = $this->_ci->PrestudentstatusModel->withGrund('preabbrecher')->update([
 						'prestudent_id' => $prestudentstatus->prestudent_id,
@@ -250,10 +271,9 @@ class AntragLib
 						$vorname = '';
 						$nachname = $name;
 					}
-					$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
+					$res = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 					if (hasData($res)) {
-						$kontakt = current(getData($res));
-						$email = $kontakt->kontakt;
+						$email = $this->_ci->StudentModel->getEmailFH(current(getData($res))->student_uid);
 						$vorlage = $antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG ? 'Student' : 'Stgl';
 
 						// NOTE(chris): Sancho mail
@@ -334,6 +354,8 @@ class AntragLib
 			$res = $this->_ci->PrestudentModel->load($antrag->prestudent_id);
 
 			if (hasData($res)) {
+				$this->_ci->load->model('crm/Student_model', 'StudentModel');
+
 				$prestudent = current(getData($res));
 				$res = $this->_ci->PersonModel->load($prestudent->person_id);
 				if (hasData($res)) {
@@ -344,13 +366,12 @@ class AntragLib
 				} else {
 					$name = $this->_ci->p->t('person', 'studentIn');
 				}
-				$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
-				if (hasData($res)) {
-					$kontakt = current(getData($res));
-					$email = $kontakt->kontakt;
 
-					$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
-					$res = $this->_ci->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
+				$res = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
+				if (hasData($res)) {
+					$email = $this->_ci->StudentModel->getEmailFH(current(getData($res))->student_uid);
+
+					$res = $this->_ci->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 					$stg = '';
 					$orgform = '';
 					if (hasData($res)) {
@@ -432,6 +453,7 @@ class AntragLib
 	public function approveUnterbrechung($studierendenantrag_ids, $insertvon)
 	{
 		$this->_ci->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 
 		$errors = [];
 
@@ -555,7 +577,7 @@ class AntragLib
 							[
 								'name' => $mail['ass'],
 								'stg' => $data['studiengang']->bezeichnung,
-								'Orgform' => $data['studiengang']->orgform_kurzbz,
+								'Orgform' => $data['prestudent_status']->orgform_kurzbz,
 								'vorname' => $data['person']->vorname,
 								'nachname' => $data['person']->nachname,
 								'UID' => $data['UID'],
@@ -579,7 +601,7 @@ class AntragLib
 							[
 								'name' => $mail['stu'],
 								'stg' => $data['studiengang']->bezeichnung,
-								'Orgform' => $data['studiengang']->orgform_kurzbz,
+								'Orgform' => $data['prestudent_status']->orgform_kurzbz,
 								'vorname' => $data['person']->vorname,
 								'nachname' => $data['person']->nachname
 							],
@@ -609,6 +631,7 @@ class AntragLib
 	public function rejectUnterbrechung($studierendenantrag_ids, $insertvon, $grund)
 	{
 		$this->_ci->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 
 		$errors = [];
 
@@ -673,7 +696,7 @@ class AntragLib
 								'nachname' => $nachname,
 								'grund' => $grund,
 								'stg' => $data['studiengang']->bezeichnung,
-								'Orgform' => $data['studiengang']->orgform_kurzbz,
+								'Orgform' => $data['prestudent_status']->orgform_kurzbz,
 								'prestudent_id' => $data['prestudent_status']->prestudent_id,
 								'abmeldungLink' => site_url('lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id),
 								'abmeldungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id
@@ -719,7 +742,6 @@ class AntragLib
 		else{
 			$result['studiengang'] = new stdClass();
 			$result['studiengang']->bezeichnung = "";
-			$result['studiengang']->orgform_kurzbz = "";
 		}
 
 		$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id);
@@ -756,7 +778,7 @@ class AntragLib
 					}
 				}
 
-				$res = $this->_ci->KontaktModel->getZustellKontakt($person_id, ['email']);
+				$res = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 				if (isError($res)) {
 					$errors['email'] = getError($res);
 				} else {
@@ -765,7 +787,7 @@ class AntragLib
 					if (!$res) {
 						$errors['email'] = $this->_ci->p->t('studierendenantrag', 'error_no_email', ['person_id' => $person_id]);
 					} else {
-						$result['email'] = current($res)->kontakt;
+						$result['email'] = $this->_ci->StudentModel->getEmailFH(current($res)->student_uid);
 					}
 				}
 			}
@@ -855,14 +877,18 @@ class AntragLib
 			$prestudent_status = current($res);
 			$email = $prestudent_status->email;
 			// NOTE(chris): Sancho mail
+			$lvzuweisungLink = site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id);
+			if( defined('VILESCI_ROOT') )
+			{
+				$lvzuweisungLink = VILESCI_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id;
+			}
 			sendSanchoMail(
 				'Sancho_Mail_Antrag_W_New',
 				[
 					'antrag_id' => $antrag_id,
 					'stg' => $prestudent_status->stg_bezeichnung,
 					'Orgform' => $prestudent_status->orgform,
-					'lvzuweisungLink' => site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id),
-					'lvzuweisungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id
+					'lvzuweisungLink' => $lvzuweisungLink 
 				],
 				$email,
 				$this->_ci->p->t('studierendenantrag', 'mail_subject_W_New')
@@ -959,6 +985,7 @@ class AntragLib
 		$studiengang_kz = $result->studiengang_kz;
 		$orgform_kurzbz = $result->orgform_kurzbz;
 		$ausbildungssemester = $result->ausbildungssemester;
+		$sprache = $result->sprache;
 
 		// NOTE(chris): check permission
 		$allowedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: [];
@@ -1004,11 +1031,12 @@ class AntragLib
 			$semA,
 			$ausbildungssemester + 1,
 			$antrag->prestudent_id,
-			$antrag->studiensemester_kurzbz
+			$sprache
 		);
 		if (isError($result))
 			return $result;
 		$lvsA = $result->retval; // NOTE(chris): don't use getData() because we want to differenciate [] and null
+		$repeat_last = false;
 		if ($lvsA) {
 			foreach($lvsA as $lv)
 			{
@@ -1019,6 +1047,81 @@ class AntragLib
 					$lv->antrag_anmerkung = $lvszugewiesen[$lv->lehrveranstaltung_id]->anmerkung;
 				}
 			}
+		} elseif ($lvsA === null) {
+			// NOTE(chris): We are repeating the last semester
+			$repeat_last = true;
+
+			$result = $this->_ci->PrestudentstatusModel->getStatusByFilter($antrag->prestudent_id, 'Student', $ausbildungssemester - 1);
+			if (isError($result))
+				return $result;
+
+			$stdsems = getData($result) ?: [];
+			$stdsem = null;
+
+			$result = $this->_ci->StudiensemesterModel->load($antrag->studiensemester_kurzbz);
+			if (isError($result))
+				return $result;
+			if (!hasData($result))
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_stdsem', ['studiensemester_kurzbz' => $antrag->studiensemester_kurzbz]));
+			$asem = current(getData($result));
+
+			foreach ($stdsems as $sem) {
+				$result = $this->_ci->StudiensemesterModel->load($sem->studiensemester_kurzbz);
+				if (isError($result))
+					return $result;
+				if (hasData($result)) {
+					if (current(getData($result))->start < $asem->start) {
+						$stdsem = $sem->studiensemester_kurzbz;
+						break;
+					}
+				}
+			}
+
+			// NOTE(chris): if we don't find a status in the previous semester there is something wrong
+			if (!$stdsem)
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_status_in_prev_sem'));
+
+			$result = $this->getLvsByStgStsemAndSem(
+				$studiengang_kz,
+				$orgform_kurzbz,
+				$semA,
+				$ausbildungssemester - 1,
+				$antrag->prestudent_id,
+				$sprache
+			);
+			if (isError($result))
+				return $result;
+			
+			$lvsA = getData($result) ?: [];
+			
+			$result = $this->getLvsByStgStsemAndSem(
+				$studiengang_kz,
+				$orgform_kurzbz,
+				$stdsem,
+				$ausbildungssemester - 1,
+				$antrag->prestudent_id,
+				$sprache
+			);
+			if (isError($result))
+				return $result;
+
+			$lvsAtest = getData($result) ?: [];
+
+			if (count(array_intersect(array_map(function ($a) {
+				return $a->lehrveranstaltung_id;
+			}, $lvsA), array_map(function ($a) {
+				return $a->lehrveranstaltung_id;
+			}, $lvsAtest)))) {
+				foreach ($lvsA as $lv) {
+					if (isset($lvszugewiesen[$lv->lehrveranstaltung_id]) && ($lvszugewiesen[$lv->lehrveranstaltung_id]->note == 0)) {
+						$lv->antrag_anmerkung = $lvszugewiesen[$lv->lehrveranstaltung_id]->anmerkung;
+						$lv->antrag_zugelassen = true;
+					}
+
+				}
+			} else {
+				$lvsA = null;
+			}
 		}
 
 		$result = $this->getLvsByStgStsemAndSem(
@@ -1027,7 +1130,7 @@ class AntragLib
 			$semB,
 			$ausbildungssemester,
 			$antrag->prestudent_id,
-			$antrag->studiensemester_kurzbz
+			$sprache
 		);
 		if (isError($result))
 			return $result;
@@ -1042,10 +1145,14 @@ class AntragLib
 			// TODO(manu): eventuelle Änderungen taggen
 		}
 
-		return success([
+		$result = [
 			'1' . $semA => $lvsA,
 			'2' . $semB => $lvsB ?: []
-		]);
+		];
+		if ($repeat_last)
+			$result['repeat_last'] = true;
+
+		return success($result);
 	}
 
 	public function getLvsByStgStsemAndSem(
@@ -1054,7 +1161,7 @@ class AntragLib
 		$studiensemester_kurzbz,
 		$ausbildungssemester,
 		$prestudent_id,
-		$note_stsem
+		$sprache
 	) {
 		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
 
@@ -1083,19 +1190,31 @@ class AntragLib
 				'semester' => $ausbildungssemester
 			]));
 		}
-		if (count($result) > 1)
-			return error($this->_ci->p->t('studierendenantrag', 'error_multiple_studienplan', [
-				'studiengang_kz' => $studiengang_kz,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'semester' => $ausbildungssemester
-			]));
+		if (count($result) > 1) {
+			$langmap = array_unique(array_map(function ($a) {
+				return $a->sprache;
+			}, $result));
+			if ($sprache
+				&& count($langmap) == count($result)
+				&& in_array($sprache, $langmap)
+			) {
+				$result = array_filter($result, function ($a) use ($sprache) {
+					return $a->sprache == $sprache;
+				});
+			} else {
+				return error($this->_ci->p->t('studierendenantrag', 'error_multiple_studienplan', [
+					'studiengang_kz' => $studiengang_kz,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz,
+					'semester' => $ausbildungssemester
+				]));
+			}
+		}
 		$studienplan = current($result);
 
 		return $this->_ci->StudienplanModel->getStudienplanLehrveranstaltungForPrestudent(
 			$studienplan->studienplan_id,
 			$ausbildungssemester,
-			$prestudent_id,
-			$note_stsem
+			$prestudent_id
 		);
 	}
 
@@ -1380,6 +1499,8 @@ class AntragLib
 		$resultDetails->grund = $resultAntrag->grund;
 		$resultDetails->studierendenantrag_id = $resultAntrag->studierendenantrag_id;
 		$resultDetails->typ = $resultAntrag->typ;
+		$resultDetails->datum = $resultAntrag->datum;
+		$resultDetails->studiensemester_kurzbz = $resultAntrag->studiensemester_kurzbz;
 
 		return success($resultDetails);
 	}
@@ -1481,9 +1602,9 @@ class AntragLib
 		);
 	}
 
-	public function getFailedExamForPrestudent($prestudent_id)
+	public function getFailedExamForPrestudent($prestudent_id, $max_date = null, $studiensemester_kurzbz = null)
 	{
-		return $this->_ci->PruefungModel->loadWhereCommitteeExamFailedForPrestudent($prestudent_id);
+		return $this->_ci->PruefungModel->loadWhereCommitteeExamFailedForPrestudent($prestudent_id, $max_date, $studiensemester_kurzbz);
 	}
 
 	public function saveLvs($lvArray)
@@ -1514,6 +1635,8 @@ class AntragLib
 
 	public function approveWiederholung($antrag_id, $insertvon)
 	{
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+
 		$result = $this->_ci->StudierendenantragstatusModel->insert([
 			'studierendenantrag_id' => $antrag_id,
 			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
@@ -1540,18 +1663,9 @@ class AntragLib
 		if (!$result)
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_antrag', ['id' => $antrag_id]));
 
-		$result = current($result);
-		$studiengang_kz = $result->studiengang_kz;
-		$semester = $result->ausbildungssemester;
-
-		$result = $this->_ci->StudiengangModel->load($studiengang_kz);
-		if (isError($result))
-			return $result;
-		$result = getData($result);
-		if (!$result)
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_antrag', ['id' => $antrag_id]));
-
 		$stg = current($result);
+		$studiengang_kz = $stg->studiengang_kz;
+		$semester = $stg->ausbildungssemester;
 
 		$result = $this->_ci->StudierendenantragModel->load($antrag_id);
 		if (isError($result))
@@ -1577,10 +1691,10 @@ class AntragLib
 			$mitarbeiter = getData($result);
 		}
 
-		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id'=> $antrag->prestudent_id]);
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id'=> $prestudent_id]);
 		if (hasData($result)) {
-			$student = current(getData($result));
-			$student_uid = $student->student_uid;
+			$studentObj = current(getData($result));
+			$student_uid = $studentObj->student_uid;
 		}
 		else
 			$student_uid = '';
@@ -1602,10 +1716,9 @@ class AntragLib
 		))
 			return error($this->_ci->p->t('studierendenantrag', 'error_mail_to', ['email' => $email]));
 
-		$result = $this->_ci->KontaktModel->getZustellKontakt($person->person_id, ['email']);
-		if (hasData($result)) {
-			$kontakt = current(getData($result));
-			$email = $kontakt->kontakt;
+		if ($student_uid) {
+			$email = $this->_ci->StudentModel->getEmailFH($student_uid);
+			$vorlage = 'Sancho_Mail_Antrag_W_Student';
 
 			$sem_not_allowed = $sem_to_repeat = '';
 			$list_not_allowed = $list_to_repeat = $this->_ci->p->t('studierendenantrag', 'mail_part_error_no_lvs');
@@ -1613,9 +1726,15 @@ class AntragLib
 			$result = $this->getLvsForAntrag($antrag_id);
 			if (hasData($result)) {
 				$lvs = getData($result);
+				$repeat_last = false;
+				if (isset($lvs['repeat_last'])) {
+					$repeat_last = true;
+					unset($lvs['repeat_last']);
+					$vorlage .= '_Lst';
+				}
 				foreach ($lvs as $sem => $lv_list) {
 					$lvs_filtered = array_filter($lv_list, function ($el) {
-						return $el->antrag_zugelassen;
+						return property_exists($el, 'antrag_zugelassen') && $el->antrag_zugelassen;
 					});
 					if (substr($sem, 0, 1) == '1') {
 						$sem_not_allowed = substr($sem, 1);
@@ -1635,7 +1754,7 @@ class AntragLib
 			
 			// NOTE(chris): Sancho mail
 			sendSanchoMail(
-				'Sancho_Mail_Antrag_W_Student',
+				$vorlage,
 				[
 					'antrag_id' => $antrag_id,
 					'stg' => $stg->bezeichnung,
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 279b6ed2a..989e14585 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -35,10 +35,12 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
-	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null)
+	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null, $bestaetigtvon = null)
 	{
 		if (!$insertvon)
 			$insertvon = getAuthUID();
+		if (!$bestaetigtvon)
+			$bestaetigtvon = $insertvon;
 
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
 		if (isError($result))
@@ -79,7 +81,7 @@ class PrestudentLib
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
-			'bestaetigtvon' => $insertvon,
+			'bestaetigtvon' => $bestaetigtvon,
 			'bestaetigtam' => $bestaetigtam
 		]);
 
diff --git a/application/models/codex/Bismeldestichtag_model.php b/application/models/codex/Bismeldestichtag_model.php
new file mode 100644
index 000000000..1a45f0fbd
--- /dev/null
+++ b/application/models/codex/Bismeldestichtag_model.php
@@ -0,0 +1,14 @@
+<?php
+class Bismeldestichtag_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_bismeldestichtag';
+		$this->pk = 'meldestichtag_id';
+	}
+}
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index d12ebd68d..08c081153 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -238,7 +238,7 @@ class Prestudentstatus_model extends DB_Model
 	{
 		$this->addSelect('tbl_prestudentstatus.*,
 						tbl_studienplan.bezeichnung AS studienplan_bezeichnung,
-						tbl_studienplan.orgform_kurzbz AS orgform,
+						tbl_orgform.orgform_kurzbz AS orgform,
 						tbl_studienplan.sprache,
 						tbl_orgform.bezeichnung_mehrsprachig AS bezeichnung_orgform,
 						tbl_status.bezeichnung_mehrsprachig,
@@ -250,7 +250,7 @@ class Prestudentstatus_model extends DB_Model
 		$this->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
 		$this->addJoin('public.tbl_status', 'tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz');
 		$this->addJoin('public.tbl_status_grund', 'statusgrund_id', 'LEFT');
-		$this->addJoin('bis.tbl_orgform', 'tbl_studienplan.orgform_kurzbz = tbl_orgform.orgform_kurzbz', 'LEFT');
+		$this->addJoin('bis.tbl_orgform', 'COALESCE(tbl_studienplan.orgform_kurzbz, ' . $this->dbTable . '.orgform_kurzbz, tbl_studiengang.orgform_kurzbz) = tbl_orgform.orgform_kurzbz', 'LEFT');
 		$this->db->where('tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz');
 
 		$where = array('prestudent_id' => $prestudent_id);
@@ -295,7 +295,8 @@ class Prestudentstatus_model extends DB_Model
 		$this->addJoin('public.tbl_studiensemester ss', 'studiensemester_kurzbz');
 		$this->addJoin('public.tbl_person pers', 'person_id');
 		$this->addJoin('public.tbl_studiengang g', 'p.studiengang_kz=g.studiengang_kz');
-		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, ' . $this->dbTable . '.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
 
 		$this->addOrder($this->dbTable . '.datum', 'DESC');
 		$this->addOrder($this->dbTable . '.insertamum', 'DESC');
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
index ec1982ea6..86ebfd0af 100644
--- a/application/models/crm/Reihungstest_model.php
+++ b/application/models/crm/Reihungstest_model.php
@@ -322,7 +322,7 @@ class Reihungstest_model extends DB_Model
 			JOIN lehre.tbl_studienplan ON (tbl_prestudentstatus.studienplan_id = tbl_studienplan.studienplan_id)
 			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 			WHERE rt_id = ?
-				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) IN (\'Interessent\', \'Bewerber\')
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL
@@ -411,7 +411,7 @@ class Reihungstest_model extends DB_Model
 			JOIN lehre.tbl_studienplan ON (tbl_prestudentstatus.studienplan_id = tbl_studienplan.studienplan_id)
 			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 			WHERE rt.studiengang_kz = ?
-				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) IN (\'Interessent\', \'Bewerber\')
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL
@@ -462,7 +462,7 @@ class Reihungstest_model extends DB_Model
 			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
 			LEFT JOIN PUBLIC.tbl_ort ON (tbl_rt_person.ort_kurzbz = tbl_ort.ort_kurzbz)
 			WHERE rt_id = ?
-				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) IN (\'Interessent\', \'Bewerber\')
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL
diff --git a/application/models/crm/Rueckstellung_model.php b/application/models/crm/Rueckstellung_model.php
index d2c39ffde..c84c625eb 100644
--- a/application/models/crm/Rueckstellung_model.php
+++ b/application/models/crm/Rueckstellung_model.php
@@ -20,7 +20,7 @@ class Rueckstellung_model extends DB_Model
 		$this->addLimit(1);
 		$this->addJoin('tbl_rueckstellung_status', 'status_kurzbz');
 		$this->addSelect('*,
-							array_to_json(bezeichnung_mehrsprachig::varchar[])->>'.$language_index . 'as bezeichnung');
+							array_to_json(bezeichnung_mehrsprachig::varchar[])->>'.$language_index . ' as bezeichnung');
 		$this->addOrder('datum_bis', 'DESC');
 		
 		$where['person_id'] = $person_id;
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index e27fa68dc..4b0a70b1a 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -84,7 +84,7 @@ class Student_model extends DB_Model
 	}
 
 	/**
-	 * Get the FH-Email for a student (not the private kontakt emailt)
+	 * Get the FH-Email for a student (not the private kontakt email)
 	 * @param $student_uid
 	 * @return string
 	 */
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index 813a74179..50109d2f1 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -39,6 +39,7 @@ class Pruefung_model extends DB_Model
 
 
     /**
+     * NOTE(chris): not used
      * @return string
      */
     protected function loadWhereThreeExamsFailed()
@@ -86,8 +87,10 @@ class Pruefung_model extends DB_Model
         $this->addJoin('public.tbl_person pers', 'person_id');
         $this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
         $this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
-        $this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
-        $this->db->join('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ = ?', 'LEFT', false);
+        $this->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id=ps.prestudent_id AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)', 'LEFT');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
+		$this->db->join('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ = ?', 'LEFT', false);
 
         $this->db->where("n.positiv", false);
         /*		$this->db->where_in("p.pruefungstyp_kurzbz1", ['kommPruef','zusKommPruef']);*/
@@ -117,38 +120,120 @@ class Pruefung_model extends DB_Model
         return $this->db->get_compiled_select($this->dbTable);
     }
 
+	/**
+	 * @return stdClass
+	 */
+	public function loadWhereCommitteeExamsFailed()
+	{
+		$this->load->config('studierendenantrag');
+
+		$this->dbTable = 'lehre.tbl_pruefung p';
+
+		$this->addSelect('p.datum');
+
+		$this->addJoin('lehre.tbl_note n', 'note');
+
+		$this->db->where("n.positiv", false);
+		$note_blacklist = $this->config->item('note_blacklist_wiederholung');
+		if ($note_blacklist)
+			$this->db->where_not_in("n.note", $note_blacklist);
+		$this->db->where_in("p.pruefungstyp_kurzbz", ['kommPruef','zusKommPruef']);
+
+		$this->addOrder('p.datum', 'DESC');
+
+		return $this->load();
+	}
 
 
+	/**
+	 * @return void
+	 */
+	protected function withDetailsForStudierendenAntrag()
+	{
+		$this->load->config('studierendenantrag');
+
+		$sprache_index = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+
+		$this->addSelect('pers.vorname');
+		$this->addSelect('pers.nachname');
+		$this->addSelect('pers.person_id');
+		$this->addSelect('s.matrikelnr');
+		$this->addSelect('g.bezeichnung');
+		$this->addSelect('g.studiengang_kz');
+		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sprache_index . ')] AS orgform', false);
+		$this->addSelect('ps.prestudent_id');
+		$this->addSelect('lv.bezeichnung as lvbezeichnung');
+		$this->addSelect('le.studiensemester_kurzbz');
+		$this->addSelect('a.typ');
+		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
+
+		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->addJoin('public.tbl_student s', 'student_uid');
+		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
+		$this->addJoin('public.tbl_person pers', 'person_id');
+		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
+		$this->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id=ps.prestudent_id AND pss.studiensemester_kurzbz=le.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(ps.prestudent_id, le.studiensemester_kurzbz)', 'LEFT');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, g.orgform_kurzbz)=o.orgform_kurzbz');
+		$this->addJoin('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ=' . $this->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG), 'LEFT');
+
+		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
+
+		$this->db->where("g.aktiv", true);
+
+		$statusgruende = $this->config->item('status_gruende_wiederholer');
+		if (is_array($statusgruende) && !isEmptyArray($statusgruende)) {
+			foreach ($statusgruende as $k => $v) {
+				$statusgruende[$k] = $this->db->escape($v);
+			}
+			$this->db->where('lv.studiengang_kz NOT IN(
+				SELECT ps1.studiengang_kz
+				FROM
+				public.tbl_prestudent ps1
+				JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
+				WHERE pss.statusgrund_id in (' . implode(',', $statusgruende) . ')
+				AND ps.prestudent_id = ps1.prestudent_id)', null, false);
+		}
+	}
 
 	/**
 	 * @param integer		$prestudent_id student_uid
 	 *
 	 * @return stdClass
 	 */
-	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id)
+	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id, $max_date = null, $studiensemester_kurzbz = null)
 	{
+		$this->withDetailsForStudierendenAntrag();
 
-		$sql = $this->loadWhereThreeExamsFailed();
+		$this->db->where('ps.prestudent_id', $prestudent_id);
 
-        $statusgruende = $this->config->item('status_gruende_wiederholer');
-        if (!is_array($statusgruende))
-            $statusgruende = [];
+		if ($max_date !== null) {
+			$this->db->where('p.datum <', $max_date);
+		}
+		if ($studiensemester_kurzbz !== null) {
+			$this->db->where('le.studiensemester_kurzbz', $studiensemester_kurzbz);
+		}
 
-        return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3 AND prestudent_id = ?', [
-			Studierendenantrag_model::TYP_WIEDERHOLUNG,
-			$statusgruende,
-			$prestudent_id
-		]);
+		return $this->loadWhereCommitteeExamsFailed();
 	}
 
+	/**
+	 * @param string		$status
+	 * @param \DateTime		$maxDate
+	 * @param \DateTime		$minDate
+	 *
+	 * @return stdClass
+	 */
 	public function getAllPrestudentsWhereCommitteeExamFailed($status, $maxDate, $minDate)
 	{
-		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->withDetailsForStudierendenAntrag();
 
 		if ($maxDate)
-			$this->db->where("p.datum < ", $maxDate->format('c'));
+			$this->db->where("p.datum <= ", $maxDate->format('Y-m-d'));
 		if ($minDate)
-			$this->db->where("p.datum > ", $minDate->format('c'));
+			$this->db->where("p.datum > ", $minDate->format('Y-m-d'));
 
 		$this->db->where("b.aktiv", true);
 
@@ -170,12 +255,6 @@ class Pruefung_model extends DB_Model
 			$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
 		}
 
-		$sql = $this->loadWhereThreeExamsFailed();
-
-		$statusgruende = $this->config->item('status_gruende_wiederholer');
-		if (!is_array($statusgruende))
-			$statusgruende = [];
-
-		return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3', [Studierendenantrag_model::TYP_WIEDERHOLUNG, $statusgruende]);
+		return $this->loadWhereCommitteeExamsFailed();
 	}
 }
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index e1b386f2e..23d69b13b 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -26,22 +26,23 @@ class Studierendenantrag_model extends DB_Model
 		return $this->loadForStudiengaenge($studiengaenge, $typ, $this->StudierendenantragstatusModel::STATUS_CREATED);
 	}
 
-	public function loadForStudiengaenge($studiengaenge, $typ = null, $status = null)
+	public function loadForStudiengaenge($studiengaenge, $typ = null, $status = null, $sql = null)
 	{
-		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+		if ($sql == null)
+			$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
 
-		$this->addSelect('stg.bezeichnung');
+		$this->addSelect('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung AS bezeichnung');
 		$this->addSelect('bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform', false);
 		$this->addSelect('s.studierendenantrag_id');
 		$this->addSelect('matrikelnr');
 		$this->addSelect('studienjahr_kurzbz');
 		$this->addSelect('vorname');
 		$this->addSelect('nachname');
-		$this->addSelect('prestudent_id');
+		$this->addSelect('p.prestudent_id');
 		$this->addSelect('p.studiengang_kz');
 		$this->addSelect('semester');
 		$this->addSelect($this->dbTable . '.grund');
-		$this->addSelect('datum');
+		$this->addSelect($this->dbTable . '.datum');
 		$this->addSelect('datum_wiedereinstieg');
 		$this->addSelect($this->dbTable . '.typ');
 		$this->addSelect('st.studierendenantrag_statustyp_kurzbz as status');
@@ -52,8 +53,10 @@ class Studierendenantrag_model extends DB_Model
 		$this->addJoin('public.tbl_student', 'prestudent_id');
 		$this->addJoin('public.tbl_person', 'person_id');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
-		$this->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
-		$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
+		$this->addJoin('public.tbl_studiensemester ss', 'studiensemester_kurzbz');
+		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=ss.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ss.studiensemester_kurzbz)');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)');
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_status as s',
 			'campus.get_status_id_studierendenantrag('. $this->dbTable .'.studierendenantrag_id) = studierendenantrag_status_id'
@@ -71,6 +74,44 @@ class Studierendenantrag_model extends DB_Model
 		return $this->loadWhere($where);
 	}
 
+	public function loadActiveForStudiengaenge($studiengaenge)
+	{
+		// NOTE(chris): get language before changing things in the global db object because getUserLanguage() might use it and it should not have been tampered with
+		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+
+		$this->db->group_start();
+		$this->db->where_not_in('s.studierendenantrag_statustyp_kurzbz', [
+			Studierendenantragstatus_model::STATUS_CANCELLED,
+			Studierendenantragstatus_model::STATUS_APPROVED,
+			Studierendenantragstatus_model::STATUS_REJECTED,
+			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
+			Studierendenantragstatus_model::STATUS_DEREGISTERED
+		]);
+		$this->db->or_group_start();
+		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
+		$this->db->where('tbl_studierendenantrag.typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+		$this->db->group_end();
+		$this->db->group_end();
+
+		return $this->loadForStudiengaenge($studiengaenge, null, null, $sql);
+	}
+
+	public function loadStgsWithAntraege($studiengaenge)
+	{
+		$this->addDistinct();
+		$this->addSelect('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung AS bezeichnung');
+		$this->addSelect('p.studiengang_kz');
+
+		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
+		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
+
+		$this->addOrder('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung');
+
+		$this->db->where_in('p.studiengang_kz', $studiengaenge);
+
+		return $this->load();
+	}
+
 	public function isInStudiengang($studierendenantrag_id, $studiengaenge)
 	{
 		$this->addJoin('public.tbl_prestudent', 'prestudent_id');
@@ -120,14 +161,18 @@ class Studierendenantrag_model extends DB_Model
 	public function getStgAndSem($antrag_id)
 	{
 		$this->addSelect('p.studiengang_kz');
+		$this->addSelect('stg.bezeichnung');
 		$this->addSelect('s.ausbildungssemester');
-		$this->addSelect('s.orgform_kurzbz');
+		$this->addSelect('plan.sprache');
+		$this->addSelect('COALESCE(plan.orgform_kurzbz, s.orgform_kurzbz, stg.orgform_kurzbz) AS orgform_kurzbz');
 
 		$this->addJoin(
 			'public.tbl_prestudentstatus s',
 			$this->dbTable . '.prestudent_id=s.prestudent_id AND ' . $this->dbTable . '.studiensemester_kurzbz=s.studiensemester_kurzbz'
 		);
 		$this->addJoin('public.tbl_prestudent p', $this->dbTable . '.prestudent_id=p.prestudent_id');
+		$this->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
 
 		$this->addOrder('s.datum', 'DESC');
 		$this->addOrder('s.insertamum', 'DESC');
@@ -192,7 +237,9 @@ class Studierendenantrag_model extends DB_Model
 
 		$this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
-		$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
+		$this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' . $this->dbTable . '.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' . $this->dbTable . '.studiensemester_kurzbz)', 'LEFT');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)');
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_statustyp st',
 			'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz',
diff --git a/application/models/education/Studierendenantraglehrveranstaltung_model.php b/application/models/education/Studierendenantraglehrveranstaltung_model.php
index 47a07ecfe..4318c773e 100644
--- a/application/models/education/Studierendenantraglehrveranstaltung_model.php
+++ b/application/models/education/Studierendenantraglehrveranstaltung_model.php
@@ -65,20 +65,40 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model
 			'stat.studierendenantrag_status_id = campus.get_status_id_studierendenantrag(a.studierendenantrag_id)'
 		);
 		$this->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->addJoin(
-			'lehre.tbl_zeugnisnote z',
-			'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid AND z.studiensemester_kurzbz=a.studiensemester_kurzbz',
-			'LEFT'
-		);
+
+		// NOTE(chris): last offizell note
+		$this->addJoin('(
+			SELECT z.* 
+			FROM lehre.tbl_zeugnisnote z
+			LEFT JOIN public.tbl_studiensemester zs 
+				USING(studiensemester_kurzbz)
+			JOIN (
+				SELECT zi.lehrveranstaltung_id, zi.student_uid, MAX(zis.start) AS start 
+				FROM lehre.tbl_zeugnisnote zi
+				LEFT JOIN lehre.tbl_note zin
+					USING(note)
+				LEFT JOIN public.tbl_studiensemester zis
+					USING(studiensemester_kurzbz)
+				WHERE zin.aktiv AND zin.offiziell
+				GROUP BY zi.lehrveranstaltung_id, zi.student_uid
+			) zx
+				ON (
+					z.lehrveranstaltung_id=zx.lehrveranstaltung_id
+					AND z.student_uid=zx.student_uid
+					AND zs.start = zx.start
+				)) z', 'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid', 'LEFT');
 		$this->addJoin('lehre.tbl_note zn', 'z.note = zn.note', 'LEFT');
 
+		$this->load->config('studierendenantrag');
+		$note_intern_angerechntet = $this->config->item('wiederholung_note_angerechnet');
+
 		return $this->loadWhere([
 			'ps.prestudent_id' => $prestudent_id,
 			'a.typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 			'stat.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
 			'n.note <> ' => 0,
 			$this->dbTable . '.studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'(n.note<>19 OR (z.note IS NOT NULL AND zn.positiv))' => null
+			'(n.note<>' . $this->db->escape($note_intern_angerechntet) . ' OR (z.note IS NOT NULL AND zn.positiv))' => null
 		]);
 	}
 }
diff --git a/application/models/education/Studierendenantragstatus_model.php b/application/models/education/Studierendenantragstatus_model.php
index b4bf3938b..c134cc4ee 100644
--- a/application/models/education/Studierendenantragstatus_model.php
+++ b/application/models/education/Studierendenantragstatus_model.php
@@ -14,6 +14,7 @@ class Studierendenantragstatus_model extends DB_Model
 	const STATUS_REQUESTSENT_2 = 'ZweiteAufforderungVersandt';
 	const STATUS_OBJECTED = 'Beeinsprucht';
 	const STATUS_OBJECTION_DENIED = 'EinspruchAbgelehnt';
+	const STATUS_DEREGISTERED = 'Abgemeldet';
 
 	/**
 	 * Constructor
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index ea8e59ebd..d232e14d6 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -525,20 +525,6 @@ class Studiengang_model extends DB_Model
 		return $this->execQuery($query, $params);
 	}
 
-	public function loadWithOrgform($studiengang_kzs)
-	{
-		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
-
-		$this->addSelect($this->dbTable . '.*');
-		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform');
-		
-		$this->addJoin('bis.tbl_orgform o', 'orgform_kurzbz');
-
-		$this->db->where_in($this->dbTable . '.studiengang_kz', $studiengang_kzs);
-
-		return $this->load();
-	}
-
 	/**
 	 * @param array		$studiengang_kzs
 	 * @param array		$not_antrag_typ		(optional) If the prestudent has an antrag with one of the specified types it will be excluded from the result
@@ -571,7 +557,8 @@ class Studiengang_model extends DB_Model
 				AND ps.ausbildungssemester=get_absem_prestudent(p.prestudent_id, NULL)
 				AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, NULL)'
 		);
-		$this->addJoin('bis.tbl_orgform o', $this->dbTable . '.orgform_kurzbz=o.orgform_kurzbz');
+		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id');
+		$this->addJoin('bis.tbl_orgform o', 'COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, ' . $this->dbTable . '.orgform_kurzbz)=o.orgform_kurzbz');
 		$this->addJoin('public.tbl_person pers', 'person_id');
 		$this->addJoin('public.tbl_student stud', 'p.prestudent_id=stud.prestudent_id', 'LEFT');
 
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index 66ec06ba8..8422f4607 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -60,7 +60,7 @@ class Studienplan_model extends DB_Model
 		));
 	}
 
-	public function getStudienplanLehrveranstaltungForPrestudent($studienplan_id, $semester, $prestudent_id, $note_stsem)
+	public function getStudienplanLehrveranstaltungForPrestudent($studienplan_id, $semester, $prestudent_id)
 	{
 		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
 		$sql = 'SELECT student_uid FROM public.tbl_student WHERE prestudent_id=' . $this->escape($prestudent_id);
@@ -75,11 +75,27 @@ class Studienplan_model extends DB_Model
 
 		$this->addJoin('lehre.tbl_studienplan_lehrveranstaltung', 'studienplan_id');
 		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		$this->addJoin(
-			'lehre.tbl_zeugnisnote zn',
-			'zn.lehrveranstaltung_id=lv.lehrveranstaltung_id AND zn.student_uid=(' . $sql . ') AND zn.studiensemester_kurzbz=' . $this->escape($note_stsem),
-			'LEFT'
-		);
+		// NOTE(chris): last offizell note
+		$this->addJoin('(
+			SELECT z.* 
+			FROM lehre.tbl_zeugnisnote z
+			LEFT JOIN public.tbl_studiensemester zs 
+				USING(studiensemester_kurzbz)
+			JOIN (
+				SELECT zi.lehrveranstaltung_id, zi.student_uid, MAX(zis.start) AS start 
+				FROM lehre.tbl_zeugnisnote zi
+				LEFT JOIN lehre.tbl_note zin
+					USING(note)
+				LEFT JOIN public.tbl_studiensemester zis
+					USING(studiensemester_kurzbz)
+				WHERE zin.aktiv AND zin.offiziell
+				GROUP BY zi.lehrveranstaltung_id, zi.student_uid
+			) zx
+				ON (
+					z.lehrveranstaltung_id=zx.lehrveranstaltung_id
+					AND z.student_uid=zx.student_uid
+					AND zs.start = zx.start
+				)) zn', 'zn.lehrveranstaltung_id=lv.lehrveranstaltung_id AND zn.student_uid=( ' . $sql . ')', 'LEFT');
 		$this->addJoin('lehre.tbl_note n', 'n.note=zn.note', 'LEFT');
 
 		$this->addOrder('lehre.tbl_studienplan_lehrveranstaltung.sort');
diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
new file mode 100644
index 000000000..37af16cc6
--- /dev/null
+++ b/application/views/codex/bismeldestichtag.php
@@ -0,0 +1,75 @@
+<?php
+	$includesArray = array(
+		'title' => 'Bismeldestichtage',
+		'axios027' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'vue3' => true,
+		'filtercomponent' => true,
+		'navigationcomponent' => true,
+		'tabulator5' => true,
+		'customCSSs' => array('vendor/vuejs/vuedatepicker_css/main.css'),
+		'customJSs' => array('vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'),
+		'customJSModules' => array('public/js/apps/Bismeldestichtag/Bismeldestichtag.js')
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+	<div id="main">
+
+		<!-- Navigation component -->
+		<core-navigation-cmpt></core-navigation-cmpt>
+
+		<!-- Fetch component -->
+		<core-fetch-cmpt
+			v-bind:api-function="fetchCmptApiFunction"
+			v-bind:api-function-parameters="fetchCmptApiFunctionParams"
+			v-bind:refresh="fetchCmptRefresh"
+			@data-fetched="fetchCmptDataFetched">
+		</core-fetch-cmpt>
+
+		<div id="content">
+			<!-- input fields -->
+			<div class="row">
+				<div class="col-5">
+					<datepicker v-model="meldestichtag"
+						v-bind:enable-time-picker="false"
+						v-bind:placeholder="'Meldestichtag'"
+						v-bind:text-input="true"
+						v-bind:auto-apply="true"
+						locale="de"
+						format="dd.MM.yyyy"
+						model-type="yyyy-MM-dd">
+					</datepicker>
+				</div>
+				<div class="col-4">
+					<select class="form-select" name="studiensemester_kurzbz" v-model="currSem">
+						<option v-for="sem in semList" :value="sem.studiensemester_kurzbz">
+							{{ sem.studiensemester_kurzbz }}
+						</option>
+					</select>
+				</div>
+				<div class="col-3">
+					<button type="button" class="btn btn-primary" @click="handlerAddBismeldestichtag">
+						<?php echo $this->p->t('bismeldestichtag', 'stichtagHinzufuegen') ?>
+					</button>
+				</div>
+			</div>
+			<br />
+			<!-- Filter component -->
+			<div class="row">
+				<div class="col">
+					<core-filter-cmpt
+						title="<?php echo $this->p->t('bismeldestichtag', 'stichtageVerwalten') ?>"
+						ref="bismeldestichtageTable"
+						:side-menu="false"
+						:tabulator-options="bismeldestichtagTabulatorOptions"
+						:tabulator-events="bismeldestichtagTabulatorEventHandlers"
+						:table-only="true">
+					</core-filter-cmpt>
+				</div>
+			</div>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index a09f9c70a..78a30b3e5 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -47,6 +47,9 @@ $saved = isset($saved) && $saved === true;
 		<p>
 			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstext') ?>
 		</p>
+		<p>
+			<?php echo $this->p->t('uhstat', 'uhstat1EinleitungSvnrtext') ?>
+		</p>
 		<br>
 		<?php if ($editPermission): ?>
 			<?php if (isset($successMessage) && !isEmptyString($successMessage)): ?>
diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index 87c9c3af6..2c9d0d382 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -11,7 +11,7 @@ $sitesettings = array(
 	'customJSModules' => array('public/js/apps/lehre/Antrag.js'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
-		'vendor/vuepic/vue-datepicker-css/main.css'
+		'vendor/vuejs/vuedatepicker_css/main.css'
 	),
 	'customJSs' => array(
 	)
@@ -35,13 +35,13 @@ $this->load->view(
 				antrag-type="<?= $antrag_type; ?>"
 				studierendenantrag-id="<?= $studierendenantrag_id; ?>"
 				v-model:info-array="infoArray"
-				v-model:status-msg="statusMsg"
-				v-model:status-severity="statusSeverity"
+				v-model:status-msg="status.msg"
+				v-model:status-severity="status.severity"
 				>
 			</studierendenantrag-antrag>
 		</div>
 		<div class="col-sm-4 mb-3">
-			<studierendenantrag-status :msg="statusMsg" :severity="statusSeverity"></studierendenantrag-status>
+			<studierendenantrag-status :msg="status.msg" :severity="status.severity"></studierendenantrag-status>
 			<studierendenantrag-infoblock :infos="infoArray"></studierendenantrag-infoblock>
 		</div>
 	</div>
diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
index 3dffacf3f..9c0749dae 100644
--- a/application/views/lehre/Antrag/Leitung/List.php
+++ b/application/views/lehre/Antrag/Leitung/List.php
@@ -13,6 +13,7 @@ $sitesettings = array(
 	'primevue3' => true,
 	'phrases' => array(
 		'global',
+		'ui',
 		'studierendenantrag',
 		'lehre',
 		'person',
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index add2e8c7d..4ca99f951 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -82,7 +82,7 @@ $this->load->view(
 													<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 												</div>
 												<div class="modal-body">
-													<pre><?= $antrag->grund; ?></pre>
+													<textarea class="form-control" style="width: 100%; height: 250px;" readonly><?= $antrag->grund; ?></textarea>
 												</div>
 											</div>
 										</div>
@@ -110,8 +110,8 @@ $this->load->view(
 										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . $antrag->typ . '.xml.php&xsl=Antrag' . $antrag->typ . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
 									<?php } ?>
 									<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
-										<a class="ms-2" href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal"><?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?></a>
-										<lv-popup id="modalgrund<?= $antrag->studierendenantrag_id; ?>" antrag-id = "<?= $antrag->studierendenantrag_id; ?>">
+										<a class="ms-2" href="#modallv<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal"><?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?></a>
+										<lv-popup id="modallv<?= $antrag->studierendenantrag_id; ?>" antrag-id = "<?= $antrag->studierendenantrag_id; ?>">
 											<?= $this->p->t('studierendenantrag', 'my_lvs'); ?>
 										</lv-popup>
 									<?php } ?>
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
index 92c896ce7..fcd9b953c 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftragData.php
@@ -142,7 +142,7 @@ FROM
                         WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
                         ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
                         END                                             AS "lv_oe_kurzbz",
-                    TRUNC(lema.semesterstunden, 1)                      AS "stunden",
+                    TRUNC(lema.semesterstunden, 2)                      AS "stunden",
                     TRUNC((lema.semesterstunden * lema.stundensatz), 2) AS "betrag",
                     vertrag_id,
                     vertragsstunden                                     AS "vertrag_stunden",
@@ -232,7 +232,7 @@ FROM
                 SELECT
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
-                    pa.projektarbeit_id                                                                 AS "projektarbeit_id",
+                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
                     le.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
@@ -375,9 +375,9 @@ $filterWidgetArray = array(
         orgform_kurzbz: {visible: false, headerFilter:"input"},
         person_id: {visible: false, headerFilter:"input"},
         lv_oe_kurzbz: {visible: false, headerFilter:"input"},
-        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:1},
+        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
-            bottomCalc:"sum", bottomCalcParams:{precision:1}
+            bottomCalc:"sum", bottomCalcParams:{precision:2}
 		},
         betrag: {align:"right", formatter: form_formatNulltoStringNumber,
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftragData.php b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
index 0414ddbf6..4f0c61193 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftragData.php
@@ -149,7 +149,7 @@ FROM
                     ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
                     END                                             AS "lv_oe_kurzbz",
                 (person.nachname || \' \' || person.vorname)        AS "lektor",
-                TRUNC(lema.semesterstunden, 1)                      AS "stunden",
+                TRUNC(lema.semesterstunden, 2)                      AS "stunden",
                 lema.stundensatz,
                 TRUNC((lema.semesterstunden * lema.stundensatz), 2) AS "betrag",
                 vertrag_id,
@@ -400,9 +400,9 @@ $filterWidgetArray = array(
         person_id: {visible: false, headerFilter:"input"},
         lv_oe_kurzbz: {visible: false, headerFilter:"input"},
         lektor: {headerFilter:"input", widthGrow: 2},
-        stunden: {align:"right",  formatter: form_formatNulltoStringNumber, formatterParams:{precision:1},
+        stunden: {align:"right",  formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
-            bottomCalc:"sum", bottomCalcParams:{precision:1}},
+            bottomCalc:"sum", bottomCalcParams:{precision:2}},
 		stundensatz: {visible: true, align:"right", formatter: form_formatNulltoStringNumber,
 			headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator},
         betrag: {align:"right", formatter: form_formatNulltoStringNumber,
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftragData.php b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
index 5a2ad98bd..85b663d4a 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftragData.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftragData.php
@@ -159,7 +159,7 @@ FROM
         (
             SELECT
                 /* lehrauftraege also planned with dummies, therefore personalnummer is needed */
-                ma.personalnummer,
+                ma.personalnummer::text,
                 lema.lehreinheit_id,
                 lv.lehrveranstaltung_id,
                 lv.bezeichnung                                      AS "lv_bezeichnung",
@@ -179,7 +179,7 @@ FROM
                     ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
                     END                                             AS "lv_oe_kurzbz",
                 (person.nachname || \' \' || person.vorname)        AS "lektor",
-                TRUNC(lema.semesterstunden, 1)                      AS "stunden",
+                TRUNC(lema.semesterstunden, 2)                      AS "stunden",
                 lema.stundensatz,
                 TRUNC((lema.semesterstunden * lema.stundensatz), 2) AS "betrag",
                 vertrag_id,
@@ -219,7 +219,7 @@ FROM
             (SELECT
                  uid
              FROM
-                 public.tbl_benutzer JOIN public.tbl_mitarbeiter ma 
+                 public.tbl_benutzer JOIN public.tbl_mitarbeiter ma
                     ON tbl_benutzer.uid = ma.mitarbeiter_uid
              WHERE
                  person_id = tmp_projektbetreuung.person_id
@@ -272,7 +272,7 @@ FROM
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
                     lv.bezeichnung                                                                      AS "lv_bezeichnung",
-                    pa.projektarbeit_id                                                                 AS "projektarbeit_id",
+                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
                     le.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
@@ -414,7 +414,7 @@ $filterWidgetArray = array(
         row_index: {visible: false},
         personalnummer: {visible: false, headerFilter:"input"},
 		auftrag: {
-			headerFilter:"input", widthGrow: 2, 
+			headerFilter:"input", widthGrow: 2,
 			bottomCalc:"count", bottomCalcFormatter:function(cell){return "'. ucfirst($this->p->t('global', 'anzahl')). ': " + cell.getValue();}
 		},
 		stg_typ_kurzbz: {headerFilter:"input"},
@@ -432,9 +432,9 @@ $filterWidgetArray = array(
         person_id: {visible: false, headerFilter:"input"},
         lv_oe_kurzbz: {headerFilter:"input"},
         lektor: {headerFilter:"input", widthGrow: 2},
-        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:1},
+        stunden: {align:"right", formatter: form_formatNulltoStringNumber, formatterParams:{precision:2},
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator,
-            bottomCalc:"sum", bottomCalcParams:{precision:1}},
+            bottomCalc:"sum", bottomCalcParams:{precision:2}},
         stundensatz: {visible: true, align:"right", formatter: form_formatNulltoStringNumber,
             headerFilter:"input", headerFilterFunc: hf_filterStringnumberWithOperator},
         betrag: {align:"right", formatter: form_formatNulltoStringNumber,
diff --git a/application/views/person/bpk/bpkDetails.php b/application/views/person/bpk/bpkDetails.php
index 198065c24..bd6191c6a 100644
--- a/application/views/person/bpk/bpkDetails.php
+++ b/application/views/person/bpk/bpkDetails.php
@@ -9,7 +9,6 @@
 			'jqueryui1' => true,
 			'ajaxlib' => true,
 			'tablesorter2' => true,
-			'tinymce4' => true,
 			'sbadmintemplate3' => true,
 			'addons' => true,
 			'navigationwidget' => true,
@@ -126,10 +125,18 @@
 										</table>
 									</div>
 									<div class="col-lg-4 table-responsive">
-										<form action="<?php echo base_url('soap/datenverbund_client.php?action=pruefeBPK');?>" method="POST" target="_blank">
+										<form
+											action="<?php echo base_url('soap/datenverbund_client.php?action=pruefeBPK');?>"
+											method="POST"
+											target="_blank"
+										>
 											<input type="hidden" name="vorname" value="<?php echo $stammdaten->vorname; ?>"/>
 											<input type="hidden" name="nachname" value="<?php echo $stammdaten->nachname; ?>"/>
-											<input type="hidden" name="geburtsdatum" value="<?php echo mb_str_replace('-', '',$stammdaten->gebdatum); ?>"/>
+											<input
+												type="hidden"
+												name="geburtsdatum"
+												value="<?php echo mb_str_replace('-', '', $stammdaten->gebdatum); ?>"
+											/>
 											<input type="hidden" name="geschlecht" value="<?php echo mb_strtoupper($stammdaten->geschlecht); ?>"/>
 											<input type="submit" value="Namenssuche starten" class="btn btn-default"/>
 										</form>
diff --git a/application/views/system/infocenter/infocenterAbgewiesenData.php b/application/views/system/infocenter/infocenterAbgewiesenData.php
index 2307ea87e..da816b2c7 100644
--- a/application/views/system/infocenter/infocenterAbgewiesenData.php
+++ b/application/views/system/infocenter/infocenterAbgewiesenData.php
@@ -31,21 +31,35 @@ $query = '
 					ORDER BY l.log_id DESC
 					LIMIT 1
 				)
-				AND '. $LOGDATA_VON .' = (
+				AND ('. $LOGDATA_VON .' = (
 					SELECT l.insertvon
 					FROM system.tbl_log l
 					WHERE l.person_id = p.person_id
 					ORDER BY l.log_id DESC
 					LIMIT 1
 				)
+				OR
+					(
+						(
+						SELECT l.insertvon
+						FROM system.tbl_log l
+						WHERE l.person_id = p.person_id
+						ORDER BY l.log_id DESC
+						LIMIT 1
+						) IS NULL
+					)
+				)
 				AND l.zeitpunkt >= pss.insertamum
 			  ORDER BY l.log_id DESC
 				 LIMIT 1
 			) AS "Nachricht",
 			(
-				SELECT SUM(konto.betrag)
+				SELECT
+					CASE
+						WHEN COUNT(CASE WHEN konto.betrag != 0 THEN 1 END) = 0 THEN null
+						ELSE SUM(konto.betrag)
+					END AS "Kaution"
 				FROM public.tbl_konto konto
-				LEFT JOIN tbl_konto skonto ON (skonto.buchungsnr_verweis = konto.buchungsnr)
 				WHERE konto.person_id = p.person_id
 					AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 					AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .'
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index bb5b84479..61dc5a575 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -292,9 +292,12 @@
 			rueck.datum_bis AS "HoldDate",
 			rueck.bezeichnung AS "Rueckstellgrund",
 			(
-				SELECT SUM(konto.betrag)
+				SELECT
+					CASE
+						WHEN COUNT(CASE WHEN konto.betrag != 0 THEN 1 END) = 0 THEN null
+						ELSE SUM(konto.betrag)
+					END AS "Kaution"
 				FROM public.tbl_konto konto
-				LEFT JOIN tbl_konto skonto ON (skonto.buchungsnr_verweis = konto.buchungsnr)
 				WHERE konto.person_id = p.person_id
 					AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 					AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .'
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index c61bb3cd2..a8e6e3e13 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -8,7 +8,7 @@
 		'dialoglib' => true,
 		'ajaxlib' => true,
 		'tablesorter2' => true,
-		'tinymce4' => true,
+		'tinymce5' => true,
 		'sbadmintemplate3' => true,
 		'addons' => true,
 		'navigationwidget' => true,
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index 32315c145..8003b42e0 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -267,9 +267,12 @@ $query = '
 				LIMIT 1
 			) AS "AktenId",
 			(
-				SELECT SUM(konto.betrag)
+				SELECT
+					CASE
+						WHEN COUNT(CASE WHEN konto.betrag != 0 THEN 1 END) = 0 THEN null
+						ELSE SUM(konto.betrag)
+					END AS "Kaution"
 				FROM public.tbl_konto konto
-				LEFT JOIN tbl_konto skonto ON (skonto.buchungsnr_verweis = konto.buchungsnr)
 				WHERE konto.person_id = p.person_id
 					AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 					AND konto.buchungstyp_kurzbz = '. $STUDIENGEBUEHR_ANZAHLUNG .'
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
index e6b6d2495..7f9ee1288 100644
--- a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
+++ b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
@@ -198,7 +198,11 @@ $query = '
 				LIMIT 1 
 			) AS "InfoCenterMitarbeiter",
 			(
-				SELECT SUM(konto.betrag)
+				SELECT
+					CASE
+						WHEN COUNT(CASE WHEN konto.betrag != 0 THEN 1 END) = 0 THEN null
+						ELSE SUM(konto.betrag)
+					END AS "Kaution"
 				FROM public.tbl_konto konto
 				WHERE konto.person_id = p.person_id
 					AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
diff --git a/application/views/system/infocenter/infocenterZgvDetails.php b/application/views/system/infocenter/infocenterZgvDetails.php
index 7636647ab..aefd95da0 100644
--- a/application/views/system/infocenter/infocenterZgvDetails.php
+++ b/application/views/system/infocenter/infocenterZgvDetails.php
@@ -10,7 +10,7 @@
 			'dialoglib' => true,
 			'ajaxlib' => true,
 			'tablesorter2' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'sbadmintemplate3' => true,
 			'addons' => true,
 			'navigationwidget' => true,
@@ -131,7 +131,11 @@
 									<?php echo $this->p->t('infocenter', 'zgvNichtErfuellt') ?>
 								</button>
 								<?php if ($studiengang_typ === 'm') : ?>
-									<button type="button" class="btn btn-default zgvAkzeptierenPruefung" id="zgvAkzeptierenPruefung_<?php echo $prestudent_id ?>">
+									<button
+										type="button"
+										class="btn btn-default zgvAkzeptierenPruefung"
+										id="zgvAkzeptierenPruefung_<?php echo $prestudent_id ?>"
+									>
 										<?php echo $this->p->t('infocenter', 'zgvErfuelltPruefung') ?>
 									</button>
 								<?php endif; ?>
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 1d26b9d55..b021379a8 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -447,7 +447,6 @@
 								<div class="form-inline">
 									<div class="input-group" id="absgstatusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
 										<select name="absgstatusgrund"
-												<?php echo $disabledStg ?>
 												<?php echo $disabledPer ?>
 												class="d-inline float-right"
 												required>
@@ -460,7 +459,7 @@
 										</select>
 										<span class="input-group-btn">
 											<button type="button"
-													class="btn btn-default absageBtn" <?php echo $disabledStg . ' ' . $disabledPer?> id="absagebtn_<?php echo $zgvpruefung->prestudent_id ?>">
+													class="btn btn-default absageBtn" <?php echo $disabledPer?> id="absagebtn_<?php echo $zgvpruefung->prestudent_id ?>">
 												<?php echo  $this->p->t('ui', 'absagen') ?>
 											</button>
 										</span>
diff --git a/application/views/system/messages/FAShtmlWriteTemplate.php b/application/views/system/messages/FAShtmlWriteTemplate.php
new file mode 100644
index 000000000..83f895d14
--- /dev/null
+++ b/application/views/system/messages/FAShtmlWriteTemplate.php
@@ -0,0 +1,197 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Write a new message or reply using templates',
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'ajaxlib' => true,
+			'fontawesome4' => true,
+			'tinymce3' => true,
+			'sbadmintemplate3' => true,
+			'dialoglib' => true,
+			'widgets' => true,
+			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/fasMessageWrite.js')
+		)
+	);
+?>
+<body>
+	<div id="wrapper">
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">
+
+							<?php echo ucfirst($this->p->t('ui', 'nachrichtSenden')); ?>
+
+						</h3>
+					</div>
+				</div>
+				<form id="sendForm" method="post" action="<?php echo site_url('/system/messages/Messages/sendImplicitTemplate'); ?>">
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfieldcol-left">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'empfaenger')); ?>:
+
+								</label>
+							</div>
+							<div class="col-lg-11 msgfieldcol-right">
+								<?php echo $recipientsList; ?>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="form-group">
+							<div class="col-lg-1 msgfield msgfieldcol-left">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'betreff')); ?>:
+
+								</label>
+							</div>
+							&nbsp;
+							<div class="col-lg-7">
+								<input id="subject" class="form-control" type="text" value="<?php echo $subject; ?>" name="subject">
+							</div>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-lg-9">
+							<label>
+
+								<?php echo ucfirst($this->p->t('global', 'nachricht')); ?>:
+
+							</label>
+							<textarea id="bodyTextArea" class="bodyTextArea" name="body">
+
+								<?php echo $body; ?>
+
+							</textarea>
+						</div>
+						<div class="col-lg-3">
+							<div class="form-group">
+								<label>
+
+									<?php echo ucfirst($this->p->t('ui', 'felder')); ?>:
+
+								</label>
+
+								<?php
+                                    $size = count($variables) > 19 ? 19 : count($variables);
+									echo $this->widgetlib->widget(
+										'MultipleDropdown_widget',
+										array('elements' => success($variables)),
+										array(
+											'name' => 'variables[]',
+											'id' => 'variables',
+											'size' => $size,
+											'multiple' => true
+										)
+									);
+								?>
+							</div>
+                            <br>
+                            <div class="form-group">
+                                <label>
+									
+									<?php echo ucfirst($this->p->t('ui', 'meineFelder')); ?>:
+
+                                </label>
+								
+								<?php
+								$size = count($user_fields) > 5 ? 5 : count($user_fields);
+								echo $this->widgetlib->widget(
+									'MultipleDropdown_widget',
+									array('elements' => success($user_fields)),
+									array(
+										'name' => 'user_fields[]',
+										'id' => 'user_fields',
+										'size' => $size,
+										'multiple' => true
+									)
+								);
+								?>
+                            </div>
+						</div>
+					</div>
+					<br>
+					<div class="row">
+						<div class="col-xs-3">
+
+							<?php
+								echo $this->widgetlib->widget(
+									'Vorlage_widget',
+									array('oe_kurzbz' => $organisationUnits, 'isAdmin' => $senderIsAdmin),
+									array('name' => 'vorlage', 'id' => 'vorlageDnD')
+								);
+							?>
+
+						</div>
+						<div class="col-xs-6">
+							<button id="sendButton" class="btn btn-default pull-right" type="button">
+
+								<?php echo $this->p->t('ui', 'senden'); ?>
+
+							</button>
+						</div>
+					</div>
+                    <br>
+						<hr>
+						<div class="row">
+							<div class="col-lg-12">
+								<label>
+
+									<?php echo ucfirst($this->p->t('global', 'vorschau')); ?>:
+
+								</label>
+							</div>
+						</div>
+						<div class="well" id="templatePreviewDiv">
+							<div class="row">
+								<div class="col-sm-12" style="display: inline">
+									<div class="form-group form-inline">
+										<div class="input-group">
+										<?php
+											echo $this->widgetlib->widget(
+												'Dropdown_widget',
+												array(
+													'elements' => success($recipientsArray),
+													'emptyElement' => ucfirst($this->p->t('global', 'empfaenger')).'...'
+												),
+												array(
+													'name' => 'recipients[]',
+													'id' => 'recipients'
+												)
+											);
+										?>
+											<span class="input-group-btn">
+												<a class="btn btn-default" href="#templatePreviewDiv" id="refresh">
+													<?php echo ucfirst($this->p->t('ui', 'refresh')); ?>
+												</a>
+											</span>
+										</div>
+									</div>
+								</div>
+							</div>
+							<br>
+							<textarea id="tinymcePreview" class="tinymcePreview"></textarea>
+						</div>
+
+					<?php echo $recipients_ids; ?>
+					<?php echo $relationmessage_id; ?>
+					<?php echo $type; ?>
+
+				</form>
+			</div>
+		</div>
+	</div>
+</body>
+
+<?php $this->load->view("templates/FHC-Footer"); ?>
+
diff --git a/application/views/system/messages/ajaxRead.php b/application/views/system/messages/ajaxRead.php
index 2cb88708e..4c1a77deb 100644
--- a/application/views/system/messages/ajaxRead.php
+++ b/application/views/system/messages/ajaxRead.php
@@ -12,7 +12,7 @@
 			'tabulator4' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/read.js')
diff --git a/application/views/system/messages/ajaxWrite.php b/application/views/system/messages/ajaxWrite.php
index 3b1582f22..b3a598506 100644
--- a/application/views/system/messages/ajaxWrite.php
+++ b/application/views/system/messages/ajaxWrite.php
@@ -10,7 +10,7 @@
 			'sbadmintemplate3' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/write.js')
diff --git a/application/views/system/messages/ajaxWriteReply.php b/application/views/system/messages/ajaxWriteReply.php
index 0a496c93e..08dc188fa 100644
--- a/application/views/system/messages/ajaxWriteReply.php
+++ b/application/views/system/messages/ajaxWriteReply.php
@@ -10,7 +10,7 @@
 			'sbadmintemplate3' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/writeReply.js')
diff --git a/application/views/system/messages/htmlWriteReply.php b/application/views/system/messages/htmlWriteReply.php
index 9106d802b..d2150c1fb 100644
--- a/application/views/system/messages/htmlWriteReply.php
+++ b/application/views/system/messages/htmlWriteReply.php
@@ -6,7 +6,7 @@
 			'jquery3' => true,
 			'bootstrap3' => true,
 			'fontawesome4' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'sbadmintemplate3' => true,
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/messageWriteReply.js')
diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
index 761e05f96..42a31f374 100644
--- a/application/views/system/messages/htmlWriteTemplate.php
+++ b/application/views/system/messages/htmlWriteTemplate.php
@@ -8,7 +8,7 @@
 			'bootstrap3' => true,
 			'ajaxlib' => true,
 			'fontawesome4' => true,
-			'tinymce4' => true,
+			'tinymce5' => true,
 			'sbadmintemplate3' => true,
 			'dialoglib' => true,
 			'widgets' => true,
diff --git a/application/views/system/vorlage/templatetextEdit.php b/application/views/system/vorlage/templatetextEdit.php
index 42efc1519..cc2487959 100644
--- a/application/views/system/vorlage/templatetextEdit.php
+++ b/application/views/system/vorlage/templatetextEdit.php
@@ -1,5 +1,5 @@
 <?php
-	$this->load->view('templates/header', array('title' => 'VorlageEdit', 'tinymce4' => true, 'jsonforms' => true));
+	$this->load->view('templates/header', array('title' => 'VorlageEdit', 'tinymce5' => true, 'jsonforms' => true));
 ?>
 
 <div class="row">
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
index 0928f516a..072ff1d7f 100644
--- a/application/views/templates/FHC-Common.php
+++ b/application/views/templates/FHC-Common.php
@@ -23,7 +23,7 @@
 	$tablesorter2 = isset($tablesorter2) ? $tablesorter2 : false;
 	$tabulator4 = isset($tabulator4) ? $tabulator4 : false;
 	$tabulator5 = isset($tabulator5) ? $tabulator5 : false;
-	$tinymce4 = isset($tinymce4) ? $tinymce4 : false;
+	$tinymce3 = isset($tinymce3) ? $tinymce3 : false;
 	$tinymce5 = isset($tinymce5) ? $tinymce5 : false;
 	$vue3 = isset($vue3) ? $vue3 : false;
 	$primevue3 = isset($primevue3) ? $primevue3 : false;
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index f4d66a9b9..75b727f38 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -100,14 +100,14 @@
 	// Tabulator 5 JS
 	if ($tabulator5 === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js');
 
-	// Tinymce 4 JS
-	if ($tinymce4 === true) generateJSsInclude('vendor/tinymce/tinymce4/tinymce.min.js');
+	// Tinymce 3 JS
+	if ($tinymce3 === true) generateJSsInclude('include/tiny_mce/tiny_mce.js');
 
 	// Tinymce 5 JS
 	if ($tinymce5 === true) generateJSsInclude('vendor/tinymce/tinymce5/tinymce.min.js');
 
 	// Vue 3 JS
-	if ($vue3 === true) 
+	if ($vue3 === true)
 	{
 		generateJSsInclude('vendor/vuejs/vuejs3/vue.global.prod.js');
 		generateJSsInclude('vendor/vuejs/vuerouter4/vue-router.global.js');
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index b87a6e6d0..ed9fa97b9 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -77,10 +77,7 @@
 			}
 
 			// Tabulator 5 CSS
-			if ($tabulator5 === true) generateCSSsInclude('vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
-
-			// Tinymce 4 CSS
-			if ($tinymce4 === true) generateCSSsInclude('public/css/TinyMCE4.css');
+			if ($tabulator5 === true) generateCSSsInclude('public/css/Tabulator5.css');
 
 			// Tinymce 5 CSS
 			if ($tinymce5 === true) generateCSSsInclude('public/css/TinyMCE5.css');
diff --git a/application/views/templates/header.php b/application/views/templates/header.php
index 637eb3c7a..e75acca4f 100644
--- a/application/views/templates/header.php
+++ b/application/views/templates/header.php
@@ -95,7 +95,7 @@ if($jqueryV1 && $jqueryV2) show_error("Two JQuery versions used: composer and in
 <?php endif ?>
 
 <?php if($tinymce) : ?>
-	<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce4/tinymce.min.js');?>"></script>
+	<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce5/tinymce.min.js');?>"></script>
 <?php endif ?>
 
 <?php if($textile) : ?>
diff --git a/application/views/widgets/tinymce.php b/application/views/widgets/tinymce.php
index 3e2093e55..618cb4836 100644
--- a/application/views/widgets/tinymce.php
+++ b/application/views/widgets/tinymce.php
@@ -5,5 +5,6 @@
 		plugins: [<?php echo $plugins; ?>],
 		toolbar: "<?php echo $toolbar; ?>"
 	});
-	</script>
-	<<?=$selector?> name="<?=$name?>" style="<?=$style?>"><?=$text?></<?=$selector?>>
+</script>
+<<?=$selector?> name="<?=$name?>" style="<?=$style?>"><?=$text?></<?=$selector?>>
+
diff --git a/cis/private/lehre/abgabe_lektor_zusatz.php b/cis/private/lehre/abgabe_lektor_zusatz.php
index 39488b6c3..b764fd556 100644
--- a/cis/private/lehre/abgabe_lektor_zusatz.php
+++ b/cis/private/lehre/abgabe_lektor_zusatz.php
@@ -121,15 +121,15 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 				<td><input  type="text" name="sprache" id="sprache" value="'.$db->convert_html_chars($row_zd->sprache).'" size="10" maxlength="8" readonly="readonly"></td>
 			</tr>
 			<tr>
-				<td width="30%"><b>'.$p->t('abgabetool/kontrollierteSchlagwoerter').':*</b></td>
+				<td width="30%"><b>'.$p->t('abgabetool/kontrollierteSchlagwoerter').':</b></td>
 				<td width="40%"><input type="text" name="kontrollschlagwoerter" id="kontrollschlagwoerter" value="'.$db->convert_html_chars($row_zd->kontrollschlagwoerter).'" size="60" maxlength="150" readonly="readonly"></td>
 			</tr>
 			<tr>
-				<td><b>'.$p->t('abgabetool/deutscheSchlagwoerter').': </b></td>
+				<td><b>'.$p->t('abgabetool/deutscheSchlagwoerter').':* </b></td>
 				<td><input type="text" name="schlagwoerter" value="'.$db->convert_html_chars($row_zd->schlagwoerter).'" size="60" maxlength="150" readonly="readonly"></td>
 			</tr>
 			<tr>
-				<td><b>'.$p->t('abgabetool/englischeSchlagwoerter').': </b></td>
+				<td><b>'.$p->t('abgabetool/englischeSchlagwoerter').':* </b></td>
 				<td><input type="text" name="schlagwoerter_en" value="'.$db->convert_html_chars($row_zd->schlagwoerter_en).'" size="60" maxlength="150" readonly="readonly"></td>
 			</tr>
 			<tr>
diff --git a/cis/private/lehre/abgabe_student.php b/cis/private/lehre/abgabe_student.php
index 9b3cec6f6..2512d9831 100644
--- a/cis/private/lehre/abgabe_student.php
+++ b/cis/private/lehre/abgabe_student.php
@@ -124,7 +124,6 @@ $sql_query = "SELECT (SELECT nachname FROM public.tbl_person  WHERE person_id=tb
 		AND tbl_projektarbeit.student_uid=".$db->db_add_param($uid)."
 		ORDER BY studiensemester_kurzbz desc, tbl_lehrveranstaltung.kurzbz";
 
-//AND tbl_projektarbeit.student_uid='$getuid' 'ie07m102';
 if(!$erg=$db->db_query($sql_query))
 {
 	$errormsg=$p->t('global/fehlerBeimLesenAusDatenbank');
diff --git a/cis/private/lehre/abgabe_student_details.php b/cis/private/lehre/abgabe_student_details.php
index 6575dcf70..860eb7579 100644
--- a/cis/private/lehre/abgabe_student_details.php
+++ b/cis/private/lehre/abgabe_student_details.php
@@ -64,7 +64,6 @@ if(!isset($_POST['uid']))
 	$fixtermin = false;
 	$datum = '01.01.1980';
 	$kurzbz = '';
-	$kontrollschlagwoerter = '';
 	$schlagwoerter = '';
 	$schlagwoerter_en = '';
 	$abstract = '';
@@ -88,7 +87,6 @@ else
 	$kurzbz = (isset($_POST['kurzbz'])?$_POST['kurzbz']:'');
 	$betreuer = (isset($_POST['betreuer'])?$_POST['betreuer']:'-1');
 	$sprache = (isset($_POST['sprache'])?$_POST['sprache']:'German');
-	$kontrollschlagwoerter = (isset($_POST['kontrollschlagwoerter'])?$_POST['kontrollschlagwoerter']:'-1');
 	$schlagwoerter = (isset($_POST['schlagwoerter'])?$_POST['schlagwoerter']:'-1');
 	$schlagwoerter_en = (isset($_POST['schlagwoerter_en'])?$_POST['schlagwoerter_en']:'-1');
 	$abstract = (isset($_POST['abstract'])?$_POST['abstract']:'-1');
@@ -211,23 +209,7 @@ if($command=='add')
 	{
 		//zusätzliche Daten bearbeiten
 		//Check der Eingabedaten
-		if(strlen($kontrollschlagwoerter)<1)
-		{
-			$error=true;
-		}
-		if(mb_strlen($kontrollschlagwoerter)>=150)
-		{
-			$kontrollschlagwoerter = mb_substr($kontrollschlagwoerter, 0, 146).'...';
-		}
-		if(strlen($abstract)<1)
-		{
-			$error=true;
-		}
-		if(strlen($abstract_en)<1)
-		{
-			$error=true;
-		}
-		if($seitenanzahl<1)
+		if((strlen($schlagwoerter) < 1) || (strlen($schlagwoerter_en) < 1) || (strlen($abstract) < 1) || (strlen($abstract_en) < 1) || ($seitenanzahl < 1))
 		{
 			$error=true;
 		}
@@ -237,7 +219,6 @@ if($command=='add')
 					seitenanzahl = ".$db->db_add_param($seitenanzahl).",
 					abgabedatum = now(),
 					sprache = ".$db->db_add_param($sprache).",
-					kontrollschlagwoerter = ".$db->db_add_param($kontrollschlagwoerter).",
 					schlagwoerter_en = ".$db->db_add_param($schlagwoerter_en).",
 					schlagwoerter = ".$db->db_add_param($schlagwoerter).",
 					abstract = ".$db->db_add_param($abstract).",
@@ -413,19 +394,16 @@ if($command=="update" && $error!=true)
 							        $htmlstr .= "</SELECT> \n";
 							    }
 							    $htmlstr .= "</td></tr>\n";
-								$htmlstr .= '<tr><td width="30%"><b>'.$p->t('abgabetool/kontrollierteSchlagwoerter').':*</b></td>
-											<td width="40%"><input type="text" name="kontrollschlagwoerter" id="kontrollschlagwoerter" value="'.$db->convert_html_chars($kontrollschlagwoerter).'" size="60" maxlength="150"></td>
-											<td  width="30%" align="left"><input type="button" name="SWD" value="    SWD    " onclick="window.open(\'swd.php\')"></td></tr>'."\n";
-								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/deutscheSchlagwoerter').':</b></td>
-											<td><input  type="text" name="schlagwoerter" value="'.$db->convert_html_chars($schlagwoerter).'" size="60" maxlength="150"></td></tr>'."\n";
-								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/englischeSchlagwoerter').':</b></td>
-											<td><input type="text" name="schlagwoerter_en" value="'.$db->convert_html_chars($schlagwoerter_en).'" size="60" maxlength="150"></td></tr>'."\n";
+								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/deutscheSchlagwoerter').':*</b></td>
+											<td><input  type="text" name="schlagwoerter" value="'.$db->convert_html_chars($schlagwoerter).'" size="60" maxlength="150" required></td></tr>'."\n";
+								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/englischeSchlagwoerter').':*</b></td>
+											<td><input type="text" name="schlagwoerter_en" value="'.$db->convert_html_chars($schlagwoerter_en).'" size="60" maxlength="150" required></td></tr>'."\n";
 								$htmlstr .= '<tr><td valign="top"><b>'.$p->t('abgabetool/abstract').' </b>'.$p->t('abgabetool/maxZeichen').':*</td>
-											<td><textarea name="abstract" cols="46"  rows="7">'.$db->convert_html_chars($abstract).'</textarea></td></tr>'."\n";
+											<td><textarea name="abstract" cols="46"  rows="7" required>'.$db->convert_html_chars($abstract).'</textarea></td></tr>'."\n";
 								$htmlstr .= '<tr><td valign="top"><b>'.$p->t('abgabetool/abstractEng').'</b>'.$p->t('abgabetool/maxZeichen').':*</td>
-											<td><textarea name="abstract_en" cols="46"  rows="7">'.$db->convert_html_chars($abstract_en).'</textarea></td></tr>'."\n";
+											<td><textarea name="abstract_en" cols="46"  rows="7" required>'.$db->convert_html_chars($abstract_en).'</textarea></td></tr>'."\n";
 								$htmlstr .= '<tr><td><b>'.$p->t('abgabetool/seitenanzahl').':*</b></td>
-											<td><input  type="text" name="seitenanzahl" value="'.$db->convert_html_chars($seitenanzahl).'" size="5" maxlength="4"></td></tr>'."\n";
+											<td><input  type="text" name="seitenanzahl" value="'.$db->convert_html_chars($seitenanzahl).'" size="5" maxlength="4" required></td></tr>'."\n";
 								$htmlstr .="<tr><td>&nbsp;</td></tr>\n";
 
 								// If there are info about the signed document
@@ -657,7 +635,6 @@ if($command!="add")
 			$htmlstr .= '<input type="hidden" name="uid" value="'.$db->convert_html_chars($uid).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="betreuer" value="'.$db->convert_html_chars($betreuer).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="command" value="update">'."\n";
-			$htmlstr .= '<input type="hidden" name="kontrollschlagwoerter" value="'.$db->convert_html_chars($kontrollschlagwoerter).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="schlagwoerter" value="'.$db->convert_html_chars($schlagwoerter).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="schlagwoerter_en" value="'.$db->convert_html_chars($schlagwoerter_en).'">'."\n";
 			$htmlstr .= '<input type="hidden" name="abstract" value="'.$db->convert_html_chars($abstract).'">'."\n";
diff --git a/cis/private/lehre/swd.php b/cis/private/lehre/swd.php
deleted file mode 100644
index 248779aac..000000000
--- a/cis/private/lehre/swd.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$url = "https://ognd.bsz-bw.de/";
-$zielfeld = "kontrollschlagwoerter";
-$url = $url."?zielfeld=".$zielfeld;
-header('Content-Type: text/html; charset=utf-8');
-$content = file_get_contents($url);
-if($content)
-	print $content;
-else
-	echo "Der Schlagwortdienst ist derzeit nicht erreichbar. Bitte füllen Sie die Schlagwörter manuell aus um den Upload abzuschließen";
-?>
diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index 46d342971..ffd179401 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -79,7 +79,12 @@ else if (defined('CIS_ZEITAUFZEICHNUNG_GESPERRT_BIS') && CIS_ZEITAUFZEICHNUNG_GE
 else
 	$gesperrt_bis = '2015-08-31';
 
-//echo $gesperrt_bis;
+//Default-Wert für Max-Intervall in Tagen für Zeitsperre, über Config veränderbar
+$maxDauerZS = 730;
+
+if (defined('CIS_ZEITSPERREN_MAX_DAUER') && CIS_ZEITSPERREN_MAX_DAUER != '') {
+	$maxDauerZS = CIS_ZEITSPERREN_MAX_DAUER;
+}
 
 //Stundentabelleholen
 if(! $result_stunde=$db->db_query("SELECT * FROM lehre.tbl_stunde ORDER BY stunde"))
@@ -204,66 +209,72 @@ function berechnen()
 
 function checkdatum()
 {
-	if(document.getElementById('vondatum').value.length<10)
+	if (document.getElementById('vondatum').value.length < 10)
 	{
 		alert('<?php echo $p->t('zeitsperre/vonDatumIstUngueltigNullenAngeben');?>');
 		return false;
 	}
 
-	if(document.getElementById('bisdatum').value.length<10)
+	if (document.getElementById('bisdatum').value.length < 10)
 	{
 		alert('<?php echo $p->t('zeitsperre/bisDatumIstUngueltigNullenAngeben');?>');
 		return false;
 	}
 
-      var Datum, Tag, Monat,Jahr,vonDatum,bisDatum, diff;
+	var Datum, Tag, Monat, Jahr, vonDatum, bisDatum, vonDatumDate, bisDatumDate, diff, diffTime, diffmax;
 
-	  Datum=document.getElementById('vondatum').value;
-      Tag=Datum.substring(0,2);
-      Monat=Datum.substring(3,5);
-	  if (parseInt(Monat,10)<1 || parseInt(Monat,10)>12)
-	  {
-		alert('<?php echo $p->t('zeitsperre/vonDatumMonat');?>'+ document.getElementById('vondatum').value+ ' <?php echo $p->t('zeitsperre/istNichtRichtig');?>.');
+	Datum = document.getElementById('vondatum').value;
+	Tag = Datum.substring(0, 2);
+	Monat = Datum.substring(3, 5);
+	if (parseInt(Monat, 10) < 1 || parseInt(Monat, 10) > 12)
+	{
+		alert('<?php echo $p->t('zeitsperre/vonDatumMonat');?>' + document.getElementById('vondatum').value + ' <?php echo $p->t('zeitsperre/istNichtRichtig');?>.');
 		document.getElementById('vondatum').focus();
-	  	return false;
-	  }
+		return false;
+	}
 
-      Jahr=Datum.substring(6,10);
+	Jahr = Datum.substring(6, 10);
 
-	  vonDatum=Jahr+''+Monat+''+Tag;
+	vonDatum = Jahr + '' + Monat + '' + Tag;
+	vonDatumDate = Jahr + '-' + Monat + '-' + Tag;
 
-	  Datum=document.getElementById('bisdatum').value;
-      Tag=Datum.substring(0,2);
-      Monat=Datum.substring(3,5);
-	  if (parseInt(Monat,10)<1 || parseInt(Monat,10)>12)
-	  {
-		alert('<?php echo $p->t('zeitsperre/bisDatumMonat');?>'+ document.getElementById('bisdatum').value+ ' <?php echo $p->t('zeitsperre/istNichtRichtig');?>.');
+	Datum = document.getElementById('bisdatum').value;
+	Tag = Datum.substring(0, 2);
+	Monat = Datum.substring(3, 5);
+	if (parseInt(Monat, 10) < 1 || parseInt(Monat, 10) > 12) {
+		alert('<?php echo $p->t('zeitsperre/bisDatumMonat');?>' + document.getElementById('bisdatum').value + ' <?php echo $p->t('zeitsperre/istNichtRichtig');?>.');
 		document.getElementById('bisdatum').focus();
-	  	return false;
-	  }
+		return false;
+	}
 
-      Jahr=Datum.substring(6,10);
+	Jahr = Datum.substring(6, 10);
+	bisDatum = Jahr + '' + Monat + '' + Tag;
+	bisDatumDate = Jahr + '-' + Monat + '-' + Tag;
 
-	  bisDatum=Jahr+''+Monat+''+Tag;
+	bisDatumDate = new Date(bisDatumDate);
+	vonDatumDate = new Date(vonDatumDate);
 
-	  diff=bisDatum-vonDatum;
+	diffTime = bisDatumDate.getTime() - vonDatumDate.getTime();
+	diff = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+	diffmax = <?php echo $maxDauerZS ;?>
 
-	  if (vonDatum>bisDatum)
-	  {
-		alert('<?php echo $p->t('zeitsperre/vonDatum');?> '+ document.getElementById('vondatum').value+ ' <?php echo $p->t('zeitsperre/istGroesserAlsBisDatum');?> '+document.getElementById('bisdatum').value);
+	if (vonDatum > bisDatum) {
+		alert('<?php echo $p->t('zeitsperre/vonDatum');?> ' + document.getElementById('vondatum').value + ' <?php echo $p->t('zeitsperre/istGroesserAlsBisDatum');?> ' + document.getElementById('bisdatum').value);
 		document.getElementById('vondatum').focus();
-	  	return false;
-	  }
-      else if (diff>14)
-      {
-      	Check = confirm('<?php echo $p->t('zeitaufzeichnung/zeitraumAuffallendHoch');?>');
+		return false;
+	}
+	else if (diff > 14 && diff < diffmax) {
+		Check = confirm('<?php echo $p->t('zeitaufzeichnung/zeitraumAuffallendHoch');?>');
 		document.getElementById('bisdatum').focus();
-	      if (Check == false)
-		      return false;
-	      else
-		      return true;
-	  }
-
+		if (Check == false)
+			return false;
+		else
+			return true;
+	} else if (diff >= diffmax) {
+		alert('<?php echo $p->t('zeitsperre/bisDatumGroesserMax');?> ');
+		document.getElementById('bisdatum').focus();
+		return false;
+	}
 	return true;
 }
 
@@ -445,7 +456,8 @@ if(isset($_GET['type']) && ($_GET['type']=='edit_sperre' || $_GET['type']=='new_
 		$date=explode('.',$_POST['bisdatum']);
 		if (@checkdate($date[1], $date[0], $date[2]))
 		{
-			 $bisdatum=$date[2].$date[1].$date[0];
+			$bisdatum=$date[2].$date[1].$date[0];
+			$bisdatum_iso = $date[2].'-'.$date[1].'-'.$date[0];
 		}
 		else
 		{
@@ -464,6 +476,17 @@ if(isset($_GET['type']) && ($_GET['type']=='edit_sperre' || $_GET['type']=='new_
 		$error_msg .= $p->t('zeitsperre/vonDatumGroesserAlsBisDatum').'! ';
 	}
 
+	//check if bis-Datum zu weit in der Zukunft
+	$bis = new DateTime($bisdatum);
+	$von = new DateTime($vondatum);
+
+	$intervall = $bis->diff($von);
+	if ($intervall->days >= $maxDauerZS)
+	{
+		$error=true;
+		$error_msg = $p->t('zeitsperre/bisDatumGroesserMax');
+	}
+
 	//von-datum pruefen TODO
 	if($vondatum_iso < $gesperrt_bis && in_array($_POST['zeitsperretyp_kurzbz'],$typen_arr))
 	{
diff --git a/cis/private/tools/zeitaufzeichnung.php b/cis/private/tools/zeitaufzeichnung.php
index 0eb86bdb1..7937857ef 100644
--- a/cis/private/tools/zeitaufzeichnung.php
+++ b/cis/private/tools/zeitaufzeichnung.php
@@ -229,6 +229,21 @@ $( document ).ready(function()
 </script>
 ';
 
+echo <<<EOSBJS
+<script>
+	$(document).ready(function() {
+        const scrollDiv = document.createElement('div');
+        scrollDiv.style.cssText = 'width: 99px; height: 99px; overflow: scroll; position: absolute; top: -9999px;';
+        document.body.appendChild(scrollDiv);
+        const scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth;
+        document.body.removeChild(scrollDiv);
+		var marginright = Math.max((20 - scrollbarWidth), 0);
+        document.body.style.setProperty('width', 'calc(100% - ' + marginright + 'px)');
+    });
+</script>
+
+EOSBJS;
+
 echo '
         <script type="text/javascript">
 		$(document).ready(function()
@@ -1621,7 +1636,7 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 			        <td '.$style.' align="right"><b>'.$tagessaldo.$erstr.'</b><br>'.date('H:i', ($pausesumme-3600)).'</td>
 			        <td '.$style.' colspan="3" align="right">';
 					if ($tag > $sperrdatum)
-					echo '<a href="?von_datum='.$datum->formatDatum($tag,'d.m.Y').'&bis_datum='.$datum->formatDatum($tag,'d.m.Y').'" class="item">&lt;-</a>';
+					echo '<a href="?von_datum='.$datum->formatDatum($tag,'d.m.Y').'&bis_datum='.$datum->formatDatum($tag,'d.m.Y').'" class="item">&larr;</a>';
 
 					echo '</td></tr>';
 
diff --git a/cis/public/coodle.php b/cis/public/coodle.php
index 721f2d3c0..2b8421db0 100644
--- a/cis/public/coodle.php
+++ b/cis/public/coodle.php
@@ -571,7 +571,7 @@ if (isset($_GET['resend']))
 
 			echo "<div id='coodle_content' >
 						<form action='' method='POST'>
-	
+
 					<table class='table-bordered'>
 					<tr><td></td>";
 			// Für Colspan bei Datum
@@ -675,7 +675,6 @@ if (isset($_GET['resend']))
 				}
 				else
 				{
-
 					// Ort-Ressourcen ueberspringen
 					if ($ressource->ort_kurzbz != '')
 					{
@@ -761,8 +760,8 @@ if (isset($_GET['resend']))
 								echo '	<td class="'.$class.'" align="center" '.$style.'>
 									<div class="checkbox">
 										<label style="font-size: 1.5em; padding-left: 10px">
-											<input  type="checkbox" 
-													value="" 
+											<input  type="checkbox"
+													value=""
 													'.($checked ? 'checked="checked"' : '').'
 													'.($termin->datum == '1900-01-01' ? 'id="disableCheckboxes"' : '').'
 													name="check_'.$ressource->coodle_ressource_id.'_'.$termin->coodle_termin_id.'"
@@ -867,8 +866,8 @@ if (isset($_GET['resend']))
 			<span class="glyphicon glyphicon-info-sign"></span>
 			Sie können ihre vorläufigen Terminzusagen in ihr Kalendersystem einbinden.<br>
 			Importieren Sie dazu die .ics-Datei des folgenden Links in ihren Kalender:<br>
-			<a href="'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid,LVPLAN_CYPHER_KEY).'" target="_blank">
-			'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid,LVPLAN_CYPHER_KEY).'
+			<a href="'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid, LVPLAN_CYPHER_KEY).'" target="_blank">
+			'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid, LVPLAN_CYPHER_KEY).'
 			</a>
 			<br><br>
 			Die Datei enthält ihre Terminzusagen aus <b>allen laufenden Umfragen</b>    .
@@ -999,7 +998,7 @@ function sendEmail($coodle_id)
 			else
 				$partstat = 'TENTATIVE';
 
-			$teilnehmer .= 'ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT='.$partstat.';CN='.$name."\n :MAILTO:".$mail."\n";
+			$teilnehmer .= $coodle->foldContentLine('ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT='.$partstat.';CN='.$name.":MAILTO:".$mail) . "\r\n";
 		}
 	}
 	$date = new DateTime($coodle_help->datum.' '.$coodle_help->uhrzeit);
@@ -1015,44 +1014,48 @@ function sendEmail($coodle_id)
 	$benutzer = new benutzer();
 	$benutzer->load($coodle->ersteller_uid);
 	$erstellername = trim($benutzer->titelpre.' '.$benutzer->vorname.' '.$benutzer->nachname.' '.$benutzer->titelpost);
+
+	$beschreibung = "DESCRIPTION:" . strip_tags(html_entity_decode($coodle->beschreibung, ENT_QUOTES, 'UTF-8'), '<br>');
+	$terminbeschreibung= $coodle->foldContentLine($beschreibung);
+
 	// Ical File erstellen
-	$ical = "BEGIN:VCALENDAR
-PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VTIMEZONE
-TZID:Europe/Vienna
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T020000
-TZNAME:GMT+02:00
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T030000
-TZNAME:GMT+01:00
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN."
-".$teilnehmer."
-DTSTART;TZID=Europe/Vienna:".$dtstart."
-DTEND;TZID=Europe/Vienna:".$dtend."
-LOCATION:".$ort."
-TRANSP:OPAQUE
-SEQUENCE:0
-UID:FHCompleteCoodle".$coodle_id."
-DTSTAMP;TZID=Europe/Vienna:".$dtstamp."
-DESCRIPTION:".strip_tags(html_entity_decode($coodle->beschreibung, ENT_QUOTES, 'UTF-8'))."
-SUMMARY:".strip_tags($coodle->titel)."
-PRIORITY:5
-CLASS:PUBLIC
-END:VEVENT
-END:VCALENDAR";
+	$ical = "BEGIN:VCALENDAR\r\n"
+			."PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN\r\n"
+			."VERSION:2.0\r\n"
+			."METHOD:PUBLISH\r\n"
+			."BEGIN:VTIMEZONE\r\n"
+			."TZID:Europe/Vienna\r\n"
+			."BEGIN:DAYLIGHT\r\n"
+			."TZOFFSETFROM:+0100\r\n"
+			."RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\n"
+			."DTSTART:19810329T020000\r\n"
+			."TZNAME:GMT+02:00\r\n"
+			."TZOFFSETTO:+0200\r\n"
+			."END:DAYLIGHT\r\n"
+			."BEGIN:STANDARD\r\n"
+			."TZOFFSETFROM:+0200\r\n"
+			."RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\n"
+			."DTSTART:19961027T030000\r\n"
+			."TZNAME:GMT+01:00\r\n"
+			."TZOFFSETTO:+0100\r\n"
+			."END:STANDARD\r\n"
+			."END:VTIMEZONE\r\n"
+			."BEGIN:VEVENT\r\n"
+			.$coodle->foldContentLine("ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN)."\r\n"
+			.rtrim($teilnehmer)."\r\n"
+			."DTSTART;TZID=Europe/Vienna:".$dtstart."\r\n"
+			."DTEND;TZID=Europe/Vienna:".$dtend."\r\n"
+			."LOCATION:".$ort."\r\n"
+			."TRANSP:OPAQUE\r\n"
+			."SEQUENCE:0\r\n"
+			."UID:FHCompleteCoodle".$coodle_id."\r\n"
+			."DTSTAMP;TZID=Europe/Vienna:".$dtstamp."\r\n"
+			.$terminbeschreibung."\r\n"
+			."SUMMARY:".strip_tags($coodle->titel)."\r\n"
+			."PRIORITY:5\r\n"
+			."CLASS:PUBLIC\r\n"
+			."END:VEVENT\r\n"
+			."END:VCALENDAR\r\n";
 
 	if (count($coodle_ressource->result) > 0)
 	{
@@ -1173,4 +1176,4 @@ function RaumBelegt($ort_kurzbz, $datum, $stunden)
 	return false;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index 0ff84f4a0..475ee9f00 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -126,10 +126,6 @@ if (isset($_REQUEST['prestudent']))
 			$rt->getReihungstestPerson($ps->person_id);
 			if (isset($rt->result[0]))
 				$reihungstest_id = $rt->result[0]->reihungstest_id;
-			else
-			{
-				$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</div>';
-			}
 		}
 		else
 		{
@@ -138,10 +134,6 @@ if (isset($_REQUEST['prestudent']))
 				// TODO Was ist wenn da mehrere Zurueckkommen?!
 				if (isset($rt->result[0]))
 					$reihungstest_id = $rt->result[0]->reihungstest_id;
-				else
-				{
-					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestKannNichtGeladenWerden').'</div>';
-				}
 			}
 			else
 			{
diff --git a/composer.json b/composer.json
index 9ee2904ba..65ab5cb6a 100644
--- a/composer.json
+++ b/composer.json
@@ -26,28 +26,6 @@
 		"wiki": "https://wiki.fhcomplete.info/doku.php"
 	},
 	"repositories": [
-		{
-			"type": "package",
-			"package": {
-				"name": "vuepic/vue-datepicker-js",
-				"version": "4.0.0",
-				"dist": {
-					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/vue-datepicker.iife.js",
-					"type": "file"
-				}
-			}
-		},
-		{
-			"type": "package",
-			"package": {
-				"name": "vuepic/vue-datepicker-css",
-				"version": "4.0.0",
-				"dist": {
-					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/main.css",
-					"type": "file"
-				}
-			}
-		},
 		{
 			"type": "package",
 			"package": {
@@ -252,9 +230,9 @@
 			"type": "package",
 			"package": {
 				"name": "olifolkerd/tabulator5",
-				"version": "5.2.1",
+				"version": "5.5.2",
 				"dist": {
-					"url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.2.1.zip",
+					"url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.5.2.zip",
 					"type": "zip"
 				}
 			}
@@ -292,17 +270,6 @@
 				}
 			}
 		},
-		{
-			"type": "package",
-			"package": {
-				"name": "tinymce/tinymce4",
-				"version": "4.9.11",
-				"dist": {
-					"url": "https://github.com/tinymce/tinymce-dist/archive/refs/tags/4.9.11.zip",
-					"type": "zip"
-				}
-			}
-		},
 		{
 			"type": "package",
 			"package": {
@@ -370,6 +337,28 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+					"name": "vuejs/vuedatepicker_js",
+					"version": "5.4.0",
+					"dist": {
+							"url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/vue-datepicker.iife.js",
+							"type": "file"
+					}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+					"name": "vuejs/vuedatepicker_css",
+					"version": "5.4.0",
+					"dist": {
+							"url": "https://unpkg.com/@vuepic/vue-datepicker@4.2.3/dist/main.css",
+							"type": "file"
+					}
+			}
+		},
 		{
 			"type": "composer",
 			"url": "https://asset-packagist.org"
@@ -426,7 +415,7 @@
 		"npm-asset/primeicons": "5.0.0",
 
 		"olifolkerd/tabulator4": "4.9.*",
-		"olifolkerd/tabulator5": "5.2.*",
+		"olifolkerd/tabulator5": "5.5.*",
 
 		"phpseclib/phpseclib": "2.0.*",
 
@@ -435,7 +424,6 @@
 		"scottjehl/respond": "1.4.2",
 
 		"tapmodo/jcrop": "2.0.4",
-		"tinymce/tinymce4": "4.9.*",
 		"tinymce/tinymce5": "5.10.*",
 		"tomazdragar/simplecropper": "1.0",
 		"twbs/bootstrap3": "3.4.*",
@@ -443,8 +431,8 @@
 
 		"vuejs/vuejs3": "3.2.33",
 		"vuejs/vuerouter4": "4.1.3",
-		"vuepic/vue-datepicker-js": "4.*",
-		"vuepic/vue-datepicker-css": "4.*"
+		"vuejs/vuedatepicker_js": "5.4.0",
+		"vuejs/vuedatepicker_css": "5.4.0"
 	},
 	"config": {
 		"bin-dir": "vendor/bin"
diff --git a/composer.lock b/composer.lock
index c88612d1b..d83e749b0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1105a07a83f98040eedbe34b23e11ee3",
+    "content-hash": "728ac4542ac39ac1efbcea15134a81f9",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -614,16 +614,16 @@
         },
         {
             "name": "components/jquery",
-            "version": "3.6.0",
+            "version": "v3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/components/jquery.git",
-                "reference": "6cf38ee1fd04b6adf8e7dda161283aa35be818c3"
+                "reference": "8edc7785239bb8c2ad2b83302b856a1d61de60e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/components/jquery/zipball/6cf38ee1fd04b6adf8e7dda161283aa35be818c3",
-                "reference": "6cf38ee1fd04b6adf8e7dda161283aa35be818c3",
+                "url": "https://api.github.com/repos/components/jquery/zipball/8edc7785239bb8c2ad2b83302b856a1d61de60e7",
+                "reference": "8edc7785239bb8c2ad2b83302b856a1d61de60e7",
                 "shasum": ""
             },
             "type": "component",
@@ -659,7 +659,7 @@
                 "source": "https://github.com/jquery/jquery",
                 "wiki": "http://docs.jquery.com/"
             },
-            "time": "2021-03-20T19:13:42+00:00"
+            "time": "2023-09-22T01:43:46+00:00"
         },
         {
             "name": "components/jqueryui",
@@ -1511,25 +1511,25 @@
         },
         {
             "name": "olifolkerd/tabulator5",
-            "version": "5.2.1",
+            "version": "5.5.2",
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.2.1.zip"
+                "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.5.2.zip"
             },
             "type": "library"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.44",
+            "version": "2.0.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5"
+                "reference": "28d8f438a0064c9de80857e3270d071495544640"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/149f608243f8133c61926aae26ce67d2b22b37e5",
-                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/28d8f438a0064c9de80857e3270d071495544640",
+                "reference": "28d8f438a0064c9de80857e3270d071495544640",
                 "shasum": ""
             },
             "require": {
@@ -1610,7 +1610,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.44"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.45"
             },
             "funding": [
                 {
@@ -1626,7 +1626,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-13T08:41:47+00:00"
+            "time": "2023-09-15T20:55:47+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -1734,15 +1734,6 @@
             },
             "type": "library"
         },
-        {
-            "name": "tinymce/tinymce4",
-            "version": "4.9.11",
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/tinymce/tinymce-dist/archive/refs/tags/4.9.11.zip"
-            },
-            "type": "library"
-        },
         {
             "name": "tinymce/tinymce5",
             "version": "5.10.3",
@@ -1848,6 +1839,24 @@
             },
             "time": "2020-02-11T05:59:23+00:00"
         },
+        {
+            "name": "vuejs/vuedatepicker_css",
+            "version": "5.4.0",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/main.css"
+            },
+            "type": "library"
+        },
+        {
+            "name": "vuejs/vuedatepicker_js",
+            "version": "5.4.0",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/vue-datepicker.iife.js"
+            },
+            "type": "library"
+        },
         {
             "name": "vuejs/vuejs3",
             "version": "3.2.33",
@@ -1865,24 +1874,6 @@
                 "url": "https://unpkg.com/vue-router@4.1.3/dist/vue-router.global.js"
             },
             "type": "library"
-        },
-        {
-            "name": "vuepic/vue-datepicker-css",
-            "version": "4.0.0",
-            "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/main.css"
-            },
-            "type": "library"
-        },
-        {
-            "name": "vuepic/vue-datepicker-js",
-            "version": "4.0.0",
-            "dist": {
-                "type": "file",
-                "url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/vue-datepicker.iife.js"
-            },
-            "type": "library"
         }
     ],
     "packages-dev": [
@@ -2025,16 +2016,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.16.0",
+            "version": "v4.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
-                "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
                 "shasum": ""
             },
             "require": {
@@ -2075,34 +2066,34 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
             },
-            "time": "2023-06-25T14:52:30+00:00"
+            "time": "2023-12-10T21:03:43+00:00"
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.14.0",
+            "version": "2.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1"
+                "reference": "66ceb05eaa8bf358574143c974b04463911bc700"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1121d4b04af06e33e9659bac3a6741b91cab1de1",
-                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/66ceb05eaa8bf358574143c974b04463911bc700",
+                "reference": "66ceb05eaa8bf358574143c974b04463911bc700",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.7",
-                "symfony/config": "^2.3.0|^3|^4|^5|^6.0",
-                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0",
-                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0"
+                "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0",
+                "symfony/polyfill-mbstring": "^1.19"
             },
             "require-dev": {
                 "easy-doc/easy-doc": "0.0.0|^1.2.3",
                 "gregwar/rst": "^1.0",
-                "phpunit/phpunit": "^4.8.36|^5.7.27",
                 "squizlabs/php_codesniffer": "^2.0.0"
             },
             "bin": [
@@ -2132,7 +2123,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pdepend/pdepend/issues",
-                "source": "https://github.com/pdepend/pdepend/tree/2.14.0"
+                "source": "https://github.com/pdepend/pdepend/tree/2.16.1"
             },
             "funding": [
                 {
@@ -2140,26 +2131,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-26T13:15:18+00:00"
+            "time": "2023-12-10T18:38:19+00:00"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.13.0",
+            "version": "2.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "dad0228156856b3ad959992f9748514fa943f3e3"
+                "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3",
-                "reference": "dad0228156856b3ad959992f9748514fa943f3e3",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0",
+                "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0",
                 "shasum": ""
             },
             "require": {
                 "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.12.1",
+                "pdepend/pdepend": "^2.16.1",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -2168,8 +2159,7 @@
                 "ext-simplexml": "*",
                 "gregwar/rst": "^1.0",
                 "mikey179/vfsstream": "^1.6.8",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27",
-                "squizlabs/php_codesniffer": "^2.0"
+                "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2"
             },
             "bin": [
                 "src/bin/phpmd"
@@ -2206,6 +2196,7 @@
             "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
             "homepage": "https://phpmd.org/",
             "keywords": [
+                "dev",
                 "mess detection",
                 "mess detector",
                 "pdepend",
@@ -2215,7 +2206,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/phpmd",
                 "issues": "https://github.com/phpmd/phpmd/issues",
-                "source": "https://github.com/phpmd/phpmd/tree/2.13.0"
+                "source": "https://github.com/phpmd/phpmd/tree/2.15.0"
             },
             "funding": [
                 {
@@ -2223,7 +2214,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-10T08:44:15+00:00"
+            "time": "2023-12-11T08:22:20+00:00"
         },
         {
             "name": "phpmetrics/phpmetrics",
@@ -2600,12 +2591,12 @@
             "version": "3.6.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
                 "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
                 "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
                 "shasum": ""
             },
@@ -2649,6 +2640,20 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2021-12-12T21:44:58+00:00"
         },
         {
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 27e0a9a70..346af8801 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -294,5 +294,4 @@ define ('DEFAULT_ALLIN_DIENSTVERTRAG',[111]);
 //Echter Dienstvertrag
 define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,111]);
 
-
 ?>
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index 8990bbd81..c4da2f6e3 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -47,6 +47,9 @@ define('CIS_PROFIL_STUDIENINFORMATION_ANZEIGEN',true);
 // Zeitaufzeichnung gesperrt_bis Datum YYYY-MM-DD
 define('CIS_ZEITAUFZEICHNUNG_GESPERRT_BIS','');
 
+// maximale Dauer einer Zeitsperre in Tagen
+define('CIS_ZEITSPERREN_MAX_DAUER', 730);
+
 // Anzeige des Links zur Noteneingabe in der LVA Uebersicht
 define('CIS_LVALISTE_NOTENEINGABE_ANZEIGEN',true);
 
diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
index fdd971be0..ddcf8d563 100644
--- a/config/vilesci.config-default.inc.php
+++ b/config/vilesci.config-default.inc.php
@@ -276,7 +276,13 @@ define('DOCSBOX_WAITING_SLEEP_TIME', 1);
 // Bei folgenden Buchungstypen wird ein Anlegen geprüft ob bereits ein Eintrag für diesen Typ vorhanden ist im selben
 // Semester und ggf ein Hinweis ausgegeben
 define('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK', serialize(
-        array('StudiengebuehrAnzahlung', 'Studiengebuehr', 'StudiengebuehrRestzahlung', 'OEH')
+	array(
+			'Studiengebuehr' => array('StudiengebuehrErhoeht', 'Studiengebuehr', 'StudiengebuehrAnzahlung', 'StudiengebuehrRestzahlung'),
+			'StudiengebuehrErhoeht' => array('StudiengebuehrErhoeht', 'Studiengebuehr', 'StudiengebuehrAnzahlung', 'StudiengebuehrRestzahlung'),
+			'StudiengebuehrAnzahlung' => array('StudiengebuehrErhoeht', 'Studiengebuehr', 'StudiengebuehrAnzahlung'),
+			'StudiengebuehrRestzahlung' => array('StudiengebuehrErhoeht', 'Studiengebuehr', 'StudiengebuehrRestzahlung'),
+			'OEH' => array('OEH')
+	))
 ));
 
 // Spezialnoten die am Zeunigs und Diplomasupplement ignoriert werden
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 2d5c9e0b8..4e5f5452c 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -74,6 +74,7 @@ require_once('../../include/reihungstest.class.php');
 require_once('../../include/studienplan.class.php');
 require_once('../../include/mobilitaet.class.php');
 require_once('../../include/studienordnung.class.php');
+require_once('../../include/bismeldestichtag.class.php');
 
 $user = get_uid();
 $db = new basis_db();
@@ -383,7 +384,7 @@ function isBuchungAllowedToChange($buchung_obj)
  * @param $new_status_ausbildungssemester Ausbildungssemester des neuen/zu ändernen Status
  * @param $old_status_studiensemester Studiensemester des alten Status, leer wenn neuer Status
  * @param $old_status_ausbildungssemester Ausbildungssemester des alten Status, leer wenn neuer Status
- * @return array
+ * @return array mit error = true und Fehlerbeschreibung wenn ungültig, andernfalls error = false
  */
 function checkStatusaenderung(
 	$prestudent_id, $status_kurzbz, $new_status_studiensemester, $new_status_datum, $new_status_ausbildungssemester,
@@ -417,7 +418,7 @@ function checkStatusaenderung(
 	$studiensemester->load($new_status_studiensemester);
 	$new_status_semesterstart = new DateTime($studiensemester->start);
 
-	// Alle bisherigen prestudentstatus nach Datum sortiert
+	// Alle prestudentstatus nach Datum sortiert
 	$qry = "SELECT status_kurzbz, studiensemester_kurzbz, ausbildungssemester, datum, sem.start AS studiensemester_start
 			FROM public.tbl_prestudentstatus pss
 			JOIN public.tbl_studiensemester sem USING (studiensemester_kurzbz)
@@ -464,7 +465,7 @@ function checkStatusaenderung(
 				// Gültige Zeitabfolge, bestehenden Status hinzufügen
 				$statusArr[] = $row;
 			}
-			// oder Neuer/editierter Statuseintrag nach bestehendem Statuseintrag
+			// oder Neuer/editierter Statuseintrag vor bestehendem Statuseintrag
 			elseif ($new_status_datum <= $status_datum && $new_status_semesterstart <= $studiensemester_start)
 			{
 				// Gültige Zeitabfolge, bestehenden Status hinzufügen
@@ -475,8 +476,7 @@ function checkStatusaenderung(
 				// Zeitabfolge ungültig, Fehler
 				return array(
 					'error' => true,
-					'errormsg' => 'Datum des Statuseintrags muss nach dem Statusdatum,'
-						.' Semesterstartdatum nach Semesterstartdatum des vorherigen Statuseintrags sein'
+					'errormsg' => 'Ungültige Zeitabfolge der Statuseinträge (Statusdatum oder Semester)'
 				);
 			}
 		}
@@ -994,6 +994,18 @@ if(!$error)
 								{
 									$new_status_datum = isset($_POST['datum']) ? $_POST['datum'] : date('Y-m-d');
 
+									$bismeldestichtag = new bismeldestichtag();
+
+									$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($new_status_datum);
+
+									if ($meldestichtag_erreicht === true)
+									{
+										$return = false;
+										$error = true;
+										$errormsg .= 'Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht hinzugefügt werden.';
+										$anzahl_fehler++;
+									}
+
 									$check_statusaenderung_result = checkStatusaenderung(
 										$prestudent_id,
 										$_POST['status_kurzbz'],
@@ -1204,13 +1216,24 @@ if(!$error)
 
 		if(isset($_POST['studiensemester_kurzbz']) && isset($_POST['status_kurzbz']) &&
 		   isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id']) &&
-		   isset($_POST['ausbildungssemester']) && is_numeric($_POST['ausbildungssemester']))
+		   isset($_POST['ausbildungssemester']) && is_numeric($_POST['ausbildungssemester']) &&
+		   isset($_POST['datum']))
 		{
-			if($_POST['status_kurzbz']=='Student' && !$rechte->isBerechtigt('admin', null, 'suid') && !$rechte->isBerechtigt('student/keine_studstatuspruefung', null, 'suid'))
+			$erweiterteBerechtigungen = $rechte->isBerechtigt('admin', null, 'suid') || $rechte->isBerechtigt('student/keine_studstatuspruefung', null, 'suid');
+
+			$bismeldestichtag = new bismeldestichtag();
+			$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($_POST['datum']);
+
+			if($_POST['status_kurzbz']=='Student' && !$erweiterteBerechtigungen)
 			{
 				$return = false;
 				$errormsg = 'Studentenrolle kann nur durch den Administrator geloescht werden';
 			}
+			elseif ($meldestichtag_erreicht && !$erweiterteBerechtigungen)
+			{
+				$return = false;
+				$errormsg = 'Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht gelöscht werden.';
+			}
 			else
 			{
 				$qry = "SELECT count(*) as anzahl FROM public.tbl_prestudentstatus WHERE prestudent_id=".$db->db_add_param($_POST['prestudent_id'], FHC_INTEGER);
@@ -1530,6 +1553,17 @@ if(!$error)
 							$error = true;
 							$errormsg = isset($check_statusaenderung_result['errormsg']) ? $check_statusaenderung_result['errormsg'] : '';
 						}
+
+						// Prüfung, ob Meldestichtag erreicht ist
+						$bismeldestichtag = new bismeldestichtag();
+						$meldestichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($_POST['datum']);
+
+						if ($meldestichtag_erreicht === true)
+						{
+							$return = false;
+							$error = true;
+							$errormsg = 'Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag können nicht hinzugefügt werden.';
+						}
 					}
 
 					if(!$error)
@@ -2502,10 +2536,15 @@ if(!$error)
 	{
 		$person_ids = explode(';',$_POST['person_ids']);
 		$exists = false;
-		if (defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK') && (in_array($_POST['buchungstyp_kurzbz'], unserialize(FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK))))
+		if (defined('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK'))
 		{
-			$konto = new konto();
-			$exists = $konto->checkDoppelteBuchung($person_ids, $_POST['studiensemester_kurzbz'], $_POST['buchungstyp_kurzbz']);
+			$buchungen = unserialize(FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK);
+			$buchung = $_POST['buchungstyp_kurzbz'];
+			if (isset($buchungen[$buchung]))
+			{
+				$konto = new konto();
+				$exists = $konto->checkDoppelteBuchung($person_ids, $_POST['studiensemester_kurzbz'], $buchungen[$buchung]);
+			}
 		}
 
 		if($exists)
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 845d48397..4b4fbdd63 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -806,24 +806,24 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									<treechildren flex="1" >
 										<treeitem uri="rdf:*">
 											<treerow>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_am"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bewerbung_abgeschicktamum"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertamum"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertvon"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#status_kurzbz"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#lehrverband"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#orgform_kurzbz"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#prestudent_id"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_id"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studienplan_bezeichnung"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#anmerkung"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_von"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bestaetigt_am"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#bewerbung_abgeschicktamum"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#statusgrund"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertamum"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertvon"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
 											</treerow>
 										</treeitem>
 									</treechildren>
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 0926a5007..cdaa2e69b 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -208,7 +208,8 @@ else
 								<menupopup id="student-filter-menu-popup" >
 									<menuitem id="student-toolbar-filter-dokumente" label="fehlende Dokumente" oncommand="InteressentDokumenteFilter()" disabled="false" tooltiptext="Liste aller Studenten mit Fehlenden Dokumenten"/>
 									<menuitem id="student-toolbar-filter-offenebuchungen" label="offene Buchungen" oncommand="StudentKontoFilterStudenten('konto')" disabled="false" tooltiptext="Liste aller Studenten mit offenen Buchungen"/>
-									<menuitem id="student-toolbar-filter-studiengebuehr" label="nicht gebuchte Studiengebuehr" oncommand="StudentKontoFilterStudenten('studiengebuehr')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit Studienbebuehr belastet wurden" />
+									<menuitem id="student-toolbar-filter-studiengebuehr" label="nicht gebuchte Studiengebuehr" oncommand="StudentKontoFilterStudenten('studiengebuehr')" disabled="false" tooltiptext="Liste aller Studenten die noch nicht mit der Studiengebühr belastet wurden" />
+									<menuitem id="student-toolbar-filter-erhoehte-studiengebuehr" label="erhöhten Studienbeitrag" oncommand="StudentKontoFilterStudenten('StudiengebuehrErhoeht')" disabled="false" tooltiptext="Liste aller Studenten denen der erhöhte Studienbeitrag eingebucht wurde" />
 									<menuitem id="student-toolbar-filter-zgvohnedatum" label="ZGV eingetragen ohne Datum" oncommand="StudentKontoFilterStudenten('zgvohnedatum')" disabled="false" tooltiptext="Liste aller Studenten die ZGV eingetragen haben bei denen aber kein ZGV Datum gesetzt ist" />
 									<menu label="nach Statusgrund">
 									    <menupopup id="student-filter-statusgrund-menu-popup">
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index d76b647d8..1bf68c809 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1876,7 +1876,6 @@ function StudentPrestudentDisableFields(val)
 
 	document.getElementById('student-prestudent-menulist-aufnahmeschluessel').disabled=val;
 	document.getElementById('student-prestudent-checkbox-facheinschlberuf').disabled=val;
-	document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
 	document.getElementById('student-prestudent-menulist-foerderrelevant').disabled=val;
 	document.getElementById('student-prestudent-checkbox-dual').disabled=val;
 	document.getElementById('student-prestudent-button-save').disabled=val;
@@ -1923,6 +1922,20 @@ function StudentPrestudentDisableFields(val)
 		document.getElementById('student-prestudent-menulist-zgvmastercode').disabled=true;
 	}
 
+	// bismelden checkbox deaktivieren wenn Recht nicht vorhanden ist
+	<?php
+		$editBismelden = $rechte->isBerechtigt('student/editBismelden') ? 'true' : 'false';
+		echo ' var editBismelden = '.$editBismelden.';';
+	?>
+	if (editBismelden == true)
+	{
+		document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
+	}
+	else
+	{
+		document.getElementById('student-prestudent-checkbox-bismelden').disabled=true;
+	}
+
 	//Status Tree leeren
 	rollentree = document.getElementById('student-prestudent-tree-rolle');
 
@@ -2080,6 +2093,7 @@ function StudentPrestudentRolleDelete()
 	var studiensemester_kurzbz = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', tree.currentIndex);
 	var prestudent_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-prestudent_id', tree.currentIndex);
 	var ausbildungssemester = getTreeCellText(tree, 'student-prestudent-tree-rolle-ausbildungssemester', tree.currentIndex);
+	var datum = getTreeCellText(tree, 'student-prestudent-tree-rolle-datum', tree.currentIndex);
 
 	studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value;
 	if(confirm('Diese Rolle wirklich loeschen?'))
@@ -2108,6 +2122,7 @@ function StudentPrestudentRolleDelete()
 				req.add('studiensemester_kurzbz', studiensemester_kurzbz);
 				req.add('ausbildungssemester', ausbildungssemester);
 				req.add('studiengang_kz', studiengang_kz);
+				req.add('datum', datum);
 
 				var response = req.executePOST();
 
@@ -2139,6 +2154,7 @@ function StudentPrestudentRolleDelete()
 			req.add('studiensemester_kurzbz', studiensemester_kurzbz);
 			req.add('ausbildungssemester', ausbildungssemester);
 			req.add('studiengang_kz', studiengang_kz);
+			req.add('datum', datum);
 
 			var response = req.executePOST();
 
@@ -2231,8 +2247,9 @@ function StudentRolleBearbeiten()
 	var studiensemester_kurzbz = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', tree.currentIndex);
 	var prestudent_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-prestudent_id', tree.currentIndex);
 	var ausbildungssemester = getTreeCellText(tree, 'student-prestudent-tree-rolle-ausbildungssemester', tree.currentIndex);
+	var datum = getTreeCellText(tree, 'student-prestudent-tree-rolle-datum', tree.currentIndex);
 
-	window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id+'&status_kurzbz='+status_kurzbz+'&studiensemester_kurzbz='+studiensemester_kurzbz+'&ausbildungssemester='+ausbildungssemester,"Status","status=no, width=500, height=450, centerscreen, resizable");
+	window.open('<?php echo APP_ROOT?>content/student/studentrolledialog.xul.php?prestudent_id='+prestudent_id+'&status_kurzbz='+status_kurzbz+'&studiensemester_kurzbz='+studiensemester_kurzbz+'&ausbildungssemester='+ausbildungssemester+'&datum='+datum,"Status","status=no, width=500, height=450, centerscreen, resizable");
 }
 
 // ****
@@ -2290,7 +2307,7 @@ function StudentRolleSpeichern(dialog, studiensemester_old, ausbildungssemester_
 					timepart_arr[i] = '00';
 				}
 			}
-			
+
 			arr = datepart.split('.');
 
 			if(arr[0].length==1)
diff --git a/content/student/studentrolledialog.xul.php b/content/student/studentrolledialog.xul.php
index ef2c0919a..88a357b6a 100644
--- a/content/student/studentrolledialog.xul.php
+++ b/content/student/studentrolledialog.xul.php
@@ -31,6 +31,7 @@ require_once('../../include/person.class.php');
 require_once('../../include/prestudent.class.php');
 require_once('../../include/studienplan.class.php');
 require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/bismeldestichtag.class.php');
 
 echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 
@@ -58,8 +59,17 @@ if(isset($_GET['ausbildungssemester']))
 else
 	$ausbildungssemester='';
 
+if(isset($_GET['datum']))
+	$datum=$_GET['datum'];
+else
+	$datum='';
+
 $vorname = '';
 $nachname = '';
+
+$user=get_uid();
+$db = new basis_db();
+
 if($prestudent_id!='')
 {
 	$prestudent = new prestudent();
@@ -67,9 +77,16 @@ if($prestudent_id!='')
 
 	$vorname = $prestudent->vorname;
 	$nachname = $prestudent->nachname;
+
+	// Prüfen, ob Studnetrolle vor dem aktuellen Meldestichtag ist. In diesem Fall darf die Rolle nicht mehr bearbeitet werden.
+	$rechte = new benutzerberechtigung();
+	$rechte->getBerechtigungen($user);
+
+	$bismeldestichtag = new bismeldestichtag();
+	$disabled = $bismeldestichtag->checkMeldestichtagErreicht($datum) && !$rechte->isBerechtigt('student/keine_studstatuspruefung', null, 'suid')
+		? ' disabled="true"'
+		: '';
 }
-$db = new basis_db();
-$user=get_uid();
 ?>
 
 <window id="student-rolle-dialog" title="Status"
@@ -83,6 +100,9 @@ $user=get_uid();
 <vbox>
 <textbox id="student-rolle-textbox-prestudent_id" value="" hidden="true" />
 <groupbox id="student-rolle-groupbox" flex="1">
+	<?php if ($disabled): ?>
+		<label class="warning">Meldestichtag erreicht - Bearbeiten nicht mehr möglich</label>
+	<?php endif; ?>
 	<caption label="Details<?php echo ($nachname!=''?" $nachname $vorname":'');?>"/>
 		<grid id="student-rolle-grid-detail" style="margin:4px;" flex="1">
 		  	<columns  >
@@ -112,7 +132,7 @@ $user=get_uid();
 					<label value="Studiensemester" control="student-rolle-menulist-studiensemester"/>
 					<menulist id="student-rolle-menulist-studiensemester"
 					          datasources="<?php echo APP_ROOT ?>rdf/studiensemester.rdf.php?order=desc" flex="1"
-					          ref="http://www.technikum-wien.at/studiensemester/liste" >
+					          ref="http://www.technikum-wien.at/studiensemester/liste"<?php echo $disabled ?> >
 						<template>
 							<menupopup>
 								<menuitem value="rdf:http://www.technikum-wien.at/studiensemester/rdf#kurzbz"
@@ -124,7 +144,7 @@ $user=get_uid();
 	  			</row>
 	  			<row>
 	  				<label value="Ausbildungssemester" control="student-rolle-menulist-ausbildungssemester"/>
-					<menulist id="student-rolle-menulist-ausbildungssemester" >
+					<menulist id="student-rolle-menulist-ausbildungssemester"<?php echo $disabled ?> >
 						<menupopup>
 						<?php
 
@@ -163,7 +183,7 @@ $user=get_uid();
 				?>
 				<row hidden="<?php echo $hidden; ?>">
 					<label value="Organisationsform" control="student-rolle-menulist-orgform_kurzbz"/>
-					<menulist id="student-rolle-menulist-orgform_kurzbz" >
+					<menulist id="student-rolle-menulist-orgform_kurzbz"<?php echo $disabled ?> >
 						<menupopup>
 						<menuitem value="" label="-- keine Auswahl --"/>
 						<?php
@@ -181,13 +201,13 @@ $user=get_uid();
 				</row>
 				<row>
 					<label value="Datum" control="student-rolle-datum-datum"/>
-					<box class='Datum' id="student-rolle-datum-datum" />
+					<box class='Datum' id="student-rolle-datum-datum"<?php echo $disabled ?>/>
 				</row>
 				<row>
 					<label value="Bestätigt am" control="student-rolle-datum-bestaetigt_datum"/>
-					<box class='Datum' id="student-rolle-datum-bestaetigt_datum" />
+					<box class='Datum' id="student-rolle-datum-bestaetigt_datum"<?php echo $disabled ?> />
 				</row>
-				<?php 
+				<?php
 						$readonly = 'readonly="true"';
 						$rechte = new benutzerberechtigung();
 						$rechte->getBerechtigungen($user);
@@ -196,11 +216,11 @@ $user=get_uid();
 					?>
 				<row>
 					<label value="Bewerbung abgeschickt am" control="student-rolle-datum-bewerbung_abgeschicktamum"/>
-					<textbox id="student-rolle-datum-bewerbung_abgeschicktamum" <?php echo $readonly ?>/>
+					<textbox id="student-rolle-datum-bewerbung_abgeschicktamum" <?php echo $readonly ?><?php echo $disabled ?>/>
 				</row>
 				<row>
 					<label value="Studienplan" control="student-rolle-menulist-studienplan"/>
-					<menulist id="student-rolle-menulist-studienplan" >
+					<menulist id="student-rolle-menulist-studienplan"<?php echo $disabled ?> >
 						<menupopup>
 						<menuitem value="" label="-- keine Auswahl --"/>
 						<?php
@@ -217,11 +237,11 @@ $user=get_uid();
 				</row>
 				<row>
 					<label value="Anmerkung"/>
-					<textbox id="student-rolle-textbox-anmerkung" multiline="true" />
+					<textbox id="student-rolle-textbox-anmerkung" multiline="true"<?php echo $disabled ?> />
 				</row>
 				<row>
 					<label value="Aufnahmestufe"/>
-					<menulist id="student-rolle-menulist-stufe" disabled="false">
+					<menulist id="student-rolle-menulist-stufe" <?php echo empty($disabled) ? 'disabled="false"' : $disabled ?>>
 						<menupopup>
 							<menuitem value="" label="-- keine Auswahl --"/>
 							<menuitem value="1" label="1"/>
@@ -234,7 +254,7 @@ $user=get_uid();
 					<label value="Grund"/>
 					<menulist id="student-rolle-menulist-statusgrund"
 					          datasources="rdf:null" flex="1"
-					          ref="http://www.technikum-wien.at/statusgrund" >
+					          ref="http://www.technikum-wien.at/statusgrund"<?php echo $disabled ?> >
 						<template>
 							<menupopup>
 								<menuitem value="rdf:http://www.technikum-wien.at/statusgrund/rdf#statusgrund_id"
@@ -248,7 +268,7 @@ $user=get_uid();
 	</grid>
 	<hbox>
 		<spacer flex="1" />
-		<button id="student-rolle-button-speichern" oncommand="StudentRolleSpeichern()" label="Speichern" />
+		<button id="student-rolle-button-speichern" oncommand="StudentRolleSpeichern()" label="Speichern"<?php echo $disabled ?> />
 	</hbox>
 </groupbox>
 </vbox>
diff --git a/include/bismeldestichtag.class.php b/include/bismeldestichtag.class.php
new file mode 100644
index 000000000..143096dd8
--- /dev/null
+++ b/include/bismeldestichtag.class.php
@@ -0,0 +1,185 @@
+<?php
+/* Copyright (C) 2007 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Alexei Karpenko <karpenko@technikum-wien.at>,
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/studiensemester.class.php');
+
+class bismeldestichtag extends basis_db
+{
+	//Tabellenspalten
+	public $meldestichtag_id;		// integer
+	public $meldestichtag;			// date
+	public $studiensemester_kurzbz;	// varchar(16)
+	public $insertamum;				// timestamp
+	public $insertvon;				// varchar(32)
+	public $updateamum;				// timestamp
+	public $updatevon;				// varchar(32)
+
+	// ErgebnisArray
+	public $result=array();
+
+	/**
+	 * Konstruktor - Uebergibt die Connection und laedt optional einen Meldestichtag
+	 * @param $meldestichtag_id Stichtag der geladen werden soll (default=null)
+	 */
+	public function __construct($meldestichtag_id=null)
+	{
+		parent::__construct();
+
+		if(!is_null($meldestichtag_id))
+			$this->load($meldestichtag_id);
+	}
+
+	/**
+	 * Laedt Meldestichtag mit der uebergebenen ID
+	 * @param $meldestichtag_id ID des Stichtags der geladen werden soll
+	 */
+	public function load($meldestichtag_id)
+	{
+		$qry = "SELECT * FROM bis.tbl_bismeldestichtag WHERE meldestichtag_id=".$this->db_add_param($meldestichtag_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$this->meldestichtag_id = $row->meldestichtag_id;
+				$this->meldestichtag = $row->meldestichtag;
+				$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				$this->updateamum = $row->updateamum;
+				$this->updatevon = $row->updatevon;
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Kein Eintrag gefunden';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = "Fehler beim Laden des Stichtags";
+			return false;
+		}
+	}
+
+	/**
+	 * Prueft die Variablen vor dem Speichern
+	 * auf Gueltigkeit.
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	protected function validate()
+	{
+		return true;
+	}
+
+	/**
+	 * Liefert zuletzt erreichten Meldestichtag
+	 *
+	 * @param $studiensemester_kurzbz
+	 * @return boolean
+	 */
+	public function getLastReachedMeldestichtag($studiensemester_kurzbz = null)
+	{
+		$qry = "SELECT
+					meldestichtag_id, meldestichtag, studiensemester_kurzbz, insertamum, insertvon, updateamum, updatevon
+				FROM
+					bis.tbl_bismeldestichtag
+				WHERE
+					meldestichtag < NOW()";
+
+		if (isset($studiensemester_kurzbz))
+		{
+			$qry .=	"
+				AND
+					studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
+		}
+
+		$qry .= "
+				ORDER BY
+					meldestichtag DESC
+				LIMIT 1;";
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$obj = new bismeldestichtag();
+
+				$obj->meldestichtag_id = $row->meldestichtag_id;
+				$obj->meldestichtag = $row->meldestichtag;
+				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+
+				$this->result[] = $obj;
+			}
+
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Meldestichtag konnte nicht geladen werden';
+			return false;
+		}
+	}
+
+	/**
+	 * Prüft, ob Meldestichtag für ein bestimmtes Statusdatum und Studiensemester erreicht ist.
+	 *
+	 * @param $status_datum
+	 * @param $studiensemester_kurzbz
+	 * @return boolean true wenn erreicht, oder false
+	 */
+	public function checkMeldestichtagErreicht($status_datum, $studiensemester_kurzbz = null)
+	{
+		$erreicht = false;
+
+		if (isset($studiensemester_kurzbz))
+		{
+			// Studiensemester ende holen
+			$studiensemester = new studiensemester();
+			if ($studiensemester->load($studiensemester_kurzbz))
+				$studiensemester_ende = new DateTime($studiensemester->ende);
+		}
+
+		// letztes erreichtes Bismeldedatum holen
+		if ($this->getLastReachedMeldestichtag() && isset($this->result[0]))
+			$lastReachedMeldestichtag = new DateTime($this->result[0]->meldestichtag);
+
+		$statusDatum = new DateTime($status_datum);
+
+		// Prüfen, ob Studentstatusdatum oder Studiensemester vor dem Stichtagsdatum liegen
+		if (isset($statusDatum))
+		{
+			if (isset($lastReachedMeldestichtag))
+				$erreicht = $statusDatum < $lastReachedMeldestichtag;
+
+			if (isset($studiensemester_ende))
+				$erreicht = $erreicht || $studiensemester_ende < $lastReachedMeldestichtag;
+
+		}
+
+		return $erreicht;
+	}
+}
+?>
diff --git a/include/coodle.class.php b/include/coodle.class.php
index 9f23f88da..9e4a57b6d 100644
--- a/include/coodle.class.php
+++ b/include/coodle.class.php
@@ -32,7 +32,7 @@ class coodle extends basis_db
 	public $coodle_id;				// integer
 	public $ersteller_uid;			// varchar(32)
 	public $coodle_status_kurzbz;	// varchar(32)
-	public $titel; 					// varchar(64)  
+	public $titel; 					// varchar(64)
 	public $beschreibung;			// text
 	public $dauer;					// smallint
 	public $endedatum;            	// date
@@ -43,7 +43,7 @@ class coodle extends basis_db
 	public $mailversand;			// boolean
 	public $teilnehmer_anonym;		// boolean
 	public $termine_anonym;			// boolean
-    
+
     // tbl_coodle_ressource
     public $coodle_ressource_id;    // integer
     public $uid;                    // varchar(32)
@@ -51,14 +51,14 @@ class coodle extends basis_db
     public $email;                  // varchar(128)
     public $name;                   // varchar(256)
     public $zugangscode;            // varchar(64)
-    
+
     // tbl_coodle_termin
     public $coodle_termin_id;       // integer
     public $datum;                  // date
     public $uhrzeit;                // date
     public $auswahl;                // boolean
-    
-    public $status_arr;	
+
+    public $status_arr;
 
 	/**
 	 * Konstruktor
@@ -67,7 +67,7 @@ class coodle extends basis_db
 	public function __construct($coodle_id=null)
 	{
 		parent::__construct();
-		
+
 		if(!is_null($coodle_id))
 			$this->load($coodle_id);
 	}
@@ -138,11 +138,11 @@ class coodle extends basis_db
 			$this->errormsg = 'titel darf nicht länger als 64 Zeichen sein';
 			return false;
 		}
-		
+
 		$this->errormsg = '';
 		return true;
 	}
-	
+
 	/**
 	 * Speichert den aktuellen Datensatz in die Datenbank
 	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
@@ -153,7 +153,7 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validate())
 			return false;
@@ -199,7 +199,7 @@ class coodle extends basis_db
 				' termine_anonym='.$this->db_add_param($this->termine_anonym, FHC_BOOLEAN).' '.
 		      	'WHERE coodle_id='.$this->db_add_param($this->coodle_id, FHC_INTEGER, false).';';
 		}
-		
+
 		if($this->db_query($qry))
 		{
 			if($new)
@@ -251,8 +251,8 @@ class coodle extends basis_db
 		}
 
 		//loeschen des Datensatzes
-		$qry="UPDATE campus.tbl_coodle SET coodle_status_kurzbz = 'storniert' 
-            WHERE 
+		$qry="UPDATE campus.tbl_coodle SET coodle_status_kurzbz = 'storniert'
+            WHERE
             coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).';';
 
 		if($this->db_query($qry))
@@ -265,10 +265,10 @@ class coodle extends basis_db
 			return false;
 		}
 	}
-    
+
     /**
      * Liefert alle Ressourcen zurück, die einer Coodleumfrage zugeteilt sind
-     * @param type $coodle_id 
+     * @param type $coodle_id
      * @return true wenn ok, false im Fehlerfall
      */
     public function getRessourcen($coodle_id)
@@ -276,42 +276,42 @@ class coodle extends basis_db
         if(!is_numeric($coodle_id) || $coodle_id == '')
         {
             $this->errormsg = 'Coodle_id muss eine gültige Zahl sein'."\n";
-            return false; 
+            return false;
         }
-        
+
         $qry ="SELECT * FROM campus.tbl_coodle_ressource WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false);
-        
+
         if(!$this->db_query($qry))
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten!'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten!';
+            return false;
         }
-        
+
         while($row = $this->db_fetch_object())
         {
-            $coodle_ressource = new coodle(); 
-            
-            $coodle_ressource->coodle_ressource_id = $row->coodle_ressource_id; 
-            $coodle_ressource->coodle_id = $row->coodle_id; 
-            $coodle_ressource->uid = $row->uid; 
-            $coodle_ressource->ort_kurzbz = $row->ort_kurzbz; 
-            $coodle_ressource->email = $row->email; 
-            $coodle_ressource->name = $row->name; 
-            $coodle_ressource->zugangscode = $row->zugangscode; 
-            $coodle_ressource->insertamum = $row->insertamum; 
-            $coodle_ressource->insertvon = $row->insertvon; 
-            $coodle_ressource->updateamum = $row->updateamum; 
-            $coodle_ressource->updatevon = $row->updatevon; 
-            
-            $this->result[] = $coodle_ressource; 
+            $coodle_ressource = new coodle();
+
+            $coodle_ressource->coodle_ressource_id = $row->coodle_ressource_id;
+            $coodle_ressource->coodle_id = $row->coodle_id;
+            $coodle_ressource->uid = $row->uid;
+            $coodle_ressource->ort_kurzbz = $row->ort_kurzbz;
+            $coodle_ressource->email = $row->email;
+            $coodle_ressource->name = $row->name;
+            $coodle_ressource->zugangscode = $row->zugangscode;
+            $coodle_ressource->insertamum = $row->insertamum;
+            $coodle_ressource->insertvon = $row->insertvon;
+            $coodle_ressource->updateamum = $row->updateamum;
+            $coodle_ressource->updatevon = $row->updatevon;
+
+            $this->result[] = $coodle_ressource;
         }
-        
-        return true; 
+
+        return true;
     }
-    
+
     /**
-     * Lädt eine Ressource 
-     * @param type $coodle_ressource_id 
+     * Lädt eine Ressource
+     * @param type $coodle_ressource_id
      * @return true wenn ok, false im Fehlerfall
      */
     public function getRessourceFromId($coodle_ressource_id)
@@ -319,95 +319,95 @@ class coodle extends basis_db
         if(!is_numeric($coodle_ressource_id) || $coodle_ressource_id=='')
         {
             $this->errormsg = 'Coodle_id muss eine gültige Zahl sein'."\n";
-            return false; 
+            return false;
         }
-        
-        $qry = "SELECT * FROM campus.tbl_coodle_ressource WHERE coodle_ressource_id =".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false); 
-        
+
+        $qry = "SELECT * FROM campus.tbl_coodle_ressource WHERE coodle_ressource_id =".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false);
+
         if(!$this->db_query($qry))
         {
             $this->errormsg = 'Fehler bei der Abfrage aufgetreten'."\n";
-            return false; 
+            return false;
         }
-        
+
         if($row = $this->db_fetch_object())
         {
-            $this->coodle_ressource_id = $row->coodle_ressource_id; 
-            $this->coodle_id = $row->coodle_id; 
-            $this->uid = $row->uid; 
-            $this->ort_kurzbz = $row->ort_kurzbz; 
-            $this->email = $row->email; 
-            $this->name = $row->name; 
-            $this->zugangscode = $row->zugangscode; 
-            $this->insertamum = $row->insertamum; 
-            $this->insertvon = $row->insertvon; 
-            $this->updateamum = $row->updateamum; 
-            $this->updatevon = $row->updatevon; 
+            $this->coodle_ressource_id = $row->coodle_ressource_id;
+            $this->coodle_id = $row->coodle_id;
+            $this->uid = $row->uid;
+            $this->ort_kurzbz = $row->ort_kurzbz;
+            $this->email = $row->email;
+            $this->name = $row->name;
+            $this->zugangscode = $row->zugangscode;
+            $this->insertamum = $row->insertamum;
+            $this->insertvon = $row->insertvon;
+            $this->updateamum = $row->updateamum;
+            $this->updatevon = $row->updatevon;
         }
         else
         {
 			$this->errormsg = 'Es ist kein Datensatz mit dieser ID vorhanden';
-            return false; 
+            return false;
         }
-        
-        return true; 
+
+        return true;
     }
-    
+
     /**
-     * Liefert alle Coodle Umfragen zurück wo Benutzer entweder Ersteller oder Ressource ist 
+     * Liefert alle Coodle Umfragen zurück wo Benutzer entweder Ersteller oder Ressource ist
      * und das Endedatum vor 20 Tagen oder in der Zukunft liegt
-     * @param type $uid 
-     * @return true wenn ok, false im Fehlerfall 
+     * @param type $uid
+     * @return true wenn ok, false im Fehlerfall
      */
     public function getCoodleFromUser($uid)
     {
         if($uid == '')
         {
-            $this->errormsg = 'keine gültige uid'; 
-            return false; 
+            $this->errormsg = 'keine gültige uid';
+            return false;
         }
-                
-        $qry = "SELECT distinct campus.tbl_coodle.* 
-                    FROM campus.tbl_coodle 
-                    LEFT JOIN campus.tbl_coodle_ressource USING(coodle_id) 
-                WHERE 
-					(uid =".$this->db_add_param($uid, FHC_STRING, false)." 
+
+        $qry = "SELECT distinct campus.tbl_coodle.*
+                    FROM campus.tbl_coodle
+                    LEFT JOIN campus.tbl_coodle_ressource USING(coodle_id)
+                WHERE
+					(uid =".$this->db_add_param($uid, FHC_STRING, false)."
                     OR ersteller_uid =".$this->db_add_param($uid, FHC_STRING, false).")
                     AND endedatum >= CURRENT_DATE - interval '90 days';";
-        
+
         if(!$this->db_query($qry))
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
+
         while($row = $this->db_fetch_object())
         {
-            $coodle = new coodle(); 
-            $coodle->coodle_id = $row->coodle_id; 
-            $coodle->titel = $row->titel; 
-            $coodle->beschreibung = $row->beschreibung; 
-            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz; 
-            $coodle->dauer = $row->dauer; 
-            $coodle->insertamum = $row->insertamum; 
-            $coodle->insertvon = $row->insertvon; 
-            $coodle->updateamum = $row->updateamum; 
-            $coodle->updatevon = $row->updatevon; 
-            $coodle->endedatum = $row->endedatum; 
-            $coodle->ersteller_uid = $row->ersteller_uid; 
-            $coodle->mailversand = $row->mailversand; 
-            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym; 
-            $coodle->termine_anonym = $row->termine_anonym; 
-            
-            $this->result[] = $coodle; 
+            $coodle = new coodle();
+            $coodle->coodle_id = $row->coodle_id;
+            $coodle->titel = $row->titel;
+            $coodle->beschreibung = $row->beschreibung;
+            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz;
+            $coodle->dauer = $row->dauer;
+            $coodle->insertamum = $row->insertamum;
+            $coodle->insertvon = $row->insertvon;
+            $coodle->updateamum = $row->updateamum;
+            $coodle->updatevon = $row->updatevon;
+            $coodle->endedatum = $row->endedatum;
+            $coodle->ersteller_uid = $row->ersteller_uid;
+            $coodle->mailversand = $row->mailversand;
+            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym;
+            $coodle->termine_anonym = $row->termine_anonym;
+
+            $this->result[] = $coodle;
         }
-        
-        return true; 
+
+        return true;
     }
 
 	/**
 	 * Prueft ob eine Ressource bereits zu einer Umfrage zugeteilt ist
-	 * 
+	 *
 	 * @param $coodle_id ID der CoodleUmfrage
 	 * @param $uid UID des Benutzers
 	 * @param $ort_kurzbz Ort
@@ -423,7 +423,7 @@ class coodle extends basis_db
 			$qry.=' AND ort_kurzbz='.$this->db_add_param($ort_kurzbz, FHC_STRING, false);
 		if($email!='')
 			$qry.=' AND email='.$this->db_add_param($email, FHC_STRING, false);
-        
+
         $qry.=';';
 
 		if($result = $this->db_query($qry))
@@ -437,7 +437,7 @@ class coodle extends basis_db
 				return false;
 		}
 	}
-   
+
 	/**
 	 * Validiert die Ressourcedaten vor dem Speichern
 	 */
@@ -456,7 +456,7 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validateRessource())
 			return false;
@@ -482,7 +482,7 @@ class coodle extends basis_db
 			$this->errormsg = 'Update not Implemented';
 			return false;
 		}
-		
+
 		if($this->db_query($qry))
 		{
 			if($new)
@@ -518,7 +518,7 @@ class coodle extends basis_db
 			return false;
 		}
 	}
-    
+
     /**
 	 * Speichert die Terminwahl der Ressource in die Datenbank
 	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
@@ -529,17 +529,17 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validateRessource())
 			return false;
 
 		if($new)
-		{            
+		{
 			//Neuen Datensatz einfuegen
 			$qry='INSERT INTO campus.tbl_coodle_ressource_termin(coodle_ressource_id, coodle_termin_id, insertamum, insertvon) VALUES('.
                   $this->db_add_param($this->coodle_ressource_id, FHC_INTEGER, false).', '.
-			      $this->db_add_param($this->coodle_termin_id, FHC_INTEGER, false).', 
+			      $this->db_add_param($this->coodle_termin_id, FHC_INTEGER, false).',
                     CURRENT_TIMESTAMP, '.
 			      $this->db_add_param($this->insertvon, FHC_STRING).');';
 		}
@@ -548,7 +548,7 @@ class coodle extends basis_db
 			$this->errormsg = 'Update not Implemented';
 			return false;
 		}
-		
+
 		if(!$this->db_query($qry))
 		{
 			$this->errormsg = 'Fehler beim Speichern des Datensatzes';
@@ -557,23 +557,23 @@ class coodle extends basis_db
         else
             return true;
 	}
-    
+
     /**
      * Lädt eine Ressource zur übergebenen $coodle_id und $uid oder $zugangscode
      * @param Integer $coodle_id
      * @param varchar $uid
      * @param varchar $zugangscode
-     * @return boolean 
+     * @return boolean
      */
     public function getRessourceFromUser($coodle_id, $uid='', $zugangscode='')
     {
 
         $qry ="SELECT * FROM campus.tbl_coodle_ressource
-            WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false); 
-        
+            WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false);
+
         if($uid != '')
-            $qry.= " AND uid = ".$this->db_add_param($uid, FHC_STRING, false); 
-        
+            $qry.= " AND uid = ".$this->db_add_param($uid, FHC_STRING, false);
+
         if ($zugangscode != '')
             $qry.= " AND zugangscode = ".$this->db_add_param($zugangscode, FHC_STRING, false);
         $qry.= ';';
@@ -581,89 +581,89 @@ class coodle extends basis_db
         if(!$this->db_query($qry))
         {
           $this->errormsg = 'Fehler bei einer Datenbankabfrage';
-            return false;  
-        }  
-           
+            return false;
+        }
+
         if ($row = $this->db_fetch_object())
         {
             $this->coodle_ressource_id  = $row->coodle_ressource_id;
-            $this->coodle_id            = $row->coodle_id; 
-            $this->uid                  = $row->uid; 
-            $this->ort_kurzbz           = $row->ort_kurzbz; 
-            $this->email                = $row->email; 
-            $this->name                 = $row->name; 
-            $this->zugangscode          = $row->zugangscode; 
-            $this->insertamum           = $row->insertamum; 
-            $this->insertvon            = $row->insertvon; 
-            $this->updateamum           = $row->updateamum; 
-            $this->updatevon            = $row->updatevon; 
+            $this->coodle_id            = $row->coodle_id;
+            $this->uid                  = $row->uid;
+            $this->ort_kurzbz           = $row->ort_kurzbz;
+            $this->email                = $row->email;
+            $this->name                 = $row->name;
+            $this->zugangscode          = $row->zugangscode;
+            $this->insertamum           = $row->insertamum;
+            $this->insertvon            = $row->insertvon;
+            $this->updateamum           = $row->updateamum;
+            $this->updatevon            = $row->updatevon;
         }
         else
         {
             $this->errormsg = "Fehler bei der Abfrage aufgetreten";
-            return false; 
-        }       
-        return true;             
+            return false;
+        }
+        return true;
     }
-    
+
     /**
      * Löscht alle Termine einer Ressource zu einer übergebenen Coodleumfrage
      * @param Integer $coodle_id
      * @param Integer $ressource_id
-     * @return boolean 
+     * @return boolean
      */
     public function deleteRessourceTermin($coodle_id, $ressource_id)
     {
         if($ressource_id == '' || !is_numeric($ressource_id) || $coodle_id == '' || !is_numeric($coodle_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
+
         $qry="DELETE FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_ressource_id =".$this->db_add_param($ressource_id, FHC_INTEGER)."
-                AND coodle_termin_id IN 
-                    (SELECT coodle_termin_id FROM campus.tbl_coodle_termin 
+                AND coodle_termin_id IN
+                    (SELECT coodle_termin_id FROM campus.tbl_coodle_termin
                         WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER).");";
-        
-        $this->errormsg = $qry; 
-        
+
+        $this->errormsg = $qry;
+
         if($this->db_query($qry))
-            return true; 
+            return true;
         else
-            return false; 
+            return false;
     }
 
     /**
      * Überprüft ob die übergebene Ressource den übergebenen Termin ausgewählt hat
      * @param Integer $termin_id
      * @param Integer $ressource_id
-     * @return boolean 
+     * @return boolean
      */
     public function checkTermin($termin_id, $ressource_id)
     {
         if($ressource_id == '' || !is_numeric($ressource_id) || $termin_id == '' || !is_numeric($termin_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
-        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin 
+
+        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_ressource_id =".$this->db_add_param($ressource_id, FHC_INTEGER)."
                 AND coodle_termin_id=".$this->db_add_param($termin_id, FHC_INTEGER).';';
-         
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_row($result))
             {
-                return true; 
+                return true;
             }
-            return false; 
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
+
 	/**
      * Überprüft ob der übergebenen Termin schon von einer Ressource gewählt wurde
      * @param Integer $termin_id
@@ -674,83 +674,83 @@ class coodle extends basis_db
         if( $termin_id == '' || !is_numeric($termin_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
-        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin 
+
+        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_termin_id=".$this->db_add_param($termin_id, FHC_INTEGER).';';
-         
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_row($result))
             {
-                return true; 
+                return true;
             }
-            return false; 
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
+
 	/**
      * Zählt, wie oft ein Termin gewählt wurde
      * @param Integer $termin_id
      * @param Integer $ressource_id
-     * @return boolean 
+     * @return boolean
      */
     public function countTermin($termin_id)
     {
         if($termin_id == '' || !is_numeric($termin_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
-        $qry="SELECT count(*) AS anzahl FROM campus.tbl_coodle_ressource_termin 
+
+        $qry="SELECT count(*) AS anzahl FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_termin_id=".$this->db_add_param($termin_id, FHC_INTEGER).';';
-         
+
    		if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
             {
-                $this->anzahl = $row->anzahl; 
+                $this->anzahl = $row->anzahl;
             }
             else
             {
-                return false; 
+                return false;
             }
-            return true; 
+            return true;
         }
         else
         {
             $this->errormsg = "Fehler bei der Abfrage aufgetreten";
-            return false; 
+            return false;
         }
     }
-    
+
     /**
-     * 
+     *
      * Laedt alle Termine einer Umfrage zu denen eine Ressource zugesagt hat
      * @param $coodle_id ID der Umfrage
      * @param $ressource_id ID der Ressource
      */
     public function getRessourceTermin($coodle_id, $ressource_id)
     {
-    	$qry = "SELECT 
-    				* 
-    			FROM 
-    				campus.tbl_coodle_ressource_termin 
+    	$qry = "SELECT
+    				*
+    			FROM
+    				campus.tbl_coodle_ressource_termin
     				JOIN campus.tbl_coodle_termin USING(coodle_termin_id)
-    			WHERE 
+    			WHERE
     				coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER)."
     				AND coodle_ressource_id=".$this->db_add_param($ressource_id, FHC_INTEGER).";";
-    				
+
     	if($result = $this->db_query($qry))
     	{
     		while($row = $this->db_fetch_object($result))
     		{
     			$obj = new coodle();
-    			
+
     			$obj->coodle_id = $row->coodle_id;
     			$obj->coodle_termin_id = $row->coodle_termin_id;
     			$obj->datum = $row->datum;
@@ -760,7 +760,7 @@ class coodle extends basis_db
     			$obj->coodle_termin_id = $row->coodle_termin_id;
     			$obj->insertamum = $row->insertamum;
     			$obj->insertvon = $row->insertvon;
-    			
+
     			$this->result[] = $obj;
     		}
     		return true;
@@ -771,66 +771,66 @@ class coodle extends basis_db
     		return false;
     	}
     }
-    
+
     /**
      * Überprüfut ob der Benutzer entweder der Ersteller oder eine Ressource der Coodleumfrage ist
      * @param Integer $coodle_id
      * @param Integer $uid
      * @param varchar $zugangscode
-     * @return boolean 
+     * @return boolean
      */
     public function checkBerechtigung($coodle_id, $uid='', $zugangscode='')
     {
         if($coodle_id =='' ||  !is_numeric($coodle_id))
         {
             $this->errormsg = 'Ungültige Id übergeben.';
-            return false; 
+            return false;
         }
-        
+
         if($uid != '' && $zugangscode != '')
         {
-            $this->errormsg = 'Uid oder Zuganscode übergeben'; 
-            return false; 
+            $this->errormsg = 'Uid oder Zuganscode übergeben';
+            return false;
         }
-        
+
         $qry ="SELECT 1 FROM campus.tbl_coodle_ressource WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).' AND ';
-        
+
         if($uid != '')
-            $qry.= ' uid = '.$this->db_add_param($uid, FHC_STRING, false); 
-        
+            $qry.= ' uid = '.$this->db_add_param($uid, FHC_STRING, false);
+
         if($zugangscode != '')
             $qry.= ' zugangscode ='.$this->db_add_param($zugangscode, FHC_STRING, false);
-         
+
         $qry.="UNION SELECT 1 FROM campus.tbl_coodle WHERE ersteller_uid=".$this->db_add_param($uid).";";
-        
-        
+
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
-                return true; 
+                return true;
             else
-                return false; 
+                return false;
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
     }
-        
+
 	/**
 	 * Entfernt eine Ressourcezuteilung von einer Umfrage
 	 * @param $coodle_ressource_id ID der Ressourcezuteilung
 	 * @return boolean true wenn ok, false im Fehlerfall
-	 */	
+	 */
 	public function deleteRessource($coodle_ressource_id)
 	{
         if($coodle_ressource_id == '' || !is_numeric($coodle_ressource_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
+
 		$qry = "DELETE FROM campus.tbl_coodle_ressource_termin WHERE coodle_ressource_id=".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false).";
 				DELETE FROM campus.tbl_coodle_ressource WHERE coodle_ressource_id=".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false).";";
 
@@ -851,7 +851,7 @@ class coodle extends basis_db
 		return true;
 	}
 
-	/** 
+	/**
 	 * Speichert einen Termin
      * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
 	 * andernfalls wird der Datensatz mit der ID in $coodle_termin_id aktualisiert
@@ -862,7 +862,7 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validateTermin())
 			return false;
@@ -883,7 +883,7 @@ class coodle extends basis_db
                 ' auswahl='.$this->db_add_param($this->auswahl, FHC_BOOLEAN, false).
 				' WHERE coodle_termin_id='.$this->db_add_param($this->coodle_termin_id, FHC_INTEGER, false).';';
 		}
-		
+
 		if($this->db_query($qry))
 		{
 			if($new)
@@ -930,21 +930,21 @@ class coodle extends basis_db
 	{
 		if($coodle_id == '' || !is_numeric($coodle_id))
 		{
-			$this->errormsg = "Ungültige Coodle_id"; 
-			return false; 
+			$this->errormsg = "Ungültige Coodle_id";
+			return false;
 		}
-		
+
 		$qry = "(SELECT * FROM campus.tbl_coodle_termin
-					WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
+					WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
 					AND datum != '1900-01-01'
 					ORDER BY datum, uhrzeit)
-							
-				UNION ALL 
-							
+
+				UNION ALL
+
 				(SELECT * FROM campus.tbl_coodle_termin
 					WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
 					AND datum = '1900-01-01');";
-		
+
 		if($result = $this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object($result))
@@ -955,7 +955,7 @@ class coodle extends basis_db
 				$obj->datum = $row->datum;
 				$obj->uhrzeit = $row->uhrzeit;
 				$obj->auswahl = $this->db_parse_bool($row->auswahl);
-	
+
 				$this->result[] = $obj;
 			}
 			return true;
@@ -967,47 +967,47 @@ class coodle extends basis_db
 		}
 	}
 
-        
+
     /**
      * Gibt die Coodle Umfrage zurück in der sich die Ressource mit dem übergebenen Zugangscode befindet
      * @param string $zugangscode
-     * @return boolean 
+     * @return boolean
      */
     public function getCoodleFromZugangscode($zugangscode)
     {
-        $qry = "SELECT tbl_coodle.* from campus.tbl_coodle 
-            JOIN campus.tbl_coodle_ressource USING(coodle_id) 
-            WHERE zugangscode =".$this->db_add_param($zugangscode, FHC_STRING).';'; 
-        
+        $qry = "SELECT tbl_coodle.* from campus.tbl_coodle
+            JOIN campus.tbl_coodle_ressource USING(coodle_id)
+            WHERE zugangscode =".$this->db_add_param($zugangscode, FHC_STRING).';';
+
         if($result = $this->db_query($qry))
         {
             while($row = $this->db_fetch_object($result))
             {
-                $coodle = new coodle(); 
-                
-                $coodle->coodle_id = $row->coodle_id; 
-                $coodle->ersteller_uid = $row->ersteller_uid; 
-                $coodle->titel = $row->titel; 
-                $coodle->beschreibung = $row->beschreibung; 
-                $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz; 
-                $coodle->dauer = $row->dauer; 
-                $coodle->endedatum = $row->endedatum; 
-                $coodle->insertamum = $row->insertamum; 
+                $coodle = new coodle();
+
+                $coodle->coodle_id = $row->coodle_id;
+                $coodle->ersteller_uid = $row->ersteller_uid;
+                $coodle->titel = $row->titel;
+                $coodle->beschreibung = $row->beschreibung;
+                $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz;
+                $coodle->dauer = $row->dauer;
+                $coodle->endedatum = $row->endedatum;
+                $coodle->insertamum = $row->insertamum;
                 $coodle->insertvon = $row->insertvon;
-                $coodle->updateamum = $row->updateamum; 
-                $coodle->updatevon = $row->updatevon; 
-                $coodle->mailversand = $row->mailversand; 
-	            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym; 
-	            $coodle->termine_anonym = $row->termine_anonym; 
-                
-                $this->result[] = $coodle; 
+                $coodle->updateamum = $row->updateamum;
+                $coodle->updatevon = $row->updatevon;
+                $coodle->mailversand = $row->mailversand;
+	            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym;
+	            $coodle->termine_anonym = $row->termine_anonym;
+
+                $this->result[] = $coodle;
             }
-            return true; 
+            return true;
         }
         else
         {
             $this->errormsg = 'Fehler beim Laden der Daten';
-            return false; 
+            return false;
         }
     }
 
@@ -1019,7 +1019,7 @@ class coodle extends basis_db
 	 */
 	public function loadTermin($coodle_termin_id)
 	{
-		$qry = "SELECT * FROM campus.tbl_coodle_termin 
+		$qry = "SELECT * FROM campus.tbl_coodle_termin
                     WHERE coodle_termin_id=".$this->db_add_param($coodle_termin_id, FHC_INTEGER).';';
 
 		if($result = $this->db_query($qry))
@@ -1055,13 +1055,13 @@ class coodle extends basis_db
 	{
         if($coodle_termin_id == '' || !is_numeric($coodle_termin_id))
         {
-            $this->errormsg = 'Ungültige Id übergeben'; 
-            return false; 
+            $this->errormsg = 'Ungültige Id übergeben';
+            return false;
         }
-        
-		$qry = "DELETE FROM campus.tbl_coodle_termin 
+
+		$qry = "DELETE FROM campus.tbl_coodle_termin
                     WHERE coodle_termin_id=".$this->db_add_param($coodle_termin_id, FHC_INTEGER, false).';';
-		
+
 		if($this->db_query($qry))
 			return true;
 		else
@@ -1069,188 +1069,188 @@ class coodle extends basis_db
 			$this->errormsg = 'Fehler beim Löschen des Eintrags';
 		}
 	}
-    
+
     /**
      * Überprüft ob die übergebene Coodleumfrage den Status laufend oder abgeschlossen hat
      * @param Integer $coodle_id
-     * @return boolean 
+     * @return boolean
      */
     public function checkStatus($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = 'Coodle_id muss eine Zahl sein'; 
-            return false; 
+            $this->errormsg = 'Coodle_id muss eine Zahl sein';
+            return false;
         }
-        
-        $qry ="SELECT 1 FROM campus.tbl_coodle 
+
+        $qry ="SELECT 1 FROM campus.tbl_coodle
                 WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
                 AND coodle_status_kurzbz IN('laufend','abgeschlossen');";
-        
+
         if($result = $this->db_query($qry))
         {
             if($this->db_fetch_object($result))
-                return true; 
+                return true;
             else
             {
-                $this->errormsg = "Kein passender Status vorhanden"; 
-                return false; 
+                $this->errormsg = "Kein passender Status vorhanden";
+                return false;
             }
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
     }
 
     /**
      * Setzt die Auswahl aller Termine auf false
      * @param Integer $coodle_id
-     * @return boolean 
+     * @return boolean
      */
     public function setTerminFalse($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
-        $qry ="UPDATE campus.tbl_coodle_termin set auswahl='false' 
-                WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).';'; 
-        
+
+        $qry ="UPDATE campus.tbl_coodle_termin set auswahl='false'
+                WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).';';
+
         if($result=$this->db_query($qry))
-            return true; 
+            return true;
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
     }
-    
+
     /**
      * Gibt true zurück wenn der übergeben termin der ausgewählte ist für die übergebene coodle_id
-     * @param Integer $coodle_id 
-     * @param Integer $coodle_termin_id 
-     * @return boolean 
+     * @param Integer $coodle_id
+     * @param Integer $coodle_termin_id
+     * @return boolean
      */
     public function checkTerminAuswahl($coodle_id, $coodle_termin_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
+
         if($coodle_termin_id == '' || !is_numeric($coodle_termin_id))
         {
-            $this->errormsg = "termin_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "termin_id muss eine gültige Zahl sein";
+            return false;
         }
-        
-        $qry = "Select * FROM campus.tbl_coodle_termin 
-                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
+
+        $qry = "Select * FROM campus.tbl_coodle_termin
+                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
                     AND coodle_termin_id = ".$this->db_add_param($coodle_termin_id, FHC_INTEGER, false)."
                     AND auswahl is true";
-        
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
-                return true; 
+                return true;
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
-    
+
+
     /**
      * Gibt die Id des ausgewählten Termines der Coodleumfrage zurück
-     * @param Integer $coodle_id 
-     * @param Integer $coodle_termin_id 
-     * @return boolean 
+     * @param Integer $coodle_id
+     * @param Integer $coodle_termin_id
+     * @return boolean
      */
     public function getTerminAuswahl($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
-        $qry = "Select * FROM campus.tbl_coodle_termin 
-                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
+
+        $qry = "Select * FROM campus.tbl_coodle_termin
+                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
                     AND auswahl is true";
-        
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
-                return $row->coodle_termin_id; 
+                return $row->coodle_termin_id;
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
+
     /**
      * Liefert alle Räume die als Ressource zu einer Umfrage eingetragen sind
      * @param Integer $coodle_id
-     * @return boolean 
+     * @return boolean
      */
     public function getRaumeFromId($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
+
         $qry ="SELECT * FROM campus.tbl_coodle_ressource
-                WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
-                    AND ort_kurzbz is not null"; 
-        
+                WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
+                    AND ort_kurzbz is not null";
+
         if($result = $this->db_query($qry))
         {
             while($row = $this->db_fetch_object($result))
             {
-                $ressource = new coodle(); 
-                
-                $ressource->coodle_ressource_id = $row->coodle_ressource_id; 
-                $ressource->coodle_id = $row->coodle_id; 
+                $ressource = new coodle();
+
+                $ressource->coodle_ressource_id = $row->coodle_ressource_id;
+                $ressource->coodle_id = $row->coodle_id;
                 $ressource->ort_kurzbz = $row->ort_kurzbz;
-                $ressource->insertamum = $row->insertamum; 
-                $ressource->insertvon = $row->insertvon; 
-                $ressource->updateamum = $row->updateamum; 
-                $ressource->updatevon = $row->updatevon; 
-                
-                $this->result[] = $ressource; 
-                
+                $ressource->insertamum = $row->insertamum;
+                $ressource->insertvon = $row->insertvon;
+                $ressource->updateamum = $row->updateamum;
+                $ressource->updatevon = $row->updatevon;
+
+                $this->result[] = $ressource;
+
             }
-            return true; 
+            return true;
         }
         else
         {
-            $this->erromsg = "Fehler bei der Abfrage aufgetreten"; 
-            return false; 
+            $this->erromsg = "Fehler bei der Abfrage aufgetreten";
+            return false;
         }
     }
-    
+
     /**
      * Laedt alle Stati
      */
     public function loadStatus()
     {
     	$qry = "SELECT * FROM campus.tbl_coodle_status";
-    	
+
     	if($result = $this->db_query($qry))
     	{
     		while($row = $this->db_fetch_object($result))
@@ -1265,48 +1265,70 @@ class coodle extends basis_db
     		return false;
     	}
     }
-    
+
 	/**
-     * Liefert alle Coodle Umfragen die das Beendigungsdatum erreicht haben 
+     * Liefert alle Coodle Umfragen die das Beendigungsdatum erreicht haben
      * und noch nicht abgeschlossen sind
-     * @return true wenn ok, false im Fehlerfall 
+     * @return true wenn ok, false im Fehlerfall
      */
     public function getCoodleBeendet()
     {
-        $qry = "SELECT * 
-                    FROM campus.tbl_coodle 
-                WHERE 
+        $qry = "SELECT *
+                    FROM campus.tbl_coodle
+                WHERE
                     endedatum = CURRENT_DATE - interval '1 day'
-                    AND coodle_status_kurzbz='laufend';"; 
-        
+                    AND coodle_status_kurzbz='laufend';";
+
         if(!$this->db_query($qry))
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
+
         while($row = $this->db_fetch_object())
         {
-            $coodle = new coodle(); 
-            $coodle->coodle_id = $row->coodle_id; 
-            $coodle->titel = $row->titel; 
-            $coodle->beschreibung = $row->beschreibung; 
-            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz; 
-            $coodle->dauer = $row->dauer; 
-            $coodle->insertamum = $row->insertamum; 
-            $coodle->insertvon = $row->insertvon; 
-            $coodle->updateamum = $row->updateamum; 
-            $coodle->updatevon = $row->updatevon; 
-            $coodle->endedatum = $row->endedatum; 
-            $coodle->ersteller_uid = $row->ersteller_uid; 
-            $coodle->mailversand = $row->mailversand; 
-            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym; 
-            $coodle->termine_anonym = $row->termine_anonym; 
-            
-            $this->result[] = $coodle; 
+            $coodle = new coodle();
+            $coodle->coodle_id = $row->coodle_id;
+            $coodle->titel = $row->titel;
+            $coodle->beschreibung = $row->beschreibung;
+            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz;
+            $coodle->dauer = $row->dauer;
+            $coodle->insertamum = $row->insertamum;
+            $coodle->insertvon = $row->insertvon;
+            $coodle->updateamum = $row->updateamum;
+            $coodle->updatevon = $row->updatevon;
+            $coodle->endedatum = $row->endedatum;
+            $coodle->ersteller_uid = $row->ersteller_uid;
+            $coodle->mailversand = $row->mailversand;
+            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym;
+            $coodle->termine_anonym = $row->termine_anonym;
+
+            $this->result[] = $coodle;
         }
-        
-        return true; 
+
+        return true;
     }
+
+	/**
+	 * Führt 2 Formatierungen bestehender Contentlines durch
+	 * Umwandeln (Maskieren) bestehender Breaks in \n
+	 * Einfügen von breaks nach 74 Zeichen, da content line <= 75 chars sein muss
+	 * @param $contentline zu formatierender Input
+	 * @return param formatierter Output
+	 */
+	public function foldContentLine($contentline)
+	{
+		$linebreaksreplaced = strtr($contentline, array(
+			"\r\n"	=> "\\n",
+			"\r" 	=> "",
+			"\n" 	=> "\\n",
+			"<br>" 	=> "\\n",
+			"<br />"=> "\\n"
+		));
+
+		$foldedcontentline = wordwrap($linebreaksreplaced, 74, "\r\n ", true);
+
+		return $foldedcontentline;
+	}
 }
 ?>
diff --git a/include/konto.class.php b/include/konto.class.php
index 281ab77c7..51f79200b 100644
--- a/include/konto.class.php
+++ b/include/konto.class.php
@@ -965,17 +965,16 @@ class konto extends basis_db
 		}
 	}
 
-	public function checkDoppelteBuchung($person_ids, $stsem, $typ)
+	public function checkDoppelteBuchung($person_ids, $stsem, $typen)
 	{
 		$qry = "SELECT person.vorname, person.nachname
 				FROM public.tbl_konto konto
 					JOIN public.tbl_person person USING(person_id)
 				WHERE konto.person_id IN (".$this->implode4SQL(array_filter($person_ids)).")
 					AND studiensemester_kurzbz = ".$this->db_add_param($stsem)."
-					AND buchungstyp_kurzbz = ".$this->db_add_param($typ)."
+					AND buchungstyp_kurzbz IN (".$this->implode4SQL($typen) .")
 				GROUP BY person.vorname, person.nachname
 				ORDER BY person.nachname, person.vorname";
-
 		if ($result = $this->db_query($qry))
 		{
 			$persons = array();
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 557412413..06b974b1a 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -906,6 +906,45 @@ class prestudent extends person
 							AND tbl_reihungstest.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
 					)";
 				break;
+			case "bewerberrtangemeldetteilgenommen":
+				$qry.=" AND a.rolle='Bewerber'
+					AND EXISTS (
+						SELECT
+							1
+						FROM
+							public.tbl_rt_person
+							JOIN public.tbl_reihungstest ON (rt_id = reihungstest_id)
+						WHERE
+							person_id=a.person_id
+							AND studienplan_id IN (
+								SELECT studienplan_id FROM lehre.tbl_studienplan
+								JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+								WHERE tbl_studienordnung.studiengang_kz=a.studiengang_kz
+							)
+							AND tbl_reihungstest.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+					)
+					AND reihungstestangetreten = true";
+				break;
+			case "bewerberrtangemeldetnichtteilgenommen":
+				$qry.=" AND a.rolle='Bewerber'
+					AND EXISTS (
+						SELECT
+							1
+						FROM
+							public.tbl_rt_person
+							JOIN public.tbl_reihungstest ON (rt_id = reihungstest_id)
+						WHERE
+							person_id=a.person_id
+							AND studienplan_id IN (
+								SELECT studienplan_id FROM lehre.tbl_studienplan
+								JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+								WHERE tbl_studienordnung.studiengang_kz=a.studiengang_kz
+							)
+							AND tbl_reihungstest.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+					)
+					AND reihungstestangetreten = false
+					";
+				break;
 			case "zgv":
 				$stg_obj = new studiengang();
 				$stg_obj->load($studiengang_kz);
diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
index 53008a4e6..3fd593833 100644
--- a/locale/de-AT/fas.dtd
+++ b/locale/de-AT/fas.dtd
@@ -212,7 +212,7 @@
 		<!ENTITY menu-dokumente-diplsupplement.accesskey	"S">
 
 		<!ENTITY menu-dokumente-antrag.key		"N">
-		<!ENTITY menu-dokumente-antrag.label	"Antrag">
+		<!ENTITY menu-dokumente-antrag.label	"Verwaltung des Studierendenstatus">
 		<!ENTITY menu-dokumente-antrag.accesskey	"N">
 
 		<!ENTITY menu-dokumente-antrag-abmeldung.key		"A">
diff --git a/locale/de-AT/testtool.php b/locale/de-AT/testtool.php
index 80b3b4bdc..059cd33c5 100644
--- a/locale/de-AT/testtool.php
+++ b/locale/de-AT/testtool.php
@@ -17,7 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basisgebiete';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='Der zuteilte Reihungstest ist noch nicht freigeschaltet';
-$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden';
+$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden. Melden Sie sich bitte bei der Reihungstestaufsicht.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Ihr Geburtsdatum stimmt nicht mit unseren Daten überein. Bitte wenden Sie sich an die Aufsichtsperson';
 $this->phrasen['testtool/home']='Home';
 $this->phrasen['testtool/teilnehmerIn']='TeilnehmerIn';
diff --git a/locale/de-AT/zeitsperre.php b/locale/de-AT/zeitsperre.php
index 463c092cf..413cd5be5 100644
--- a/locale/de-AT/zeitsperre.php
+++ b/locale/de-AT/zeitsperre.php
@@ -26,6 +26,7 @@ $this->phrasen['zeitsperre/vonDatumMonat']='Von-Datum Monat';
 $this->phrasen['zeitsperre/bisDatumMonat']='Bis-Datum Monat';
 $this->phrasen['zeitsperre/istGroesserAlsBisDatum']='ist größer als das Bis-Datum';
 $this->phrasen['zeitsperre/vonDatum']='Von-Datum';
+$this->phrasen['zeitsperre/bisDatumGroesserMax']='BisDatum liegt zu weit in der Zukunft, nicht zulässig!';
 
 $this->phrasen['zeitsperre/resturlaubstage']='Resturlaubstage';
 $this->phrasen['zeitsperre/aktuellerStand']='aktueller Stand';
diff --git a/locale/en-US/testtool.php b/locale/en-US/testtool.php
index b44d717e2..260b5ceea 100644
--- a/locale/en-US/testtool.php
+++ b/locale/en-US/testtool.php
@@ -17,7 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basic test';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='The entrance examination assigned has not yet been activated.';
-$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The entrance examination assigned to you can not be loaded.';
+$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The placement test you are assigned to could not be loaded. Please contact the placement test supervisior.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Your date of birth does not correspond to the data we have. Please speak to the supervisor. ';
 $this->phrasen['testtool/home']='Home';
 $this->phrasen['testtool/teilnehmerIn']='Participant';
diff --git a/locale/en-US/zeitsperre.php b/locale/en-US/zeitsperre.php
index 44123529f..31cdef6f8 100644
--- a/locale/en-US/zeitsperre.php
+++ b/locale/en-US/zeitsperre.php
@@ -26,6 +26,7 @@ $this->phrasen['zeitsperre/vonDatumMonat']='From-date month';
 $this->phrasen['zeitsperre/bisDatumMonat']='To-date month';
 $this->phrasen['zeitsperre/istGroesserAlsBisDatum']='is later than To-date';
 $this->phrasen['zeitsperre/vonDatum']='From-date';
+$this->phrasen['zeitsperre/bisDatumGroesserMax']='TO-Date value is too far in the future, action not permitted';
 
 $this->phrasen['zeitsperre/resturlaubstage']='Carry-over days';
 $this->phrasen['zeitsperre/aktuellerStand']='Available vacation';
diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css
new file mode 100644
index 000000000..48124335f
--- /dev/null
+++ b/public/css/Tabulator5.css
@@ -0,0 +1,40 @@
+@import '../../vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css';
+
+/* Apply borders and background to Cell instead of the Row
+ * otherwise frozen columns won't look good (columns behind
+ * will be partial visible)
+ */
+.tabulator-row {
+	border-bottom: none;
+}
+.tabulator-row .tabulator-frozen,
+.tabulator-row .tabulator-cell {
+	border-bottom: 1px solid #dee2e6;
+}
+.tabulator-row.tabulator-row-even {
+	background-color: transparent;
+}
+.tabulator-headers .tabulator-frozen,
+.tabulator-row.tabulator-row-odd .tabulator-frozen,
+.tabulator-row.tabulator-row-odd .tabulator-cell {
+	background-color: #fff;
+}
+.tabulator-row.tabulator-row-even .tabulator-frozen,
+.tabulator-row.tabulator-row-even .tabulator-cell {
+	background-color: #f2f2f2;
+}
+.tabulator-row.tabulator-selectable:hover .tabulator-frozen,
+.tabulator-row.tabulator-selectable:hover .tabulator-cell {
+	background-color: #ececec;
+}
+.tabulator-row.tabulator-selected .tabulator-frozen,
+.tabulator-row.tabulator-selected .tabulator-cell {
+	background-color: #9abcea;
+}
+.tabulator-row.tabulator-selected:hover .tabulator-frozen,
+.tabulator-row.tabulator-selected:hover .tabulator-cell {
+	background-color: #769bcc;
+}
+.tabulator .tabulator-col-resize-handle:last-of-type {
+	z-index: 999999;
+}
diff --git a/public/css/TinyMCE.css b/public/css/TinyMCE5.css
similarity index 100%
rename from public/css/TinyMCE.css
rename to public/css/TinyMCE5.css
diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
index 9ee7cd848..48a5bfb1b 100644
--- a/public/css/cis_bs5.css
+++ b/public/css/cis_bs5.css
@@ -59,8 +59,41 @@ h6, .h6 {
 
 .fhc-container {
 	padding: 0 15px;
+	max-width: 100%;
 }
 
 .tabulator {
 	font-size: var(--bs-body-font-size);
 }
+
+.fhc-container .tabulator {
+	border-left: 1px solid #dee2e6;
+}
+.fhc-container .tabulator .tabulator-row {
+	border-bottom: none;
+}
+.fhc-container .tabulator .tabulator-row .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row .tabulator-cell {
+	border-bottom: 1px solid #dee2e6;
+}
+.fhc-container .tabulator .tabulator-row.tabulator-row-even {
+	background-color: transparent;
+}
+.fhc-container .tabulator .tabulator-headers .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-cell {
+	background-color: #fff;
+}
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell {
+	background-color: #f2f2f2;
+}
+.fhc-container .tabulator .tabulator-row.tabulator-selectable:hover .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-selectable:hover .tabulator-cell {
+	background-color: #ececec;
+}
+
+.fhc-container .tabulator .tabulator-col,
+.fhc-container .tabulator .tabulator-cell {
+	border-right: 1px solid #dee2e6;
+}
diff --git a/public/js/apps/Bismeldestichtag/API.js b/public/js/apps/Bismeldestichtag/API.js
new file mode 100644
index 000000000..6a2989d5c
--- /dev/null
+++ b/public/js/apps/Bismeldestichtag/API.js
@@ -0,0 +1,72 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {CoreRESTClient} from '../../RESTClient.js';
+
+//
+const CORE_BISMELDESTICHTAG_CMPT_TIMEOUT = 2000;
+
+/**
+ *
+ */
+export const BismeldestichtagAPIs = {
+	/**
+	 *
+	 */
+	getStudiensemester: function() {
+		return CoreRESTClient.get(
+			'codex/Bismeldestichtag/getStudiensemester',
+			null,
+			{
+				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
+			}
+		);
+	},
+	getBismeldestichtage: function() {
+		return CoreRESTClient.get(
+			'codex/Bismeldestichtag/getBismeldestichtage',
+			null,
+			{
+				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
+			}
+		);
+	},
+	addBismeldestichtag: function(wsParams) {
+		return CoreRESTClient.post(
+			'codex/Bismeldestichtag/addBismeldestichtag',
+			{
+				meldestichtag: wsParams.meldestichtag,
+				studiensemester_kurzbz: wsParams.studiensemester_kurzbz
+			},
+			{
+				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
+			}
+		);
+	},
+	deleteBismeldestichtag: function(wsParams) {
+		return CoreRESTClient.post(
+			'codex/Bismeldestichtag/deleteBismeldestichtag',
+			{
+				meldestichtag_id: wsParams.meldestichtag_id
+			},
+			{
+				timeout: CORE_BISMELDESTICHTAG_CMPT_TIMEOUT
+			}
+		);
+	}
+};
+
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
new file mode 100644
index 000000000..79b73a2e5
--- /dev/null
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -0,0 +1,190 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {BismeldestichtagTabulatorOptions} from './TabulatorSetup.js';
+import {BismeldestichtagTabulatorEventHandlers} from './TabulatorSetup.js';
+
+import {CoreFilterCmpt} from '../../components/filter/Filter.js';
+import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
+import {CoreRESTClient} from '../../RESTClient.js';
+import {CoreFetchCmpt} from '../../components/Fetch.js';
+import {BismeldestichtagAPIs} from './API.js';
+
+const bismeldestichtagApp = Vue.createApp({
+	data: function() {
+		return {
+			bismeldestichtagTabulatorOptions: BismeldestichtagTabulatorOptions,
+			bismeldestichtagTabulatorEventHandlers: BismeldestichtagTabulatorEventHandlers,
+			meldestichtag: null, // date of Meldestichtag
+			semList: null, // all Studiensemester for dropdown
+			currSem: null, // selected Studiensemester
+			fetchCmptApiFunction: {}, // api function call
+			fetchCmptApiFunctionParams: null, // parameters for api function call
+			fetchCmptDataFetched: null, // function to execute after call
+			fetchCmptRefresh: true // for refreshing
+		};
+	},
+	components: {
+		CoreNavigationCmpt,
+		CoreFilterCmpt,
+		BismeldestichtagAPIs,
+		CoreFetchCmpt,
+		"datepicker": VueDatePicker
+	},
+	created() {
+		this.handlerStudiensemester();
+	},
+	methods: {
+		/**
+		 * Define Studiensemester call and method to be executed after the call
+		 */
+		handlerStudiensemester: function() {
+			this.startFetchCmpt(
+				BismeldestichtagAPIs.getStudiensemester,
+				null,
+				this.fetchCmptDataFetchedStudiensemester
+			);
+		},
+		/**
+		 * Define Studiensemester call and method to be executed after the call
+		 */
+		handlerBismeldestichtage: function() {
+			this.startFetchCmpt(
+				BismeldestichtagAPIs.getBismeldestichtage,
+				null,
+				this.fetchCmptDataFetchedBismeldestichtage
+			);
+		},
+		/**
+		 * Define add Bismeldestichtag call and method to be executed after the call
+		 */
+		handlerAddBismeldestichtag: function(event) {
+			this.startFetchCmpt(
+				BismeldestichtagAPIs.addBismeldestichtag,
+				{
+					meldestichtag: this.meldestichtag,
+					studiensemester_kurzbz: this.currSem
+				},
+				this.fetchCmptDataFetchedAddBismeldestichtag
+			);
+		},
+		/**
+		 * Define delete Bismeldestichtag call and method to be executed after the call
+		 */
+		handlerDeleteBismeldestichtag: function(meldestichtag_id) {
+			this.startFetchCmpt(
+				BismeldestichtagAPIs.deleteBismeldestichtag,
+				{
+					meldestichtag_id: meldestichtag_id
+				},
+				this.fetchCmptDataFetchedDeleteBismeldestichtag
+			);
+		},
+		/**
+		 * Called after Studiensemester response is received
+		 */
+		fetchCmptDataFetchedStudiensemester: function(data) {
+			if (CoreRESTClient.isError(data)) alert(CoreRESTClient.getError(data));
+			if (CoreRESTClient.hasData(data))
+			{
+				let semRes = CoreRESTClient.getData(data);
+				this.semList = semRes.semList;
+				this.currSem = semRes.currSem;
+				this.handlerBismeldestichtage();
+			}
+			else
+				alert("No Studiensemester data");
+		},
+		/**
+		 * Called after Bismeldestichtage response is received
+		 */
+		fetchCmptDataFetchedBismeldestichtage: function(data) {
+			if (CoreRESTClient.isError(data)) alert(CoreRESTClient.getError(data));
+			if (CoreRESTClient.hasData(data))
+			{
+				// set the Meldestichtagedata
+				this.$refs.bismeldestichtageTable.tabulator.setData(CoreRESTClient.getData(data));
+
+				// save delete Bismeldestichtag function
+				let funcDeleteBismeldestichtag = this.handlerDeleteBismeldestichtag;
+
+				let btns = document.getElementsByClassName('delete-btn');
+
+				// add click events for deletion
+				for (let btn in btns)
+				{
+					if (btns[btn].addEventListener)
+					{
+						btns[btn].addEventListener('click',
+							function(){
+								funcDeleteBismeldestichtag(btns[btn].getAttribute('data-meldestichtag-id'));
+							}
+						);
+					}
+				}
+			}
+			else
+				this.$refs.bismeldestichtageTable.tabulator.setData([]);
+		},
+		/**
+		 * Called after Add Bismeldestichtag response is received
+		 */
+		fetchCmptDataFetchedAddBismeldestichtag: function(data) {
+			if (CoreRESTClient.isError(data))
+				alert(CoreRESTClient.getError(data));
+			else if (CoreRESTClient.hasData(data))
+			{
+				this.handlerBismeldestichtage();
+			}
+			else
+				alert("No response data");
+		},
+		/**
+		 * Called after Add Bismeldestichtag response is received
+		 */
+		fetchCmptDataFetchedDeleteBismeldestichtag: function(data) {
+			if (CoreRESTClient.isError(data))
+				alert(CoreRESTClient.getError(data));
+			else if (CoreRESTClient.hasData(data))
+			{
+				this.handlerBismeldestichtage();
+			}
+			else
+				alert("No response data");
+		},
+		/**
+		 * Used to start/refresh the FetchCmpt
+		 */
+		startFetchCmpt: function(apiFunction, apiFunctionParameters, dataFetchedCallback) {
+			// Assign the function api of the FetchCmpt binded property
+			this.fetchCmptApiFunction = apiFunction;
+
+			// In case a null value is provided set the parameters as an empty object
+			if (apiFunctionParameters == null) apiFunctionParameters = {};
+
+			// Assign parameters to the FetchCmpt binded properties
+			this.fetchCmptApiFunctionParams = apiFunctionParameters;
+			// Assign data fetch callback to the FetchCmpt binded properties
+			this.fetchCmptDataFetched = dataFetchedCallback;
+			// Set the FetchCmpt binded property refresh to have the component to refresh
+			// NOTE: this should be the last one to be called because it triggers the FetchCmpt to start to refresh
+			this.fetchCmptRefresh === true ? this.fetchCmptRefresh = false : this.fetchCmptRefresh = true;
+		}
+	}
+});
+
+bismeldestichtagApp.mount('#main');
diff --git a/public/js/apps/Bismeldestichtag/TabulatorSetup.js b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
new file mode 100644
index 000000000..d98cc993c
--- /dev/null
+++ b/public/js/apps/Bismeldestichtag/TabulatorSetup.js
@@ -0,0 +1,75 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *
+ */
+export const BismeldestichtagTabulatorOptions = {
+	maxHeight: "100%",
+	minHeight: 50,
+	layout: 'fitColumns',
+	index: 'meldestichtag_id',
+	columns: [
+		{title: 'Meldestichtag',field: 'meldestichtag', headerFilter: true, formatter: function(cell){
+				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
+			}
+		},
+		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true, sorter:function(a, b, aRow, bRow, column, dir, sorterParams) {
+
+				//aRow, bRow - the row components for the values being compared
+				let semesterStartA = new Date(aRow.getData().semester_start);
+				let semesterStartB = new Date(bRow.getData().semester_start);
+
+				return semesterStartA - semesterStartB; // difference between studiensemester start dates
+			}
+		},
+		{title: 'Semesterstart',field: 'semester_start', headerFilter: true, visible: false, formatter: function(cell){
+				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
+			}
+		},
+		{title: 'ID', field: 'meldestichtag_id', headerFilter: true, visible: false},
+		{title: 'Insertamum', field: 'insertamum', headerFilter: true, visible: false},
+		{title: 'Insertvon', field: 'insertvon', headerFilter: true, visible: false},
+		{title: 'Löschen', field: 'loeschen', headerFilter: false, formatter:function(cell){
+				return	'<button class="btn btn-outline-secondary delete-btn" data-meldestichtag-id="'+cell.getRow().getIndex()+'">'+
+							'<i class="fa fa-xmark"></i>'+
+						'</button>';
+			}
+		}
+	]
+};
+
+/**
+ *
+ */
+export const BismeldestichtagTabulatorEventHandlers = [
+	{
+		event: "rowClick",
+		handler: function(e, row) {
+			if (e.target.nodeName == 'DIV') {
+				let data = row.getData();
+				alert(data.studiensemester_kurzbz + ': ' + BismeldestichtagTabulatorHelperFunctions._formatDate(data.meldestichtag));
+			}
+		}
+	}
+];
+
+let BismeldestichtagTabulatorHelperFunctions = {
+	_formatDate: function(date) {
+		return date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+	}
+}
diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
index bcb7b37a7..00a5877b3 100644
--- a/public/js/apps/lehre/Antrag.js
+++ b/public/js/apps/lehre/Antrag.js
@@ -2,6 +2,7 @@ import StudierendenantragAntrag from "../../components/Studierendenantrag/Antrag
 import StudierendenantragStatus from "../../components/Studierendenantrag/Status.js";
 import StudierendenantragInfoblock from "../../components/Studierendenantrag/Infoblock.js";
 import VueDatePicker from "../../components/vueDatepicker.js.php";
+import Phrasen from '../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
 	components: {
@@ -12,10 +13,14 @@ const app = Vue.createApp({
 	},
 	data() {
 		return {
-			statusMsg: "",
-			statusSeverity: "",
+			status: {
+				msg: '',
+				severity: ''
+			},
 			infoArray: []
 		};
 	}
 });
-app.mount('#wrapper');
+app
+	.use(Phrasen)
+	.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js
index 25e4afaa0..637ca3f61 100644
--- a/public/js/apps/lehre/Antrag/Leitung.js
+++ b/public/js/apps/lehre/Antrag/Leitung.js
@@ -1,8 +1,12 @@
 import StudierendenantragLeitung from '../../../components/Studierendenantrag/Leitung.js';
+import Phrasen from '../../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
 	components: {
 		StudierendenantragLeitung
 	}
 });
-app.use(primevue.config.default,{zIndex: {overlay: 9999}}).mount('#wrapper');
+app
+	.use(Phrasen)
+	.use(primevue.config.default,{zIndex: {overlay: 9999}})
+	.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Lvzuweisung.js b/public/js/apps/lehre/Antrag/Lvzuweisung.js
index 836d1168e..78abec5cf 100644
--- a/public/js/apps/lehre/Antrag/Lvzuweisung.js
+++ b/public/js/apps/lehre/Antrag/Lvzuweisung.js
@@ -1,4 +1,5 @@
 import LvZuweisung from '../../../components/Studierendenantrag/Lvzuweisung.js';
+import Phrasen from '../../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
 	components: {
@@ -10,4 +11,6 @@ const app = Vue.createApp({
 		}
 	}
 });
-app.mount('#wrapper');
+app
+	.use(Phrasen)
+	.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Student.js b/public/js/apps/lehre/Antrag/Student.js
index f06143149..80cea89e9 100644
--- a/public/js/apps/lehre/Antrag/Student.js
+++ b/public/js/apps/lehre/Antrag/Student.js
@@ -1,8 +1,11 @@
 import LvPopup from '../../../components/Studierendenantrag/Leitung/LvPopup.js';
+import Phrasen from '../../../plugin/Phrasen.js';
 
 const app = Vue.createApp({
 	components: {
 		LvPopup
 	}
 });
-app.mount('#wrapper');
+app
+	.use(Phrasen)
+	.mount('#wrapper');
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 90cec2d50..453cc0b48 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -1,3 +1,5 @@
+import Phrasen from '../../plugin/Phrasen.js';
+
 export default {
 	data: () => ({
 		modal: null
@@ -86,6 +88,7 @@ export default {
 				}
 			});
 			const wrapper = document.createElement("div");
+			instance.use(Phrasen); // TODO(chris): find a more dynamic way
 			instance.mount(wrapper);
 			document.body.appendChild(wrapper);
 		});
diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
index d5989b521..197fe2206 100644
--- a/public/js/components/Studierendenantrag/Antrag.js
+++ b/public/js/components/Studierendenantrag/Antrag.js
@@ -2,7 +2,6 @@ import StudierendenantragAbmeldung from './Form/Abmeldung.js';
 import StudierendenantragAbmeldungStgl from './Form/AbmeldungStgl.js';
 import StudierendenantragUnterbrechung from './Form/Unterbrechung.js';
 import StudierendenantragWiederholung from './Form/Wiederholung.js';
-import Phrasen from '../../mixins/Phrasen.js';
 
 export default {
 	components: {
@@ -11,9 +10,6 @@ export default {
 		StudierendenantragUnterbrechung,
 		StudierendenantragWiederholung
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'update:infoArray',
 		'update:statusMsg',
@@ -37,13 +33,13 @@ export default {
 			return 'Studierendenantrag' + this.antragType;
 		},
 		infoText() {
-			return this.p.t('studierendenantrag/info_' + this.antragType + '_' + this.status);
+			return this.$p.t('studierendenantrag/info_' + this.antragType + '_' + this.status);
 		}
 	},
 	template: `
 	<div class="studierendenantrag-antrag card">
 		<div class="card-header">
-		    {{p.t('studierendenantrag', 'title_' + antragType)}}
+		    {{$p.t('studierendenantrag', 'title_' + antragType)}}
 		</div>
 		<div v-if="infoText && infoText.substr(0, 9) != '<< PHRASE'" class="alert alert-primary m-3" role="alert" v-html="infoText">
 		</div>
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
index ba6a054ad..513b8b542 100644
--- a/public/js/components/Studierendenantrag/Form/Abmeldung.js
+++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js
@@ -1,5 +1,4 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 var _uuid = 0;
 
@@ -7,9 +6,6 @@ export default {
 	components: {
 		CoreFetchCmpt
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'setInfos',
 		'setStatus'
@@ -56,7 +52,7 @@ export default {
 					this.data = result.data.retval;
 					if (this.data.status) {
 						this.$emit("setStatus", {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 							severity: this.statusSeverity
 						});
 					}
@@ -67,7 +63,7 @@ export default {
 		createAntrag() {
 			bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -93,7 +89,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -104,13 +100,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')})),
 								severity:'success'
 							});
 					}
@@ -120,7 +116,7 @@ export default {
 		},
 		cancelAntrag() {
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelling')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -144,7 +140,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity:'danger'
 						});
 					}
@@ -156,13 +152,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelled')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')})),
 								severity: 'danger'
 							});
 					}
@@ -183,37 +179,37 @@ export default {
 					</div>
 					<table class="table">
 						<tr>
-							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<th>{{$p.t('lehre', 'studiengang')}}</th>
 							<td align="right">{{data.bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<th>{{$p.t('lehre', 'organisationsform')}}</th>
 							<td align="right">{{data.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<th>{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
 							<td align="right">{{data.name}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<th>{{$p.t('person', 'personenkennzeichen')}}</th>
 							<td align="right">{{data.matrikelnr}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'studienjahr')}}</th>
+							<th>{{$p.t('lehre', 'studienjahr')}}</th>
 							<td align="right">{{data.studienjahr_kurzbz}}</td>
 						</tr>						
 						<tr>
-							<th>{{p.t('lehre', 'studiensemester')}}</th>
+							<th>{{$p.t('lehre', 'studiensemester')}}</th>
 							<td align="right">{{data.studiensemester_kurzbz}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'semester')}}</th>
+							<th>{{$p.t('lehre', 'semester')}}</th>
 							<td align="right">{{data.semester}}</td>
 						</tr>
 					</table>
 				</div>
 				<div v-if="data.grund" class="mb-3">
-					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+					<h5>{{$p.t('studierendenantrag', 'antrag_grund')}}:</h5>
 					<pre>{{data.grund}}</pre>
 				</div>
 				<div v-else class="col-sm-6 mb-3">
@@ -239,7 +235,7 @@ export default {
 						@click="cancelAntrag"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_cancel')}}
+						{{$p.t('studierendenantrag', 'btn_cancel')}}
 					</button>
 					<button
 						v-else-if="!data.studierendenantrag_id"
@@ -249,7 +245,7 @@ export default {
 						:data-bs-target="'#studierendenantrag-form-abmeldung-' + uuid + '-modal'"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+						{{$p.t('studierendenantrag', 'btn_create_Abmeldung')}}
 					</button>
 
 					<div
@@ -266,18 +262,18 @@ export default {
 										class="modal-title"
 										:id="'studierendenantrag-form-abmeldung-' + uuid + '-modal-label'"
 										>
-										{{p.t('studierendenantrag', 'title_Abmeldung')}}
+										{{$p.t('studierendenantrag', 'title_Abmeldung')}}
 									</h5>
-									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui', 'schliessen')"></button>
+									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$p.t('ui', 'schliessen')"></button>
 								</div>
-								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_Abmeldung')">
+								<div class="modal-body" v-html="$p.t('studierendenantrag', 'warning_Abmeldung')">
 								</div>
 								<div class="modal-footer">
 									<button
 										type="button"
 										class="btn btn-primary"
 										@click="createAntrag">
-										{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+										{{$p.t('studierendenantrag', 'btn_create_Abmeldung')}}
 									</button>
 								</div>
 							</div>
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 3524bcd1f..1650d3638 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -1,5 +1,4 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 var _uuid = 0;
 
@@ -7,9 +6,6 @@ export default {
 	components: {
 		CoreFetchCmpt
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'setInfos',
 		'setStatus'
@@ -30,7 +26,7 @@ export default {
 	},
 	computed: {
 		statusSeverity() {
-			switch (this.data.status)
+			switch (this.data?.status)
 			{
 				case 'Erstellt': return 'info';
 				case 'Genehmigt': return 'success';
@@ -56,7 +52,7 @@ export default {
 					this.data = result.data.retval;
 					if (this.data.status) {
 						this.$emit("setStatus", {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 							severity: this.statusSeverity
 						});
 					}
@@ -67,7 +63,7 @@ export default {
 		createAntrag() {
 			bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -93,7 +89,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -104,13 +100,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_open')})),
 								severity:'success'
 							});
 					}
@@ -123,7 +119,7 @@ export default {
 
 			if(event.target.value)
 			{
-				let templateT= this.p.t('studierendenantrag', event.target.value);
+				let templateT= this.$p.t('studierendenantrag', event.target.value);
 				templateText.value = templateT;
 			}
 			else
@@ -140,40 +136,40 @@ export default {
 				<div class="col-12">
 					<table class="table">
 						<tr>
-							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<th>{{$p.t('lehre', 'studiengang')}}</th>
 							<td align="right">{{data.bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<th>{{$p.t('lehre', 'organisationsform')}}</th>
 							<td align="right">{{data.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<th>{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
 							<td align="right">{{data.name}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<th>{{$p.t('person', 'personenkennzeichen')}}</th>
 							<td align="right">{{data.matrikelnr}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'studienjahr')}}</th>
+							<th>{{$p.t('lehre', 'studienjahr')}}</th>
 							<td align="right">{{data.studienjahr_kurzbz}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'studiensemester')}}</th>
+							<th>{{$p.t('lehre', 'studiensemester')}}</th>
 							<td align="right">{{data.studiensemester_kurzbz}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'semester')}}</th>
+							<th>{{$p.t('lehre', 'semester')}}</th>
 							<td align="right">{{data.semester}}</td>
 						</tr>
 					</table>
 				</div>
 
 				<div v-if="data.grund" class="mb-3">
-					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+					<h5>{{$p.t('studierendenantrag', 'antrag_grund')}}:</h5>
 				
-					<pre class="text-prewrap">{{data.grund}}</pre>
+					<pre class="text-prewrap">{{data?.grund}}</pre>
 				</div>      
 				<div v-else class="col-sm-6 mb-3">
 					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
@@ -181,18 +177,20 @@ export default {
 						<select name="grundAv" @change="appendDropDownText
 							($event)">
 							<option value="" > --- bitte auswählen, sofern zutreffend ---- </option>
-							<option value="textLong_NichtantrittStudium">{{p.t('studierendenantrag', 'dropdown_NichtantrittStudium')}}
+							<option value="textLong_NichtantrittStudium">{{$p.t('studierendenantrag', 'dropdown_NichtantrittStudium')}}
 							</option>
-							<option value="textLong_ungenuegendeLeistung">{{p.t('studierendenantrag', 'dropdown_ungenuegendeLeistung')}}
+							<option value="textLong_ungenuegendeLeistung">{{$p.t('studierendenantrag', 'dropdown_ungenuegendeLeistung')}}
 							</option>
-							<option value="textLong_studentNichtAnwesend">{{p.t('studierendenantrag', 'dropdown_nichtAnwesend')}}
+							<option value="textLong_studentNichtAnwesend">{{$p.t('studierendenantrag', 'dropdown_nichtAnwesend')}}
 							</option>
-							<option value="textLong_PruefunstermineNichtEingehalten">{{p.t('studierendenantrag', 'dropdown_PruefunstermineNichtEingehalten')}}
+							<option value="textLong_PruefunstermineNichtEingehalten">{{$p.t('studierendenantrag', 'dropdown_PruefunstermineNichtEingehalten')}}
 							</option>
-							<option value="textLong_studentNichtGezahlt">{{p.t('studierendenantrag', 'dropdown_nichtGezahlt')}}
+							<option value="textLong_studentNichtGezahlt">{{$p.t('studierendenantrag', 'dropdown_nichtGezahlt')}}
 							</option>
-							<option value="textLong_plageat">{{p.t('studierendenantrag', 'dropdown_plageat')}}
+							<option value="textLong_plageat">{{$p.t('studierendenantrag', 'dropdown_plageat')}}
 							</option>					
+							<option value="textLong_MissingZgv">{{$p.t('studierendenantrag', 'dropdown_MissingZgv')}}
+							</option>						
 						</select>	
 					</div>			
 					<textarea
@@ -211,14 +209,14 @@ export default {
 				
 				<div class="col-12 text-end">
 					<button
-						v-if="!data.studierendenantrag_id"
+						v-if="!data?.studierendenantrag_id"
 						type="button"
 						class="btn btn-primary"
 						data-bs-toggle="modal"
 						:data-bs-target="'#studierendenantrag-form-abmeldung-' + uuid + '-modal'"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+						{{$p.t('studierendenantrag', 'btn_create_Abmeldung')}}
 					</button>
 					<div
 						ref="modal"
@@ -234,18 +232,18 @@ export default {
 										class="modal-title"
 										:id="'studierendenantrag-form-abmeldung-' + uuid + '-modal-label'"
 										>
-										{{p.t('studierendenantrag', 'title_Abmeldung')}}
+										{{$p.t('studierendenantrag', 'title_Abmeldung')}}
 									</h5>
-									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui', 'schliessen')"></button>
+									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$p.t('ui', 'schliessen')"></button>
 								</div>
-								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_AbmeldungStgl')">
+								<div class="modal-body" v-html="$p.t('studierendenantrag', 'warning_AbmeldungStgl')">
 								</div>
 								<div class="modal-footer">
 									<button
 										type="button"
 										class="btn btn-primary"
 										@click="createAntrag">
-										{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+										{{$p.t('studierendenantrag', 'btn_create_Abmeldung')}}
 									</button>
 								</div>
 							</div>
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 2459dec17..a0e84af63 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -1,6 +1,5 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
 import VueDatepicker from '../../vueDatepicker.js.php';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 var _uuid = 0;
 
@@ -9,9 +8,6 @@ export default {
 		CoreFetchCmpt,
 		VueDatepicker
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'setInfos',
 		'setStatus'
@@ -79,7 +75,7 @@ export default {
 					this.data = result.data.retval;
 					if (this.data.status) {
 						this.$emit("setStatus", {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 							severity: this.statusSeverity
 						});
 					}
@@ -89,7 +85,7 @@ export default {
 		},
 		createAntrag() {
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -126,7 +122,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -137,13 +133,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_created')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_created')})),
 								severity: 'info'
 							});
 					}
@@ -153,7 +149,7 @@ export default {
 		},
 		cancelAntrag() {
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelling')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelling')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -177,7 +173,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -189,13 +185,13 @@ export default {
 						this.data = result.data.retval;
 						if (this.data.status) {
 							this.$emit("setStatus", {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 								severity: this.statusSeverity
 							});
 						}
 						else
 							this.$emit('setStatus', {
-								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelled')}),
+								msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_cancelled')})),
 								severity: 'danger'
 							});
 					}
@@ -216,28 +212,28 @@ export default {
 					</div>
 					<table class="table">
 						<tr>
-							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<th>{{$p.t('lehre', 'studiengang')}}</th>
 							<td align="right">{{data.bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<th>{{$p.t('lehre', 'organisationsform')}}</th>
 							<td align="right">{{data.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<th>{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
 							<td align="right">{{data.name}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<th>{{$p.t('person', 'personenkennzeichen')}}</th>
 							<td align="right">{{data.matrikelnr}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'studienjahr')}}</th>
+							<th>{{$p.t('lehre', 'studienjahr')}}</th>
 							<td align="right" v-if="data.studierendenantrag_id">{{data.studienjahr_kurzbz}}</td>
 							<td align="right" v-else>{{stsem === null ? '' : data.studiensemester[stsem].studienjahr_kurzbz}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'semester')}}</th>
+							<th>{{$p.t('lehre', 'semester')}}</th>
 							<td align="right" v-if="data.studierendenantrag_id">{{data.semester}}</td>
 							<td align="right" v-else>{{stsem === null ? '' : data.studiensemester[stsem].semester}}</td>
 						</tr>
@@ -246,7 +242,7 @@ export default {
 
 				<div class="col-sm-6 mb-3">
 					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-stsem'" class="form-label">
-						{{p.t('lehre', 'studiensemester')}}
+						{{$p.t('lehre', 'studiensemester')}}
 					</label>
 					<div v-if="data.studierendenantrag_id">
 						{{data.studiensemester_kurzbz}}
@@ -271,7 +267,7 @@ export default {
 				</div>
 				<div class="col-sm-6 mb-3">
 					<label class="form-label">
-						{{p.t('studierendenantrag', 'antrag_datum_wiedereinstieg')}}
+						{{$p.t('studierendenantrag', 'antrag_datum_wiedereinstieg')}}
 					</label>
 
 					<div v-if="data.studierendenantrag_id">
@@ -279,7 +275,7 @@ export default {
 					</div>
 					<div v-else-if="stsem === null">
 						<select class="form-select" disabled>
-							<option selected>{{p.t('ui/select_studiensemester')}}</option>
+							<option selected>{{$p.t('ui/select_studiensemester')}}</option>
 						</select>
 					</div>
 					<div v-else>
@@ -295,8 +291,8 @@ export default {
 					</div>
 				</div>
 				<div v-if="data.studierendenantrag_id" class="mb-3">
-					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
-					<pre>{{data.grund}}</pre>
+					<h5>{{$p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+					<textarea class="form-control" rows="5" readonly>{{data.grund}}</textarea>
 				</div>
 				<div v-else class="col-sm-6 mb-3">
 					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
@@ -316,14 +312,14 @@ export default {
 				<div class="col-12 mb-3">
 
 					<div v-if="data.studierendenantrag_id">
-						<a v-if="data.dms_id" target="_blank" :href="siteUrl + '/lehre/Antrag/Attachment/Show/' + data.dms_id"> {{p.t('studierendenantrag', 'antrag_dateianhaenge')}} </a>
-						<span v-else>{{p.t('studierendenantrag', 'no_attachments')}}</span>
+						<a v-if="data.dms_id" target="_blank" :href="siteUrl + '/lehre/Antrag/Attachment/Show/' + data.dms_id"> {{$p.t('studierendenantrag', 'antrag_dateianhaenge')}} </a>
+						<span v-else>{{$p.t('studierendenantrag', 'no_attachments')}}</span>
 					</div>
 					<div v-else>
 						<label
 							:for="'studierendenantrag-form-abmeldung-' + uuid + '-attachment'"
 							class="form-label">
-							{{p.t('studierendenantrag', 'antrag_dateianhaenge')}}
+							{{$p.t('studierendenantrag', 'antrag_dateianhaenge')}}
 						</label>
 						<input
 							class="form-control"
@@ -341,7 +337,7 @@ export default {
 						@click="createAntrag"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_create_Unterbrechung')}}
+						{{$p.t('studierendenantrag', 'btn_create_Unterbrechung')}}
 					</button>
 					<button
 						v-else-if="data.status == 'Erstellt'"
@@ -350,7 +346,7 @@ export default {
 						@click="cancelAntrag"
 						:disabled="saving"
 						>
-						{{p.t('studierendenantrag', 'btn_cancel')}}
+						{{$p.t('studierendenantrag', 'btn_cancel')}}
 					</button>
 				</div>
 			</div>
diff --git a/public/js/components/Studierendenantrag/Form/Wiederholung.js b/public/js/components/Studierendenantrag/Form/Wiederholung.js
index 336441dda..c2aea93f2 100644
--- a/public/js/components/Studierendenantrag/Form/Wiederholung.js
+++ b/public/js/components/Studierendenantrag/Form/Wiederholung.js
@@ -1,6 +1,5 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
 import VueDatepicker from '../../vueDatepicker.js.php';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 var _uuid = 0;
 
@@ -9,9 +8,6 @@ export default {
 		CoreFetchCmpt,
 		VueDatepicker
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'setInfos',
 		'setStatus',
@@ -67,11 +63,11 @@ export default {
 					this.data = result.data.retval;
 					if (!this.data.status || this.data.status == 'ErsteAufforderungVersandt' || this.data.status == 'ZweiteAufforderungVersandt') {
 						this.data.status = 'Offen';
-						this.data.statustyp = this.p.t('studierendenantrag', 'status_open');
+						this.data.statustyp = this.$p.t('studierendenantrag', 'status_open');
 					}
 					this.$emit('update:status', this.data.status);
 					this.$emit("setStatus", {
-						msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+						msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 						severity: this.statusSeverity
 					});
 					return result;
@@ -89,7 +85,7 @@ export default {
 			let nextState = repeat ? 'Erstellt' : 'Verzichtet';
 
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_saving')})),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -116,7 +112,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.$p.t('studierendenantrag', 'status_error')})),
 							severity: 'danger'
 						});
 					}
@@ -129,7 +125,7 @@ export default {
 							this.data.status = nextState;
 						this.$emit('update:status', this.data.status);
 						this.$emit("setStatus", {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							msg: Vue.computed(() => this.$p.t('studierendenantrag', 'status_x', {status: this.data.statustyp})),
 							severity: this.statusSeverity
 						});
 					}
@@ -143,7 +139,7 @@ export default {
 	},
 	mounted() {
 		this.infos = [...Array(5).keys()].map(n => ({
-			body: this.p.t_ref('studierendenantrag', 'infotext_Wiederholung_' + n)
+			body: Vue.computed(() => this.$p.t('studierendenantrag', 'infotext_Wiederholung_' + n))
 		}));
 		this.$emit('setInfos', this.infos);
 	},
@@ -156,27 +152,27 @@ export default {
 					</div>
 					<table class="table">
 						<tr>
-							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<th>{{$p.t('lehre', 'studiengang')}}</th>
 							<td align="right">{{data.bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<th>{{$p.t('lehre', 'organisationsform')}}</th>
 							<td align="right">{{data.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<th>{{$p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
 							<td align="right">{{data.name}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<th>{{$p.t('person', 'personenkennzeichen')}}</th>
 							<td align="right">{{data.matrikelnr}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('studierendenantrag', 'antrag_Wiederholung_pruefung')}}</th>
+							<th>{{$p.t('studierendenantrag', 'antrag_Wiederholung_pruefung')}}</th>
 							<td align="right">{{data.lvbezeichnung}}</td>
 						</tr>
 						<tr>
-							<th>{{p.t('studierendenantrag', 'antrag_Wiederholung_pruefung_date')}}</th>
+							<th>{{$p.t('studierendenantrag', 'antrag_Wiederholung_pruefung_date')}}</th>
 							<td align="right">{{datumPruefungFormatted}}</td>
 						</tr>
 					</table>
@@ -190,7 +186,7 @@ export default {
 						@click="createAntrag"
 						:disabled="saving"
 					>
-						{{p.t('studierendenantrag/antrag_Wiederholung_button_yes')}}
+						{{$p.t('studierendenantrag/antrag_Wiederholung_button_yes')}}
 					</button>
 <!--					<button
 						v-if="!data.studierendenantrag_id || data.status == 'Offen'"
@@ -199,7 +195,7 @@ export default {
 						@click="cancelAntrag"
 						:disabled="saving"
 					>
-						{{p.t('studierendenantrag/antrag_Wiederholung_button_no')}}
+						{{$p.t('studierendenantrag/antrag_Wiederholung_button_no')}}
 					</button>-->
 				</div>
 			</div>
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index 747ad7123..a56e23725 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -5,7 +5,6 @@ import GrundPopup from './Leitung/GrundPopup.js';
 import LvPopup from './Leitung/LvPopup.js';
 import BsAlert from '../Bootstrap/Alert.js';
 import FhcLoader from '../Loader.js';
-import Phrasen from '../../mixins/Phrasen.js';
 
 export default {
 	components: {
@@ -14,7 +13,6 @@ export default {
 		LeitungActions,
 		FhcLoader
 	},
-	mixins: [Phrasen],
 	props: {
 		stgL: Array,
 		stgA: Array
@@ -31,12 +29,12 @@ export default {
 		stgkzL() {
 			if (!this.stgL)
 				return [];
-			return this.stgL.map(stg => stg.studiengang_kz);
+			return this.stgL.map(stg => parseInt(stg));
 		},
 		stgkzA() {
 			if (!this.stgA)
 				return [];
-			return this.stgA.map(stg => stg.studiengang_kz);
+			return this.stgA.map(stg => parseInt(stg));
 		}
 	},
 	methods: {
@@ -46,17 +44,18 @@ export default {
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
 				'/components/Antrag/Leitung/getActiveStgs'
 			).then(result => {
-				this.stgs = Object.values(result.data.retval).sort((a,b) => a.bezeichnung == b.bezeichnung ? (a.orgform == b.orgform ? 0 : (a.orgform > b.orgform ? 1 : -1)) : (a.bezeichnung > b.bezeichnung ? 1 : -1));
+				this.stgs = result.data.retval;
 			}).catch(error => {
 				console.error(error);
 			});
 		},
-		changeFilter(evt) {
-			this.filter = evt.target.value || undefined;
+		changeFilter(filter) {
+			this.filter = filter || undefined;
 			this.reload();
 		},
 		reload() {
-			this.$refs.table.reload(this.filter);
+			if (this.$refs.table)
+				this.$refs.table.reload(this.filter);
 			this.loadFilter();
 		},
 		download() {
@@ -79,7 +78,7 @@ export default {
 				{
 					let countAntrage = 0;
 					LvPopup
-						.popup(this.p.t('studierendenantrag','title_show_lvs', currentAntrag), {
+						.popup(this.$p.t('studierendenantrag','title_show_lvs', currentAntrag), {
 							antragId: currentAntrag.studierendenantrag_id,
 							footer: true,
 							dialogClass: 'modal-lg',
@@ -128,7 +127,7 @@ export default {
 			var currentAntrag = antraege.pop();
 			if (currentAntrag) {
 				GrundPopup
-					.popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
+					.popup(this.$p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
 						countRemaining: antraege.length
 					})
 					.then(result => {
@@ -211,7 +210,7 @@ export default {
 			var currentAntrag = antraege.pop();
 			if (currentAntrag) {
 				GrundPopup
-					.popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
+					.popup(this.$p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
 						countRemaining : antraege.length,
 						optional: true
 					})
@@ -338,6 +337,7 @@ export default {
 			ref="table"
 			:stg-a="stgkzA"
 			:stg-l="stgkzL"
+			:filter="filter"
 			v-model:columnData="columns"
 			v-model:selectedData="selectedData"
 			@action:approve="actionApprove"
@@ -347,6 +347,7 @@ export default {
 			@action:objectionDeny="actionoObjectionDeny"
 			@action:objectionApprove="actionObjectionApprove"
 			@action:cancel="actionCancel"
+			@reload="reload"
 			>
 		</leitung-table>
 
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions.js b/public/js/components/Studierendenantrag/Leitung/Actions.js
index 71ada5c20..2720a7df5 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions.js
@@ -1,13 +1,11 @@
 import ActionsNew from './Actions/New.js';
 import ActionsColumns from './Actions/Columns.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 export default {
 	components: {
 		ActionsNew,
 		ActionsColumns
 	},
-	mixins: [Phrasen],
 	props: {
 		selectedData: Array,
 		columns: Array,
@@ -67,17 +65,17 @@ export default {
 	<div class="studierendenantrag-leitung-actions fhc-table-actions d-flex flex-wrap justify-content-between mb-2">
 		<div class="d-flex align-items-center gap-2">
 			<actions-new @reload="$emit('reload')"></actions-new>
-			<button type="button" class="btn btn-outline-secondary" @click="$emit('reload')" :title="p.t('table','reload')">
+			<button type="button" class="btn btn-outline-secondary" @click="$emit('reload')" :title="$p.t('table','reload')">
 				<i class="fa-solid fa-rotate-right"></i>
 			</button>
-			<span>{{p.t('table', 'with_selected', {count: selectedData.length})}}</span>
-			<button v-if="stgL.length" :disabled="!selectedCanBeApproved" type="button" class="btn btn-outline-secondary" @click="$emit('action:approve')">{{p.t('studierendenantrag', 'btn_approve')}}</button>
-			<button v-if="stgL.length" :disabled="!selectedCanBeRejected" type="button" class="btn btn-outline-secondary" @click="$emit('action:reject')">{{p.t('studierendenantrag', 'btn_reject')}}</button>
-			<button v-if="stgA.length" :disabled="!selectedCanBeReopened" type="button" class="btn btn-outline-secondary" @click="$emit('action:reopen')">{{p.t('studierendenantrag', 'btn_reopen')}}</button>
+			<span>{{$p.t('table', 'with_selected', {count: selectedData.length})}}</span>
+			<button v-if="stgL.length" :disabled="!selectedCanBeApproved" type="button" class="btn btn-outline-secondary" @click="$emit('action:approve')">{{$p.t('studierendenantrag', 'btn_approve')}}</button>
+			<button v-if="stgL.length" :disabled="!selectedCanBeRejected" type="button" class="btn btn-outline-secondary" @click="$emit('action:reject')">{{$p.t('studierendenantrag', 'btn_reject')}}</button>
+			<button v-if="stgA.length" :disabled="!selectedCanBeReopened" type="button" class="btn btn-outline-secondary" @click="$emit('action:reopen')">{{$p.t('studierendenantrag', 'btn_reopen')}}</button>
 		</div>
 		<div>
-			<button type="button" class="btn btn-link" data-bs-toggle="collapse" href="#columns" :title="p.t('table','spaltenEinAusblenden')"><i class="fa fa-table-columns"></i></button>
-			<button type="button" class="btn btn-link" @click="$emit('download')" :title="p.t('table','download')"><i class="fa fa-download"></i></button>
+			<button type="button" class="btn btn-link" data-bs-toggle="collapse" href="#columns" :title="$p.t('table','spaltenEinAusblenden')"><i class="fa fa-table-columns"></i></button>
+			<button type="button" class="btn btn-link" @click="$emit('download')" :title="$p.t('table','download')"><i class="fa fa-download"></i></button>
 		</div>
 		<div class="col-12">
 			<actions-columns id="columns" class="collapse" :columns="columns"></actions-columns>
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
index 7128761d7..55a7bd1cc 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
@@ -6,9 +6,6 @@ export default {
 		toggleColumn(col) {
 			col.visible = !col.visible;
 			col.original.toggle()
-		},
-		show() {
-
 		}
 	},
 	template: `
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index ad3009bdb..8952c4e78 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -1,15 +1,11 @@
 import BsAlert from '../../../Bootstrap/Alert.js';
 import BsModal from '../../../Bootstrap/Modal.js';
-import Phrasen from '../../../../mixins/Phrasen.js';
 
 export default {
 	components: {
 		BsModal,
 		AutoComplete: primevue.autocomplete
 	},
-	mixins: [
-		Phrasen
-	],
 	emits: [
 		'reload'
 	],
@@ -33,7 +29,7 @@ export default {
 				class: 'position-absolute top-0 start-0 w-100 h-100'
 			}), {
 				dialogClass: 'modal-fullscreen'
-			}, this.p.t('studierendenantrag', 'antrag_header')).then(() => {
+			}, this.$p.t('studierendenantrag', 'antrag_header')).then(() => {
 				this.$emit('reload');
 				this.student = '';
 			});
@@ -67,17 +63,17 @@ export default {
 	<div class="studierendenantrag-leitung-actions-new" v-if="data">
 		<button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#newAntragModal">
 			<i class="fa fa-plus"></i>
-			{{p.t('studierendenantrag','btn_new')}}
+			{{$p.t('studierendenantrag','btn_new')}}
 		</button>
 		<div ref="modal" class="modal fade" id="newAntragModal" tabindex="-1" aria-labelledby="newAntragModalLabel" aria-hidden="true">
 			<div class="modal-dialog">
 				<div class="modal-content">
 					<div class="modal-header">
-						<h5 class="modal-title" id="newAntragModalLabel">{{p.t('studierendenantrag','title_new_Abmeldung')}}</h5>
-						<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui','schliessen')"></button>
+						<h5 class="modal-title" id="newAntragModalLabel">{{$p.t('studierendenantrag','title_new_Abmeldung')}}</h5>
+						<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="$p.t('ui','schliessen')"></button>
 					</div>
 					<div class="modal-body">
-						<label for="newAntragModalAutoComplete">{{p.t('person','studentIn')}}</label>
+						<label for="newAntragModalAutoComplete">{{$p.t('person','studentIn')}}</label>
 						<div>
 							<auto-complete
 								class="w-100"
@@ -102,7 +98,7 @@ export default {
 							class="btn btn-primary"
 							:disabled="!this.student"
 							@click.prevent="openForm">
-							{{p.t('studierendenantrag','btn_create')}}
+							{{$p.t('studierendenantrag','btn_create')}}
 						</button>
 					</div>
 				</div>
diff --git a/public/js/components/Studierendenantrag/Leitung/GrundPopup.js b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
index 3a7b40f2d..bdea298ec 100644
--- a/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
@@ -1,11 +1,8 @@
-
 import BsAlert from '../../Bootstrap/Alert.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 
 export default {
 	mixins: [
 		BsAlert,
-		Phrasen
 	],
 	props: {
 		placeholder: String,
@@ -46,17 +43,17 @@ export default {
 			<div>
 				<textarea ref="input" class="form-control" :class="{'is-invalid' : isInvalid}" v-model="value"></textarea>
 				<div v-if="isInvalid" class="invalid-feedback">
-					{{p.t('kvp','new.error.required')}}
+					{{$p.t('kvp','new.error.required')}}
 				</div>
 			</div>
 		</template>
 		<template v-slot:footer>
 			<div v-if="countRemaining > 0" class="form-check flex-grow-1">
 				<input ref="check" type="checkbox" class="form-check-input" id="cbid" v-model="check">
-				<label class="form-check-label" for="cbid">{{p.t('studierendenantrag','fuer_alle_uebernehmen')}}</label>
+				<label class="form-check-label" for="cbid">{{$p.t('studierendenantrag','fuer_alle_uebernehmen')}}</label>
 			</div>
-			<button type="button" class="btn btn-primary" @click="submit">{{p.t('ui','ok')}}</button>
-			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{p.t('ui','cancel')}}</button>
+			<button type="button" class="btn btn-primary" @click="submit">{{$p.t('ui','ok')}}</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui','cancel')}}</button>
 		</template>
 	</bs-modal>`
 }
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
index 388a93b7d..addb3ff72 100644
--- a/public/js/components/Studierendenantrag/Leitung/Header.js
+++ b/public/js/components/Studierendenantrag/Leitung/Header.js
@@ -1,23 +1,73 @@
-import Phrasen from '../../../mixins/Phrasen.js';
+const LOCAL_STORAGE_ID = 'studierendenantrag_leitung_2023-11-14_header_filter';
 
 export default {
-	mixins: [Phrasen],
 	props: {
 		stgs: Array
 	},
 	emits: [
 		'input'
 	],
+	data() {
+		return {
+			todo_value: '',
+			stg_value: ''
+		}
+	},
+	computed: {
+		value() {
+			const a = [];
+			if (this.todo_value)
+				a.push(this.todo_value);
+			if (this.stg_value)
+				a.push(this.stg_value);
+
+			return a.join('/');
+		}
+	},
+	watch: {
+		value(n) {
+			window.localStorage.setItem(LOCAL_STORAGE_ID, n);
+			this.$emit('input', n);
+		}
+	},
+	created() {
+		var values = 'todo';
+		const savedPath = window.localStorage.getItem(LOCAL_STORAGE_ID);
+		if (savedPath !== null) {
+			values = savedPath;
+		}
+
+		values = values.split('/');
+
+		if (values.length) {
+			if (values.length == 1) {
+				if (values[0] == 'todo')
+					values.push('');
+				else
+					values.unshift('');
+			}
+			this.stg_value = values.pop();
+			this.todo_value = values.pop();
+		}
+	},
 	template: `
 	<div class="studierendenantrag-leitung-header fhc-table-header d-flex align-items-center mb-2 gap-2">
-		<h3 class="h5 col m-0">{{p.t('studierendenantrag', 'studierendenantraege')}}</h3>
-		<div v-if="stgs.length > 1" class="col-auto">
-			<select ref="stg_select" class="form-select" @input="$emit('input', $event)">
-				<option value="">{{p.t('global', 'alle')}}</option>
-				<option v-for="stg in stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
-					{{stg.bezeichnung}} ({{stg.orgform}})
-				</option>
-			</select>
+		<h3 class="h5 col m-0">{{$p.t('studierendenantrag', 'studierendenantraege')}}</h3>
+		<div class="col-auto row row-cols-lg-auto g-3 align-items-center">
+			<div class="col-12">
+				<select class="form-select" v-model="todo_value">
+					<option value="todo">{{$p.t('studierendenantrag', 'filter_todo')}}</option>
+					<option value="">{{$p.t('studierendenantrag', 'filter_all')}}</option>
+				</select>
+			</div>
+			<div class="col-12">
+				<select v-if="stgs.length > 1" class="form-select" v-model="stg_value">
+					<option value="">{{$p.t('global', 'alle')}}</option>
+					<option v-for="stg in stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
+						{{stg.bezeichnung}}
+					</option>
+				</select>
+			</div>
 		</div>
 	</div>
 	`
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
index db13a1bb7..700a2330b 100644
--- a/public/js/components/Studierendenantrag/Leitung/LvPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
@@ -1,14 +1,12 @@
 import BsAlert from '../../Bootstrap/Alert.js';
 import {CoreFetchCmpt} from "../../Fetch.js";
-import Phrasen from '../../../mixins/Phrasen.js';
 
 export default {
 	components: {
 		CoreFetchCmpt
 	},
 	mixins: [
-		BsAlert,
-		Phrasen
+		BsAlert
 	],
 	props: {
 		footer: Boolean,
@@ -18,6 +16,7 @@ export default {
 	data(){
 		return {
 			lvs: null,
+			repeat_last: false,
 			refresh: true,
 			result: false,
 			check: false
@@ -37,13 +36,16 @@ export default {
 	},
 	methods: {
 		setlvs(param) {
-			if(param.error)
-			{
+			if(param.error) {
 				this.$refs.fetchCompt.error = true;
 				this.$refs.fetchCompt.errorMessage = param.retval;
-			}
-			else
+			} else {
+				this.repeat_last = !!param.retval.repeat_last;
+				if (this.repeat_last) {
+					delete param.retval.repeat_last;
+				}
 				this.lvs = param.retval;
+			}
 		},
 		loadlvs() {
 			if (!this.antragId)
@@ -79,29 +81,29 @@ export default {
 				@data-fetched="setlvs">
 				<template #default>
 					<div v-if="lvzugelassenLength == 0">
-						{{p.t('studierendenantrag','error_no_lvs')}}
+						{{$p.t('studierendenantrag','error_no_lvs')}}
 					</div>
 					<table v-else class="table caption-top" v-for="(lv_arr, sem) in lvzugelassen" :key="sem">
 						<caption>
 							<span class="d-flex justify-content-between">
-								<span>{{ p.t('studierendenantrag',['title_lv_nicht_zugelassen', 'title_lv_wiederholen'][sem.substr(0,1)-1]) }}</span>
+								<span>{{ $p.t('studierendenantrag',['title_lv_nicht_zugelassen', 'title_lv_wiederholen'][repeat_last ? 1 : sem.substr(0,1)-1]) }}</span>
 								<span>{{sem.substr(1)}}</span>
 							</span>
 						</caption>
 						<thead v-if="lv_arr !== null">
 							<tr>
-								<th scope="col">{{p.t('ui','bezeichnung')}}</th>
-								<th scope="col">{{p.t('lehre','lehrform')}}</th>
+								<th scope="col">{{$p.t('ui','bezeichnung')}}</th>
+								<th scope="col">{{$p.t('lehre','lehrform')}}</th>
 								<th scope="col">ECTS</th>
-								<th scope="col">{{p.t('lehre','note')}}</th>
+								<th scope="col">{{$p.t('lehre','note')}}</th>
 								<th scope="col">
-									{{p.t('global','anmerkung')}}
+									{{$p.t('global','anmerkung')}}
 								</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-if="lv_arr === null" class="table-warning">
-								<td colspan="5">{{p.t('studierendenantrag/error_stg_last_semester')}}</td>
+								<td colspan="5">{{$p.t('studierendenantrag/error_stg_last_semester')}}</td>
 							</tr>
 							<template v-else>
 								<tr v-for="lv in lv_arr">
@@ -140,10 +142,10 @@ export default {
 		<template v-if="footer" v-slot:footer>
 			<div v-if="countRemaining > 0" class="form-check flex-grow-1">
 				<input ref="check" type="checkbox" class="form-check-input" id="cbid" v-model="check">
-				<label class="form-check-label" for="cbid">{{p.t('studierendenantrag','fuer_x_uebernehmen', {count: countRemaining})}}</label>
+				<label class="form-check-label" for="cbid">{{$p.t('studierendenantrag','fuer_x_uebernehmen', {count: countRemaining})}}</label>
 			</div>
-			<button type="button" class="btn btn-primary" @click="submit(true)">{{p.t('studierendenantrag','btn_approve')}}</button>
-			<button v-if="countRemaining > 0" type="button" class="btn btn-secondary" @click="submit(false)">{{p.t('ui','skip')}}</button>
+			<button type="button" class="btn btn-primary" @click="submit(true)">{{$p.t('studierendenantrag','btn_approve')}}</button>
+			<button v-if="countRemaining > 0" type="button" class="btn btn-secondary" @click="submit(false)">{{$p.t('ui','skip')}}</button>
 		</template>
 	</bs-modal>`
 }
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 8cbfdd9d7..da9ddf456 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -1,7 +1,6 @@
 import BsModal from '../../Bootstrap/Modal.js';
 import {CoreFetchCmpt} from '../../Fetch.js';
 import LvPopup from './LvPopup.js';
-import Phrasen from '../../../mixins/Phrasen.js';
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
 
 export default {
@@ -10,12 +9,12 @@ export default {
 		CoreFetchCmpt,
 		LvPopup
 	},
-	mixins: [Phrasen],
 	props: {
 		selectedData: Array,
 		columnData: Array,
 		stgL: Array,
-		stgA: Array
+		stgA: Array,
+		filter: String
 	},
 	emits: [
 		'update:columnData',
@@ -41,10 +40,13 @@ export default {
 	},
 	methods: {
 		reload(stg) {
-			this.table.replaceData(this.ajaxUrl + (stg || ''));
+			this.table.setData(this.ajaxUrl + (stg || ''));
 		},
 		download() {
-			this.table.download("csv", "data.csv");
+			this.table.download("csv", "data.csv", {
+				delimiter: ';',
+				bom: true
+			});
 		},
 		getHistory() {
 			if (this.lastHistoryClickedId === null)
@@ -73,12 +75,13 @@ export default {
 			this.$refs.lvList.show();
 		}
 	},
-	mounted() {
+	async mounted() {
+		await this.$p.loadCategory(['lehre', 'studierendenantrag', 'person', 'global', 'ui']);
 		function dateFormatter(cell)
 		{
 			let val = cell.getValue();
 			if (!val)
-				return '';
+				return '&nbsp;';
 			let date = new Date(val);
 			return date.toLocaleDateString();
 		}
@@ -86,9 +89,9 @@ export default {
 		this.table = new Tabulator(this.$refs.table, {
 			placeholder:"Keine zu bearbeitenden Datensätze",
 			movableColumns: true,
-			height: '50vh',
-			layout: "fitDataStretch", // TODO(chris): wont work when changed
-			ajaxURL: this.ajaxUrl,
+			maxHeight: '50vh',
+			layout: "fitDataFill",
+			ajaxURL: this.ajaxUrl + (this.filter || ''),
 			persistence: { // NOTE(chris): do not store column titles
 				sort: true, //persist column sorting
 				filter: true, //persist filters
@@ -97,7 +100,7 @@ export default {
 				page: true, //persist page
 				columns: ["width", "visible"], //persist columns
 			},
-			persistenceID: 'studierendenantrag_leitung',
+			persistenceID: 'studierendenantrag_leitung_2023-11-14',
 			columns: [{
 				formatter: 'rowSelection',
 				titleFormatter: 'rowSelection',
@@ -111,7 +114,7 @@ export default {
 				title: '#'
 			}, {
 				field: 'bezeichnung',
-				title: this.p.t('lehre', 'studiengang'),
+				title: this.$p.t('lehre', 'studiengang'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -120,7 +123,7 @@ export default {
 				}
 			}, {
 				field: 'orgform',
-				title: this.p.t('lehre', 'organisationsform'),
+				title: this.$p.t('lehre', 'organisationsform'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -129,7 +132,7 @@ export default {
 				}
 			}, {
 				field: 'typ',
-				title: this.p.t('studierendenantrag', 'antrag_typ'),
+				title: this.$p.t('studierendenantrag', 'antrag_typ'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -137,11 +140,11 @@ export default {
 					autocomplete: true,
 				},
 				formatter: (cell, formatterParams, onRendered) => {
-					return this.p.t('studierendenantrag','antrag_typ_' + cell.getValue());
+					return this.$p.t('studierendenantrag','antrag_typ_' + cell.getValue());
 				}
 			}, {
 				field: 'statustyp',
-				title: this.p.t('studierendenantrag', 'antrag_status'),
+				title: this.$p.t('studierendenantrag', 'antrag_status'),
 				headerFilter: 'list',
 				headerFilterParams: {
 					valuesLookup: true,
@@ -163,57 +166,67 @@ export default {
 				}
 			}, {
 				field: 'matrikelnr',
-				title: this.p.t('person', 'personenkennzeichen'),
+				title: this.$p.t('person', 'personenkennzeichen'),
 				headerFilter: 'input'
 			}, {
 				field: 'prestudent_id',
-				title: this.p.t('lehre', 'prestudent'),
+				title: this.$p.t('lehre', 'prestudent'),
 				headerFilter: 'input'
 			}, {
 				field: 'name',
-				title: this.p.t('global', 'name'),
+				title: this.$p.t('global', 'name'),
 				mutator: (value, data) => (data.vorname + ' ' + data.nachname).replace(/^\s*(.*)\s*$/, '$1'),
 				headerFilter: 'input'
 			}, {
 				field: 'datum',
-				title: this.p.t('global', 'datum'),
+				title: this.$p.t('global', 'datum'),
 				formatter: dateFormatter,
 				headerFilterFunc: 'dates',
 				headerFilter: dateFilter
 			}, {
 				field: 'datum_wiedereinstieg',
-				title: this.p.t('studierendenantrag', 'antrag_datum_wiedereinstieg'),
+				title: this.$p.t('studierendenantrag', 'antrag_datum_wiedereinstieg'),
 				formatter: dateFormatter,
 				headerFilterFunc: 'dates',
 				headerFilter: dateFilter
 			}, {
 				field: 'grund',
-				title: this.p.t('studierendenantrag', 'antrag_grund'),
+				title: this.$p.t('studierendenantrag', 'antrag_grund'),
 				formatter: (cell, formatterParams, onRendered) => {
 					let link = document.createElement('a'),
 						val = cell.getValue();
 					link.href = "#modal-grund";
 					link.setAttribute('data-bs-toggle', 'modal');
-					link.innerHTML = this.p.t('studierendenantrag', 'antrag_grund');
+					link.innerHTML = this.$p.t('studierendenantrag', 'antrag_grund');
 					link.addEventListener('click', () => {
 						this.$refs.modalGrundPre.innerHTML = val;
 					});
 
-					return val ? link : '';
+					return val ? link : '&nbsp;';
 				}
 			}, {
 				field: 'dms_id',
-				title: this.p.t('studierendenantrag', 'antrag_dateianhaenge'),
+				title: this.$p.t('studierendenantrag', 'antrag_dateianhaenge'),
 				formatter: (cell, formatterParams, onRendered) => {
 					let val = cell.getValue();
 					if (!val)
-						return '';
-					return '<a href="' + FHC_JS_DATA_STORAGE_OBJECT.app_root +
+						return '&nbsp;';
+					let link = document.createElement('a');
+					link.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
 						FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-						'/lehre/Antrag/Attachment/show/' + val + '" target="_blank"><i class="fa fa-paperclip" aria-hidden="true"></i> ' + this.p.t('studierendenantrag', 'antrag_anhang') + '</a>';
+						'/lehre/Antrag/Attachment/show/' +
+						val;
+					link.setAttribute('target', '_blank');
+					link.innerHTML = '<i class="fa fa-paperclip" aria-hidden="true"></i>';
+					link.append(this.$p.t('studierendenantrag/antrag_anhang'));
+					return link;
 				}
 			}, {
 				field: 'actions',
+				frozen: true,
+				title: this.$p.t('ui', 'aktion'),
+				headerFilter: false,
+				headerSort: false,				
 				formatter: (cell, formatterParams, onRendered) => {
 					let container = document.createElement('div'),
 						data = cell.getData();
@@ -223,7 +236,9 @@ export default {
 					if ((data.typ == 'Abmeldung' || data.typ == 'AbmeldungStgl' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt' || data.status == 'Beeinsprucht' || data.status == 'EinspruchAbgelehnt' || data.status == 'EmailVersandt')) {
 						// NOTE(chris): Download PDF
 						let button = document.createElement('a');
-						button.innerHTML = '<i class="fa-solid fa-download" title="' + this.p.t('studierendenantrag', 'btn_download_antrag') + '"></i>';
+						// NOTE(chris): phrasen in attribues don't work if they are not preloaded
+						// it work in this case because the category has already been loaded before
+						button.innerHTML = '<i class="fa-solid fa-download" title="' + this.$p.t('studierendenantrag', 'btn_download_antrag') + '"></i>';
 						button.className = "btn btn-outline-secondary";
 						button.target = "_blank";
 						button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -233,7 +248,7 @@ export default {
 					if (data.typ == 'AbmeldungStgl' && data.status == 'Genehmigt') {
 						// NOTE(chris): Object
 						let button = document.createElement('button');
-						button.innerHTML = this.p.t('studierendenantrag', 'btn_object');
+						button.append(this.$p.t('studierendenantrag', 'btn_object'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.$emit('action:object', [cell.getData()]));
 						container.append(button);
@@ -242,14 +257,14 @@ export default {
 					if (data.typ == 'AbmeldungStgl' && data.status == 'Beeinsprucht') {
 						// NOTE(chris): Deny Objection
 						let button = document.createElement('button');
-						button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_deny');
+						button.append(this.$p.t('studierendenantrag', 'btn_objection_deny'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.$emit('action:objectionDeny', [cell.getData()]));
 						container.append(button);
 
 						// NOTE(chris): Approve Objection
 						button = document.createElement('button');
-						button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_approve');
+						button.append(this.$p.t('studierendenantrag', 'btn_objection_approve'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.$emit('action:objectionApprove', [cell.getData()]));
 						container.append(button);
@@ -259,7 +274,7 @@ export default {
 						// NOTE(chris): Reopen
 						if (data.typ == 'Wiederholung' && data.status == 'Verzichtet') {
 							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_reopen');
+							button.append(this.$p.t('studierendenantrag', 'btn_reopen'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click', () => this.$emit('action:reopen', [cell.getData()]));
 							container.append(button);
@@ -267,7 +282,7 @@ export default {
 						// NOTE(chris): Lv Zuweisen
 						if (data.typ == 'Wiederholung' && (data.status == 'Erstellt' || data.status == 'Lvszugewiesen')) {
 							let button = document.createElement('a');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_lvzuweisen');
+							button.append(this.$p.t('studierendenantrag', 'btn_lvzuweisen'));
 							button.className = "btn btn-outline-secondary";
 							button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
 								FHC_JS_DATA_STORAGE_OBJECT.ci_router +
@@ -280,7 +295,7 @@ export default {
 									class: 'position-absolute top-0 start-0 w-100 h-100'
 								}), {
 									dialogClass: 'modal-fullscreen'
-								}, this.p.t('studierendenantrag', 'title_lvzuweisen', cell.getData())).then(() => {
+								}, this.$p.t('studierendenantrag', 'title_lvzuweisen', cell.getData())).then(() => {
 									this.$emit('reload');
 								});
 							};
@@ -289,7 +304,7 @@ export default {
 						// NOTE(chris): Cancel
 						if (data.typ == 'AbmeldungStgl' && (data.status == 'Erstellt' || data.status == 'Genehmigt' )) {
 							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_cancel');
+							button.append(this.$p.t('studierendenantrag', 'btn_cancel'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click',() => this.$emit('action:cancel', [cell.getData()]));
 							container.append(button);
@@ -300,7 +315,7 @@ export default {
 						// NOTE(chris): Approve
 						if ((data.typ == 'Wiederholung' && data.status == 'Lvszugewiesen') || (data.typ != 'Wiederholung' && data.status == 'Erstellt')) {
 							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_approve');
+							button.append(this.$p.t('studierendenantrag', 'btn_approve'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click', () => this.$emit('action:approve', [cell.getData()]));
 							container.append(button);
@@ -308,7 +323,7 @@ export default {
 						// NOTE(chris): Reject (Unterbrechung braucht grund)
 						if (data.status == 'Erstellt' && data.typ == 'Unterbrechung') {
 							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_reject');
+							button.append(this.$p.t('studierendenantrag', 'btn_reject'));
 							button.className = "btn btn-outline-secondary";
 							button.addEventListener('click', () => this.$emit('action:reject', [cell.getData()]));
 							container.append(button);
@@ -318,16 +333,14 @@ export default {
 					// NOTE(chris): Show LVs
 					if (data.typ == 'Wiederholung' && (data.status == 'Lvszugewiesen' || data.status == 'Genehmigt')) {
 						let button = document.createElement('button');
-						button.innerHTML = this.p.t('studierendenantrag', 'btn_show_lvs');
+						button.append(this.$p.t('studierendenantrag', 'btn_show_lvs'));
 						button.className = "btn btn-outline-secondary";
 						button.addEventListener('click', () => this.showLVs(cell.getData()));
 						container.append(button);
 					}
 
-					// TODO(chris): not yet perfect
-					onRendered(() => {
-						cell.getColumn().setWidth(true);
-					});
+					if (container.innerHTML == '')
+						container.innerHTML = '&nbsp;';
 
 					return container;
 				}
@@ -338,7 +351,7 @@ export default {
 			let columnData = [];
 			for (let col of columns) {
 				let def = col.getDefinition();
-				if (def.title) {
+				if (def.title && !def.frozen) {
 					columnData.push({
 						title: def.title,
 						visible: col.isVisible(),
@@ -356,11 +369,11 @@ export default {
 	<div class="studierendenantrag-leitung-table">
 		<div ref="table"></div>
 		<bs-modal ref="modalGrund" id="modal-grund" class="fade">
-			<template #title>{{p.t('studierendenantrag', 'antrag_grund')}}</template>
-			<pre ref="modalGrundPre"></pre>
+			<template #title>{{$p.t('studierendenantrag', 'antrag_grund')}}</template>
+			<textarea class="form-control" ref="modalGrundPre" style="width: 100%; height: 250px;" readonly></textarea>
 		</bs-modal>
 		<bs-modal ref="history" class="fade">
-			<template #title>{{p.t('studierendenantrag', 'title_history', {id: lastHistoryClickedId})}}</template>
+			<template #title>{{$p.t('studierendenantrag', 'title_history', {id: lastHistoryClickedId})}}</template>
 			<core-fetch-cmpt ref="historyLoader" :api-function="getHistory">
 				<table v-if="historyData.length" class="table">
 					<tr v-for="status in historyData" :key="status.studierendenantrag_status_id">
@@ -369,7 +382,7 @@ export default {
 						<td>{{status.typ}}</td>
 						<td>
 							<a v-if="status.grund" href="#modal-grund" data-bs-toggle="modal" @click="showHistoryGrund(status.grund)">
-								{{p.t('studierendenantrag', 'antrag_grund')}}
+								{{$p.t('studierendenantrag', 'antrag_grund')}}
 							</a>
 						</td>
 					</tr>
@@ -377,7 +390,7 @@ export default {
 			</core-fetch-cmpt>
 		</bs-modal>
 		<lv-popup ref="lvList" class="fade" :antrag-id="lvsData ? lvsData.studierendenantrag_id : null">
-			{{p.t('studierendenantrag', 'title_show_lvs', lvsData ? lvsData : {name: ''}) }}
+			{{$p.t('studierendenantrag', 'title_show_lvs', lvsData ? lvsData : {name: ''}) }}
 		</lv-popup>
 	</div>
 	`
diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
index 376e266d3..5ef1e9030 100644
--- a/public/js/components/Studierendenantrag/Lvzuweisung.js
+++ b/public/js/components/Studierendenantrag/Lvzuweisung.js
@@ -1,11 +1,9 @@
 import StudierendenantragStatus from './Status.js';
-import Phrasen from '../../mixins/Phrasen.js';
 
 export default {
 	components: {
 		StudierendenantragStatus
 	},
-	mixins: [Phrasen],
 	props: {
 		antragId: Number,
 		initialStatusCode: String,
@@ -43,10 +41,11 @@ export default {
 	methods: {
 		save() {
 			this.isloading = true;
-			const forbiddenLvs = this.lvs1.filter(lv => lv.antrag_zugelassen && !lv._children).map(lv => ({
+			const forbiddenLvs = this.lvs1.filter(lv => (lv.antrag_zugelassen || this.lvs.repeat_last)
+			 && !lv._children).map(lv => ({
 				studierendenantrag_id: this.antragId,
 				lehrveranstaltung_id: lv.lehrveranstaltung_id,
-				zugelassen: 0,
+				zugelassen: this.lvs.repeat_last ? (lv.antrag_zugelassen ? 1 : 2) : 0,
 				anmerkung: lv.antrag_anmerkung || "",
 				studiensemester_kurzbz: this.lvs1sem
 			}));
@@ -64,7 +63,7 @@ export default {
 						this.statusCode = response.data.retval[0].studierendenantrag_statustyp_kurzbz;
 						this.statusMsg = response.data.retval[0].typ;
 					} else {
-						this.addAlert(response.data.retval, 'alert-danger');
+						this.addAlert(response.data.retval.message || response.data.retval, 'alert-danger');
 						this.statusCode = 0;
 						this.statusMsg = 'Error';
 					}
@@ -107,119 +106,131 @@ export default {
 				else
 				{
 					let res = {};
-					for (var k in result.data.retval) {
-						if (result.data.retval[k] === null) {
-							const alert = document.createElement('div');
-							alert.innerHTML = this.p.t('studierendenantrag', 'error_stg_last_semester');
-							alert.className = 'alert alert-warning';
-							alert.role = 'alert';
-							this.$refs["lvtable" + k.substr(0,1)].append(alert);
-							continue;
-						}
-						let lvs = result.data.retval[k].reduce((obj,lv) => {
-							obj[lv.studienplan_lehrveranstaltung_id] = lv;
-							return obj;
-						}, {});
-						for (var lv of Object.values(lvs)) {
-							if (!lv.studienplan_lehrveranstaltung_id_parent)
-								continue;
-							if (!lvs[lv.studienplan_lehrveranstaltung_id_parent])
-								console.error('parent not available');
-							else {
-								if (!lvs[lv.studienplan_lehrveranstaltung_id_parent]._children)
-									lvs[lv.studienplan_lehrveranstaltung_id_parent]._children = [];
-								lvs[lv.studienplan_lehrveranstaltung_id_parent]._children.push(lv);
-							}
-						}
-						res[k] = Object.values(lvs).filter(lv => !lv.studienplan_lehrveranstaltung_id_parent);
-						let current = res[k];
-						let index = k.substr(0,1);
-						var table = new Tabulator(this.$refs["lvtable" + k.substr(0,1)], {
-							data: current,
-							dataTree: true,
-							dataTreeStartExpanded: true, //start with an expanded tree
-							dataTreeChildIndent: 15,
-							layout: "fitDataStretch",
-							columns: [
-								{title: this.p.t('ui','bezeichnung'), field: "bezeichnung"},
-								{title: this.p.t('lehre','lehrform'), field: "lehrform_kurzbz"},
-								{title: "ECTS", field: "ects"},
-								{title: this.p.t('lehre','note'), field: "note", formatter:(cell, formatterParams, onRendered)=>cell.getValue() || "---"},
-								{title: (index==1) ? this.p.t('studierendenantrag','lv_nicht_zulassen') : this.p.t('studierendenantrag','lv_wiederholen'), field: "antrag_zugelassen", formatter: (cell, formatterParams, onRendered) => {
-									let data = cell.getData();
-									if(data._children || !data.zeugnis)
-										return "";
-									let input = document.createElement('input');
-									input.className = "form-check-input";
-									input.type = "checkbox";
-									input.role = "switch";
-									input.checked = cell.getValue();
-									input.addEventListener('input', () => {
-										lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen = input.checked;
-										cell.getRow().reformat();
-									});
-									if (this.disabled) {
-										input.disabled = true;
-									}
-
-									let div =  document.createElement('div');
-									div.className = 'form-check form-switch';
-									div.append(input);
-
-									return div;
-								}},
-								{
-									title: this.p.t('global','anmerkung'),
-									field: "antrag_anmerkung",
-									headerSort:false,
-									titleFormatter:(cell, formatterParams, onRendered)=>{
-										let link =  document.createElement('a');
-										link.addEventListener('click', (e) => {
-											e.preventDefault();
-										});
-
-										link.href ="#";
-										link.title = this.p.t('studierendenantrag','anmerkung_tooltip');
-										new bootstrap.Tooltip(link);
-										let tooltip = document.createElement('span');
-										tooltip.innerHTML = this.p.t('global','anmerkung') + " ";
-										tooltip.append(link);
-
-										let icon =  document.createElement('i');
-										link.append(icon);
-										icon.className = "fa fa-info-circle";
-										icon.setAttribute("aria-hidden", "true");
-										icon.style.minWidth = '1em';
-
-										return tooltip;
-
-									},
-									formatter: (cell, formatterParams, onRendered) => {
-										if (this.disabled) {
-											return cell.getValue() || "";
-										}
-										var data = cell.getData();
-										if (lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen)
-										{
-											let input = document.createElement('input');
-											input.className = "form-control";
-											input.type = "text";
-											input.value = cell.getValue() || "";
-											input.addEventListener('input', () => {
-												lvs[data.studienplan_lehrveranstaltung_id].antrag_anmerkung = input.value;
-											});
-											return input;
-										}
-										else
-										{
-											return "";
-										}
+					this.$p
+						.loadCategory(['ui', 'lehre', 'studierendenantrag', 'global'])
+						.then(() => {
+							for (var k in result.data.retval) {
+								if (k === 'repeat_last')
+									continue;
+								if (result.data.retval[k] === null) {
+									const alert = document.createElement('div');
+									alert.innerHTML = this.$p.t('studierendenantrag', 'error_stg_last_semester');
+									alert.className = 'alert alert-warning';
+									alert.role = 'alert';
+									this.$refs["lvtable" + k.substr(0,1)].append(alert);
+									continue;
+								}
+								let lvs = result.data.retval[k].reduce((obj,lv) => {
+									obj[lv.studienplan_lehrveranstaltung_id] = lv;
+									return obj;
+								}, {});
+								for (var lv of Object.values(lvs)) {
+									if (!lv.studienplan_lehrveranstaltung_id_parent)
+										continue;
+									if (!lvs[lv.studienplan_lehrveranstaltung_id_parent])
+										console.error('parent not available');
+									else {
+										if (!lvs[lv.studienplan_lehrveranstaltung_id_parent]._children)
+											lvs[lv.studienplan_lehrveranstaltung_id_parent]._children = [];
+										lvs[lv.studienplan_lehrveranstaltung_id_parent]._children.push(lv);
 									}
 								}
-							]
+								res[k] = Object.values(lvs).filter(lv => !lv.studienplan_lehrveranstaltung_id_parent);
+								let current = res[k];
+								let index = k.substr(0,1);
+
+								const options = {
+									data: current,
+									dataTree: true,
+									dataTreeStartExpanded: true, //start with an expanded tree
+									dataTreeChildIndent: 15,
+									layout: "fitDataStretch",
+									columns: [
+										{title: this.$p.t('ui', 'bezeichnung'), field: "bezeichnung"},
+										{title: this.$p.t('lehre','lehrform'), field: "lehrform_kurzbz"},
+										{title: "ECTS", field: "ects"},
+										{title: this.$p.t('lehre','note'), field: "note", formatter:(cell, formatterParams, onRendered)=>cell.getValue() || "---"},
+										{
+											title: index == 1 && !result.data.retval.repeat_last ? this.$p.t('studierendenantrag','lv_nicht_zulassen') : this.$p.t('studierendenantrag','lv_wiederholen'),
+											field: "antrag_zugelassen",
+											formatter: (cell, formatterParams, onRendered) => {
+												let data = cell.getData();
+												if(data._children || !data.zeugnis)
+													return "";
+												let input = document.createElement('input');
+												input.className = "form-check-input";
+												input.type = "checkbox";
+												input.role = "switch";
+												input.checked = cell.getValue();
+												input.addEventListener('input', () => {
+													lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen = input.checked;
+													cell.getRow().reformat();
+												});
+												if (this.disabled) {
+													input.disabled = true;
+												}
+
+												let div =  document.createElement('div');
+												div.className = 'form-check form-switch';
+												div.append(input);
+
+												return div;
+											}
+										},
+										{
+											title: this.$p.t('global','anmerkung'),
+											field: "antrag_anmerkung",
+											headerSort:false,
+											titleFormatter:(cell, formatterParams, onRendered)=>{
+												let link =  document.createElement('a');
+												link.addEventListener('click', (e) => {
+													e.preventDefault();
+												});
+
+												link.href ="#";
+												link.title = this.$p.t('studierendenantrag','anmerkung_tooltip');
+												new bootstrap.Tooltip(link);
+												let tooltip = document.createElement('span');
+												tooltip.innerHTML = this.$p.t('global','anmerkung') + " ";
+												tooltip.append(link);
+
+												let icon =  document.createElement('i');
+												link.append(icon);
+												icon.className = "fa fa-info-circle";
+												icon.setAttribute("aria-hidden", "true");
+												icon.style.minWidth = '1em';
+
+												return tooltip;
+
+											},
+											formatter: (cell, formatterParams, onRendered) => {
+												if (this.disabled) {
+													return cell.getValue() || "";
+												}
+												var data = cell.getData();
+												if (lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen)
+												{
+													let input = document.createElement('input');
+													input.className = "form-control";
+													input.type = "text";
+													input.value = cell.getValue() || "";
+													input.addEventListener('input', () => {
+														lvs[data.studienplan_lehrveranstaltung_id].antrag_anmerkung = input.value;
+													});
+													return input;
+												}
+												else
+												{
+													return "";
+												}
+											}
+										}
+									]
+								};
+								var table = new Tabulator(this.$refs["lvtable" + k.substr(0,1)], options);
+							}
+							this.lvs = result.data.retval;
 						});
-					}
-					this.lvs = result.data.retval;
 				}
 			}
 		);
@@ -229,20 +240,20 @@ export default {
 		<div ref="alertbox"></div>
 
 		<span class="d-flex justify-content-between h4">
-			<span>{{p.t('studierendenantrag', 'title_lv_nicht_zugelassen')}}</span>
+			<span>{{lvs.repeat_last ? $p.t('studierendenantrag', 'title_lv_wiederholen') : $p.t('studierendenantrag', 'title_lv_nicht_zugelassen')}}</span>
 			<span>{{lvs1sem}}</span>
 		</span>
 		<div ref="lvtable1" class="mb-3">
 		</div>
 
 		<span class="d-flex justify-content-between h4">
-			<span>{{p.t('studierendenantrag', 'title_lv_wiederholen')}}</span>
+			<span>{{$p.t('studierendenantrag', 'title_lv_wiederholen')}}</span>
 			<span>{{lvs2sem}}</span>
 		</span>
 		<div ref="lvtable2">
 		</div>
 
-		<button type="button" @click="save" :disabled="isloading || disabled"  class="btn btn-primary my-3">{{p.t('studierendenantrag', 'btn_save_lvs')}}</button>
+		<button type="button" @click="save" :disabled="isloading || disabled"  class="btn btn-primary my-3">{{$p.t('studierendenantrag', 'btn_save_lvs')}}</button>
 	</div>
 	<div class="col-sm-2">
 		<studierendenantrag-status :msg="statusMsg" :severity="statusSeverity"></studierendenantrag-status>
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 2bf878e5a..77e3d7a60 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -18,6 +18,9 @@
 import {CoreFilterAPIs} from './API.js';
 import {CoreRESTClient} from '../../RESTClient.js';
 import {CoreFetchCmpt} from '../../components/Fetch.js';
+import FilterConfig from './Filter/Config.js';
+import FilterColumns from './Filter/Columns.js';
+import TableDownload from './Table/Download.js';
 
 //
 const FILTER_COMPONENT_NEW_FILTER = 'Filter Component New Filter';
@@ -29,11 +32,18 @@ var _uuid = 0;
  *
  */
 export const CoreFilterCmpt = {
-	emits: ['nwNewEntry'],
 	components: {
-		CoreFetchCmpt
+		CoreFetchCmpt,
+		FilterConfig,
+		FilterColumns,
+		TableDownload
 	},
+	emits: [
+		'nwNewEntry',
+		'click:new'
+	],
 	props: {
+		onNwNewEntry: Function, // NOTE(chris): Hack to get the nwNewEntry listener into $props
 		title: String,
 		sideMenu: {
 			type: Boolean,
@@ -45,7 +55,16 @@ export const CoreFilterCmpt = {
 		},
 		tabulatorOptions: Object,
 		tabulatorEvents: Array,
-		tableOnly: Boolean
+		tableOnly: Boolean,
+		reload: Boolean,
+		download: {
+			type: [Boolean, String, Function, Array, Object],
+			default: false
+		},
+		newBtnShow: Boolean,
+		newBtnClass: [String, Array, Object],
+		newBtnDisabled: Boolean,
+		newBtnLabel: String
 	},
 	data: function() {
 		return {
@@ -60,6 +79,7 @@ export const CoreFilterCmpt = {
 			filterFields: null,
 
 			availableFilters: null,
+			selectedFilter: null,
 
 			// FetchCmpt binded properties
 			fetchCmptRefresh: false,
@@ -68,7 +88,9 @@ export const CoreFilterCmpt = {
 			fetchCmptDataFetched: null,
 
 			tabulator: null,
-			tableBuilt: false
+			tableBuilt: false,
+			tabulatorHasSelector: false,
+			selectedData: []
 		};
 	},
 	computed: {
@@ -115,6 +137,8 @@ export const CoreFilterCmpt = {
 				{
 					// If the column has to be displayed or not
 					col.visible = selectedFields.indexOf(col.field) >= 0;
+					if (col.formatter == 'rowSelection')
+						col.visible = true;
 
 					if (col.hasOwnProperty('resizable'))
 						col.resizable = col.visible;
@@ -123,6 +147,14 @@ export const CoreFilterCmpt = {
 
 			return columns;
 		},
+		fieldIdsForVisibilty() {
+			if (!this.tableBuilt)
+				return [];
+			return this.tabulator.getColumns().filter(col => {
+				let def = col.getDefinition();
+				return !def.frozen && def.title;
+			}).map(col => col.getField());
+		},
 		fieldNames() {
 			if (!this.tableBuilt)
 				return {};
@@ -135,21 +167,24 @@ export const CoreFilterCmpt = {
 			if (!this.uuid)
 				return '';
 			return '-' + this.uuid;
+		},
+		columnsForFilter() {
+			if (!this.filteredColumns || !this.datasetMetadata)
+				return [];
+			const filterTitles = this.filteredColumns.reduce((a,c) => {
+				a[c.field] = c.title;
+				return a;
+			}, {});
+			return this.datasetMetadata.map(el => ({...el, ...{title: filterTitles[el.name]}}));
 		}
 	},
-	beforeCreate() {
-		if (!this.tableOnly == !this.filterType)
-			alert('You can not have a filter-type in table-only mode!');
-	},
-	created() {
-		this.uuid = _uuid++;
-		if (!this.tableOnly)
-			this.getFilter(); // get the filter data
-	},
-	mounted() {
-		this.initTabulator();
-	},
 	methods: {
+		reloadTable() {
+			if (this.tableOnly)
+				this.tabulator.setData();
+			else
+				this.getFilter();
+		},
 		initTabulator() {
 			// Define a default tabulator options in case it was not provided
 			let tabulatorOptions = {...{
@@ -164,6 +199,9 @@ export const CoreFilterCmpt = {
 				tabulatorOptions.columns = this.filteredColumns;
 			}
 
+			if (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length)
+				this.tabulatorHasSelector = true;
+
 			// Start the tabulator with the build options
 			this.tabulator = new Tabulator(
 				this.$refs.table,
@@ -177,6 +215,9 @@ export const CoreFilterCmpt = {
 					this.tabulator.on(evt.event, evt.handler);
 			}
 			this.tabulator.on('tableBuilt', () => this.tableBuilt = true);
+			this.tabulator.on("rowSelectionChanged", data => {
+				this.selectedData = data;
+			});
 			if (this.tableOnly) {
 				this.tabulator.on('tableBuilt', () => {
 					const cols = this.tabulator.getColumns();
@@ -194,15 +235,24 @@ export const CoreFilterCmpt = {
 			}
 		},
 		_updateTabulator() {
-			this.tabulator.setData(this.filteredData);
+			this.tabulatorHasSelector = this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
 			this.tabulator.setColumns(this.filteredColumns);
+			this.tabulator.setData(this.filteredData);
 		},
 		/**
 		 *
 		 */
 		getFilter: function() {
-			//
-			this.startFetchCmpt(CoreFilterAPIs.getFilter, null, this.render);
+			if (this.selectedFilter === null)
+				this.startFetchCmpt(CoreFilterAPIs.getFilter, null, this.render);
+			else
+				this.startFetchCmpt(
+					CoreFilterAPIs.getFilterById,
+					{
+						filterId: this.selectedFilter
+					},
+					this.render
+				);
 		},
 		/**
 		 *
@@ -230,7 +280,7 @@ export const CoreFilterCmpt = {
 							filter.type = data.datasetMetadata[i].type;
 
 							this.filterFields.push(filter);
-							break;
+							//break;
 						}
 					}
 				}
@@ -266,6 +316,7 @@ export const CoreFilterCmpt = {
 				if (link == null) link = '#';
 
 				filtersArray[filtersArray.length] = {
+					id: filters[filtersCount].filter_id,
 					link: link + filters[filtersCount].filter_id,
 					description: filters[filtersCount].desc,
 					sort: filtersCount,
@@ -280,6 +331,7 @@ export const CoreFilterCmpt = {
 				if (link == null) link = '#';
 
 				filtersArray[filtersArray.length] = {
+					id: personalFilters[filtersCount].filter_id,
 					link: link + personalFilters[filtersCount].filter_id,
 					description: personalFilters[filtersCount].desc,
 					subscriptDescription: personalFilters[filtersCount].subscriptDescription,
@@ -318,6 +370,7 @@ export const CoreFilterCmpt = {
 				if (link == null) link = '#';
 
 				filtersArray[filtersArray.length] = {
+					id: filters[filtersCount].filter_id,
 					option: filters[filtersCount].filter_id,
 					description: filters[filtersCount].desc
 				};
@@ -330,6 +383,7 @@ export const CoreFilterCmpt = {
 				if (link == null) link = '#';
 
 				filtersArray[filtersArray.length] = {
+					id: personalFilters[filtersCount].filter_id,
 					option: personalFilters[filtersCount].filter_id,
 					description: personalFilters[filtersCount].desc
 				};
@@ -366,12 +420,13 @@ export const CoreFilterCmpt = {
 		/**
 		 *
 		 */
-		handlerSaveCustomFilter: function(event) {
+		handlerSaveCustomFilter: function(customFilterName) {
+			this.selectedFilter = null;
 			//
 			this.startFetchCmpt(
 				CoreFilterAPIs.saveCustomFilter,
 				{
-					customFilterName: this.$refscustomFilterName.value
+					customFilterName
 				},
 				this.getFilter
 			);
@@ -380,159 +435,22 @@ export const CoreFilterCmpt = {
 		 *
 		 */
 		handlerRemoveCustomFilter: function(event) {
+			filterId = event.currentTarget.getAttribute("href").substring(1);
+			if (filterId === this.selectedFilter)
+				this.selectedFilter = null;
 			//
 			this.startFetchCmpt(
 				CoreFilterAPIs.removeCustomFilter,
 				{
-					filterId: event.currentTarget.getAttribute("href").substring(1)
+					filterId: filterId
 				},
 				this.getFilter
 			);
 		},
-		/**
-		 *
-		 */
-		handlerApplyFilterFields: function(event) {
-			let filterFields = [];
-			let filterFieldDivRows = document.getElementById('filterFields').getElementsByClassName('row');
 
-			for (let i = 0; i< filterFieldDivRows.length; i++)
-			{
-				let filterField = {};
-
-				for (let j = 0; j< filterFieldDivRows[i].children.length; j++)
-				{
-					let filterColumn = filterFieldDivRows[i].children[j];
-					let filterColumnElement = filterColumn.children[0];
-
-					// If the first column then search for the fields dropdown
-					if (j == 0) filterColumnElement = filterColumnElement.querySelector('select[name=fieldName]');
-
-					// If the filter name is _not_ null and it is _not_ a new filter
-					if (filterColumnElement.name != null && filterColumnElement.name != FILTER_COMPONENT_NEW_FILTER)
-					{
-						// Condition
-						if (filterColumnElement.name == 'condition' && filterColumnElement.value == "")
-						{
-							alert("Please fill all the filter options");
-							return;
-						}
-
-						// Name
-						if (filterColumnElement.name == 'fieldName')
-						{
-							filterField.name = filterColumnElement.value;
-						}
-						// Operation
-						if (filterColumnElement.name == 'operation')
-						{
-							filterField.operation = filterColumnElement.value;
-						}
-						// Condition
-						if (filterColumnElement.name == 'condition')
-						{
-							filterField.condition = filterColumnElement.value;
-						}
-						// Option
-						if (filterColumnElement.name == 'option')
-						{
-							filterField.option = filterColumnElement.value;
-						}
-					}
-				}
-
-				if (Object.entries(filterField).length > 0) filterFields.push(filterField);
-			}
-
-			//
-			this.startFetchCmpt(
-				CoreFilterAPIs.applyFilterFields,
-				{
-					filterFields: filterFields
-				},
-				this.getFilter
-			);
-		},
-		/**
-		 *
-		 */
-		handlerChangeFilterField: function(oldValue, newValue) {
-
-			// If an old filter has been changed
-			if (oldValue != "")
-			{
-				for (let i = 0; i < this.filterFields.length; i++)
-				{
-					if (this.filterFields[i].name == oldValue)
-					{
-						this.filterFields.splice(i, 1);
-						break;
-					}
-				}
-			}
-
-			// Then add the new filter
-			for (let i = 0; i < this.datasetMetadata.length; i++)
-			{
-				if (this.datasetMetadata[i].name == newValue)
-				{
-					let filter = {
-						name: this.datasetMetadata[i].name,
-						type: this.datasetMetadata[i].type
-					};
-
-					this.filterFields.push(filter);
-					break;
-				}
-			}
-		},
-		/**
-		 *
-		 */
-		handlerAddNewFilter: function(event) {
-			// Adds a new empty filter
-			this.filterFields.push({
-				name: FILTER_COMPONENT_NEW_FILTER,
-				type: FILTER_COMPONENT_NEW_FILTER_TYPE
-			});
-		},
 		/*
 		 *
 		 */
-		handlerToggleSelectedField(field) {
-
-			// If it is a selected field
-			if (this.selectedFields.indexOf(field) != -1)
-			{
-				// then hide it
-				this.tabulator.hideColumn(field);
-				// and remove it from the this.selectedFields property
-				this.selectedFields.splice(this.selectedFields.indexOf(field), 1);
-			}
-			else // otherwise
-			{
-				// show it
-				this.tabulator.showColumn(field);
-				// and add it to the this.selectedFields property
-				this.selectedFields.push(field);
-			}
-		},
-		/**
-		 *
-		 */
-		handlerRemoveFilterField: function(event) {
-			//
-			this.startFetchCmpt(
-				CoreFilterAPIs.removeFilterField,
-				{
-					filterField: event.currentTarget.getAttribute('field-to-remove')
-				},
-				this.getFilter
-			);
-		},
-		/**
-		 *
-		 */
 		handlerGetFilterById: function(event) {
 
 			let filterId = null;
@@ -550,16 +468,37 @@ export const CoreFilterCmpt = {
 				filterId = attr.substring(1);
 			}
 
-			// Ajax call
+			this.switchFilter(filterId);
+		},
+		switchFilter(filterId) {
+			this.selectedFilter = filterId;
+			this.getFilter();
+		},
+		applyFilterConfig(filterFields) {
+			this.selectedFilter = null;
 			this.startFetchCmpt(
-				CoreFilterAPIs.getFilterById,
+				CoreFilterAPIs.applyFilterFields,
 				{
-					filterId: filterId
+					filterFields
 				},
-				this.render
+				this.getFilter
 			);
 		}
 	},
+	beforeCreate() {
+		if (!this.tableOnly == !this.filterType)
+			alert('You can not have a filter-type in table-only mode!');
+	},
+	created() {
+		if (this.sideMenu && (!this.$props.onNwNewEntry || !(this.$props.onNwNewEntry instanceof Function)))
+			alert('"nwNewEntry" listener is mandatory when sideMenu is true');
+		this.uuid = _uuid++;
+		if (!this.tableOnly)
+			this.getFilter(); // get the filter data
+	},
+	mounted() {
+		this.initTabulator();
+	},
 	template: `
 		<!-- Load filter data -->
 		<core-fetch-cmpt
@@ -580,178 +519,53 @@ export const CoreFilterCmpt = {
 
 		<div :id="'filterCollapsables' + idExtra">
 
-			<div class="filter-header-title">
-				<span v-if="!tableOnly" class="filter-header-title-span-filter">[ {{ filterName }} ]</span>
-				<span v-if="!tableOnly" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra" class="filter-header-title-span-icon fa-solid fa-filter fa-xl"></span>
-				<span data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra" class="filter-header-title-span-icon fa-solid fa-table-columns fa-xl"></span>
-			</div>
-
-			<div :id="'collapseColumns' + idExtra" class="card-body collapse" :data-bs-parent="'#filterCollapsables' + idExtra">
-				<div class="card">
-					<!-- Filter fields options -->
-					<div class="row card-body filter-options-div">
-						<div class="filter-fields-area">
-							<template v-for="fieldToDisplay in fields">
-								<div
-									class="filter-fields-field"
-									v-bind:class="selectedFields.indexOf(fieldToDisplay) != -1 ? 'text-light bg-dark' : '' "
-									@click="handlerToggleSelectedField(fieldToDisplay)"
-								>
-									{{ fieldNames[fieldToDisplay] || fieldToDisplay }}
-								</div>
-							</template>
-						</div>
-					</div>
+			<div class="d-flex flex-row justify-content-between flex-wrap">
+				<div v-if="newBtnShow || reload || $slots.actions" class="d-flex gap-2 align-items-baseline flex-wrap">
+					<button v-if="newBtnShow" class="btn btn-outline-secondary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
+						<span class="fa-solid fa-plus" aria-hidden="true"></span>
+						{{ newBtnLabel }}
+					</button>
+					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
+						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
+					</button>
+					<span v-if="$slots.actions && tabulatorHasSelector">Mit {{selectedData.length}} ausgewählten: </span>
+					<slot name="actions" v-bind="tabulatorHasSelector ? selectedData : []"></slot>
+				</div>
+				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
+					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
+					<a v-if="!tableOnly" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
+						<span class="fa-solid fa-xl fa-filter"></span>
+					</a>
+					<a href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
+						<span class="fa-solid fa-xl fa-table-columns"></span>
+					</a>
+					<table-download class="btn btn-link px-0 text-dark" :tabulator="tabulator" :config="download"></table-download>
 				</div>
 			</div>
 
-			<div v-if="!tableOnly" :id="'collapseFilters' + idExtra" class="card-body collapse" :data-bs-parent="'#filterCollapsables' + idExtra">
-				<div class="card">
-				<!-- Filter options -->
-					<div class="card-body" v-if="!sideMenu">
-						<select
-							class="form-select"
-							@change="handlerGetFilterById"
-						>
-							<option value="">Bitte auswählen...</option>
-							<template v-for="availableFilter in availableFilters">
-								<option v-bind:value="availableFilter.option">{{ availableFilter.description }}</option>
-							</template>
-						</select>
-					</div>
-					<div class="card-body filter-options-div">
-						<div>
-							<span>
-								Neuer Filter
-							</span>
-							<span>
-								<button class="btn btn-outline-dark" type="button" @click=handlerAddNewFilter>+</button>
-							</span>
-						</div>
-						<div :id="'filterFields' + idExtra" class="filter-filter-fields">
-							<template v-for="(filterField, index) in filterFields">
-								<div class="row">
+			<filter-columns
+				:id="'collapseColumns' + idExtra"
+				class="card-body collapse"
+				:data-bs-parent="'#filterCollapsables' + idExtra"
+				:fields="fieldIdsForVisibilty"
+				:selected="selectedFields"
+				:names="fieldNames"
+				@hide="tabulator.hideColumn($event)"
+				@show="tabulator.showColumn($event)"
+			></filter-columns>
 
-									<div class="col-5">
-										<div class="input-group">
-											<span class="input-group-text">Filter {{ index + 1 }}</span>
-											<select
-												class="form-select"
-												name="fieldName"
-												v-bind:value="filterField.name"
-												@change="handlerChangeFilterField(filterField.name, $event.target.value)"
-											>
-												<option value="">Feld zum Filter hinzufügen...</option>
-												<template v-for="columnAlias in filteredColumns">
-													<option v-bind:value="columnAlias.field">{{ columnAlias.title }}</option>
-												</template>
-											</select>
-										</div>
-									</div>
-
-									<!-- Numeric -->
-									<template
-										v-if="filterField.type.toLowerCase().indexOf('int') >= 0">
-										<div class="col-2">
-											<select class="form-select" name="operation" v-model="filterField.operation">
-												<option value="equal">Gleich</option>
-												<option value="nequal">Nicht gleich</option>
-												<option value="gt">Größer als</option>
-												<option value="lt">Weniger als</option>
-											</select>
-										</div>
-										<div class="col-3">
-											<input type="number" class="form-control" v-bind:value="filterField.condition" name="condition">
-										</div>
-										<div class="col">
-											<button
-												class="btn btn-outline-dark"
-												type="button"
-												v-bind:field-to-remove="filterField.name"
-												@click=handlerRemoveFilterField>
-												&emsp;X&emsp;
-											</button>
-										</div>
-									</template>
-
-									<!-- Text -->
-									<template
-										v-if="filterField.type.toLowerCase().indexOf('varchar') >= 0
-											|| filterField.type.toLowerCase().indexOf('text') >= 0
-											|| filterField.type.toLowerCase().indexOf('bpchar') >= 0">
-										<div class="col-2">
-											<select class="form-select" name="operation" v-model="filterField.operation">
-												<option value="equal">Gleich</option>
-												<option value="nequal">Nicht gleich</option>
-												<option value="contains">Enthält</option>
-												<option value="ncontains">Enthält nicht</option>
-											</select>
-										</div>
-										<div class="col-3">
-											<input type="text" class="form-control" v-bind:value="filterField.condition" name="condition">
-										</div>
-										<div class="col">
-											<button
-												class="btn btn-outline-dark"
-												type="button"
-												v-bind:field-to-remove="filterField.name"
-												@click=handlerRemoveFilterField>
-												&emsp;X&emsp;
-											</button>
-										</div>
-									</template>
-
-									<!-- Timestamp and date -->
-									<template
-										v-if="filterField.type.toLowerCase().indexOf('timestamp') >= 0
-											|| filterField.type.toLowerCase().indexOf('date') >= 0">
-										<div class="col-2">
-											<select class="form-select" name="operation" v-model="filterField.operation">
-												<option value="gt">Größer als</option>
-												<option value="lt">Weniger als</option>
-												<option value="set">Eingestellt ist</option>
-												<option value="nset">Eingestellt nicht ist</option>
-											</select>
-										</div>
-										<div class="col-1">
-											<input type="number" class="form-control" v-bind:value="filterField.condition" name="condition">
-										</div>
-										<div class="col-2">
-											<select class="form-select" name="option" v-model="filterField.option">
-												<option value="minutes">Minuten</option>
-												<option value="hours">Stunden</option>
-												<option value="days">Tage</option>
-												<option value="months">Monate</option>
-											</select>
-										</div>
-										<div class="col">
-											<button
-												class="btn btn-outline-dark"
-												type="button"
-												v-bind:field-to-remove="filterField.name"
-												@click=handlerRemoveFilterField
-											> - </button>
-										</div>
-									</template>
-								</div>
-							</template>
-						</div>
-
-						<!-- Filter save options -->
-						<div class="row">
-							<div class="col-7">
-								<div class="input-group">
-									<input ref="customFilterName" type="text" class="form-control" placeholder="Filternamen eingeben..." :id="'customFilterName' + idExtra">
-									<button type="button" class="btn btn-outline-secondary" @click=handlerSaveCustomFilter>Filter speichern</button>
-								</div>
-							</div>
-							<div class="col">
-								<button type="button" class="btn btn-outline-dark" @click=handlerApplyFilterFields>Filter anwenden</button>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
+			<filter-config
+				v-if="!tableOnly"
+				:id="'collapseFilters' + idExtra"
+				class="card-body collapse"
+				:data-bs-parent="'#filterCollapsables' + idExtra"
+				:filters="!sideMenu ? (availableFilters || []) : []"
+				:columns="columnsForFilter"
+				:fields="filterFields || []"
+				@switch-filter="switchFilter"
+				@apply-filter-config="applyFilterConfig"
+				@save-custom-filter="handlerSaveCustomFilter"
+			></filter-config>
 		</div>
 
 		<!-- Tabulator -->
diff --git a/public/js/components/filter/Filter/Columns.js b/public/js/components/filter/Filter/Columns.js
new file mode 100644
index 000000000..47d66d5f1
--- /dev/null
+++ b/public/js/components/filter/Filter/Columns.js
@@ -0,0 +1,78 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *
+ */
+export default {
+	props: {
+		fields: Array,
+		selected: {
+			type: Array,
+			default: []
+		},
+		names: {
+			type: Array,
+			default: []
+		}
+	},
+	emits: {
+		hide: ['fieldName'],
+		show: ['fieldName']
+	},
+	data: function() {
+		return {
+			selectedFields: []
+		};
+	},
+	watch: {
+		selected(n) {
+			this.selectedFields = n;
+		}
+	},
+	methods: {
+		toggle(field) {
+			if (this.selectedFields.indexOf(field) != -1)
+			{
+				this.selectedFields.splice(this.selectedFields.indexOf(field), 1);
+				this.$emit('hide', field);
+			}
+			else
+			{
+				this.selectedFields.push(field);
+				this.$emit('show', field);
+			}
+		}
+	},
+	template: `
+	<div class="filter-columns">
+		<div class="card">
+			<div class="d-flex flex-wrap gap-2 p-3 justify-content-center">
+				<div
+					v-for="fieldToDisplay in fields"
+					class="btn"
+					:class="selectedFields.indexOf(fieldToDisplay) != -1 ? 'btn-dark' : 'btn-outline-dark' "
+					@click="toggle(fieldToDisplay)"
+				>
+					{{ names[fieldToDisplay] || fieldToDisplay }}
+				</div>
+			</div>
+		</div>
+	</div>
+	`
+};
+
diff --git a/public/js/components/filter/Filter/Config.js b/public/js/components/filter/Filter/Config.js
new file mode 100644
index 000000000..3c75c5a3c
--- /dev/null
+++ b/public/js/components/filter/Filter/Config.js
@@ -0,0 +1,215 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+const FILTER_COMPONENT_NEW_FILTER = 'Filter Component New Filter';
+
+/**
+ *
+ */
+export default {
+	props: {
+		filters: {
+			type: Array,
+			default: []
+		},
+		columns: {
+			type: Array,
+			default: []
+		},
+		fields: {
+			type: Array,
+			default: []
+		}
+	},
+	emits: {
+		switchFilter: ['filterId'],
+		applyFilterConfig: ['filterFields'],
+		saveCustomFilter: ['customFilterName']
+	},
+	data: function() {
+		return {
+			currentFields: []
+		};
+	},
+	computed: {
+		types() {
+			return this.columns.reduce((a,c) => {
+				let type = c.type.toLowerCase();
+				if (type.indexOf('int') >= 0)
+					a[c.name] = 'Numeric';
+				else if (
+					type.indexOf('varchar') >= 0 || 
+					type.indexOf('text') >= 0 || 
+					type.indexOf('bpchar') >= 0
+				)
+					a[c.name] = 'Text';
+				else if (
+					type.indexOf('timestamp') >= 0 || 
+					type.indexOf('date') >= 0
+				)
+					a[c.name] = 'Date';
+				else
+					a[c.name] = '';
+				return a;
+			}, {});
+		}
+	},
+	watch: {
+		fields(n) {
+			this.currentFields = n;
+		}
+	},
+	methods: {
+		switchFilter(evt) {
+			this.$emit('switchFilter', evt.currentTarget.value);
+		},
+		applyFilterConfig() {
+			const filteredFields = this.currentFields.filter(el => el.name != FILTER_COMPONENT_NEW_FILTER);
+			if (filteredFields.filter(el => el.condition == "").length)
+				alert("Please fill all the filter options");
+			else
+				this.$emit('applyFilterConfig', filteredFields);
+		},
+		addField(evt) {
+			this.currentFields.push({
+				name: FILTER_COMPONENT_NEW_FILTER
+			});
+		},
+		removeField(index) {
+			this.currentFields.splice(index, 1);
+		}
+	},
+	template: `
+	<div class="filter-config">
+		<div class="card">
+			<div class="card-body">
+				<div v-if="filters.length" class="mb-4">
+					<select class="form-select" @change="switchFilter">
+						<option value="">Bitte auswählen...</option>
+						<option v-for="filter in filters" :value="filter.id">
+							{{ filter.description }}
+						</option>
+					</select>
+				</div>
+				<div>
+					<button class="btn btn-outline-dark" type="button" @click=addField>
+						<span class="fa-solid fa-plus" aria-hidden="true"></span> Neuer Filter
+					</button>
+				</div>
+				<div class="filter-config-fields my-3">
+					<div v-for="(filterField, index) in currentFields" class="filter-config-field row">
+
+						<div class="col-5">
+							<div class="input-group">
+								<span class="input-group-text">Filter {{ index + 1 }}</span>
+								<select
+									class="form-select"
+									v-model="filterField.name"
+								>
+									<option value="">Feld zum Filter hinzufügen...</option>
+									<option v-for="col in columns" :value="col.name">
+										{{ col.title }}
+									</option>
+								</select>
+							</div>
+						</div>
+
+						<!-- Numeric -->
+						<template v-if="types[filterField.name] == 'Numeric'">
+							<div class="col-2">
+								<select class="form-select" v-model="filterField.operation">
+									<option value="equal">Gleich</option>
+									<option value="nequal">Nicht gleich</option>
+									<option value="gt">Größer als</option>
+									<option value="lt">Weniger als</option>
+								</select>
+							</div>
+							<div class="col-3">
+								<input type="number" class="form-control" v-model="filterField.condition">
+							</div>
+						</template>
+
+						<!-- Text -->
+						<template v-if="types[filterField.name] == 'Text'">
+							<div class="col-2">
+								<select class="form-select" v-model="filterField.operation">
+									<option value="equal">Gleich</option>
+									<option value="nequal">Nicht gleich</option>
+									<option value="contains">Enthält</option>
+									<option value="ncontains">Enthält nicht</option>
+								</select>
+							</div>
+							<div class="col-3">
+								<input type="text" class="form-control" v-model="filterField.condition">
+							</div>
+						</template>
+
+						<!-- Timestamp and date -->
+						<template v-if="types[filterField.name] == 'Date'">
+							<div class="col-2">
+								<select class="form-select" v-model="filterField.operation">
+									<option value="gt">Größer als</option>
+									<option value="lt">Weniger als</option>
+									<option value="set">Eingestellt ist</option>
+									<option value="nset">Eingestellt nicht ist</option>
+								</select>
+							</div>
+							<div class="col-1">
+								<input type="number" class="form-control" v-model="filterField.condition">
+							</div>
+							<div class="col-2">
+								<select class="form-select" v-model="filterField.option">
+									<option value="minutes">Minuten</option>
+									<option value="hours">Stunden</option>
+									<option value="days">Tage</option>
+									<option value="months">Monate</option>
+								</select>
+							</div>
+						</template>
+
+						<div class="col text-end">
+							<button
+								class="btn btn-outline-dark"
+								type="button"
+								@click="removeField(index)"
+								title="Filter entfernen"
+								aria-title="Filter entfernen"
+							>
+								<span class="fa-solid fa-minus" aria-hidden="true"></span>
+							</button>
+						</div>
+					</div>
+				</div>
+
+				<!-- Filter save options -->
+				<div class="row">
+					<div class="col-7">
+						<div class="input-group">
+							<input ref="filterName" type="text" class="form-control" placeholder="Filternamen eingeben...">
+							<button type="button" class="btn btn-outline-secondary" @click="$emit('saveCustomFilter', $refs.filterName.value)">Filter speichern</button>
+						</div>
+					</div>
+					<div class="col">
+						<button type="button" class="btn btn-outline-dark" @click="applyFilterConfig">Filter anwenden</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	`
+};
+
diff --git a/public/js/components/filter/Table/Download.js b/public/js/components/filter/Table/Download.js
new file mode 100644
index 000000000..057fdad5e
--- /dev/null
+++ b/public/js/components/filter/Table/Download.js
@@ -0,0 +1,247 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+const DEFAULT_ICONS = {
+	jsonLines: 'fa-file-lines',
+	xlsx: 'fa-file-excel',
+	pdf: 'fa-file-pdf',
+	html: 'fa-file-code',
+	json: 'fa-file',
+	csv: 'fa-file-csv'
+};
+const DEFAULT_LABELS = {
+	jsonLines: 'Download as JSONLINES',
+	xlsx: 'Download as XLSX',
+	pdf: 'Download as PDF',
+	html: 'Download as HTML',
+	json: 'Download as JSON',
+	csv: 'Download as CSV '
+};
+
+
+/**
+ *
+ */
+export default {
+	props: {
+		tabulator: Object,
+		config: {
+			type: [Boolean, String, Function, Array, Object],
+			default: false
+		},
+		iconClass: [String, Array, Object]
+	},
+	computed: {
+		currentConfig() {
+			if (!this.config)
+				return false;
+
+			let config = this.config;
+
+			if (config instanceof Function)
+				return [config];
+
+			if (config === null)
+				return [];
+
+			if (this.config === true)
+				config = ['csv'];
+
+			if (Object.prototype.toString.call(config) === "[object String]")
+				config = config.split(',');
+
+			if (typeof config === 'object' && !Array.isArray(config)) {
+				let newConfig = [];
+				for (var k in config) {
+					var v = config[k], type;
+					
+					if (!v)
+						continue;
+					
+					if (Object.prototype.toString.call(v) === "[object String]") {
+						type = this.stringToFileFormatter(v);
+						if (type !== null) {
+							newConfig.push({
+								icon: 'fa-solid ' + DEFAULT_ICONS[type],
+								label: v === k ? DEFAULT_LABELS[type] : k,
+								formatter: type
+							});
+						} else {
+							type = this.stringToFileFormatter(k);
+							if(type !== null) {
+								newConfig.push({
+									icon: 'fa-solid ' + DEFAULT_ICONS[type],
+									label: v,
+									formatter: type
+								});
+							} else {
+								alert('neither ' + k + ' nor ' + v + ' are supported download file types');
+							}
+						}
+					} else if (typeof v === 'object' && !Array.isArray(v)) {
+						type = this.stringToFileFormatter(k);
+						if (type !== null) {
+							if (v.formatter === undefined)
+								v.formatter = type;
+							if (v.label === undefined)
+								v.label = DEFAULT_LABELS[type];
+							if (v.icon === undefined)
+								v.icon = DEFAULT_ICONS[type];
+							newConfig.push(v);
+						} else {
+							if (v.label === undefined)
+								v.label = k;
+							newConfig.push(v);
+						}
+					} else {
+						type = this.stringToFileFormatter(k);
+						if (type !== null) {
+							newConfig.push({
+								icon: 'fa-solid ' + DEFAULT_ICONS[type],
+								label: DEFAULT_LABELS[type],
+								formatter: type
+							});
+						} else {
+							alert(k + ' is not a supported download file type');
+						}
+					}
+				}
+				config = newConfig;
+			}
+
+			if (Array.isArray(config))
+			{
+				config = config.map(el => {
+					if (Object.prototype.toString.call(el) === "[object String]") {
+						let formatter = this.stringToFileFormatter(el);
+						if (formatter === null)
+							return null;
+						return {
+							icon: 'fa-solid ' + DEFAULT_ICONS[formatter],
+							label: DEFAULT_LABELS[formatter],
+							formatter
+						};
+					}
+					
+					if (el instanceof Function)
+						return {
+							formatter: el
+						}
+					
+					if (typeof el === 'object' && !Array.isArray(el) && el !== null) {
+						if (el.formatter instanceof Function)
+							return el;
+						if (this.validateFileFormatter(el.formatter))
+							return el;
+					}
+					
+					return null;
+				}).filter(el => el !== null);
+
+				if (config.length < 2)
+					return config;
+
+				if (config.filter(el => el.label || el.icon).length == config.length)
+					return config;
+
+				alert('Config not valid');
+			}
+
+			return [];
+		}
+	},
+	methods: {
+		stringToFileFormatter(input) {
+			let lcInput = input.toLowerCase();
+			
+			if (lcInput == 'jsonlines')
+				return 'jsonLines';
+			
+			if (['xlsx', 'pdf', 'html', 'json', 'csv'].includes(lcInput))
+				return lcInput;
+
+			return null;
+		},
+		validateFileFormatter(input) {
+			let formatter = this.stringToFileFormatter(input);
+			if (!formatter) {
+				alert(input + ' is not a supported file formatter');
+				return false;
+			}
+			if (formatter == 'xlsx') {
+				if (!window.XLSX) {
+					alert('XLSX Library not loaded');
+					return false;
+				}
+			}
+			if (formatter == 'pdf') {
+				if (!window.jspdf) {
+					alert('jsPDF Library not loaded');
+					return false;
+				}
+				var doc = new jspdf.jsPDF({});
+				if (!doc.autoTable) {
+					alert('jsPDF-AutoTable Plugin not loaded');
+					return false;
+				}
+			}
+			return true;
+		},
+		download(config) {
+			this.tabulator.download(config.formatter, config.file, config.options)
+		}
+	},
+	template: `
+	<template v-if="currentConfig">
+		<template v-if="currentConfig.length == 1">
+			<a
+				href="#"
+				class="table-download"
+				v-bind="$attrs"
+				title="Download"
+				aria-title="Download"
+				@click.prevent="download(currentConfig[0])"
+			>
+				<span :class="iconClass || 'fa-solid fa-xl fa-download'" aria-hidden="true"></span>
+			</a>
+		</template>
+		<div v-else class="dropdown d-inline">
+			<a
+				href="#"
+				class="table-download"
+				v-bind="$attrs"
+				title="Download"
+				aria-title="Download"
+				role="button"
+				data-bs-toggle="dropdown"
+				aria-expanded="false"
+			>
+				<span :class="iconClass || 'fa-solid fa-xl fa-download'" aria-hidden="true"></span>
+			</a>
+			<ul class="dropdown-menu dropdown-menu-end">
+				<li v-for="(conf, i) in currentConfig" :key="i">
+					<a class="dropdown-item" href="#" @click.prevent="download(conf)">
+						<span v-if="conf.icon" :class="conf.icon" aria-hidden="true"></span>
+						{{conf.label}}
+					</a>
+				</li>
+			</ul>
+		</div>
+	</template>
+	`
+};
+
diff --git a/public/js/components/vueDatepicker.js.php b/public/js/components/vueDatepicker.js.php
index e0814ac53..ad9053248 100644
--- a/public/js/components/vueDatepicker.js.php
+++ b/public/js/components/vueDatepicker.js.php
@@ -1,9 +1,9 @@
 <?php
 
-if(file_exists("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js"))
+if(file_exists("../../../vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js"))
 {
 	header('Content-Type: application/javascript');
-	echo file_get_contents("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js");
+	echo file_get_contents("../../../vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js");
 	echo "export default VueDatePicker";
 }
 else
diff --git a/public/js/infocenter/messageList.js b/public/js/infocenter/messageList.js
index 6146c7639..f6eb6218a 100644
--- a/public/js/infocenter/messageList.js
+++ b/public/js/infocenter/messageList.js
@@ -15,6 +15,7 @@ var MessageList = {
 			statusbar: false,
 			plugins: "autoresize",
 			autoresize_bottom_margin: 10,
+			max_height:495,
 			autoresize_min_height: 140,
 			autoresize_max_height: 495,
 			//callback to avoid conflict with ajax (for getting body of first message)
diff --git a/public/js/messaging/fasMessageWrite.js b/public/js/messaging/fasMessageWrite.js
new file mode 100644
index 000000000..ee480eb31
--- /dev/null
+++ b/public/js/messaging/fasMessageWrite.js
@@ -0,0 +1,154 @@
+// ********************************************************
+// JS used by view system/messages/htmlWriteTemplate
+// ********************************************************
+
+function tinymcePreviewSetContent()
+{
+	if ($("#tinymcePreview"))
+	{
+		if ($("#recipients").children(":selected").val() > -1)
+		{
+			parseMessageText($("#recipients").children(":selected").val(), tinyMCE.get("bodyTextArea").getContent());
+		}
+		else
+		{
+			tinyMCE.get("tinymcePreview").setContent("");
+		}
+	}
+}
+
+function parseMessageText(receiver_id, text)
+{
+	FHC_AjaxClient.ajaxCallPost(
+		"system/messages/Messages/parseMessageText",
+		{
+			receiver_id: receiver_id,
+			text: text,
+			type: $("#type").val()
+		},
+		{
+			successCallback: function(data, textStatus, jqXHR) {
+
+				if (FHC_AjaxClient.hasData(data))
+				{
+					tinyMCE.get("tinymcePreview").setContent(FHC_AjaxClient.getData(data));
+				}
+				else if (FHC_AjaxClient.isError(data))
+				{
+					FHC_DialogLib.alertError(data.retval);
+				}
+			}
+		}
+	);
+}
+
+$(document).ready(function ()
+{
+
+	tinymce.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: "bodyTextArea",
+		theme_advanced_buttons2: "undo, redo, outdent, indent, bullist, numlist, link",
+		theme_advanced_buttons3: "",
+		theme_advanced_buttons4: "",
+		theme_advanced_toolbar_location: "top",
+		height: "400px",
+	});
+
+	tinymce.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: "tinymcePreview",
+		height: 400,
+		readonly: 1,
+	});
+
+	if ($("#variables"))
+	{
+		$("#variables").dblclick(function ()
+		{
+			if ($("#bodyTextArea"))
+			{
+				//if editor active add at cursor position, otherwise at end
+				if (tinymce.activeEditor.id === "bodyTextArea")
+					tinymce.activeEditor.execCommand('mceInsertContent', false, $(this).children(":selected").val());
+				else
+					tinyMCE.get("bodyTextArea").setContent(tinyMCE.get("bodyTextArea").getContent() + $(this).children(":selected").val());
+			}
+		});
+	}
+
+	if ($("#user_fields"))
+	{
+		$("#user_fields").dblclick(function ()
+		{
+			if ($("#bodyTextArea"))
+			{
+				//if editor active add at cursor position, otherwise at end
+				if (tinymce.activeEditor.id === "bodyTextArea")
+					tinymce.activeEditor.execCommand('mceInsertContent', false, $(this).children(":selected").val());
+				else
+					tinyMCE.get("bodyTextArea").setContent(tinyMCE.get("bodyTextArea").getContent() + $(this).children(":selected").val());
+			}
+		});
+	}
+
+	if ($("#recipients"))
+	{
+		$("#recipients").change(tinymcePreviewSetContent);
+	}
+
+	if ($("#refresh"))
+	{
+		$("#refresh").click(tinymcePreviewSetContent);
+	}
+
+	if ($("#sendButton") && $("#sendForm"))
+	{
+		$("#sendButton").click(function ()
+		{
+			if ($("#subject") && $("#subject").val() != '' && tinyMCE.get("bodyTextArea").getContent() != '')
+			{
+				$("#sendForm").submit();
+			}
+			else
+			{
+				FHC_DialogLib.alertInfo("Subject and text are required fields!");
+			}
+		});
+	}
+
+	if ($("#vorlageDnD"))
+	{
+		$("#vorlageDnD").change(function ()
+		{
+			var vorlage_kurzbz = this.value;
+
+			if (vorlage_kurzbz != '')
+			{
+				FHC_AjaxClient.ajaxCallGet(
+					"system/messages/Messages/getVorlage",
+					{
+						vorlage_kurzbz: vorlage_kurzbz
+					},
+					{
+						successCallback: function(data, textStatus, jqXHR) {
+
+							if (FHC_AjaxClient.hasData(data))
+							{
+								var msg = FHC_AjaxClient.getData(data);
+
+								tinyMCE.get("bodyTextArea").setContent(msg[0].text);
+								$("#subject").val(msg[0].subject);
+							}
+						}
+					}
+				);
+			}
+		});
+	}
+
+	$("#subject").focus();
+
+});
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
index 8b1d73bdf..5132c0b7f 100644
--- a/public/js/messaging/messageWrite.js
+++ b/public/js/messaging/messageWrite.js
@@ -42,11 +42,14 @@ function parseMessageText(receiver_id, text)
 	);
 }
 
-$(document).ready(function ()
-{
+$(document).ready(function () {
+
 	tinymce.init({
 		selector: "#bodyTextArea",
-		plugins: "autoresize",
+		plugins: "link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		min_height: 400,
+		max_height: 700,
 		autoresize_on_init: false,
 		autoresize_min_height: 400,
 		autoresize_max_height: 400,
@@ -60,7 +63,14 @@ $(document).ready(function ()
 		menubar: false,
 		toolbar: false,
 		statusbar: false,
-		readonly: 1
+		readonly: 1,
+		min_height: 400,
+		max_height: 700,
+		autoresize_on_init: false,
+		autoresize_min_height: 400,
+		autoresize_max_height: 700,
+		autoresize_bottom_margin: 10,
+		auto_focus: "bodyTextArea"
 	});
 
 	if ($("#variables"))
diff --git a/public/js/messaging/messageWriteReply.js b/public/js/messaging/messageWriteReply.js
index c6401ded2..318a83280 100644
--- a/public/js/messaging/messageWriteReply.js
+++ b/public/js/messaging/messageWriteReply.js
@@ -6,7 +6,9 @@ $(document).ready(function ()
 {
 	tinymce.init({
 		selector: "#bodyTextArea",
-		plugins: "autoresize",
+		plugins: "autoresize, link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		max_height: 600,
 		autoresize_min_height: 150,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10,
diff --git a/public/js/messaging/read.js b/public/js/messaging/read.js
index b4b1573a2..d38365467 100644
--- a/public/js/messaging/read.js
+++ b/public/js/messaging/read.js
@@ -220,6 +220,7 @@ $(document).ready(function () {
 		statusbar: false,
 		readonly: 1,
 		autoresize_min_height: 300,
+		max_height: 600,
 		autoresize_bottom_margin: 0
 	});
 
diff --git a/public/js/messaging/write.js b/public/js/messaging/write.js
index 1370fb2e0..46336b8eb 100644
--- a/public/js/messaging/write.js
+++ b/public/js/messaging/write.js
@@ -62,8 +62,11 @@ $(document).ready(function () {
 	//
 	tinymce.init({
 		selector: "#body",
-		plugins: "autoresize",
-		autoresize_min_height: 150,
+		plugins: "autoresize, link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		min_height: 300,
+		max_height: 600,
+		autoresize_min_height: 300,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10
 	});
diff --git a/public/js/messaging/writeReply.js b/public/js/messaging/writeReply.js
index c78748889..df195d20f 100644
--- a/public/js/messaging/writeReply.js
+++ b/public/js/messaging/writeReply.js
@@ -37,7 +37,9 @@ $(document).ready(function () {
 	//
 	tinymce.init({
 		selector: "#body",
-		plugins: "autoresize",
+		plugins: "autoresize, link",
+		toolbar: "undo redo | presentation | bold italic | link | alignleft aligncenter alignright alignjustify | outdent indent",
+		max_height: 600,
 		autoresize_min_height: 150,
 		autoresize_max_height: 600,
 		autoresize_bottom_margin: 10
diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index bf11f8435..6c27f87bb 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -59,13 +59,18 @@ const phrasen = {
 			return '';
 		}
 		if (!categories[category]) {
-
-			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined)
-				categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+			
+			var initialval = '';
+  			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) {
+  				var tmp_category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+				if(tmp_category[phrase] !== undefined ) {
+					initialval = tmp_category[phrase];
+				}
+			}
 			
 			if (!categories[category] || Object.keys(categories[category]).length === 0) {
 				categories[category] = undefined;
-				let val = Vue.ref('');
+				let val = Vue.ref(initialval);
 				loadLazy(category, val, phrase, params);
 				return val;
 			}
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
new file mode 100644
index 000000000..162dc2179
--- /dev/null
+++ b/public/js/plugin/Phrasen.js
@@ -0,0 +1,67 @@
+const categories = Vue.reactive({});
+const loadingModules = {};
+
+function extractCategory(obj, category) {
+	return obj.filter(e => e.category == category).reduce((res, elem) => {
+		if (!res[elem.phrase])
+			res[elem.phrase] = elem.text;
+		return res;
+	}, {});
+}
+function getValueForLoadedPhrase(category, phrase, params) {
+	let result = categories[category][phrase];
+	if (!result)
+		return '<< PHRASE ' + phrase + '>>';
+	if (params)
+		result = result.replace(/\{([^}]*)\}/g, (match, p1) => params[p1] === undefined ? match : params[p1]);
+	return result;
+}
+
+
+const phrasen = {
+	loadCategory(category) {
+		if (Array.isArray(category))
+			return Promise.all(category.map(cat => this.loadCategory(cat)));
+		if (!loadingModules[category])
+			loadingModules[category] = axios
+				.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Phrasen/loadModule/' + category)
+				.then(res => {
+					if (res.data.retval)
+						categories[category] = extractCategory(res.data.retval, category);
+					else
+						categories[category] = {};
+				});
+		return loadingModules[category];
+	},
+	t_ref(category, phrase, params) {
+		console.warn('depricated');
+		return Vue.computed(() => this.t(category, phrase, params));
+	},
+	t(category, phrase, params) {
+		if (params === undefined && (
+			(Array.isArray(category) && category.length == 2) ||
+			(category.split && category.split('/').length == 2))
+			) {
+			params = phrase;
+			[category, phrase] = category.split ? category.split('/') : category;
+		}
+		if (phrase === undefined) {
+			console.error('invalid input', category, phrase, params);
+			return '';
+		}
+		let val = Vue.computed(() => {
+			if (!categories[category])
+				return '';
+			return getValueForLoadedPhrase(category, phrase, params);
+		});
+		if (!categories[category])
+			this.loadCategory(category);
+		return val.value;
+	}
+};
+
+export default {
+	install(app, options) {
+		app.config.globalProperties.$p = phrasen;
+	}
+}
diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
index dc59b57a0..515b1809a 100644
--- a/rdf/AntragAbmeldung.xml.php
+++ b/rdf/AntragAbmeldung.xml.php
@@ -14,7 +14,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$id = $_GET['id'];
 
 		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
-					AND campus.tbl_studierendenantrag.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+					AND a.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) = 'Genehmigt';";
 		$not_found_error = 'Studierendenantrag not found'. $id;
 	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
 		$uid = $_GET['uid'];
@@ -25,8 +25,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$prestudent_id = explode(';', $prestudent_id);
 		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
 
-		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
-					AND campus.tbl_studierendenantrag.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+		$where = " WHERE  a.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
+					AND a.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) = 'Genehmigt';";
 		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
 	} else
 		die('<error>wrong parameters</error>');
@@ -36,15 +36,17 @@ else
 
 
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
+	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(a.prestudent_id, NULL) AS semester, a.grund
 	FROM
-	campus.tbl_studierendenantrag
+	campus.tbl_studierendenantrag a
 	JOIN public.tbl_student USING (prestudent_id)
 	JOIN public.tbl_benutzer ON tbl_student.student_uid=uid
 	JOIN public.tbl_person USING (person_id)
-	JOIN public.tbl_studiengang USING (studiengang_kz)
+	JOIN public.tbl_studiengang stg USING (studiengang_kz)
 	JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
-	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = tbl_studiengang.orgform_kurzbz)" . $where;
+	LEFT JOIN public.tbl_prestudentstatus pss ON (pss.prestudent_id = a.prestudent_id AND pss.studiensemester_kurzbz=a.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(a.prestudent_id, a.studiensemester_kurzbz))
+	LEFT JOIN lehre.tbl_studienplan plan USING (studienplan_id)
+	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, stg.orgform_kurzbz))" . $where;
 
 
 if (!$db->db_query($query) || !$db->db_num_rows())
@@ -55,7 +57,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
 	<antrag>
-        <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+        <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
         <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
         <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
         <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
index 55d940457..4511be232 100644
--- a/rdf/AntragAbmeldungStgl.xml.php
+++ b/rdf/AntragAbmeldungStgl.xml.php
@@ -14,7 +14,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$id = $_GET['id'];
 
 		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
-					AND campus.tbl_studierendenantrag.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
+					AND a.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
 		$not_found_error = 'Studierendenantrag not found'. $id;
 	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
 		$uid = $_GET['uid'];
@@ -25,8 +25,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$prestudent_id = explode(';', $prestudent_id);
 		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
 
-		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
-					AND campus.tbl_studierendenantrag.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
+		$where = " WHERE  a.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
+					AND a.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
 		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
 	} else
 		die('<error>wrong parameters</error>');
@@ -36,15 +36,17 @@ else
 
 
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
+	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(a.prestudent_id, NULL) AS semester, a.grund
 	FROM
-	campus.tbl_studierendenantrag
+	campus.tbl_studierendenantrag a
 	JOIN public.tbl_student USING (prestudent_id)
 	JOIN public.tbl_benutzer ON tbl_student.student_uid=uid
 	JOIN public.tbl_person USING (person_id)
-	JOIN public.tbl_studiengang USING (studiengang_kz)
+	JOIN public.tbl_studiengang stg USING (studiengang_kz)
 	JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
-	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = tbl_studiengang.orgform_kurzbz)" . $where;
+	LEFT JOIN public.tbl_prestudentstatus pss ON (pss.prestudent_id = a.prestudent_id AND pss.studiensemester_kurzbz=a.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(a.prestudent_id, a.studiensemester_kurzbz))
+	LEFT JOIN lehre.tbl_studienplan plan USING (studienplan_id)
+	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, stg.orgform_kurzbz))" . $where;
 
 
 if (!$db->db_query($query) || !$db->db_num_rows())
@@ -55,7 +57,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
         <antrag>
-            <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+            <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
             <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
             <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
             <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
index 6945f66ef..ff3e68afa 100644
--- a/rdf/AntragUnterbrechung.xml.php
+++ b/rdf/AntragUnterbrechung.xml.php
@@ -15,7 +15,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$id = $_GET['id'];
 
 		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
-					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
+					AND a.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
 		$not_found_error = 'Studierendenantrag not found'. $id;
 	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
 		$uid = $_GET['uid'];
@@ -26,8 +26,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$prestudent_id = explode(';', $prestudent_id);
 		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
 
-		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
-					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
+		$where = " WHERE  a.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
+					AND a.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(a.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
 		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
 	} else
 		die('<error>wrong parameters</error>');
@@ -37,15 +37,17 @@ else
 
 
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund, datum_wiedereinstieg, datum
+	SELECT stg.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, a.studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(a.prestudent_id, NULL) AS semester, a.grund, datum_wiedereinstieg, a.datum
 	FROM
-	campus.tbl_studierendenantrag
+	campus.tbl_studierendenantrag a
 	JOIN public.tbl_student USING (prestudent_id)
 	JOIN public.tbl_benutzer ON tbl_student.student_uid=uid
 	JOIN public.tbl_person USING (person_id)
-	JOIN public.tbl_studiengang USING (studiengang_kz)
+	JOIN public.tbl_studiengang stg USING (studiengang_kz)
 	JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
-	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = tbl_studiengang.orgform_kurzbz)" . $where;
+	LEFT JOIN public.tbl_prestudentstatus pss ON (pss.prestudent_id = a.prestudent_id AND pss.studiensemester_kurzbz=a.studiensemester_kurzbz AND pss.status_kurzbz=get_rolle_prestudent(a.prestudent_id, a.studiensemester_kurzbz))
+	LEFT JOIN lehre.tbl_studienplan plan USING (studienplan_id)
+	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz, stg.orgform_kurzbz))" . $where;
 
 
 if (!$db->db_query($query) || !$db->db_num_rows())
@@ -56,7 +58,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
 	<antrag>
-        <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+        <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
         <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
         <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
         <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
diff --git a/rdf/adresse.rdf.php b/rdf/adresse.rdf.php
index ac557fb98..fd6a76d19 100644
--- a/rdf/adresse.rdf.php
+++ b/rdf/adresse.rdf.php
@@ -100,7 +100,7 @@ function draw_rdf($row)
             <ADRESSE:gemeinde><![CDATA['.$row->gemeinde.']]></ADRESSE:gemeinde>
             <ADRESSE:nation><![CDATA['.$row->nation.']]></ADRESSE:nation>
             <ADRESSE:typ><![CDATA['.$row->typ.']]></ADRESSE:typ>
-            <ADRESSE:typ_name><![CDATA['.$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE].']]></ADRESSE:typ_name>
+            <ADRESSE:typ_name><![CDATA['.(isset($row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE])?$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE]:'').']]></ADRESSE:typ_name>
             <ADRESSE:heimatadresse><![CDATA['.($row->heimatadresse?'Ja':'Nein').']]></ADRESSE:heimatadresse>
             <ADRESSE:zustelladresse><![CDATA['.($row->zustelladresse?'Ja':'Nein').']]></ADRESSE:zustelladresse>
             <ADRESSE:co_name><![CDATA['. $row->co_name.']]></ADRESSE:co_name>
diff --git a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
index e065925e7..9696978b3 100644
--- a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
+++ b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
@@ -52,7 +52,7 @@ function breaktext($text, $zeichen)
 	$arr = explode(' ',$text);
 	$ret = '';
 	$teilstring='';
-	
+
 	foreach($arr as $elem)
 	{
 		if(strlen($teilstring.$elem)>$zeichen)
@@ -60,7 +60,7 @@ function breaktext($text, $zeichen)
 			$ret.=' '.$teilstring.'\n';
 			$teilstring=$elem;
 		}
-		else 
+		else
 			$teilstring .=' '.$elem;
 	}
 	$ret.=$teilstring;
@@ -72,9 +72,9 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 
 	if(isset($_GET['uid']))
 		$uid = $_GET['uid'];
-	else 
+	else
 		$uid = null;
-	
+
 	$uid_arr = explode(";",$uid);
 
 	if ($uid_arr[0] == "")
@@ -82,61 +82,61 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		unset($uid_arr[0]);
 		$uid_arr = array_values($uid_arr);
 	}
-	
+
 	$note_arr = array();
 	$note = new note();
 	$note->getAll($offiziell = true);
 	foreach ($note->result as $n){
 		$note_arr[$n->note] = $n->anmerkung;
-		$note_bezeichnung_arr[$n->note] = $n->bezeichnung;	
-	
+		$note_bezeichnung_arr[$n->note] = $n->bezeichnung;
+
 	}
 	if(isset($_GET['ss']))
 		$studiensemester_kurzbz = $_GET['ss'];
-	else 
+	else
 		die('Studiensemester muss uebergeben werden');
 
 	if(isset($_GET['lvid']))
 		$lehrveranstaltung_id = $_GET['lvid'];
-	else 
+	else
 		$lehrveranstaltung_id = 0;
-	
+
 	//Daten holen
 
-	$lqry = "SELECT 
-				tbl_person.titelpre, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpost 
-			FROM 
-				public.tbl_benutzer JOIN public.tbl_person using (person_id) 
-			WHERE 
-				tbl_benutzer.uid = (SELECT 
-										tbl_lehreinheitmitarbeiter.mitarbeiter_uid 
-									FROM 
-										lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehrfunktion USING(lehrfunktion_kurzbz), 
-										lehre.tbl_lehreinheit JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id) 
-									WHERE 
+	$lqry = "SELECT
+				tbl_person.titelpre, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpost
+			FROM
+				public.tbl_benutzer JOIN public.tbl_person using (person_id)
+			WHERE
+				tbl_benutzer.uid = (SELECT
+										tbl_lehreinheitmitarbeiter.mitarbeiter_uid
+									FROM
+										lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehrfunktion USING(lehrfunktion_kurzbz),
+										lehre.tbl_lehreinheit JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+									WHERE
 										tbl_lehreinheitmitarbeiter.lehreinheit_id = tbl_lehreinheit.lehreinheit_id AND
 										tbl_lehrveranstaltung.lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id)." AND
 										tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
 									ORDER BY tbl_lehrfunktion.standardfaktor desc limit 1)";
-	
+
 	$leiter_titel = '';
 	$leiter_vorname = '';
 	$leiter_nachname = '';
 	$leiter_titelpost = '';
-	
+
 	if($db->db_query($lqry))
 	{
 		if ($lrow = $db->db_fetch_object())
 		{
-			$leiter_titel = $lrow->titelpre;			
+			$leiter_titel = $lrow->titelpre;
 			$leiter_vorname = $lrow->vorname;
-			$leiter_nachname = $lrow->nachname;	
-			$leiter_titelpost = $lrow->titelpost;	
-		}		
+			$leiter_nachname = $lrow->nachname;
+			$leiter_titelpost = $lrow->titelpost;
+		}
 	}
-		
-	$qry = "SELECT wochen FROM public.tbl_semesterwochen 
-						WHERE (studiengang_kz, semester) in (SELECT studiengang_kz, semester 
+
+	$qry = "SELECT wochen FROM public.tbl_semesterwochen
+						WHERE (studiengang_kz, semester) in (SELECT studiengang_kz, semester
 						FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER).")";
 	$wochen = 15;
 	if($result_wochen = $db->db_query($qry))
@@ -146,7 +146,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$wochen = $row_wochen->wochen;
 		}
 	}
-	
+
 	$lehrveranstaltung=new lehrveranstaltung();
 	$lehrveranstaltung->load($lehrveranstaltung_id);
 	$sws=$lehrveranstaltung->semesterstunden/$wochen;
@@ -157,7 +157,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 	$lehrform = new lehrform($lehrform_kurzbz);
 	$lehrform_bezeichnung = $lehrform->bezeichnung;
 	$organisationseinheit = new organisationseinheit($lehrveranstaltung->oe_kurzbz);
-	
+
 	$lehreinheit=new lehreinheit();
 	$lehreinheit->load_lehreinheiten($lehrveranstaltung_id, $studiensemester_kurzbz);
 	if(count($lehreinheit->lehreinheiten)>=1)
@@ -169,11 +169,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$lehrfach_id='';
 		die('keine Lehreinheiten gefunden!');
 	}
-	
+
 	$lv_lehrfach=new lehrveranstaltung();
 	$lv_lehrfach->load($lehrfach_id);
 	$lehrfach_bezeichnung=$lv_lehrfach->bezeichnung;
-	
+
 /*	$lvqry = "SELECT * from lehre.tbl_lehrveranstaltung where lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
 	if($db->db_query($lvqry))
 	{
@@ -182,43 +182,43 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$sws = $lvrow->semesterstunden/$wochen;
 			$ects = $lvrow->ects;
 			$lvbezeichnung = $lvrow->bezeichnung;
-			$lvstg = $lvrow->studiengang_kz;			
-		}		
+			$lvstg = $lvrow->studiengang_kz;
+		}
 	} */
-	
+
 	$lehrinhalte = '';
 	$infoqry = "SELECT * FROM campus.tbl_lvinfo WHERE sprache='German' AND lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
 	if($db->db_query($infoqry))
 	{
 		if ($inforow = $db->db_fetch_object())
 		{
-			$lehrinhalte_arr = explode("<br>",$inforow->lehrinhalte);			
+			$lehrinhalte_arr = explode("<br>",$inforow->lehrinhalte);
 			for ($i = 0; $i < sizeof($lehrinhalte_arr); $i++)
 			{
-				$lehrinhalte .= $lehrinhalte_arr[$i].'\n';			
+				$lehrinhalte .= $lehrinhalte_arr[$i].'\n';
 			}
-		}		
-	}	
-	
+		}
+	}
+
 	$xml = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>";
 	$xml .= "<zertifikate>";
-	
+
 	$studiensemester = new studiensemester();
 	$studiensemester->load($studiensemester_kurzbz);
-			
+
 	for ($i = 0; $i < sizeof($uid_arr); $i++)
 	{
 		$anzahl_fussnoten=0;
 		$studiengang_typ='';
 		$xml_fussnote='';
-		
+
 		$query = "SELECT mitarbeiter_uid FROM lehre.tbl_lehreinheit as le
 			JOIN lehre.tbl_pruefung as p USING(lehreinheit_id)
 			JOIN lehre.tbl_lehrveranstaltung as lv USING(lehrveranstaltung_id)
 			WHERE p.student_uid = ".$db->db_add_param($uid_arr[$i])."
 			AND le.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz)."
 			AND lv.lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
-		
+
 		$pruefer_uid='';
 		$pruefer_name='';
 		if($db->db_query($query))
@@ -231,7 +231,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		if($pruefer_uid!='')
 		{
 			$pruefer = new mitarbeiter($pruefer_uid);
-			$pruefer_name = trim($pruefer->titelpre.' '.$pruefer->vorname.' '.$pruefer->nachname.' '.$pruefer->titelpost);			
+			$pruefer_name = trim($pruefer->titelpre.' '.$pruefer->vorname.' '.$pruefer->nachname.' '.$pruefer->titelpost);
 		}
 
 		$query = "SELECT tbl_student.matrikelnr, tbl_student.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.bezeichnung, tbl_person.vorname, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre, tbl_person.titelpost, tbl_person.geschlecht, tbl_person.matr_nr FROM tbl_person, tbl_student, tbl_studiengang, tbl_benutzer WHERE tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz and tbl_student.student_uid = tbl_benutzer.uid and tbl_benutzer.person_id = tbl_person.person_id and tbl_student.student_uid = '".$uid_arr[$i]."'";
@@ -251,7 +251,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$stgl_ma = new mitarbeiter($stgleiter_uid);
 			$stgl .= trim($stgl_ma->titelpre.' '.$stgl_ma->vorname.' '.$stgl_ma->nachname.' '.$stgl_ma->titelpost);
 		}
-		
+
 		$student=new student();
 		$student->load($uid_arr[$i]);
 		$prestudent=new prestudent();
@@ -261,11 +261,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		{
 			if($status->studienplan_bezeichnung != '')
 			    $studienplan_bezeichnung=$status->studienplan_bezeichnung;
-			
+
 			if($status->studienplan_id != NULL)
 			    $studienplan_id = $status->studienplan_id;
 		}
-		
+
 		$xml .= "\n	<zertifikat>";
 		$xml .= "\n		<studiensemester>".$studiensemester_kurzbz."</studiensemester>";
 		$xml .= "\n		<vorname>".$row->vorname."</vorname>";
@@ -279,8 +279,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$xml .= "\n		<studiengangsleiter>".$stgl."</studiengangsleiter>";
 		$datum_aktuell = date('d.m.Y');
 		$xml .= "\n		<ort_datum>Wien, am ".$datum_aktuell."</ort_datum>";
-		
-		
+
+
 		$obj = new zeugnisnote();
 		$obj->load($lehrveranstaltung_id, $uid_arr[$i], $studiensemester_kurzbz);
 
@@ -298,10 +298,10 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$uebernahmedatum = "";
 			$benotungsdatum = "";
 		}
-		
+
 		$stg = new studiengang();
 		$stg->load($lvstg);
-                
+
                 $xml .= "				<stg_studiengang_bezeichnung>".$stg_oe_obj->bezeichnung."</stg_studiengang_bezeichnung>";
 		$xml .= "				<lv_studiengang_bezeichnung>".$stg->bezeichnung."</lv_studiengang_bezeichnung>";
 		$xml .= "				<lv_studiengang_typ>".$stg->typ."</lv_studiengang_typ>";
@@ -318,20 +318,20 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$xml .= "				<lehrform_kurzbz>".$lehrform_kurzbz."</lehrform_kurzbz>";
 		$xml .= "				<lehrform_bezeichnung>".$lehrform_bezeichnung."</lehrform_bezeichnung>";
 		$xml .= "				<sws>".($sws==0?'':number_format(sprintf('%.1F',$sws),1))."</sws>";
-		
+
 		$xml .= "				<lvleiter>".$leiter_titel." ".$leiter_vorname." ".$leiter_nachname.($leiter_titelpost!=''?', '.$leiter_titelpost:'')."</lvleiter>";
 		$xml .= "				<lehrinhalte><![CDATA[".clearHtmlTags($lehrinhalte)."]]></lehrinhalte>";
 		$xml .= "				<kompatible_lvs>";
-		
+
 		$lehrveranstaltung->getLVkompatibel($lehrveranstaltung_id);
 		foreach($lehrveranstaltung->lehrveranstaltungen as $lv_kompatibel)
 		{
-		    $xml .= "<lv>".$lv_kompatibel->bezeichnung."</lv>";
+		    $xml .= "<lv><![CDATA[".$lv_kompatibel->bezeichnung."]]></lv>";
 		}
 
 		$xml .= "	</kompatible_lvs>";
-                
-		
+
+
 		$anrechnung = new anrechnung();
 		$anrechnung->getAnrechnungPrestudent($student->prestudent_id, null, $lehrveranstaltung_id);
 
@@ -343,7 +343,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		    $xml .= $anrechnung->result[0]->lehrveranstaltung_bez;
 		}
 		$xml .= "</studienverpflichtung>";
-                
+
                 if($lehrveranstaltung_id_kompatibel != "")
                 {
                     $lv = new lehrveranstaltung($lehrveranstaltung_id_kompatibel);
@@ -352,11 +352,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
                         $ects = $lv->ects;
                     }
                 }
-                
+
                 $xml .= "				<ects>".number_format($ects,1)."</ects>";
 
 		$lehrveranstaltung->loadLehrveranstaltungStudienplan($studienplan_id);
-		
+
 		$studienplan_lehrveranstaltung_id = "";
 		foreach($lehrveranstaltung->lehrveranstaltungen as $lv)
 		{
@@ -366,7 +366,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			break;
 		    }
 		}
-		
+
 		$studienplan = new studienplan();
 		if($studienplan_lehrveranstaltung_id != "")
 		{
@@ -384,11 +384,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		{
 		    $lehrveranstaltung->lehrveranstaltungen = array();
 		}
-		
+
 //		$return = $lehrveranstaltung->getLVFromStudienplanByLehrtyp($studienplan_id, "modul");
 
 		$xml .= "	<module>";
-		
+
 		//Variable wird zur korrekten Darstellung im Dokument benötigt
 		$count=0;
 		foreach($lehrveranstaltung->lehrveranstaltungen as $modul)
@@ -411,4 +411,4 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 	$xml .= "</zertifikate>";
 	echo $xml;
 }
-?>
\ No newline at end of file
+?>
diff --git a/rdf/lehrverbandsgruppe.rdf.php b/rdf/lehrverbandsgruppe.rdf.php
index 19affa245..755444b6d 100644
--- a/rdf/lehrverbandsgruppe.rdf.php
+++ b/rdf/lehrverbandsgruppe.rdf.php
@@ -309,6 +309,24 @@ function draw_orgformsubmenu($stg_kz, $orgform)
 						<VERBAND:orgform><![CDATA['.$orgform.']]></VERBAND:orgform>
 					</RDF:Description>
 
+					<RDF:Description RDF:about="'.$rdf_url.$stg_kurzbz.'/'.$orgform.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet/teilgenommen" >
+						<VERBAND:name>Teilgenommen</VERBAND:name>
+						<VERBAND:stg><![CDATA['.$stg_kurzbz.']]></VERBAND:stg>
+						<VERBAND:stg_kz><![CDATA['.$stg_kz.']]></VERBAND:stg_kz>
+						<VERBAND:stsem><![CDATA['.$stsem->studiensemester_kurzbz.']]></VERBAND:stsem>
+						<VERBAND:typ>bewerberrtangemeldetteilgenommen</VERBAND:typ>
+						<VERBAND:orgform><![CDATA['.$orgform.']]></VERBAND:orgform>
+					</RDF:Description>
+					
+					<RDF:Description RDF:about="'.$rdf_url.$stg_kurzbz.'/'.$orgform.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet/nichtteilgenommen" >
+						<VERBAND:name>Nicht teilgenommen</VERBAND:name>
+						<VERBAND:stg><![CDATA['.$stg_kurzbz.']]></VERBAND:stg>
+						<VERBAND:stg_kz><![CDATA['.$stg_kz.']]></VERBAND:stg_kz>
+						<VERBAND:stsem><![CDATA['.$stsem->studiensemester_kurzbz.']]></VERBAND:stsem>
+						<VERBAND:typ>bewerberrtangemeldetnichtteilgenommen</VERBAND:typ>
+						<VERBAND:orgform><![CDATA['.$orgform.']]></VERBAND:orgform>
+					</RDF:Description>
+
 					<RDF:Description RDF:about="'.$rdf_url.$stg_kurzbz.'/'.$orgform.'/'.$stsem->studiensemester_kurzbz.'/aufgenommen" >
 						<VERBAND:name>Aufgenommen</VERBAND:name>
 						<VERBAND:stg><![CDATA['.$stg_kurzbz.']]></VERBAND:stg>
@@ -366,7 +384,14 @@ function draw_orgformsubmenu($stg_kz, $orgform)
 			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li>";
 			$orgform_sequence[$stg_kz].= "\n\t\t\t\t<RDF:Seq RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber\">\n";
 			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestnichtangemeldet\" />\n";
-			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\" />\n";
+			
+			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li>";
+			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:Seq RDF:about=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\">\n";
+			$orgform_sequence[$stg_kz].= "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet/reihungstestnichtangemeldet/teilgenommen\" />\n";
+			$orgform_sequence[$stg_kz].= "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet/reihungstestnichtangemeldet/nichtteilgenommen\" />\n";
+			$orgform_sequence[$stg_kz].= "\t\t\t\t</RDF:Seq>";
+			$orgform_sequence[$stg_kz].= "\n\t\t\t</RDF:li>\n";
+			
 			$orgform_sequence[$stg_kz].= "\t\t\t\t</RDF:Seq>";
 			$orgform_sequence[$stg_kz].= "\n\t\t\t</RDF:li>\n";
 			
@@ -663,6 +688,22 @@ while ($row=$dbo->db_fetch_object())
 				<VERBAND:stsem><![CDATA[<?php echo $stsem->studiensemester_kurzbz; ?>]]></VERBAND:stsem>
 				<VERBAND:typ><![CDATA[bewerberrtangemeldet]]></VERBAND:typ>
 			</RDF:Description>
+			
+			<RDF:Description RDF:about="<?php echo $rdf_url.$stg_kurzbz.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet/teilgenommen'; ?>" >
+				<VERBAND:name><![CDATA[Teilgenommen]]></VERBAND:name>
+				<VERBAND:stg><![CDATA[<?php echo $stg_kurzbz; ?>]]></VERBAND:stg>
+				<VERBAND:stg_kz><![CDATA[<?php echo $row->studiengang_kz; ?>]]></VERBAND:stg_kz>
+				<VERBAND:stsem><![CDATA[<?php echo $stsem->studiensemester_kurzbz; ?>]]></VERBAND:stsem>
+				<VERBAND:typ><![CDATA[bewerberrtangemeldetteilgenommen]]></VERBAND:typ>
+			</RDF:Description>
+			
+			<RDF:Description RDF:about="<?php echo $rdf_url.$stg_kurzbz.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet/nichtteilgenommen'; ?>" >
+				<VERBAND:name><![CDATA[Nicht teilgenommen]]></VERBAND:name>
+				<VERBAND:stg><![CDATA[<?php echo $stg_kurzbz; ?>]]></VERBAND:stg>
+				<VERBAND:stg_kz><![CDATA[<?php echo $row->studiengang_kz; ?>]]></VERBAND:stg_kz>
+				<VERBAND:stsem><![CDATA[<?php echo $stsem->studiensemester_kurzbz; ?>]]></VERBAND:stsem>
+				<VERBAND:typ><![CDATA[bewerberrtangemeldetnichtteilgenommen]]></VERBAND:typ>
+			</RDF:Description>
 
 			<RDF:Description RDF:about="<?php echo $rdf_url.$stg_kurzbz.'/'.$stsem->studiensemester_kurzbz.'/aufgenommen'; ?>" >
 				<VERBAND:name><![CDATA[Aufgenommen]]></VERBAND:name>
@@ -876,7 +917,13 @@ draw_orgformpart($stg_kz);
 					echo "\t\t\t<RDF:li>";
 					echo "\t\t\t\t<RDF:Seq RDF:about=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber\">\n";
 					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestnichtangemeldet\" />\n";
-					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\" />\n";
+					echo "\t\t\t<RDF:li>";
+					echo "\t\t\t\t<RDF:Seq RDF:about=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\">\n";
+					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet/teilgenommen\" />\n";
+					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet/nichtteilgenommen\" />\n";
+					echo "\t\t\t\t</RDF:Seq>";
+					echo "\n\t\t\t</RDF:li>\n";
+					
 					echo "\t\t\t\t</RDF:Seq>";
 					echo "\n\t\t\t</RDF:li>\n";
 
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
index 7a3dd636b..0a6caf05c 100644
--- a/rdf/prestudentrolle.rdf.php
+++ b/rdf/prestudentrolle.rdf.php
@@ -35,6 +35,7 @@ require_once('../include/prestudent.class.php');
 require_once('../include/datum.class.php');
 require_once('../include/statusgrund.class.php');
 require_once('../include/student.class.php');
+require_once('../include/bismeldestichtag.class.php');
 
 $rdf_url='http://www.technikum-wien.at/prestudentrolle';
 $datum = new datum();
@@ -80,6 +81,8 @@ foreach($statusgrund->result as $row)
 $studentlehrverband = new student();
 $uid = $studentlehrverband->getUid($prestudent_id);
 
+
+$erstes_stichtag_inaktiv = true;
 foreach($ps->result as $row)
 {
 	$lehrverband = '-';
@@ -99,6 +102,21 @@ foreach($ps->result as $row)
 		}
 	}
 
+	// prüfen, ob Meldestichtag erreicht
+	$bismeldestichtag = new bismeldestichtag();
+	$stichtag_erreicht = $bismeldestichtag->checkMeldestichtagErreicht($row->datum);
+
+	// Variablen für layout von prestudentstatus Anzeige
+	$stichtagsaktiv = $stichtag_erreicht ? 'stichtagsinaktiv' : 'stichtagsaktiv';
+	$aktiv = $stichtag_erreicht ? 'false' : 'true';
+
+	// erstes mal stichtag erreicht -> anderes layout
+	if ($stichtag_erreicht && $erstes_stichtag_inaktiv)
+	{
+		$stichtagsaktiv = 'erstes_stichtagsinaktiv';
+		$erstes_stichtag_inaktiv = false;
+	}
+
 	echo '
 	  <RDF:li>
       	<RDF:Description  id="'.$row->prestudent_id.'/'.$row->status_kurzbz.'/'.$row->studiensemester_kurzbz.'/'.$row->ausbildungssemester.'"  about="'.$rdf_url.'/'.$row->prestudent_id.'/'.$row->status_kurzbz.'/'.$row->studiensemester_kurzbz.'/'.$row->ausbildungssemester.'" >
@@ -123,6 +141,8 @@ foreach($ps->result as $row)
 			<ROLLE:insertvon><![CDATA['.$row->insertvon.']]></ROLLE:insertvon>
 			<ROLLE:updateamum><![CDATA['.$datum->formatDatum($row->updateamum,'d.m.Y H:i:s').']]></ROLLE:updateamum>
 			<ROLLE:updatevon><![CDATA['.$row->updatevon.']]></ROLLE:updatevon>
+			<ROLLE:stichtagsaktiv><![CDATA['.$stichtagsaktiv.']]></ROLLE:stichtagsaktiv>
+			<ROLLE:aktiv><![CDATA['.$aktiv.']]></ROLLE:aktiv>
       	</RDF:Description>
       </RDF:li>
 	';
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 1625f161c..40cf28e01 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -107,6 +107,21 @@ function checkfilter($row, $filter2, $buchungstyp = null)
 				if($row_filter->anzahl>0 || $prestudent->status_kurzbz=='Incoming')
 					return false;
 	}
+	elseif($filter2 == 'StudiengebuehrErhoeht')
+	{
+		// Alle Personen die eine erhöhte Studiengebuehrbelastung haben
+		$prestudent = new prestudent();
+		$prestudent->getLastStatus($row->prestudent_id);
+
+		$qry = "SELECT count(*) as anzahl FROM public.tbl_konto WHERE
+					studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND
+					person_id=".$db->db_add_param($row->person_id, FHC_INTEGER)." AND
+					buchungstyp_kurzbz='StudiengebuehrErhoeht'";
+		if($db->db_query($qry))
+			if($row_filter = $db->db_fetch_object())
+				if($row_filter->anzahl == 0)
+					return false;
+	}
 	elseif(strstr($filter2,'buchungstyp;'))
 	{
 		// Alle Personen die keine Belastung auf den uebergebenen Buchungstyp haben
@@ -736,7 +751,7 @@ if($xmlformat=='rdf')
 		}
 	}
 	elseif(in_array($typ, array('prestudent', 'interessenten', 'bewerber', 'aufgenommen',
-		'warteliste', 'absage', 'zgv', 'reihungstestangemeldet', 'reihungstestnichtangemeldet', 'absolvent',
+		'warteliste', 'absage', 'zgv', 'reihungstestangemeldet', 'reihungstestnichtangemeldet', 'bewerberrtangemeldetteilgenommen', 'bewerberrtangemeldetnichtteilgenommen','absolvent',
 		'diplomand', 'bewerbungnichtabgeschickt', 'bewerbungabgeschickt', 'statusbestaetigt', 'statusbestaetigtrtnichtangemeldet', 'statusbestaetigtrtangemeldet', 'bewerberrtangemeldet', 'bewerberrtnichtangemeldet')))
 	{
 		$prestd = new prestudent();
diff --git a/skin/tempus.css b/skin/tempus.css
index 7684fddb1..597be41f8 100644
--- a/skin/tempus.css
+++ b/skin/tempus.css
@@ -234,3 +234,19 @@ treechildren::-moz-tree-row(makeItMarked)
    width: 25px;
    height:25px;
 }
+
+treechildren::-moz-tree-cell(stichtagsinaktiv)
+{
+	background-color: #e6e6e6;
+}
+
+treechildren::-moz-tree-cell(erstes_stichtagsinaktiv)
+{
+	background-color: #e6e6e6;
+	border-top: 1px solid grey;
+}
+
+label.warning
+{
+	font-weight: bold;
+}
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 458f178d4..0e345fd45 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -40,11 +40,13 @@ require_once('dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php')
 require_once('dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php');
 require_once('dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php');
 require_once('dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php');
+require_once('dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php');
 require_once('dbupdate_3.4/27351_digitalisierung_formulare.php');
 require_once('dbupdate_3.4/30537_anmerkung_in_tbl_rolleberechtigung.php');
 require_once('dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php');
 require_once('dbupdate_3.4/29529_infocenter_anpassungen.php');
 require_once('dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php');
+require_once('dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php');
 
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
@@ -64,6 +66,7 @@ $tabellen=array(
 	"bis.tbl_bisfunktion"  => array("bisverwendung_id","studiengang_kz","sws","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"bis.tbl_bisio"  => array("bisio_id","mobilitaetsprogramm_code","nation_code","von","bis","zweck_code","student_uid","updateamum","updatevon","insertamum","insertvon","ext_id","ort","universitaet","lehreinheit_id","ects_erworben","ects_angerechnet","herkunftsland_code"),
 	"bis.tbl_bisio_zweck"  => array("bisio_id","zweck_code"),
+	"bis.tbl_bismeldestichtag"  => array("meldestichtag_id", "meldestichtag", "studiensemester_kurzbz", "insertamum", "insertvon", "updateamum", "updatevon"),
 	"bis.tbl_bisstandort"  => array("standort_code","bezeichnung","aktiv","insertamum","insertvon","updateamum","updatevon"),
 	"bis.tbl_bisverwendung"  => array("bisverwendung_id","ba1code","ba2code","vertragsstunden","beschausmasscode","verwendung_code","mitarbeiter_uid","hauptberufcode","hauptberuflich","habilitation","beginn","ende","updateamum","updatevon","insertamum","insertvon","ext_id","dv_art","inkludierte_lehre","zeitaufzeichnungspflichtig","azgrelevant", "homeoffice"),
 	"bis.tbl_bundesland"  => array("bundesland_code","kurzbz","bezeichnung"),
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
index 1f8dd4b4b..d05b69604 100644
--- a/system/dbupdate_3.4/27351_digitalisierung_formulare.php
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -37,7 +37,8 @@ if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statust
 			('ErsteAufforderungVersandt', '{\"1.Aufforderung Versandt\",\"1st Request Sent\"}'),
 			('ZweiteAufforderungVersandt', '{\"2.Aufforderung Versandt\",\"2nd Request Sent\"}'),
 			('Beeinsprucht', '{\"Beeinsprucht\",\"Objected\"}'),
-			('EinspruchAbgelehnt', '{\"Einspruch abgelehnt\",\"Objection denied\"}');
+			('EinspruchAbgelehnt', '{\"Einspruch abgelehnt\",\"Objection denied\"}'),
+			('Abgemeldet', '{\"Abgemeldet\",\"Deregistered\"}');
 			";
 		if (!$db->db_query($qry))
 			echo '<strong>campus.tbl_studierendenantrag_statustyp (insert): '.$db->db_last_error().'</strong><br>';
@@ -45,6 +46,21 @@ if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statust
 			echo '<br>campus.tbl_studierendenantrag_statustyp: table prefilled';
 	}
 }
+if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statustyp WHERE studierendenantrag_statustyp_kurzbz = 'Abgemeldet' "))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO campus.tbl_studierendenantrag_statustyp
+			(studierendenantrag_statustyp_kurzbz, bezeichnung)
+			VALUES
+			('Abgemeldet', '{\"Abgemeldet\",\"Deregistered\"}');
+			";
+		if (!$db->db_query($qry))
+			echo '<strong>campus.tbl_studierendenantrag_statustyp (insert): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>campus.tbl_studierendenantrag_statustyp: "Abgemeldet" added';
+	}
+}
 
 if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag LIMIT 1"))
 {
@@ -170,9 +186,12 @@ if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berecht
 	}
 }
 
-if (!$result = @$db->db_query("SELECT campus.get_status_studierendenantrag(0)")) {
+if (!$result = @$db->db_query("SELECT campus.get_status_studierendenantrag(0)"))
+{
 	$qry = 'CREATE FUNCTION campus.get_status_studierendenantrag(integer) RETURNS character varying
     LANGUAGE plpgsql
+    STABLE
+    RETURNS NULL ON NULL INPUT
     AS $_$
         DECLARE i_studierendenantrag_id ALIAS FOR $1;
         DECLARE rec RECORD;
@@ -194,10 +213,25 @@ if (!$result = @$db->db_query("SELECT campus.get_status_studierendenantrag(0)"))
 	else
 		echo '<br>campus.get_status_studierendenantrag(integer): function created';
 }
+elseif ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_status_studierendenantrag' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION campus.get_status_studierendenantrag(integer) STABLE;';
+		$qry .= 'ALTER FUNCTION campus.get_status_studierendenantrag(integer) RETURNS NULL ON NULL INPUT;';
 
-if (!$result = @$db->db_query("SELECT campus.get_status_id_studierendenantrag(0)")) {
+		if(!$db->db_query($qry))
+			echo '<strong>campus.get_status_studierendenantrag(integer): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>campus.get_status_studierendenantrag(integer): function updated';
+	}
+}
+
+if (!$result = @$db->db_query("SELECT campus.get_status_id_studierendenantrag(0)"))
+{
 	$qry = 'CREATE FUNCTION campus.get_status_id_studierendenantrag(integer) RETURNS integer
     LANGUAGE plpgsql
+    STABLE
+    RETURNS NULL ON NULL INPUT
     AS $_$
         DECLARE i_studierendenantrag_id ALIAS FOR $1;
         DECLARE rec RECORD;
@@ -219,10 +253,24 @@ if (!$result = @$db->db_query("SELECT campus.get_status_id_studierendenantrag(0)
 	else
 		echo '<br>campus.get_status_id_studierendenantrag(integer): function created';
 }
+elseif ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_status_id_studierendenantrag' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION campus.get_status_id_studierendenantrag(integer) STABLE;';
+		$qry .= 'ALTER FUNCTION campus.get_status_id_studierendenantrag(integer) RETURNS NULL ON NULL INPUT;';
 
-if (!$result = @$db->db_query("SELECT public.get_absem_prestudent(0, null)")) {
+		if(!$db->db_query($qry))
+			echo '<strong>campus.get_status_id_studierendenantrag(integer): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>campus.get_status_id_studierendenantrag(integer): function updated';
+	}
+}
+
+if (!$result = @$db->db_query("SELECT public.get_absem_prestudent(0, null)"))
+{
 	$qry = 'CREATE FUNCTION public.get_absem_prestudent(integer, character varying) RETURNS integer
     LANGUAGE plpgsql
+    STABLE
     AS $_$
         DECLARE i_prestudent_id ALIAS FOR $1;
         DECLARE cv_studiensemester_kurzbz ALIAS FOR $2;
@@ -253,9 +301,22 @@ if (!$result = @$db->db_query("SELECT public.get_absem_prestudent(0, null)")) {
 	else
 		echo '<br>public.get_absem_prestudent(integer, character varying): function created';
 }
-if (!$result = @$db->db_query("SELECT public.get_stdsem_prestudent(0, null)")) {
+elseif ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_absem_prestudent' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION public.get_absem_prestudent(integer, character varying) STABLE;';
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.get_absem_prestudent(integer, character varying): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.get_absem_prestudent(integer, character varying): function updated';
+	}
+}
+if (!$result = @$db->db_query("SELECT public.get_stdsem_prestudent(0, null)"))
+{
 	$qry = 'CREATE FUNCTION public.get_stdsem_prestudent(integer, character varying) RETURNS character varying
     LANGUAGE plpgsql
+    STABLE
     AS $_$
         DECLARE i_prestudent_id ALIAS FOR $1;
         DECLARE cv_studiensemester_kurzbz ALIAS FOR $2;
@@ -286,6 +347,29 @@ if (!$result = @$db->db_query("SELECT public.get_stdsem_prestudent(0, null)")) {
 	else
 		echo '<br>public.get_stdsem_prestudent(integer, character varying): function created';
 }
+elseif ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_stdsem_prestudent' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION public.get_stdsem_prestudent(integer, character varying) STABLE;';
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.get_stdsem_prestudent(integer, character varying): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.get_stdsem_prestudent(integer, character varying): function updated';
+	}
+}
+
+if ($result = @$db->db_query("SELECT 1 FROM pg_proc WHERE proname='get_rolle_prestudent' AND provolatile='s'"))
+{
+	if ($db->db_num_rows($result) == 0) {
+		$qry = 'ALTER FUNCTION public.get_rolle_prestudent(integer, character varying) STABLE;';
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.get_rolle_prestudent(integer, character varying): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.get_rolle_prestudent(integer, character varying): function updated';
+	}
+}
 
 if($result = @$db->db_query("SELECT 1 FROM public.tbl_status_grund WHERE statusgrund_kurzbz = 'abbrecherStgl';"))
 {
diff --git a/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
new file mode 100644
index 000000000..e473eb37a
--- /dev/null
+++ b/system/dbupdate_3.4/29144_prestudent_status_nach_bismeldung_sperren.php
@@ -0,0 +1,73 @@
+<?php
+
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Creates table bis.tbl_bismeldestichtag if it doesn't exist and grants privileges
+if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_bismeldestichtag LIMIT 1'))
+{
+	$qry = "CREATE TABLE bis.tbl_bismeldestichtag (
+				meldestichtag_id integer,
+				meldestichtag date NOT NULL,
+				studiensemester_kurzbz varchar(16) NOT NULL,
+				insertamum timestamp DEFAULT NOW(),
+				insertvon varchar(32),
+				updateamum timestamp,
+				updatevon varchar(32)
+			);
+
+			COMMENT ON TABLE bis.tbl_bismeldestichtag IS 'Deadline Dates for BIS reporting';
+
+			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT pk_bismeldestichtag PRIMARY KEY (meldestichtag_id);
+
+			CREATE SEQUENCE bis.tbl_meldestichtag_meldestichtag_id_seq
+				INCREMENT BY 1
+				NO MAXVALUE
+				NO MINVALUE
+				CACHE 1;
+
+			ALTER TABLE bis.tbl_bismeldestichtag ALTER COLUMN meldestichtag_id SET DEFAULT nextval('bis.tbl_meldestichtag_meldestichtag_id_seq');
+			ALTER TABLE bis.tbl_bismeldestichtag ADD CONSTRAINT fk_bismeldestichtag_studiensemester_kurzbz FOREIGN KEY (studiensemester_kurzbz) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;";
+
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_bismeldestichtag: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>bis.tbl_bismeldestichtag table created';
+
+	$qry = 'GRANT SELECT ON TABLE bis.tbl_bismeldestichtag TO web;';
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_bismeldestichtag: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>web</strong> on bis.tbl_bismeldestichtag';
+
+	$qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE bis.tbl_bismeldestichtag TO vilesci;';
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_bismeldestichtag: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>vilesci</strong> on bis.tbl_bismeldestichtag';
+
+	$qry = 'GRANT SELECT, UPDATE ON SEQUENCE bis.tbl_meldestichtag_meldestichtag_id_seq TO web;';
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_meldestichtag_meldestichtag_id_seq: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>web</strong> on bis.tbl_meldestichtag_meldestichtag_id_seq';
+
+	$qry = 'GRANT SELECT, UPDATE ON SEQUENCE bis.tbl_meldestichtag_meldestichtag_id_seq TO vilesci;';
+	if (!$db->db_query($qry))
+		echo '<strong>bis.tbl_meldestichtag_meldestichtag_id_seq: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>vilesci</strong> on bis.tbl_meldestichtag_meldestichtag_id_seq';
+}
+
+// Add permission for edit Bismelden flag
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'student/editBismelden';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('student/editBismelden', 'Ändern des Bismelden Attributs pro Student');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' system.tbl_berechtigung: Added permission editBismelden<br>';
+	}
+}
diff --git a/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php b/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
new file mode 100644
index 000000000..d2c0c07b8
--- /dev/null
+++ b/system/dbupdate_3.4/33714_erhoehter_studienbeitrag_fuer_drittsaatenangehoerig.php
@@ -0,0 +1,13 @@
+<?php
+// Added Buchungstyp "StudiengebuehrErhoeht"
+if ($result = @$db->db_query("SELECT 1 FROM public.tbl_buchungstyp WHERE buchungstyp_kurzbz = 'StudiengebuehrErhoeht';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_buchungstyp (buchungstyp_kurzbz, beschreibung, standardtext, standardbetrag) VALUES ('StudiengebuehrErhoeht', 'Erhöhter Studienbeitrag', 'Erhöhter Studienbeitrag', '-3000');";
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_buchungstyp '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' public.tbl_buchungstyp: Added buchungstyp "StudiengebuehrErhoeht" <br>';
+	}
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d405692ba..9b122dded 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -4154,6 +4154,671 @@ When on hold, the date is only a reminder.',
 			)
 		)
 	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnungsnummer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungsnummer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invoice Number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'date',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungsnummer',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invoice Number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faelligam',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fällig am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Due on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'gesamtbetrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamtbetrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Total amount',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnungsempfaenger',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungsempfänger',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invoice recipient',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungsempfänger',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invoice',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'studiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Semester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'bezeichnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Title',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'datum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'zahlungsbestaetigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zahlungsbestätigung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Payment confirmation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'bewerbung',
+		'phrase' => 'erklaerungInvoices',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ablauf und Zahlungsbedingungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnungserklaerung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wir möchten Sie darauf aufmerksam machen, dass bei der Überweisung *immer* die Rechnungsnummer als Zahlungsreferenz anzuführen ist.
+						Andernfalls erfolgt keine automatische Zahlungszuordnung und es kann zu einer Verzögerung der Darstellung des aktuellen Zahlungsstatus
+						der Rechnung im CIS kommen.
+						<br/>
+						<br/>
+						Im Falle dass der Betrag an ein falsches Konto überwiesen wurde, bitten wir Sie höflichst sich an Ihre Bank zu wenden.
+						<br/>
+						<br/>
+						Jede Rechnung gilt als "Bezahlt", wenn der Gesamtbetrag vollständig auf unser Konto eingelangt ist.
+						<br/>
+						<br/>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'kontoinfotitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontoinformationen der FHTW',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'kontoinfobody',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sämtliche Zahlungen sind an die nachstehende Kontonummer zu leisten und die Rechnungsnummer muss als Zahlungsreferenz eingegeben werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'kontoinfoausland',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Auslandsüberweisungen:
+											<br/>
+											Bei Auslandsüberweisungen sind die Spesenkosten von den
+											<br/>
+											Zahlenden zusätzlich zu den Rechnungsbeträgen zu zahlen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'rechnungtitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rechnungen & Zahlungsbestätigungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq0frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Warum ist die Einzahlung trotz Einzahlung noch offen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq0antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der häufigste Grund für diesen Fall ist, dass bei der Überweisung nicht die Rechnungsnummer als Zahlungsreferenz eingegeben wird.
+Wir bitten Sie höflichst in diesem Fall eine Mail an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> mit Zahlungsbestätigung zu senden.
+Die Transaktion und die Bearbeitung der Zahlung, kann bis zu sechs Werktage dauern.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq1frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ich habe keine Rechnung erhalten, was tun?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq1antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'In diesem Fall ist der Spam-Ordner zu kontrollieren. Falls die Rechnung nicht übermittelt wurde ersuchen wir um Information an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a>.
+Die Rechnung wird Ihnen erneut zugesendet. <u><strong>Erst nach Erhalt der Rechnung ist der Betrag zu überweisen</strong></u>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq2frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Refundierung des Studienbeitrags',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq2antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Studienbeitrag wird nicht rückerstattet, wenn…
+-Anfänger*innen, die ihren Studienplatz nach Semesterbeginn (1. September / 16. Februar) nicht in Anspruch nehmen
+-Studierende, die ihr Studium nach Semesterbeginn (1. September / 16. Februar) abbrechen.
+
+-Unterbrechung vor dem 15.10. bzw. 15.3.: Studienbeitrag wird rückerstattet
+-Unterbrechung nach dem 15.10. bzw. 15.3.: Studienbeitrag wird nicht rückerstattet
+-in den Folgesemestern der Unterbrechung sind keine Studienbeiträge zu zahlen; der ÖHBeitrag ist jedoch in jedem Semester der Unterbrechung zu zahlen',
+			'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq3frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie sind vom Studienbeitrag befreit und haben eine Rechnung für den Studienbeitrag bekommen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq3antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Treten Sie bitte in Kontakt mit Ihrer Studiengangsassistenz. Die offene Rechnung wird storniert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq4frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mir ist ein Fehler bei der Überweisung unterlaufen, was tun?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq4antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte den Fehler an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> melden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq5frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eine Rechnung wurde zwei Mal überwiesen, was tun?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq5antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Falls eine Rechnung doppelt überwiesen wurde, bitten wir Sie dies an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> zu melden. Wir werden Ihnen eine Zahlung refundieren.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq6frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es stehen mehrere Positionen auf der Rechnung – soll für jede Position eine Überweisung durchgeführt werden?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq6antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nein, es ist immer der auf der Rechnung ausgewiesene Gesamtbetrag zu überweisen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq7frage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wann kann der Betrag überwiesen werden?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'faq7antwort',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wir möchten Sie darauf hinweisen, dass Überweisungen erst bei Erhalt der Rechnung durchzuführen sind. Bitte um Angabe der Rechnungsnummer als Zahlungsreferenz.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 	array(
 		'app' => 'core',
 		'category' => 'password',
@@ -13637,6 +14302,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'antragNichtFuerVerganganeSS',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Der Antrag kann nicht für vergangene Semester gestellt werden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "You can not apply for the past study semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -18516,6 +19201,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'uhstat1EinleitungSvnrtext',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Laut Bildungsdokumentationsgesetz sind wir verpflichtet die Sozialversicherungsnummer zu erheben bzw. zu registrieren. Falls Sie über keine Sozialversicherungsnummer verfügen, fordert die FH Technikum Wien in Ihrem Namen ein Ersatzkenneichen an.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'According to the General Social Insurance Act, we are obliged to collect and register your national insurance number. If you do not have a national insurance number, UAS Technikum Wien will request a social insurance substitute code on your behalf.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'uhstat',
@@ -18936,6 +19641,9 @@ array(
 			)
 		)
 	),
+/*
+	// es kann fuer jede Kombination Typ und Status eine Phrase der Form info_<Typ>_<Status
+	// erstellt werden, die dann in der Studierendenansicht in einer infobox angezeigt werden
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -18956,6 +19664,7 @@ array(
 			)
 		)
 	),
+*/
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -19196,6 +19905,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'filter_all',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'alle anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'show all',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'filter_todo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'nur offene anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'only show open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -20679,6 +21428,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_stdsem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Studiensemester {studiensemester_kurzbz} existiert nicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Semester {studiensemester_kurzbz} does not exist',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_status_in_prev_sem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Status im letzten Semester gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No status found in previous semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -21427,7 +22216,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Die Abmeldung vom Studium kann hier durchführt werden.',
+				'text' => 'Die Abmeldung vom Studium kann hier durchgeführt werden.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -21487,13 +22276,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nNichterfüllung finanzieller Verpflichtungen trotz Mahnung (Studienbeitrag)',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (Studienbeitrag)',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nFailure to meet financial obligations despite a reminder (tuition fees)',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Failure to meet financial obligations despite a reminder (tuition fees)',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21507,13 +22296,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nmehrmalig unentschuldigtes Verletzen der Anwesenheitspflicht',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): mehrmalig unentschuldigtes Verletzen der Anwesenheitspflicht',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nmultiple unexcused breaches of attendance requirements',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): multiple unexcused breaches of attendance requirements',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21527,13 +22316,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nwiederholtes Nichteinhalten von Prüfungsterminen bzw Abgabeterminen für Seminararbeiten bzw. Projektarbeiten',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): wiederholtes Nichteinhalten von Prüfungsterminen bzw Abgabeterminen für Seminararbeiten bzw. Projektarbeiten',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nrepeated non-compliance with examination dates or deadlines for seminar papers or project work',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): repeated non-compliance with examination dates or deadlines for seminar papers or project work',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21547,13 +22336,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nPlagiieren im Rahmen wissenschaftlicher Arbeiten bzw. unerlaubte Verwendung KI generierter Hilfsmittel bzw. Quellen',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Plagiieren im Rahmen wissenschaftlicher Arbeiten bzw. unerlaubte Verwendung KI generierter Hilfsmittel bzw. Quellen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nPlagiarism in the context of scientific work or unauthorized use of AI-generated tools or sources',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Plagiarism in the context of scientific work or unauthorized use of AI-generated tools or sources',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21567,13 +22356,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nnicht genügende Leistung im Sinne der Prüfungsordnung',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): nicht genügende Leistung im Sinne der Prüfungsordnung',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \ninsufficient performance in terms of the examination regulations',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): insufficient performance in terms of the examination regulations',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21587,13 +22376,33 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nNichtantritt des Studiums zu Beginn des Studienjahres (=Unbegründetes Nichterscheinen zur ersten Studienveranstaltung)',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichtantritt des Studiums zu Beginn des Studienjahres (=Unbegründetes Nichterscheinen zur ersten Studienveranstaltung)',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nFailure to start the course at the beginning of the academic year (= unjustified non-attendance to the first course event)',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Failure to start the course at the beginning of the academic year (= unjustified non-attendance to the first course event)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_MissingZgv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangsvoraussetzung BA (bzw. MA) nicht erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Entry requirements BA (resp. MA) not fulfilled)',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21719,6 +22528,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_MissingZgv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangsvoraussetzung BA (bzw. MA) nicht erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Entry requirements BA (resp. MA) not fulfilled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -21738,6 +22567,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'stichtagHinzufuegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meldestichtag hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add report target date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'stichtageVerwalten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'BIS-Meldestichtage verwalten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Manage report target dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'stichtagLoeschen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meldestichtag löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete report target date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );
 
 
diff --git a/vilesci/lehre/abgabe_assistenz_zusatz.php b/vilesci/lehre/abgabe_assistenz_zusatz.php
index 20dbe9d97..724658d24 100644
--- a/vilesci/lehre/abgabe_assistenz_zusatz.php
+++ b/vilesci/lehre/abgabe_assistenz_zusatz.php
@@ -120,15 +120,15 @@ echo '<div>Student: <b>'.$uid.'</b><br>Titel: <b>'.
 	<td><input type="text" name="sprache" id="sprache" value="'.(isset($row_zd->sprache)?$db->convert_html_chars($row_zd->sprache):'').'" size="10" maxlength="8" readonly="readonly"></td>
 </tr>
 <tr>
-	<td width="30%"><b>Kontrollierte Schlagw&ouml;rter:*</b></td>
+	<td width="30%"><b>Kontrollierte Schlagw&ouml;rter:</b></td>
 	<td width="40%"><input type="text" name="kontrollschlagwoerter" id="kontrollschlagwoerter" value="'.(isset($row_zd->kontrollschlagwoerter)?$db->convert_html_chars($row_zd->kontrollschlagwoerter):'').'" size="60" maxlength="150" readonly="readonly"></td>
 </tr>
 <tr>
-	<td><b>Dt. Schlagw&ouml;rter:</b></td>
+	<td><b>Dt. Schlagw&ouml;rter:*</b></td>
 	<td><input type="text" name="schlagwoerter" value="'.(isset($row_zd->schlagwoerter)?$db->convert_html_chars($row_zd->schlagwoerter):'').'" size="60" maxlength="150" readonly="readonly"></td>
 </tr>
 <tr>
-	<td><b>Engl. Schlagw&ouml;rter:</b></td>
+	<td><b>Engl. Schlagw&ouml;rter:*</b></td>
 	<td><input  type="text" name="schlagwoerter_en" value="'.(isset($row_zd->schlagwoerter_en)?$db->convert_html_chars($row_zd->schlagwoerter_en):'').'" size="60" maxlength="150" readonly="readonly"></td>
 </tr>
 <tr>
diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php
index 3cdfefb06..d1830eaeb 100644
--- a/vilesci/personen/import/interessentenimport.php
+++ b/vilesci/personen/import/interessentenimport.php
@@ -806,7 +806,12 @@ if (isset($_POST['save']))
 		$stg_obj = new studiengang();
 		$stg_obj->load(ltrim($stg,'0'));
 
-		$uid = generateUID($stg_obj->kurzbz,$jahr, $stg_obj->typ, $matrikelnr);
+		$nachname_clean = mb_strtolower(convertProblemChars($person->nachname));
+		$vorname_clean = mb_strtolower(convertProblemChars($person->vorname));
+		$nachname_clean = str_replace(' ','_', $nachname_clean);
+		$vorname_clean = str_replace(' ','_', $vorname_clean);
+
+		$uid = generateUID($stg_obj->kurzbz,$jahr, $stg_obj->typ, $matrikelnr, $vorname_clean, $nachname_clean);
 
 		//Benutzerdatensatz anlegen
 		$benutzer = new benutzer();
@@ -815,10 +820,6 @@ if (isset($_POST['save']))
 		$benutzer->aktiv = true;
 		$benutzer->aktivierungscode = generateActivationKey();
 
-		$nachname_clean = mb_strtolower(convertProblemChars($person->nachname));
-		$vorname_clean = mb_strtolower(convertProblemChars($person->vorname));
-		$nachname_clean = str_replace(' ','_', $nachname_clean);
-		$vorname_clean = str_replace(' ','_', $vorname_clean);
 
 		if (!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT === true)
 		{
diff --git a/vilesci/personen/urlaubsverwaltung.php b/vilesci/personen/urlaubsverwaltung.php
index 274a04b94..20b2d293c 100644
--- a/vilesci/personen/urlaubsverwaltung.php
+++ b/vilesci/personen/urlaubsverwaltung.php
@@ -34,6 +34,7 @@ require_once('../../include/datum.class.php');
 require_once('../../include/benutzerberechtigung.class.php');
 require_once('../../include/addon.class.php');
 require_once('../../include/benutzerfunktion.class.php');
+require_once('../../include/phrasen.class.php');
 
 if (!$db = new basis_db())
 	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
@@ -63,6 +64,16 @@ $message='';
 $error=false;
 $mlAbgeschickt = '';
 
+//Phrasen
+$sprache = getSprache();
+$p = new phrasen($sprache);
+
+//Default-Wert für Max-Intervall in Tagen für Zeitsperre, über Config veränderbar
+$maxDauerZS = 730;
+
+if (defined('CIS_ZEITSPERREN_MAX_DAUER') && CIS_ZEITSPERREN_MAX_DAUER != '') {
+	$maxDauerZS = CIS_ZEITSPERREN_MAX_DAUER;
+}
 //prüfen, ob addon casetime aktiviert ist
 $addon_obj = new addon();
 $addoncasetime = $addon_obj->checkActiveAddon("casetime");
@@ -205,6 +216,24 @@ if(isset($_POST['save']))
 	if(!$berechtigt)
 		die('Sie haben keine Berechtigung für diese Aktion');
 
+	//Validierungen Felder Bis-Datum und Von-Datum
+	if($vondatum > $bisdatum)
+	{
+		$errormsg = $p->t('zeitsperre/vonDatumGroesserAlsBisDatum').'! ';
+		$error=true;
+	}
+
+	//Check if Bisdatum zu weit in der Zukunft
+	$von = new DateTime($vondatum);
+	$bis = new DateTime($bisdatum);
+
+	$intervall = $bis->diff($von);
+	if ($intervall->days > $maxDauerZS)
+	{
+		$error=true;
+		$errormsg = $p->t('zeitsperre/bisDatumGroesserMax');
+	}
+
 	//Speichern der Daten
 	$zeitsperre = new zeitsperre();
 
@@ -225,6 +254,8 @@ if(isset($_POST['save']))
 		$zeitsperre->mitarbeiter_uid=$uid;
 	}
 
+
+
 	if(!$error)
 	{
 		$zeitsperre->zeitsperretyp_kurzbz=$zeitsperretyp_kurzbz;
diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index 6fac37be7..038c1977d 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -1010,6 +1010,7 @@ if(isset($_GET['excel']))
 							headers: {0: { sorter: false}},
 							widgetOptions: {filter_cssFilter: [
 									"filter_clm_null",
+									"filter_clm_prestudent_id",
 									"filter_clm_person_id",
 									"filter_clm_null",
 									"filter_clm_vorname",
@@ -1027,18 +1028,30 @@ if(isset($_GET['excel']))
 						$("#"+v.id).checkboxes('toggle');
 						e.preventDefault();
 						if ($("input.chkbox:checked").size() > 0)
+						{
 							$("#mailSendButton").html('Mail an markierte Personen senden');
+							$("#msgSendButton").html('Message an markierte Personen senden');
+						}
 						else
+						{
 							$("#mailSendButton").html('Mail an alle senden');
+							$("#msgSendButton").html('Message an alle senden');
+						}
 					});
 
 					$("#uncheck_"+v.id).on('click', function(e) {
 						$("#"+v.id).checkboxes('uncheck');
 						e.preventDefault();
 						if ($("input.chkbox:checked").size() > 0)
+						{
 							$("#mailSendButton").html('Mail an markierte Personen senden');
+							$("#msgSendButton").html('Message an markierte Personen senden');
+						}
 						else
+						{
 							$("#mailSendButton").html('Mail an alle senden');
+							$("#msgSendButton").html('Message an alle senden');
+						}
 					});
 
 					$("#"+v.id).checkboxes('range', true);
@@ -1049,6 +1062,7 @@ if(isset($_GET['excel']))
 					if (typeof(Storage) !== 'undefined')
 					{
 						var arr = ['clm_null',
+							'clm_prestudent_id',
 							'clm_person_id',
 							'clm_null',
 							'clm_vorname',
@@ -1114,9 +1128,15 @@ if(isset($_GET['excel']))
 				$('.chkbox').change(function()
 				{
 					if ($("input.chkbox:checked").size() > 0)
+					{
 						$("#mailSendButton").html('Mail an markierte Personen senden');
+						$("#msgSendButton").html('Message an markierte Personen senden');
+					}
 					else
+					{
 						$("#mailSendButton").html('Mail an alle senden');
+						$("#msgSendButton").html('Message an alle senden');
+					}
 				});
 
 				$('#toggle_bearbeitenForm').click(function()
@@ -1227,6 +1247,23 @@ if(isset($_GET['excel']))
 				});
 				window.location.href = "mailto:?bcc="+mailadressen;
 			}
+			
+			function SendMessage()
+			{
+				// Wenn Checkboxen markiert sind, an diese senden, sonst an alle
+				if ($("input.chkbox:checked").size() > 0)
+					var elements = $("input.chkbox:checked");
+				else
+					var elements = $("input.chkbox");
+				var form = $("#sendMsgForm");
+				form.find("input[type=hidden]").remove();
+				$.each(elements, function(index, item)
+				{
+					var prestudent_id = $(this).closest('tr').find('td.clm_prestudent_id').text();
+					form.append("<input type='hidden' name='prestudent_id[]' value='" + prestudent_id + "'>");
+				});
+				form.submit();
+			}
 		</script>
 		<style type="text/css">
 		.active
@@ -2264,7 +2301,7 @@ $studienplaene_list = implode(',', array_keys($studienplaene_arr));
 								echo '<option value="2" '.($reihungstest->stufe == 2 ? 'selected' : '').'>2 (Interview)</option>';
 								echo '<option value="3" '.($reihungstest->stufe == 3 ? 'selected' : '').'>3</option>';
 							}
-							else 
+							else
 							{
 								echo '<option value="1" '.($reihungstest->stufe == 1 ? 'selected' : '').'>1</option>';
 								echo '<option value="2" '.($reihungstest->stufe == 2 ? 'selected' : '').'>2</option>';
@@ -2583,6 +2620,9 @@ if($reihungstest_id!='')
 	echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&excel=true">Excel Export</a>';
 	//echo '<a class="buttongreen" href="'.$_SERVER['PHP_SELF'].'?reihungstest_id='.$reihungstest_id.'&type=saveallrtpunkte">Punkte ins FAS &uuml;bertragen</a>';
 	echo '<a class="buttongreen" href="#" onclick="SendMail()" id="mailSendButton">Mail an alle BewerberInnen senden</a>';
+	echo '<form id="sendMsgForm" method="post" action="'. APP_ROOT .'index.ci.php/system/messages/FASMessages/writeTemplate" target="_blank" style="display:inline-block">
+			<a class="buttongreen" href="javascript:void(0)" onclick="SendMessage()" id="msgSendButton">Message an alle BewerberInnen senden</a>
+			</form>';
 }
 if (defined('CAMPUS_NAME') && CAMPUS_NAME == 'FH Technikum Wien')
 {
@@ -2607,7 +2647,7 @@ if($reihungstest_id!='')
 	$qry = "
 	SELECT DISTINCT rt_person_id,
 		rt_id,
-		'0' AS prestudent_id,
+		prestudent_id,
 		tbl_rt_person.person_id,
 		vorname,
 		nachname,
@@ -2725,7 +2765,7 @@ if($reihungstest_id!='')
 		echo '<br><span style="color: red"><b>Achtung!</b> Anzahl Arbeitsplätze überschritten</span>';
 	echo '</td></tr>';
 	echo '<tr><td>';
-	//echo '<div id="clm_prestudent_id" class="active" onclick="hideColumn(\'clm_prestudent_id\')">Prestudent ID</div>';
+	echo '<div id="clm_prestudent_id" class="active" onclick="hideColumn(\'clm_prestudent_id\')">Prestudent ID</div>';
 	echo '<div id="clm_person_id" class="active" onclick="hideColumn(\'clm_person_id\')">Person ID</div>';
 	echo '<div id="clm_vorname" class="active" onclick="hideColumn(\'clm_vorname\')">Vorname</div>';
 	echo '<div id="clm_geschlecht" class="active" onclick="hideColumn(\'clm_geschlecht\')">Geschlecht</div>';
@@ -2765,7 +2805,7 @@ if($reihungstest_id!='')
 						<a href="#" data-toggle="checkboxes" data-action="uncheck" id="uncheck_t'.$cnt.'"><img src="../../skin/images/checkbox_uncheck.png" name="toggle"></a>
 					</nobr>
 					</th>
-					<!--<th style="display: table-cell" class="clm_prestudent_id" title="PrestudentID">Prestudent ID</th>-->
+					<th style="display: table-cell" class="clm_prestudent_id" title="PrestudentID">Prestudent ID</th>
 					<th style="display: table-cell" class="clm_person_id" title="PersonID">Person ID</th>
 					<th>Nachname</th>
 					<th style="display: table-cell" class="clm_vorname">Vorname</th>
@@ -2884,7 +2924,7 @@ if($reihungstest_id!='')
 							echo '
 									<tr>
 										<td style="text-align: center"><input type="checkbox" class="chkbox" id="checkbox_'.$row->person_id.'" name="checkbox['.$row->person_id.']"></td>
-										<!--<td style="display: table-cell" class="clm_prestudent_id">'.$db->convert_html_chars($row->prestudent_id).'</td>-->
+										<td style="display: table-cell" class="clm_prestudent_id">'.$db->convert_html_chars($row->prestudent_id).'</td>
 										<td style="display: table-cell" class="clm_person_id">'.$db->convert_html_chars($row->person_id).'</td>
 										<td>'.$db->convert_html_chars($row->nachname).'</td>
 										<td style="display: table-cell" class="clm_vorname">'.$db->convert_html_chars($row->vorname).'</td>
@@ -2947,7 +2987,7 @@ if($reihungstest_id!='')
 									<a href="#" data-toggle="checkboxes" data-action="uncheck" id="uncheck_t'.$cnt.'"><img src="../../skin/images/checkbox_uncheck.png" name="toggle"></a>
 							</nobr>
 							</th>
-							<!--<th style="display: table-cell" class="clm_prestudent_id" title="PrestudentID">Prestudent ID</th>-->
+							<th style="display: table-cell" class="clm_prestudent_id" title="PrestudentID">Prestudent ID</th>
 							<th style="display: table-cell" class="clm_person_id" title="PersonID">Person ID</th>
 							<th>Nachname</th>
 							<th style="display: table-cell" class="clm_vorname">Vorname</th>
@@ -3066,7 +3106,7 @@ if($reihungstest_id!='')
 							echo '
 								<tr>
 									<td style="text-align: center"><input class="chkbox" type="checkbox" id="checkbox_'.$row->person_id.'" name="checkbox['.$row->person_id.']"></td>
-									<!--<td style="display: table-cell" class="clm_prestudent_id">'.$db->convert_html_chars($row->prestudent_id).'</td>-->
+									<td style="display: table-cell" class="clm_prestudent_id">'.$db->convert_html_chars($row->prestudent_id).'</td>
 									<td style="display: table-cell" class="clm_person_id">'.$db->convert_html_chars($row->person_id).'</td>
 									<td>'.$db->convert_html_chars($row->nachname).'</td>
 									<td style="display: table-cell" class="clm_vorname">'.$db->convert_html_chars($row->vorname).'</td>