Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader

2026-06-01 20:29:29 +00:00 · 2025-09-05 12:48:33 +02:00
parent 4099d91a1b 5889bdb6ea
commit 9067f0e00a
43 changed files with 1428 additions and 505 deletions
@@ -75,16 +75,16 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien';

 // (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';

 // (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';

 // (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
@@ -111,23 +111,29 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'a
 // // (studiensemester_kurzbz)/person/(person_id)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/person/(:num)'] = 'api/frontend/v1/stv/Students/getPerson/$1/$2';

-// load routes from extensions
-$subdir = 'application/config/extensions';
-$dirlist = scandir($subdir);
+// load routes from extensions, also look for environment-specific configs
+$subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];

-if ($dirlist)
+foreach($subdirs as $subdir)
 {
-	$files = array_diff($dirlist, array('.','..'));
-
-	foreach ($files as &$item)
+	if(is_dir($subdir))
 	{
-		if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
+		$dirlist = scandir($subdir);
+		if ($dirlist)
 		{
-			$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
+			$files = array_diff($dirlist, array('.','..'));

-			if (file_exists($routes_file))
+			foreach ($files as &$item)
 			{
-				require($routes_file);
+				if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
+				{
+					$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
+
+					if (file_exists($routes_file))
+					{
+						require($routes_file);
+					}
+				}
 			}
 		}
 	}
@@ -269,6 +269,8 @@ class LvMenu extends FHCAPI_Controller
 			'lehrfach_id'=>$lehrfach_id,
 			'lektor_der_lv'=>$lektor_der_lv,
 			'lehrfach_oe_kurzbz_arr'=>$lehrfach_oe_kurzbz_arr,
+			'permissionLib' => &$this->PermissionLib,
+			'phrasesLib' => &$this->PhrasesLib
 		];
 		
 		Events::trigger('lvMenuBuild', 
@@ -418,6 +418,10 @@ class Messages extends FHCAPI_Controller
 		}

 		$data = $this->getDataOrTerminateWithError($result);
+		if (count($data) < 1)
+		{
+			$this->terminateWithError('Error: Messages API no person_id found.');
+		}
 		$person = current($data);

 		return $person->person_id;
@@ -432,8 +436,12 @@ class Messages extends FHCAPI_Controller
 		);

 		$data = $this->getDataOrTerminateWithError($result);
+		if (count($data) < 1)
+		{
+			$this->terminateWithError('Error: Messages API no prestudent_id found.');
+		}
 		$student = current($data);
-	//	$this->terminateWithError($student->prestudent_id, self::ERROR_TYPE_GENERAL);
+
 		return $student->prestudent_id;
 	}

@@ -254,7 +254,6 @@ class Student extends FHCAPI_Controller
 			'gebdatum',
 			'gebort',
 			'geburtsnation',
-			'svnr',
 			'ersatzkennzeichen',
 			'staatsbuergerschaft',
 			'matr_nr',
@@ -694,7 +693,7 @@ class Student extends FHCAPI_Controller
 			return $result;
 		}*/

-		$this->terminateWithSuccess(true);
+		return success(true);
 	}

 	public function requiredIfNotPersonId($value)
@@ -710,4 +709,9 @@ class Student extends FHCAPI_Controller
 			return true;
 		return !!$value;
 	}
+
+	public function isValidDate($value)
+	{
+		return isValidDate($value);
+	}
 }
@@ -761,7 +761,6 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('wahlname');
 		$this->PrestudentModel->addSelect('vornamen');
 		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('svnr');
 		$this->PrestudentModel->addSelect('ersatzkennzeichen');
 		$this->PrestudentModel->addSelect('gebdatum');
 		$this->PrestudentModel->addSelect('geschlecht');
@@ -11,6 +11,7 @@ class UHSTAT1 extends FHC_Controller
 	const CODEX_UNKNOWN_YEAR = 9999;
 	const CODEX_UNKNOWN_NATION = 'XXX';
 	const CODEX_UNKNOWN_BILDUNGMAX = 999;
+	const CODEX_EXCLUDED_NATIONS = ['ZZZ'];
 	const LOWER_BOUNDARY_YEARS = 160;
 	const UPPER_BOUNDARY_YEARS = 20;

@@ -32,8 +33,7 @@ class UHSTAT1 extends FHC_Controller
 		$this->load->library('PermissionLib');

 		// load models
-		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('system/Sprache_model', 'SpracheModel');
 		$this->load->model('codex/Abschluss_model', 'AbschlussModel');
 		$this->load->model('codex/Uhstat1daten_model', 'Uhstat1datenModel');
@@ -104,7 +104,7 @@ class UHSTAT1 extends FHC_Controller
 	{
 		$saved = false;

-		$person_id = $this->_getValidPersonId('sui');
+		$person_id = $this->_getUHSTATPersonId('sui');

 		$this->form_validation->set_error_delimiters('<span class="text-danger">', '</span>');

@@ -245,7 +245,7 @@ class UHSTAT1 extends FHC_Controller
 		// uhstat data can only be deleted with permission
 		if (!$this->_checkPermission('suid')) show_error('no permission');

-		$person_id = $this->_getValidPersonId('suid');
+		$person_id = $this->_getUHSTATPersonId('suid');

 		$uhstat1datenRes = $this->Uhstat1datenModel->delete(
 			array('person_id' => $person_id)
@@ -287,13 +287,17 @@ class UHSTAT1 extends FHC_Controller
 	 */
 	private function _getFormMetaData()
 	{
-		$person_id = $this->_getValidPersonId('s');
+		$person_id = $this->_getUHSTATPersonId('s');

 		// read only display param
 		$readOnly = $this->input->get('readOnly');

-		// depending on permissions, editing or deleting is possible
-		$editPermission = $this->_checkPermission('sui');
+		// checking permissions for form
+
+		// saving is possible if there permission or student log in (but not from application tool)
+		$savePermission = $this->_checkPermission('sui') || ($this->_getUserPersonId() && !$this->_getApplicationToolPersonId());
+
+		// deleting only possible with permission
 		$deletePermission = $this->_checkPermission('suid');

 		$languageIdx = $this->_getLanguageIndex();
@@ -304,7 +308,7 @@ class UHSTAT1 extends FHC_Controller
 			'abschluss_nicht_oesterreich' => array(),
 			'jahre' => array(),
 			'person_id' => $person_id,
-			'editPermission' => $editPermission,
+			'savePermission' => $savePermission,
 			'deletePermission' => $deletePermission,
 			'readOnly' => $readOnly
 		);
@@ -336,15 +340,19 @@ class UHSTAT1 extends FHC_Controller

 		if (hasData($nationRes))
 		{
+			$dropdownNations = [];
 			$nations = getData($nationRes);

-			// put austria in beginning of selection
 			foreach ($nations as $nation)
 			{
-				if ($nation->nation_code == self::CODEX_OESTERREICH) array_unshift($nations, $nation);
+				// put austria in beginning of selection
+				if ($nation->nation_code == self::CODEX_OESTERREICH)
+					array_unshift($dropdownNations, $nation);
+				elseif (!in_array($nation->nation_code, self::CODEX_EXCLUDED_NATIONS)) // add nation if not excluded
+					$dropdownNations[] = $nation;
 			}

-			$formMetaData['nation'] = $nations;
+			$formMetaData['nation'] = $dropdownNations;
 		}

 		// get abschluss list
@@ -386,7 +394,7 @@ class UHSTAT1 extends FHC_Controller
 	 */
 	private function _getUHSTAT1Data()
 	{
-		$person_id = $this->_getValidPersonId('s');
+		$person_id = $this->_getUHSTATPersonId('s');

 		$this->Uhstat1datenModel->addSelect(
 			implode(', ', array_keys($this->_uhstat1Fields))
@@ -417,29 +425,70 @@ class UHSTAT1 extends FHC_Controller
 	}

 	/**
-	 * Gets Id of person having permissions to manage UHSTAT1 data.
-	 * Can be passed as parameter or be in session.
+	 * Gets Id of person, for which UHSTAT1 data is edited.
+	 * Can be passed as parameter, id of logged in person, or be in session.
+	 * @param berechtigungsArt type of permission (suid)
 	 * @return int person_id
 	 */
-	private function _getValidPersonId($berechtigungsArt)
+	private function _getUHSTATPersonId($berechtigungsArt)
 	{
 		// if coming from bewerbungstool - person id is in session (person must be logged in bewerbungstool)
+		$applicationToolPersonId = $this->_getApplicationToolPersonId();
+		if (isset($applicationToolPersonId) && is_numeric($applicationToolPersonId)) return $applicationToolPersonId;
+
+		// if successfully logged in
+		$loggedInPersonId = $this->_getUserPersonId();
+		if (isset($loggedInPersonId) && is_numeric($loggedInPersonId))
+		{
+			// if person id passed directly...
+			$person_id = $this->input->post('person_id');
+			if (!isset($person_id)) $person_id = $this->input->get('person_id');
+
+			if (isset($person_id))
+			{
+				if (!is_numeric($person_id)) show_error("invalid person id");
+				// ...check if there is a permission for editing UHSTAT1 data
+				if ($this->_checkPermission($berechtigungsArt)) return $person_id;
+			}
+
+			// if no id passed, use logged in person id
+			return $loggedInPersonId;
+		}
+
+		show_error("No permission");
+	}
+
+	/**
+	 * Gets person Id if there is a application tool login.
+	 * @return person Id or null
+	 */
+	private function _getApplicationToolPersonId()
+	{
+		// if coming from aplication tool - person id is in session (person must be logged in bewerbungstool)
 		if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX])
 			&& is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX])
 			&& isset($_SESSION[self::LOGIN_SESSION_INDEX])
 		)
 			return $_SESSION[self::PERSON_ID_SESSION_INDEX];

-		// if person id passed directly...
-		$person_id = $this->input->post('person_id');
-		if (!isset($person_id)) $person_id = $this->input->get('person_id');
+		return null;
+	}

-		if (!isset($person_id) || !is_numeric($person_id)) show_error("invalid person id");
-
-		// ...check if there is a permission for editing UHSTAT1 data
-		if ($this->_checkPermission($berechtigungsArt)) return $person_id;
-
-		show_error("No permission");
+	/**
+	 * Gets person Id if there is a user login.
+	 * @return person Id or null
+	 */
+	private function _getUserPersonId()
+	{
+		$loggedInPersonId = getAuthPersonId();
+		if (isset($loggedInPersonId) && is_numeric($loggedInPersonId))
+		{
+			// check if the the user is a student and if the benutzer is active
+			$this->BenutzerModel->addSelect('1');
+			$res = $this->BenutzerModel->loadWhere(["public.tbl_benutzer.person_id" => $loggedInPersonId, "public.tbl_benutzer.aktiv" => TRUE]);
+			if (hasData($res)) return $loggedInPersonId;
+		}
+		return null;
 	}

 	/**
@@ -1275,7 +1275,6 @@ class InfoCenter extends Auth_Controller
 				'nachname' => $this->input->post('nachname'),
 				'titelpost' => isEmptyString($this->input->post('titelpost')) ? null : $this->input->post('titelpost'),
 				'gebdatum' => isEmptyString($this->input->post('gebdatum')) ? null : date("Y-m-d", strtotime($this->input->post('gebdatum'))),
-				'svnr' => isEmptyString($this->input->post('svnr')) ? null : $this->input->post('svnr'),
 				'staatsbuergerschaft' => isEmptyString($this->input->post('buergerschaft')) ? null : $this->input->post('buergerschaft'),
 				'geschlecht' => $this->input->post('geschlecht'),
 				'geburtsnation' => isEmptyString($this->input->post('gebnation')) ? null : $this->input->post('gebnation'),
@@ -1816,7 +1815,7 @@ class InfoCenter extends Auth_Controller
 	}

 	/**
-	 * Loads all necessary Person data: Stammdaten (name, svnr, contact, ...), Dokumente, Logs and Notizen
+	 * Loads all necessary Person data: Stammdaten (name, contact, ...), Dokumente, Logs and Notizen
 	 * @param $person_id
 	 * @return array
 	 */
@@ -122,6 +122,7 @@ class PhrasesLib
 								$tmpText = substr($tmpText, 0, strlen($tmpText) - 4);
 							}
 						}
+						$tmpText = str_replace(['<span class="caps">', '</span>'], '', $tmpText);

 						$result->retval[$i]->text = $tmpText;
 					}
@@ -26,7 +26,7 @@ $vater_bildungsstaat = isset($uhstatData->vater_bildungsstaat) ? $uhstatData->va
 $vater_bildungmax = isset($uhstatData->vater_bildungmax) ? $uhstatData->vater_bildungmax : set_value('vater_bildungmax');
 $readOnly = isset($formMetaData['readOnly']);
 $disabled = $readOnly ? ' disabled' : '';
-$editPermission = isset($formMetaData['editPermission']) && $formMetaData['editPermission'] === true;
+$savePermission = isset($formMetaData['savePermission']) && $formMetaData['savePermission'] === true;
 $deletePermission = isset($formMetaData['deletePermission']) && $formMetaData['deletePermission'] === true;
 $saved = isset($saved) && $saved === true;
 ?>
@@ -51,7 +51,7 @@ $saved = isset($saved) && $saved === true;
 			<?php echo $this->p->t('uhstat', 'uhstat1EinleitungSvnrtext') ?>
 		</p>
 		<br>
-		<?php if ($editPermission): ?>
+		<?php if ($savePermission): ?>
 			<?php if (isset($successMessage) && !isEmptyString($successMessage)): ?>
 				<div class="alert alert-success" id="uhstat_success_alert">
 					<button type="button" class="close" data-dismiss="alert">x</button>
@@ -288,7 +288,7 @@ $saved = isset($saved) && $saved === true;
 					</div>
 				</div>
 			</fieldset>
-			<?php if ($editPermission && !$readOnly): ?>
+			<?php if ($savePermission && !$readOnly): ?>
 				<br>
 				<fieldset>
 					<div class="form-group">
@@ -32,12 +32,6 @@
 					<div class='stammdaten' id="gebdatum"><?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></div>
 				</td>
 			</tr>
-			<tr>
-				<td><strong><?php echo  ucfirst($this->p->t('person','svnr')) ?></strong></td>
-				<td>
-					<div class='stammdaten' id="svnr"><?php echo $stammdaten->svnr ?></div>
-				</td>
-			</tr>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','staatsbuergerschaft')) ?></strong></td>
 				<td>
@@ -843,7 +843,6 @@ function meine_uid_informationen_detail($db,$uid,$count=0)

 		$aktiv=$db->db_result($erg,0,"aktiv");

-		$svnr=$db->db_result($erg,0,"svnr");

 		$titelpre=$db->db_result($erg,0,"titelpre");
 		$titelpost=$db->db_result($erg,0,"titelpost");
@@ -285,15 +285,16 @@ function showHideBezeichnungDropDown()
 	if (dd.options[dd.selectedIndex].value == 'DienstV')
 	{
 		var str = '<select name="bezeichnung" class="dd_breit">';
-		str += '<option value="Eheschließung">a) Eigene Eheschließung (3 Tage)</option>';
+		str += '<option value="Eheschließung">a) Eigene Eheschließung oder Verpartnerung (3 Tage)</option>';
 		str += '<option value="Geburt eigenes Kind">b) Geburt eines Kindes der Ehefrau/Lebensgefährtin (2 Tage)</option>';
-		str += '<option value="Heirat Kind/Geschwister">c) Eheschließung eines Kindes/eigener Geschwister (1 Tag)</option>';
+		str += '<option value="Heirat Kind/Geschwister">c) Eheschließung oder Verpartnerung eines Kindes/eigener Geschwister (1 Tag)</option>';
 		str += '<option value="Eigene Sponsion/Promotion">d) Teilnahme an eigener Sponsion/Promotion (1 Tag)</option>';
 		str += '<option value="Lebensbedr. Erkrankung P/K/E">e) Lebensbedrohliche Erkrankung Partner/Kinder/Eltern (3 Tage)</option>';
 		str += '<option value="Ableben P/K/E">f) Ableben Partner/Kinder/Elternteil (3 Tage)</option>';
 		str += '<option value="Bestattung G/S/G">g) Teilnahme an Bestattung Geschwister/Schwiegereltern/eigener Großeltern (1 Tag)</option>';
 		str += '<option value="Wohnungswechsel">h) Wohnungswechsel in eigenen Haushalt (2 Tage)</option>';
 		str += '<option value="Bundesheer">i) Einberufung Bundesheer</option>';
+		str += '<option value="Volksschultag">j) erster Volksschultag (1 Tag)</option>';
 		str += '</select>';

 		sp.innerHTML = str;
@@ -307,8 +307,6 @@ foreach($prestudent_ids as $pid)
 		$nation->load($prestudent->zgvnation);
 		$zgvnation = $nation->kurztext;

-		$svnr = ($prestudent->svnr == '')?($prestudent->ersatzkennzeichen != ''?'Ersatzkennzeichen: '.$prestudent->ersatzkennzeichen:''):$prestudent->svnr;
-
 		foreach($adresse->result as $row_adresse)
 		{
 			if($row_adresse->heimatadresse)
@@ -439,7 +437,6 @@ foreach($prestudent_ids as $pid)
 				'zustell_ort' => $zustellOrt,
 				'zustell_bundesland' => $zustellBundesland,
 				'geburtsnation' => $geburtsnation,
-				'svnr' => $svnr,
 				'staatsbuergerschaft' => $staatsbuergerschaft,
 				'geschlecht' => $prestudent->geschlecht,
 				'telefonnummer' => $telefonnummer,
@@ -125,8 +125,6 @@ $worksheet->write($zeile, ++$i, "PERSONENKENNZEICHEN", $format_bold);
 $maxlength[$i] = 19;
 $worksheet->write($zeile, ++$i, "STAATSBÜRGERSCHAFT", $format_bold);
 $maxlength[$i] = 16;
-$worksheet->write($zeile, ++$i, "SVNR", $format_bold);
-$maxlength[$i] = 4;
 $worksheet->write($zeile, ++$i, "PERSON_ID", $format_bold);
 $maxlength[$i] = 6;
 $worksheet->write($zeile, ++$i, "ERSATZKENNZEICHEN", $format_bold);
@@ -396,12 +394,7 @@ function draw_content($row)
 	$worksheet->write($zeile, $i, $row->staatsbuergerschaft);
 	$i++;

-	//SVNR
-	if (mb_strlen($row->svnr) > $maxlength[$i])
-		$maxlength[$i] = mb_strlen($row->svnr);
-	$worksheet->write($zeile, $i, $row->svnr);
-	$i++;
-	
+
 	//Person_id
 	if (mb_strlen($row->person_id) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->person_id);
@@ -594,7 +594,6 @@ if(!$error)
 				$student->anmerkungen = $_POST['anmerkung'];
 				$student->homepage = $_POST['homepage'];
 				$student->matr_nr = $_POST['matr_nr'];
-				$student->svnr = $_POST['svnr'];
 				$student->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
 				$student->familienstand = $_POST['familienstand'];
 				$student->geschlecht = $_POST['geschlecht'];
@@ -746,7 +745,6 @@ if(!$error)
 				$person->gebzeit = $_POST['geburtszeit'];
 				$person->anmerkungen = $_POST['anmerkung'];
 				$person->homepage = $_POST['homepage'];
-				$person->svnr = $_POST['svnr'];
 				$person->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
 				$person->familienstand = $_POST['familienstand'];
 				$person->geschlecht = $_POST['geschlecht'];
@@ -134,8 +134,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';

 						</row>
 						<row>
-							<label value="SVNR" control="student-detail-textbox-svnr"/>
-							<hbox><textbox id="student-detail-textbox-svnr" disabled="true" maxlength="16" size="10"/></hbox>
+
 							<label value="Ersatzkennzeichen" control="student-detail-textbox-ersatzkennzeichen"/>
 							<hbox><textbox id="student-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10" size="15"/></hbox>
 							<label value="Geburtszeit" control="student-detail-textbox-geburtszeit" hidden="true"/>
@@ -284,10 +284,6 @@ else
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#titelpost" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
-	    				<treecol id="student-treecol-svnr" label="SVNR" flex="1" hidden="false" persist="hidden, width, ordinal"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#svnr" onclick="StudentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
 	    				<treecol id="student-treecol-ersatzkennzeichen" label="Ersatzkennzeichen" flex="1" hidden="false" persist="hidden, width, ordinal"
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#ersatzkennzeichen" onclick="StudentTreeSort()"/>
@@ -445,7 +441,6 @@ else
 													<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#wahlname" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#titelpost" />
-	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#svnr" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#ersatzkennzeichen" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#geschlecht" />
@@ -786,7 +786,6 @@ function StudentDetailReset()
 	document.getElementById('student-detail-textbox-geburtszeit').value='';
 	document.getElementById('student-detail-textbox-anmerkung').value='';
 	document.getElementById('student-detail-textbox-homepage').value='';
-	document.getElementById('student-detail-textbox-svnr').value='';
 	document.getElementById('student-detail-textbox-ersatzkennzeichen').value='';
 	document.getElementById('student-detail-menulist-familienstand').value='l';
 	document.getElementById('student-detail-menulist-geschlecht').value='m';
@@ -819,7 +818,6 @@ function StudentDetailDisableFields(val)
 	document.getElementById('student-detail-textbox-geburtszeit').disabled=val;
 	document.getElementById('student-detail-textbox-anmerkung').disabled=val;
 	document.getElementById('student-detail-textbox-homepage').disabled=val;
-	document.getElementById('student-detail-textbox-svnr').disabled=val;
 	document.getElementById('student-detail-textbox-ersatzkennzeichen').disabled=val;
 	document.getElementById('student-detail-menulist-familienstand').disabled=val;
 	document.getElementById('student-detail-menulist-geschlecht').disabled=val;
@@ -860,7 +858,6 @@ function StudentDetailSave()
 	geburtszeit = document.getElementById('student-detail-textbox-geburtszeit').value;
 	anmerkung = document.getElementById('student-detail-textbox-anmerkung').value;
 	homepage = document.getElementById('student-detail-textbox-homepage').value;
-	svnr = document.getElementById('student-detail-textbox-svnr').value;
 	ersatzkennzeichen = document.getElementById('student-detail-textbox-ersatzkennzeichen').value;
 	familienstand = document.getElementById('student-detail-menulist-familienstand').value;
 	geschlecht = document.getElementById('student-detail-menulist-geschlecht').value;
@@ -919,7 +916,6 @@ function StudentDetailSave()
 	req.add('geburtszeit', geburtszeit);
 	req.add('anmerkung', anmerkung);
 	req.add('homepage', homepage);
-	req.add('svnr', svnr);
 	req.add('ersatzkennzeichen', ersatzkennzeichen);
 	req.add('familienstand', familienstand);
 	req.add('geschlecht', geschlecht);
@@ -1167,7 +1163,6 @@ function StudentAuswahl()
 	geburtszeit=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gebzeit" ));
 	anmerkung=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkungen" ));
 	homepage=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#homepage" ));
-	svnr=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#svnr" ));
 	ersatzkennzeichen=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ersatzkennzeichen" ));
 	familienstand=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#familienstand" ));
 	geschlecht=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geschlecht" ));
@@ -1211,7 +1206,6 @@ function StudentAuswahl()
 	document.getElementById('student-detail-textbox-geburtszeit').value=geburtszeit;
 	document.getElementById('student-detail-textbox-anmerkung').value=anmerkung;
 	document.getElementById('student-detail-textbox-homepage').value=homepage;
-	document.getElementById('student-detail-textbox-svnr').value=svnr;
 	document.getElementById('student-detail-textbox-ersatzkennzeichen').value=ersatzkennzeichen;
 	document.getElementById('student-detail-menulist-familienstand').value=familienstand;

@@ -3553,6 +3547,15 @@ function StudentZeugnisDokumentArchivieren()
 			xml = 'abschlussdokument_lehrgaenge.xml.php';
 			break;

+		case 'microcredentialzertifikat_1':
+		case 'microcredentialzertifikat_2':
+		case 'microcredentialzertifikat_3':
+		case 'microcredential_1':
+		case 'microcredential_2':
+		case 'microcredential_3':
+			xml = 'microcredential.xml.php';
+			break;
+			
 		default:
 			alert('Das Archivieren fuer diesen Dokumenttyp wird derzeit nicht unterstuetzt');
 			return
@@ -4783,7 +4786,7 @@ function StudentNotenMoveFromAntrag()

 	var uid = document.getElementById('student-detail-textbox-uid').value;
 	req.add('student_uid', uid);
-	
+
 	var txt = "?";
 	for(var q in req.parms) {
 		txt = txt+'&'+req.parms[q].name+'='+encodeURIComponent(req.parms[q].value);
@@ -1051,7 +1051,6 @@ class prestudent extends person
 				//$ps->foto = $row->foto;
 				$ps->anmerkungen = $row->anmerkungen;
 				$ps->homepage = $row->homepage;
-				$ps->svnr = $row->svnr;
 				$ps->ersatzkennzeichen = $row->ersatzkennzeichen;
 				$ps->familienstand = $row->familienstand;
 				$ps->geschlecht = $row->geschlecht;
@@ -294,7 +294,6 @@ class student extends benutzer
 			$l->gebort=$row->gebort;
 			$l->gebzeit=$row->gebzeit;
 			$l->familienstand = $row->familienstand;
-			$l->svnr=$row->svnr;
 			$l->foto=$row->foto;
 			$l->anmerkungen=$row->anmerkung;
 			$l->aktiv=$this->db_parse_bool($row->aktiv);
@@ -649,7 +648,7 @@ class student extends benutzer
 	{
 		$sql_query = "SELECT
 						person_id, staatsbuergerschaft, geburtsnation, sprache, anrede, titelpost, titelpre,
-						nachname, vorname, vornamen, gebdatum, gebort, gebzeit, anmerkung, homepage, svnr,
+						nachname, vorname, vornamen, gebdatum, gebort, gebzeit, anmerkung, homepage,
 						ersatzkennzeichen, familienstand, geschlecht, anzahlkinder, tbl_person.aktiv, kurzbeschreibung,
 						tbl_benutzer.aktiv as bnaktiv, tbl_student.studiengang_kz, tbl_student.semester, tbl_student.verband,
 						tbl_student.gruppe, tbl_student.prestudent_id, tbl_benutzer.uid
@@ -691,7 +690,6 @@ class student extends benutzer
 				$l->gebzeit = $row->gebzeit;
 				$l->anmerkungen = $row->anmerkung;
 				$l->homepage = $row->homepage;
-				$l->svnr = $row->svnr;
 				$l->ersatzkennzeichen = $row->ersatzkennzeichen;
 				$l->familienstand = $row->familienstand;
 				$l->geschlecht = $row->geschlecht;
@@ -244,10 +244,10 @@ function checkZeilenUmbruch()
 	if(defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet
 		&& (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG') || in_array($lv->studiengang_kz, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG)))
 		&& (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA') || in_array($lv->lehrveranstaltung_id, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA)))
-		&& ($rechte->isBerechtigt('extension/anw_ent_admin')
-				|| $rechte->isBerechtigt('extension/anwesenheit_lektor')
-				|| $rechte->isBerechtigt('extension/anwesenheit_student')
-				|| $rechte->isBerechtigt('extension/anwesenheit_admin')))
+		&& ($rechte->isBerechtigt('extension/anw_r_ent_assistenz')
+				|| $rechte->isBerechtigt('extension/anw_r_lektor')
+				|| $rechte->isBerechtigt('extension/anw_r_student')
+				|| $rechte->isBerechtigt('extension/anw_r_full_assistenz')))
 	{
 		$link='';
 		$text='';
@@ -3,7 +3,8 @@
 export default {
 	name: 'BootstrapModal',
 	data: () => ({
-		modal: null
+		modal: null,
+		fullscreen: false
 	}),
 	props: {
 		backdrop: {
@@ -34,6 +35,10 @@ export default {
 		footerClass: {
 			type: [String,Array,Object],
 			default: ''
+		},
+		allowFullscreenExpand: {
+			type: Boolean,
+			default: false
 		}
 	},
 	emits: [
@@ -58,6 +63,9 @@ export default {
 		},
 		toggle() {
 			return this.modal.toggle();
+		},
+		toggleFullscreen() {
+			this.fullscreen = !this.fullscreen
 		}
 	},
 	mounted() {
@@ -122,13 +130,18 @@ export default {
 			});
 		});
 	},
-	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" >
-		<div class="modal-dialog" :class="dialogClass">
+	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
+		<div class="modal-dialog" :class="fullscreen ? 'modal-fullscreen' : dialogClass">
 			<div class="modal-content">
 				<div v-if="$slots.title" class="modal-header" :class="headerClass">
 					<h5 class="modal-title"><slot name="title"/></h5>
-					<slot name="popoutButton"></slot>
-					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<div class="d-flex align-items-center ms-auto">
+						<button type="button" class="btn ms-auto" style="filter: invert(1)" v-if="allowFullscreenExpand" @click="toggleFullscreen">
+						  <i v-if="!fullscreen" class="fa-solid fa-expand"></i>
+						  <i v-else class="fa-solid fa-compress"></i>
+						</button>
+						<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					</div>
 					<slot name="modal-header-content"></slot>
 				</div>
 				<div class="modal-body" :class="bodyClass">
@@ -44,11 +44,16 @@ export default {
 	},
 	watch: {
 		currentDate() {
-			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
-			if (this.rangeOffset) {
-				this.$refs.view.$refs.grid.disableAutoScroll();
+			if (this.currentDate.locale != this.focusDate.locale) {
+				this.focusDate = this.currentDate;
 				this.$emit('update:range', this.range);
-				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
+				if (this.rangeOffset) {
+					this.$refs.view.$refs.grid.disableAutoScroll();
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
 			}
 		}
 	},
@@ -47,10 +47,15 @@ export default {
 	},
 	watch: {
 		currentDate() {
-			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
-			if (this.rangeOffset) {
+			if (this.currentDate.locale != this.focusDate.locale) {
+				this.focusDate = this.currentDate;
 				this.$emit('update:range', this.range);
-				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
+				if (this.rangeOffset) {
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
 			}
 		}
 	},
@@ -3,6 +3,7 @@ import FhcFragment from "../Fragment.js";
 let _uuid = {};

 export default {
+	name: "FormInput",
 	inheritAttrs: false,
 	components: {
 		FhcFragment
@@ -220,7 +221,7 @@ export default {
 			if (this.tag == 'VueDatePicker' && !this._.components.VueDatePicker) {
 				this._.components.VueDatePicker = Vue.defineAsyncComponent(() => import("../vueDatepicker.js.php"));
 			} else if (this.tag == 'PvAutocomplete' && !this._.components.PvAutocomplete) {
-				this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"));
+				this._.components.PvAutocomplete = primevue.autocomplete;
 			} else if (this.tag == 'UploadImage' && !this._.components.UploadImage) {
 				this._.components.UploadImage = Vue.defineAsyncComponent(() => import("./Upload/Image.js"));
 			} else if (this.tag == 'UploadDms' && !this._.components.UploadDms) {
@@ -318,16 +318,6 @@ export default {
 					</form-input>
 				</div>
 				<div class="row mb-3">
-					<form-input
-						v-if="!config.hiddenFields.includes('svnr')"
-						container-class="col-4 stv-details-details-svnr"
-						:label="$p.t('person', 'svnr')"
-						type="text"
-						v-model="data.svnr"
-						name="svnr"
-						maxlength="16"
- 						>
-					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('ersatzkennzeichen')"
 						container-class="col-4 stv-details-details-ersatzkennzeichen"
@@ -151,7 +151,17 @@ export default {
 				ApiStvStatus.addStudent(prestudent_id, data),
 				{ errorHeader: prestudent_id }
 			]))
-			.then(() => {
+			.then(result => {
+				const messagesSuccessful = result.filter(res => res.status == 'fulfilled');
+				if (messagesSuccessful.length) {
+					this.$fhcAlert.alertDefault(
+						'info',
+						'Feedback',
+						messagesSuccessful.length + " erfolgreiche Statusänderung(en) durchgeführt", // TODO(chris): translate
+						false,
+						true
+					);
+				}
 				this.$emit('reloadTable');
 				this.$reloadList();
 			});
@@ -50,7 +50,6 @@ export default {
 					{title:"Wahlname", field:"wahlname", visible:false, headerFilter: true},
 					{title:"Vornamen", field:"vornamen", visible:false, headerFilter: true},
 					{title:"TitelPost", field:"titelpost", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title:"SVNR", field:"svnr", headerFilter: true},
 					{title:"Ersatzkennzeichen", field:"ersatzkennzeichen", headerFilter: true},
 					{title:"Geburtsdatum", field:"gebdatum", formatter:dateFormatter, 
 						headerFilter: true, headerFilterFunc: function(headerValue, rowValue, rowData, filterParams) {
@@ -193,7 +193,7 @@ export default {

 			// TODO(chris): move to fhcapi.factory
 			this.$refs.form
-				.send('api/frontend/v1/stv/student/add', data)
+				.post('api/frontend/v1/stv/student/add', data)
 				.then(result => {
 					this.$fhcAlert.alertSuccess('Gespeichert');
 					this.$refs.modal.hide();
@@ -213,7 +213,7 @@ export default {
 	},
 	template: `
 	<fhc-form ref="form" class="stv-list-new" @submit.prevent="send">
-		<bs-modal ref="modal" dialog-class="modal-lg modal-scrollable" @hidden-bs-modal="reset">
+		<bs-modal ref="modal" dialog-class="modal-lg modal-dialog-scrollable" @hidden-bs-modal="reset">
 			<template #title>
 				InteressentIn anlegen
 			</template>
@@ -44,7 +44,6 @@ $(document).ready(function ()
 			"nachname" : $('#nachname_input').val(),
 			"titelpost" : $('#titelpost_input').val(),
 			"gebdatum" : $('#gebdatum_input').val(),
-			"svnr" : $('#svnr_input').val(),
 			"buergerschaft" : $('#buergerschaft').val(),
 			"geschlecht" : $('#geschlecht').val(),
 			"gebnation" : $('#gebnation').val(),
@@ -10,7 +10,232 @@ export default {
 		if (!app.config.globalProperties.$fhcAlert)
 			app.use(FhcAlert);

-		function _get_config(form, uri, data, config) {
+		const $fhcAlert = app.config.globalProperties.$fhcAlert;
+
+		function _send_array_or_object(errors, func) {
+			if (Array.isArray(errors))
+				errors.forEach(func);
+			else
+				Object.entries(errors).forEach(
+					([title, errs]) => errs.forEach(
+						error => func(error, title)
+					)
+				);
+		}
+		let DEFAULT_ERROR_CONFIG = {
+			success: true,
+			fail: true,
+			combine: {
+				form: ['validation', 'general'],
+				toast: ['validation', 'general', 'not_found', 'site_failed']
+			},
+			handler: {
+				form(form, errors) {
+					form.clearValidation();
+					errors.forEach(err => form.setFeedback(
+						false,
+						err.messages || err.message
+					));
+				},
+				async toast(errors) {
+					const $p = app.config.globalProperties.$p;
+					if (!$p)
+						return Promise.reject('Phrasen plugin not loaded!');
+				
+					async function _format_toast(errors) {
+						errors = errors.reduce((result, err) => {
+							switch (err.type) {
+							case 'not_found':
+							case 'site_failed':
+								if (err.message)
+									result[err.message] = [err.url];
+								else
+									result._default = [err.url];
+								break;
+							case 'general':
+								if (!result._default)
+									result._default = [];
+								result._default.push(err.message);
+								break;
+							case 'validation':
+								Object.entries(err.messages)
+									.forEach(([field, msg]) => {
+										if (!result[field])
+											result[field] = [];
+										if (Array.isArray(msg))
+											result[field].push(...msg);
+										else
+											result[field].push(msg);
+									});
+								break;
+							}
+							return result;
+						}, {});
+						let counter = 0;
+						const msgs = await Promise.all(Object.entries(errors)
+							.sort((a, b) => ['_default'].indexOf(b[0]) - ['_default'].indexOf(a[0])) // sort _default first
+							.map(async ([field, msgs]) => {
+								if (field == '_default') {
+									await $p.loadCategory('dashboard');
+									const general = $p.t('dashboard/general');
+									field = '<dt class="d-none">' + general + '</dt>';
+								} else {
+									field = '<dt>' + field + '</dt>';
+								}
+								counter += msgs.length;
+								return field
+									+ '<dd>'
+									+ msgs.join('</dd><dd>')
+									+ '</dd>';
+							}));
+						return {
+							counter,
+							msgs
+						}
+					}
+
+					let counter, msgs;
+					if (Array.isArray(errors)) {
+						({ counter, msgs } = await _format_toast(errors));
+					} else {
+						({ counter, msgs } = await Object.entries(errors)
+							.reduce(async (res, [title, errs]) => {
+								const result = await res;
+								const { counter, msgs } = await _format_toast(errs);
+								result.counter += counter;
+								result.msgs.push('<dt>'
+									+ title
+									+ '</dt><dd><dl>'
+									+ msgs.join('')
+									+ '</dl></dd>');
+								return result;
+							}, Promise.resolve({ counter: 0, msgs: []})));
+					}
+
+					await $p.loadCategory('ui');
+					const n_errors = $p.t('ui/n_errors', { n: counter });
+
+					$fhcAlert.alertDefault(
+						'error',
+						n_errors,
+						'<dl>' + msgs.join('') + '</dl>',
+						true,
+						true
+					);
+				},
+				php(errors) {
+					_send_array_or_object(errors, (error, title) => {
+						var message = '';
+						message += 'Message: ' + error.message + '\n\n';
+						message += 'Filename: ' + error.filename + '\n';
+						message += 'Line Number: ' + error.line + '\n';
+						if (error.backtrace && error.backtrace.length) {
+							message += '\nBacktrace: ';
+							error.backtrace.forEach(err => {
+								message += '\n\tFile: ' + err.file + '\n';
+								message += '\tLine: ' + err.line + '\n';
+								message += '\tFunction: ' + err.function + '\n';
+							});
+						}
+						switch (error.severity) {
+							case 'Warning':
+							case 'Core Warning':
+							case 'Compile Warning':
+							case 'User Warning':
+								if (title)
+									title += ': PHP ' + error.severity;
+								else
+									title = 'PHP ' + error.severity;
+								$fhcAlert.alertDefault('warn', title, message, true);
+								break;
+							case 'Notice':
+							case 'User Notice':
+							case 'Runtime Notice':
+								if (title)
+									title += ': PHP ' + error.severity;
+								else
+									title = 'PHP ' + error.severity;
+								$fhcAlert.alertDefault('info', title, message, true);
+								break;
+							default:
+								message = 'Type: PHP ' + error.severity + '\n\n' + message;
+								if (title)
+									message = title + '\n\n' + message;
+								$fhcAlert.alertSystemError(message);
+								break;
+						}
+					});
+				},
+				exception(errors) {
+					_send_array_or_object(errors, (error, title) => {
+						var message = '';
+						if (title)
+							message += title + '\n\n';
+						message += 'Type: ' + error.class + '\n\n';
+						message += 'Message: ' + error.message + '\n\n';
+						message += 'Filename: ' + error.filename + '\n';
+						message += 'Line Number: ' + error.line + '\n';
+						if (error.backtrace && error.backtrace.length) {
+							message += '\nBacktrace: ';
+							error.backtrace.forEach(err => {
+								message += '\n\tFile: ' + err.file + '\n';
+								message += '\tLine: ' + err.line + '\n';
+								message += '\tFunction: ' + err.function + '\n';
+							});
+						}
+						$fhcAlert.alertSystemError(message);
+					});
+				},
+				db(errors) {
+					_send_array_or_object(errors, (error, title) => {
+						var message = '';
+						if (title)
+							message += title + '\n\n';
+						if (error.heading !== undefined)
+							message += error.heading + '\n\n';
+						if (error.code !== undefined)
+							message += 'Code: ' + error.code + '\n\n';
+						if (error.sql !== undefined)
+							message += 'SQL: ' + error.sql + '\n\n';
+						if (error.message !== undefined)
+							message += 'Message: ' + error.message + '\n\n';
+						else if (error.messages !== undefined)
+							message += 'Messages: ' + error.messages.join('\n\t') + '\n\n';
+						if (error.filename !== undefined)
+							message += 'Filename: ' + error.filename + '\n';
+						if (error.line !== undefined)
+							message += 'Line Number: ' + error.line + '\n';
+
+						$fhcAlert.alertSystemError(message);
+					});
+				},
+				auth(errors) {
+					_send_array_or_object(errors, (error, title) => {
+						if (title)
+							title += ': ' + error.message;
+						else
+							title = error.message;
+
+						var message = '';
+						message += 'Controller name: ' + error.controller + '\n';
+						message += 'Method name: ' + error.method + '\n';
+						message += 'Required permissions: ' + error.required_permissions;
+
+						$fhcAlert.alertDefault(
+							'error',
+							title,
+							message,
+							true
+						);
+					});
+				}
+			}
+		};
+
+		if (options?.errorHandling !== undefined)
+			DEFAULT_ERROR_CONFIG = _merge_error_config(options.errorHandling);
+		
+		function get_config(form, uri, data, config) {
 			if (typeof form == 'string' && config === undefined) {
 				[uri, data, config] = [form, uri, data];
 				form = undefined;
@@ -40,10 +265,9 @@ export default {

 			return [uri, data, config];
 		}
-
-		function _clean_return_value(response) {
+		function clean_return_value(response) {
 			if (typeof response.data === 'string' || response.data instanceof String)
-				return _clean_return_value({ data: response });
+				return clean_return_value({ data: response });

 			const result = response.data;
 			delete response.data;
@@ -55,10 +279,111 @@ export default {
 				result.meta.response = response;
 			return result;
 		}
-		const baseURL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/";
+		function _merge_error_config(config) {
+			if (config === false || config === 'off')
+				return { ...DEFAULT_ERROR_CONFIG, success: false, fail: false };
+			
+			if (!config || config === true)
+				return { ...DEFAULT_ERROR_CONFIG };
+
+			if (config === 'success')
+				return { ...DEFAULT_ERROR_CONFIG, fail: false };
+			
+			if (config === 'fail')
+				return { ...DEFAULT_ERROR_CONFIG, success: false };
+			
+			const { success, fail, handler, combine } = config;
+			
+			config = { ...DEFAULT_ERROR_CONFIG };
+
+			Object.entries({ fail, success }).forEach(([key, value]) => {
+				if (value !== undefined)
+					config[key] = value;
+			});
+			Object.entries({ handler, combine }).forEach(([key, value]) => {
+				if (value !== undefined)
+					config[key] = { ...config[key], ...value };
+			});
+
+			return config;
+		}
+		function get_error_handler(config) {
+			const result = _merge_error_config(config?.errorHandling);
+
+			if (!config?.form) {
+				result.combine = { ...result.combine, form: [] };
+			} else {
+				const formHandler = result.handler.form;
+				result.handler = { ...result.handler, form: errors => formHandler(config.form, errors) };
+			}
+
+			return result;
+		}
+		function get_error_list(error) {
+			if (error.response) {
+				if (error.response.status == 404) {
+					return [{
+						type: 'not_found',
+						message: error.message,
+						url: error.request.responseURL
+					}];
+				} else {
+					return error.response.data.errors;
+				}
+			} else if (error.request) {
+				return [{
+					type: 'site_failed',
+					message: error.message,
+					url: error.request.responseURL
+				}];
+			} else {
+				return [{
+					type: 'script',
+					message: error.message
+				}];
+			}
+		}
+		function popHandleableErrors(errorHandling, errors) {
+			const result = {};
+			const copy = [];
+			while (errors.length)
+				copy.push(errors.pop());
+			for (var error of copy) {
+				let type = error.type;
+				let newType = null;
+				for (var t in errorHandling.combine) {
+					let newTypeCombinesType = errorHandling
+						.combine[t]
+						.includes(type);
+					let newTypeHasHandler = errorHandling.handler[t];
+					if (newTypeCombinesType && newTypeHasHandler) {
+						newType = t;
+						if (newType == 'form')
+							break;
+					}
+				}
+				if (newType)
+					type = newType;
+				const handler = errorHandling.handler[type];
+				if (handler) {
+					if (!result[type])
+						result[type] = [];
+					if (Array.isArray(error))
+						result[type].push(...error);
+					else
+						result[type].push(error);
+					continue;
+				}
+				errors.push(error);
+			}
+			return result;
+		}
+
 		const fhcApiAxios = axios.create({
 			timeout: 500000,
-			baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/"
+			baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ "/"
 		});

 		fhcApiAxios.interceptors.request.use(config => {
@@ -100,57 +425,51 @@ export default {
 			return config;
 		});

-		fhcApiAxios.interceptors.response.use(response => {
-			if (response.config?.errorHandling == 'off'
-				|| response.config?.errorHandling === false
-				|| response.config?.errorHandling == 'fail')
-				return _clean_return_value(response);
-
-			// NOTE(chris): loop through errors
-			if (response.data.errors)
-				response.data.errors = response.data.errors.filter(
-					err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, response.config)
-				);
-
-			return _clean_return_value(response);
-		}, error => {
-			if (error.code == 'ERR_CANCELED')
-				return Promise.reject({...{handled: true}, ...error});
-
-			if (error.config?.errorHandling == 'off'
-				|| error.config?.errorHandling === false
-				|| error.config?.errorHandling == 'success')
-				return Promise.reject(error);
-
-			if (error.response) {
-				if (error.response.status == 404) {
-					app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true);
-					return Promise.reject({...{handled: true}, ...error});
-				}
+		fhcApiAxios.interceptors.response.use(
+			response => {
+				if (response.config?.errorHandling == 'off'
+					|| response.config?.errorHandling === false
+					|| response.config?.errorHandling == 'fail')
+					return clean_return_value(response);

 				// NOTE(chris): loop through errors
-				error.response.data.errors = error.response.data.errors.filter(
-					err => (error.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, error.config)
-				);
-				if (!error.response.data.errors.length)
-					return Promise.reject({...{handled: true}, ...error});
-			} else if (error.request) {
-				app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL);
-				return Promise.reject({...{handled: true}, ...error});
-			} else {
-				app.config.globalProperties.$fhcAlert.alertError(error.message);
-				return Promise.reject({...{handled: true}, ...error});
-			}
+				if (response.data.errors)
+					response.data.errors = response.data.errors.filter(
+						err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, response.config)
+					);

-			return Promise.reject(error);
-		});
+				return clean_return_value(response);
+			},
+			error => {
+				if (error.code == 'ERR_CANCELED')
+					return Promise.reject({ handled: true, ...error });
+
+				const errorConfig = get_error_handler(error.config);
+
+				if (!errorConfig.fail)
+					return Promise.reject(error);
+
+				const remaining = get_error_list(error);
+
+				const errors = popHandleableErrors(errorConfig, remaining);
+
+				for (var type in errors) {
+					errorConfig.handler[type](errors[type]);
+				}
+
+				if (remaining.length)
+					return Promise.reject(error);
+				
+				return Promise.reject({ handled: true, ...error });
+			}
+		);

 		app.config.globalProperties.$api = {
 			getUri(url) {
 				return fhcApiAxios.getUri({url});
 			},
 			get(form, uri, params, config) {
-				[uri, params, config] = _get_config(form, uri, params, config);
+				[uri, params, config] = get_config(form, uri, params, config);
 				if (params) {
 					if (config)
 						config.params = params;
@@ -160,82 +479,58 @@ export default {
 				return fhcApiAxios.get(uri, config);
 			},
 			post(form, uri, data, config) {
-				[uri, data, config] = _get_config(form, uri, data, config);
+				[uri, data, config] = get_config(form, uri, data, config);
 				return fhcApiAxios.post(uri, data, config);
 			},
 			call(factory, configoverwrite, form) {
 				if (Array.isArray(factory)) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
 					const $api = app.config.globalProperties.$api;

-					Promise
+					return Promise
 						.allSettled(factory.map((config, index) => {
-							if (Array.isArray(config))
-								return $api.call(config[1], {
-									errorHeader: config[0],
-									errorHandling: false
-								});
-							else
-								return $api.call(config, {
-									errorHeader: '#' + index,
-									errorHandling: false
-								});
-						}))
-						.then(res => {
-							// TODO(chris): obey form & configoverwrite
-							let messagesError = [];
-							let messagesSuccessful = [];
-
-							res.forEach(result => {
-								if (result.status === 'fulfilled') {
-									//console.log(JSON.parse(result.value.data));
-									const successTitle = "<dt>" + result.value.data + "</dt>";
-									messagesSuccessful.push(successTitle + "ok");
-								} else {
-									const errorTitle = "<dt>" + result.reason.config.errorHeader + "</dt>";
-									const errorMsg = JSON.parse(result.reason.request.response);
-									const fullMessage = errorMsg.errors.map(error => {
-										if (error.type == 'validation') {
-											// TODO(chris): do we want the keys?
-											return '<dd>' + Object.values(error.messages).join("</dd><dd>") + '</dd>';
-										}
-										// TODO(chris): other types
-										if (error.message)
-											return '<dd>' + error.message + '</dd>';
-										if (error.messages)
-											return '<dd>' + error.messages.join("\n") + '</dd>';
-										// TODO(chris): what to do here
-										return '<dd>' + "Generic Error" + '</dd>'; // TODO(chris): translate
-									}).join("\n");
-									messagesError.push(errorTitle + fullMessage);
-								}
+							if (!Array.isArray(config))
+								config = ['#' + index, config];
+							return $api.call(config[1], {
+								errorHeader: config[0],
+								errorHandling: false
 							});
+						}))
+						.then(result => {
+							const [ , , config ] = get_config(form, undefined, undefined, configoverwrite || {});
+							const errorConfig = get_error_handler(config);

-							if (messagesError.length)
-							{
-								const test = document.createElement('b');
-								$fhcAlert.alertDefault(
-									'error',
-									messagesError.length + " Fehler", // TODO(chris): translate
-									'<dl>' + messagesError.join("") + '</dl>',
-									true,
-									true
-								);
+							if (!errorConfig.success && !errorConfig.fail) {
+								return result;
 							}
-							if (messagesSuccessful.length)
-							{
-								const test = document.createElement('b');
-								$fhcAlert.alertDefault(
-									'info',
-									'Feedback',
-								messagesSuccessful.length + " erfolgreiche Statusänderung(en) durchgeführt", // TODO(chris): translate
-									false,
-									true
-								);
+
+							const typedErrors = {};
+							for (var res of result) {
+								const [ allowed, item ] = res.status === 'fulfilled'
+									? [ errorConfig.success, res.value ]
+									: [ errorConfig.fail, res.reason ];
+								if (!allowed)
+									return;
+
+								const errors = popHandleableErrors(errorConfig, get_error_list(item));
+
+								for (var type in errors) {
+									if (!typedErrors[type])
+										typedErrors[type] = {
+											[item.config.errorHeader]: errors[type]
+										};
+									else
+										typedErrors[type][item.config.errorHeader] = errors[type];
+								}
+							};
+
+							for (var errType in typedErrors) {
+								errorConfig.handler[errType](typedErrors[errType]);
 							}
+							
+							return result;
 						});
 				}
-				let {method, url, params, config} = factory;
+				let { method, url, params, config } = factory;
 				if (configoverwrite !== undefined) {
 					config = configoverwrite;
 				}
@@ -251,141 +546,6 @@ export default {
 				} else {
 					console.error("FhcApi: method not allowed:", method);
 				}
-			},
-			_defaultErrorHandlers: {
-				validation(error, config) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					if (config?.form) {
-						config.form.clearValidation();
-						config.form.setFeedback(false, error.messages);
-						return false;
-					}
-					if (Array.isArray(error.messages)) {
-						error.messages.forEach($fhcAlert.alertError);
-						return false;
-					} else if (typeof error.messages == 'object') {
-						if (config?.errorHeader)
-							Object.values(error.messages).forEach(
-								value => $fhcAlert.alertDefault(
-									'error',
-									Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader,
-									value,
-									true
-								)
-							);
-						else
-							Object.entries(error.messages).forEach(
-								([key, value]) => $fhcAlert.alertDefault('error', key, value, true)
-							);
-						return false;
-					}
-					return true;
-				},
-				general(error, config) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					if (config?.form)
-						config.form.setFeedback(false, error.message);
-					else if (config?.errorHeader)
-						$fhcAlert.alertDefault(
-							'error',
-							Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader,
-							error.message,
-							true
-						);
-					else
-						$fhcAlert.alertError(error.message);
-				},
-				php(error) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					var message = '';
-					message += 'Message: ' + error.message + '\n\n';
-					message += 'Filename: ' + error.filename + '\n';
-					message += 'Line Number: ' + error.line + '\n';
-					if (error.backtrace && error.backtrace.length) {
-						message += '\nBacktrace: ';
-						error.backtrace.forEach(err => {
-							message += '\n\tFile: ' + err.file + '\n';
-							message += '\tLine: ' + err.line + '\n';
-							message += '\tFunction: ' + err.function + '\n';
-						});
-					}
-					switch (error.severity) {
-						case 'Warning':
-						case 'Core Warning':
-						case 'Compile Warning':
-						case 'User Warning':
-							$fhcAlert.alertDefault('warn', 'PHP ' + error.severity, message, true);
-							break;
-						case 'Notice':
-						case 'User Notice':
-						case 'Runtime Notice':
-							$fhcAlert.alertDefault('info', 'PHP ' + error.severity, message, true);
-							break;
-						default:
-							message = 'Type: PHP ' + error.severity + '\n\n' + message;
-							$fhcAlert.alertSystemError(message);
-							break;
-					}
-				},
-				exception(error) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					var message = '';
-					message += 'Type: ' + error.class + '\n\n';
-					message += 'Message: ' + error.message + '\n\n';
-					message += 'Filename: ' + error.filename + '\n';
-					message += 'Line Number: ' + error.line + '\n';
-					if (error.backtrace && error.backtrace.length) {
-						message += '\nBacktrace: ';
-						error.backtrace.forEach(err => {
-							message += '\n\tFile: ' + err.file + '\n';
-							message += '\tLine: ' + err.line + '\n';
-							message += '\tFunction: ' + err.function + '\n';
-						});
-					}
-					$fhcAlert.alertSystemError(message);
-				},
-				db(error) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					var message = '';
-					if (error.heading !== undefined)
-						message += error.heading + '\n\n';
-					if (error.code !== undefined)
-						message += 'Code: ' + error.code + '\n\n';
-					if (error.sql !== undefined)
-						message += 'SQL: ' + error.sql + '\n\n';
-					if (error.message !== undefined)
-						message += 'Message: ' + error.message + '\n\n';
-					else if (error.messages !== undefined)
-						message += 'Messages: ' + error.messages.join('\n\t') + '\n\n';
-					if (error.filename !== undefined)
-						message += 'Filename: ' + error.filename + '\n';
-					if (error.line !== undefined)
-						message += 'Line Number: ' + error.line + '\n';
-
-					$fhcAlert.alertSystemError(message);
-				},
-				auth(error, config) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					var message = '';
-					message += 'Controller name: ' + error.controller + '\n';
-					message += 'Method name: ' + error.method + '\n';
-					message += 'Required permissions: ' + error.required_permissions;
-					if (config?.errorHeader)
-						$fhcAlert.alertDefault(
-							'error',
-							Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader,
-							error.message,
-							true
-						);
-					else
-						$fhcAlert.alertDefault('error', error.message, message);
-				}
 			}
 		};

@@ -123,8 +123,6 @@ foreach($uid_arr as $uid)
 		$studiengang_bezeichnung = empty($studiengangbezeichnung) ? $studiengang->bezeichnung : $studiengangbezeichnung;
 		$studiengang_bezeichnung_englisch = empty($studiengangbezeichnung_englisch) ? $studiengang->english : $studiengangbezeichnung_englisch;

-		$svnr = ($student->svnr == '')?'Ersatzkennzeichen: '.$student->ersatzkennzeichen:$student->svnr;
-
 		//Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen
 		if ($studiengang->studiengang_kz<0)
 		{
@@ -146,7 +144,6 @@ foreach($uid_arr as $uid)
 		echo "\t\t<gebdatum>".$gebdatum."</gebdatum>\n";
 		echo "\t\t<gebort>".$student->gebort."</gebort>\n";
 		echo "\t\t<staatsbuergerschaft>".$staatsbuergerschaft->langtext."</staatsbuergerschaft>\n";
-		echo "\t\t<svnr>".$svnr."</svnr>\n";
 		echo "\t\t<matrikelnr>".trim($student->matrikelnr)."</matrikelnr>\n";
 		echo "\t\t<studiengang>".$db->convert_html_chars($studiengang_bezeichnung)."</studiengang>\n";
 		echo "\t\t<studiengang_englisch>".$db->convert_html_chars($studiengang_bezeichnung_englisch)."</studiengang_englisch>\n";
@@ -340,8 +337,6 @@ foreach($prestudent_arr as $prest_id)
 				$studiengang_bezeichnung = empty($studiengangbezeichnung) ? $studiengang->bezeichnung : $studiengangbezeichnung;
 				$studiengang_bezeichnung_englisch = empty($studiengangbezeichnung_englisch) ? $studiengang->english : $studiengangbezeichnung_englisch;

-				$svnr = ($person->svnr == '')?($person->ersatzkennzeichen != ''?'Ersatzkennzeichen: '.$person->ersatzkennzeichen:''):$person->svnr;
-
 				//Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen
 				if ($studiengang->studiengang_kz<0)
 				{
@@ -363,7 +358,6 @@ foreach($prestudent_arr as $prest_id)
 					echo "\t\t<gebdatum>".$gebdatum."</gebdatum>\n";
 					echo "\t\t<gebort>".$person->gebort."</gebort>\n";
 					echo "\t\t<staatsbuergerschaft>".$staatsbuergerschaft->langtext."</staatsbuergerschaft>\n";
-					echo "\t\t<svnr>".$svnr."</svnr>\n";
 					echo "\t\t<studiengang>".$db->convert_html_chars($studiengang_bezeichnung)."</studiengang>\n";
 					echo "\t\t<studiengang_englisch>".$db->convert_html_chars($studiengang_bezeichnung_englisch)."</studiengang_englisch>\n";
 					echo "\t\t<studiengang_kurzbz>".$studiengang->kurzbzlang."</studiengang_kurzbz>\n";
@@ -235,7 +235,6 @@ function draw_content_liste($row)
 			<STUDENT:vorname><![CDATA['.$row->vorname.']]></STUDENT:vorname>
 			<STUDENT:nachname><![CDATA['.$row->nachname.']]></STUDENT:nachname>
 			<STUDENT:geschlecht><![CDATA['.$row->geschlecht.']]></STUDENT:geschlecht>
-			<STUDENT:svnr>'.($row->svnr==''?'&#xA0;':'<![CDATA['.$row->svnr.']]>').'</STUDENT:svnr>
 			<STUDENT:ersatzkennzeichen>'.($row->ersatzkennzeichen==''?'&#xA0;':'<![CDATA['.$row->ersatzkennzeichen.']]>').'</STUDENT:ersatzkennzeichen>
 			<STUDENT:geburtsdatum><![CDATA['.$datum_obj->convertISODate($row->gebdatum).']]></STUDENT:geburtsdatum>
 			<STUDENT:geburtsdatum_iso><![CDATA['.$row->gebdatum.']]></STUDENT:geburtsdatum_iso>
@@ -349,7 +348,6 @@ function draw_content($row)
 			<STUDENT:gebzeit><![CDATA['.$row->gebzeit.']]></STUDENT:gebzeit>
 			<STUDENT:anmerkungen>'.($row->anmerkungen==''?'&#xA0;':'<![CDATA['.$row->anmerkungen.']]>').'</STUDENT:anmerkungen>
 			<STUDENT:anrede><![CDATA['.$row->anrede.']]></STUDENT:anrede>
-			<STUDENT:svnr><![CDATA['.$row->svnr.']]></STUDENT:svnr>
 			<STUDENT:ersatzkennzeichen><![CDATA['.$row->ersatzkennzeichen.']]></STUDENT:ersatzkennzeichen>
 			<STUDENT:familienstand><![CDATA['.$row->familienstand.']]></STUDENT:familienstand>
 			<STUDENT:geschlecht><![CDATA['.$row->geschlecht.']]></STUDENT:geschlecht>
@@ -470,7 +468,6 @@ function draw_empty_content()
 			<STUDENT:gebzeit><![CDATA[]]></STUDENT:gebzeit>
 			<STUDENT:anmerkungen><![CDATA[]]></STUDENT:anmerkungen>
 			<STUDENT:anrede><![CDATA[]]></STUDENT:anrede>
-			<STUDENT:svnr><![CDATA[]]></STUDENT:svnr>
 			<STUDENT:ersatzkennzeichen><![CDATA[]]></STUDENT:ersatzkennzeichen>
 			<STUDENT:familienstand><![CDATA[]]></STUDENT:familienstand>
 			<STUDENT:geschlecht><![CDATA[]]></STUDENT:geschlecht>
@@ -647,7 +644,7 @@ if($xmlformat=='rdf')
 		$sql_query="
 		SELECT
 			p.person_id, tbl_student.prestudent_id, tbl_benutzer.uid, titelpre, titelpost,vorname, wahlname, vornamen, geschlecht,
-			nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen,svnr, tbl_student.matrikelnr, p.anmerkung as anmerkungen,
+			nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen, tbl_student.matrikelnr, p.anmerkung as anmerkungen,
 			tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
 			tbl_student.studiengang_kz, aufmerksamdurch_kurzbz, mentor, public.tbl_benutzer.aktiv AS bnaktiv,
 			(	SELECT kontakt
@@ -985,8 +982,7 @@ if($xmlformat=='rdf')
 						$qry .= "	prestudent_id = ".$db->db_add_param($searchItems_string_orig).";";
 					else
 						$qry .= "	matrikelnr = ".$db->db_add_param($searchItems_string_orig)." OR
-									matr_nr = ".$db->db_add_param($searchItems_string_orig)." OR
-									svnr = ".$db->db_add_param($searchItems_string_orig).";";
+									matr_nr = ".$db->db_add_param($searchItems_string_orig).";";
 				}
 				if($result = $db->db_query($qry))
 				{
@@ -1282,7 +1278,6 @@ else
 				<lv_studiengang_art><![CDATA['.$lv_studiengang_art.']]></lv_studiengang_art>
 				<anrede><![CDATA['.$student->anrede.']]></anrede>
 				<geschlecht><![CDATA['.$student->geschlecht.']]></geschlecht>
-				<svnr><![CDATA['.$student->svnr.']]></svnr>
 				<ersatzkennzeichen><![CDATA['.$student->ersatzkennzeichen.']]></ersatzkennzeichen>
 				<familienstand><![CDATA['.$student->familienstand.']]></familienstand>
 				<rektor><![CDATA['.$rektor.']]></rektor>
@@ -105,9 +105,6 @@ foreach($uid_arr as $uid)
 			$staatsbuergerschaft = new nation();
 			$staatsbuergerschaft->load($student->staatsbuergerschaft);

-
-			$svnr = ($student->svnr == '')?'Ersatzkennzeichen: '.$student->ersatzkennzeichen:$student->svnr;
-
 			$geschlecht_obj = new geschlecht();
 			$geschlecht_obj->load($student->geschlecht);

@@ -143,7 +140,6 @@ foreach($uid_arr as $uid)
 			echo "\t\t<gebdatum><![CDATA[".$gebdatum."]]></gebdatum>\n";
 			echo "\t\t<gebort><![CDATA[".$student->gebort."]]></gebort>\n";
 			echo "\t\t<staatsbuergerschaft><![CDATA[".$staatsbuergerschaft->langtext."]]></staatsbuergerschaft>\n";
-			echo "\t\t<svnr><![CDATA[".$svnr."]]></svnr>\n";
 			echo "\t\t<matr_nr><![CDATA[".trim($student->matr_nr)."]]></matr_nr>\n";
 			echo "\t\t<matrikelnr><![CDATA[".trim($student->matrikelnr)."]]></matrikelnr>\n";
 			echo "\t\t<studiengang><![CDATA[".$studienordnung->studiengangbezeichnung."]]></studiengang>\n";
@@ -1,5 +1,6 @@
 <?php

+
 $raum_contentmittitel_xslt_xhtml=  <<<EOD
 <xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -8,27 +9,56 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		<head>
 			<title><xsl:value-of select="titel" /></title>
 			<link rel="stylesheet" href="../skin/style.css.php" type="text/css"  />
-            <link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/5.0.7/css/tabulator.min.css" rel="stylesheet" />
-            <script type="text/javascript" src="https://c3p0.ma0594.technikum-wien.at/fh-core/vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js?2019102903"></script>
+			<link rel="stylesheet" href="../skin/jquery.css" type="text/css" />
+			<link rel="stylesheet" type="text/css" href="../skin/jquery-ui-1.9.2.custom.min.css" />
+			<script type="text/javascript" src="../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+			<script type="text/javascript" src="../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+			<script type="text/javascript" src="../vendor/components/jqueryui/jquery-ui.min.js"></script>
+			<script type="text/javascript" src="../include/js/jquery.ui.datepicker.translation.js"></script>
+			<script type="text/javascript" src="../vendor/jquery/sizzle/sizzle.js"></script>
+			<link rel="stylesheet" href="../skin/tablesort.css" type="text/css"/>
 			<script type="text/javascript">

-            document.addEventListener("DOMContentLoaded", function() 
-			{
-				let tables = document.getElementsByClassName("tablesorter");
-				for(table of tables){
-					new Tabulator(table, {
-						layout:"fitDataFill",
-						autoResize:true,
-						resizableRows:true,
-						columnDefaults:{
-							formatter:"html",
-							resizable:true,
-						}
-					})
-				}
-			});
+				$(document).ready(function()
+				{
+					$(".tablesorter").each(function()
+					{
+						var col=0;
+						var sort=0;
+						var no_sort=1;
+						var classes = $(this).attr("class");
+						var class_arr = classes.split(" ");
+						var headersobj={};
+		
+						for(i in class_arr)
+						{
+							if(class_arr[i].indexOf("tablesorter_col_")!=-1)
+							{
+								col = class_arr[i].substr(16);
+							}
+						
+							if(class_arr[i].indexOf("tablesorter_sort_")!=-1)
+							{
+								sort = class_arr[i].substr(17);
+							}

+							if(class_arr[i].indexOf("tablesorter_no_sort_")!=-1)
+							{
+								no_sort = class_arr[i].substr(20);
+								headersobj[no_sort]={sorter:false};
+							}
+						}
+		
+						$(this).tablesorter(
+						{
+							sortList: [[col,sort]],
+							widgets: ["zebra"],
+							headers: headersobj
+						});
+					});
+				});
 			</script>
+			
 		</head>
 		<body>
 	    <h1><xsl:value-of select="titel" /></h1>
@@ -1475,6 +1475,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'n_errors',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{n} Fehler',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{n} Error(s)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -30282,7 +30302,6 @@ array(
 			)
 		),

-
 		//ProfilUpdate Phrasen ende
 	array(
 		'app' => 'core',
@@ -30627,6 +30646,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigtLegendeBlau',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student ist am gewählten Datum bestätigt entschuldigt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student is confirmed excused on the selected date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigtLegendeTuerkis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student hat eine offene Entschuldigung am gewählten Datum.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student has an open excuse on the selected date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -30887,6 +30946,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleOhneQR',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten ohne QR-Code einfügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Insert attendances without QR-Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -30947,6 +31026,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'offen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Offen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -31010,18 +31129,58 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'entschuldigungAutoEmailBetreff',
+		'phrase' => 'entFullEmailBetreff',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.',
+				'text' => 'Neue Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Excuse note for digital attendances - a new document has been uploaded.',
+				'text' => 'New Excuse note for digital attendances - a new document has been uploaded.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entNewEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Entschuldigung zur Befreiung der Anwesenheitspflicht: Dokument wird nachgereicht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Excuse note for digital attendances - Document will be submitted later',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entEditEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Dokument wurde eingereicht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note for digital attendances - Document has been submitted',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -32310,18 +32469,78 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'studentConfig',
+		'phrase' => 'errorCodeTooOld',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Studenten auswählen.',
+				'text' => 'Der Zugangscode ist zeitlich abgelaufen.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Configure student profile.',
+				'text' => 'The access code has expired.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'profil',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Profil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'profile',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'admin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigungsmanagement',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excuse note management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'allowed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aktuell prüfbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'allowed to test',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -32367,6 +32586,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'termineV2',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterricht laut LV-Plan',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Lesson as per Timetable',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -32375,7 +32614,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Termine laut Stundenplan',
+				'text' => 'Unterricht laut LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32470,18 +32709,18 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'noStudentsFound',
+		'phrase' => 'noStudentsFoundV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine zugeteilten Studenten gefunden!',
+				'text' => 'Keine zugeteilten Studenten für Mitarbeiter {0} in dem gewählten LV-Teil {1} gefunden!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No assigned students found!',
+				'text' => 'No assigned students for employee {0} in the selected teaching unit {1} found!',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -32490,7 +32729,7 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'kontrolldatum',
+		'phrase' => 'kontrolldatumV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -32501,7 +32740,27 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Attendance Check Date',
+				'text' => 'Check Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrollen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontrollen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Checks',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -32810,12 +33069,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'zeitNichtAusStundenplanBeginn',
+		'phrase' => 'zeitNichtAusStundenplanBeginnV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtbeginn entspricht keinem Unterrichtstermin laut Stundenplan.',
+				'text' => 'Unterrichtbeginn entspricht keinem Unterrichtstermin laut LV-Plan.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32830,12 +33089,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'zeitNichtAusStundenplanEnde',
+		'phrase' => 'zeitNichtAusStundenplanEndeV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtende entspricht keinem Unterrichtstermin laut Stundenplan.',
+				'text' => 'Unterrichtende entspricht keinem Unterrichtstermin laut LV-Plan.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32850,12 +33109,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'datumNichtAusStundenplan',
+		'phrase' => 'datumNichtAusStundenplanV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Datum entspricht keinem Stundenplan Termin.',
+				'text' => 'Datum entspricht keinem LV-Plan Termin.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32867,6 +33126,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleTimeOverlap',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontrollzeiten überlappen mit Kontrolle von {0} bis {1}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Times overlap with attendance check from {0} to {1}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'keineKontrollenAnDatumFallback',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Kontrollen an {0} gefunden, es werden alle Kontrollen angezeigt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance checks found on {0}, all attendance checks are being shown.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noLePreselectTermineTooOld',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine intelligente LV-Teil Vorauswahl möglich, da sämtliche Termine außerhalb des erlaubten Kontrollzeitraums liegen. Bitte wählen Sie sorgfältig den gewünschten LV-Teil aus.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No intelligent pre-selection of teaching unit is possible, as all dates fall outside the permitted control period. Please carefully select the desired teaching unit.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -32922,22 +33241,18 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipAssistenz',
+		'phrase' => 'tooltipAssistenzV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.
-
-				Bitte beachten Sie dass nur Entschuldigungen INNERHALB des angegebenen Zeitraumes angezeigt werden. Sollten Sie nach einer lang wirken Entschuldigung suchen, müssen Sie die Zeitspanne entsprechend weit setzen.',
+				'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly.
-
-				Please note that only excuses WITHIN the specified time period are displayed. If you are looking for a long-lasting excuse, you must set the time period accordingly.',
+				'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -32970,16 +33285,16 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipLektorStartKontrolle',
+		'phrase' => 'tooltipLektorStartKontrolleV4',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem Stundenplan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an.
+				'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem LV-Plan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an.

-				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im Stundenplan halten.
+				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im LV-Plan halten.

-				Sie können pro Datum und Unterrichtsgruppe eine Anwesenheitskontrolle pro Tag eröffnen, welche jedoch beliebig oft aufgerufen und von Studenten eingecheckt werden kann. Es gelten dabei ihre zuletzt eingetragenen Zeiten. Ein Student muss nur einmal am Tag pro Gruppe einchecken um als anwesend registriert zu sein, egal wie oft Sie die Kontrolle starten.',
+				Sie können pro Datum und Unterrichtsgruppe mehrere Anwesenheitskontrollen am Tag durchführen, solange sich diese nicht in Ihren Zeiten überschneiden und eine Mindestlänge von {0} Minuten beträgt.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32989,7 +33304,7 @@ array(

 				The validity period determines the weighting of attendance in relation to the overall extent, but you can adjust this at your own discretion and do not have to stick strictly to the dates in the timetable.

-				You can open one attendance check per day for each date and class group, which can be called up and checked in by students as often as you like. The times they last entered apply. A student only has to check in once a day per group to be registered as present, regardless of how often you start the check.',
+				You can conduct multiple attendance checks per day per date and lesson group, as long as they do not overlap in your times and are at least {0} minutes long.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -33066,18 +33381,38 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'anwTimeline',
+		'phrase' => 'anwTimelineV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Digitale Anwesenheiten Timeline',
+				'text' => 'Digitale Anwesenheiten Timeline EXPERIMENTELL',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Digital Attendances Timeline',
+				'text' => 'Digital Attendances Timeline EXPERIMENTAL',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'studentenInLVTeil',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten in LV-Teil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Students in teaching unit',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -33103,6 +33438,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'file',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -33206,12 +33561,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'termineAusStundenplan',
+		'phrase' => 'termineAusStundenplanV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterricht Termine laut Stundenplan',
+				'text' => 'Unterricht Termine laut LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -33226,12 +33581,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipUnterrichtZeitCustom',
+		'phrase' => 'tooltipUnterrichtZeitCustomV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtszeiten werden aus dem Stundenplan geladen, überschreiben Sie diese nur falls Ihre tatsächliche Unterrichtszeiten davon abweichen!',
+				'text' => 'Unterrichtszeiten werden aus dem LV-Plan geladen, überschreiben Sie diese nur falls Ihre tatsächliche Unterrichtszeiten davon abweichen!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -33246,12 +33601,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipUnterrichtDatumCustom',
+		'phrase' => 'tooltipUnterrichtDatumCustomV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtsdaten werden aus dem Stundenplan geladen, überschreiben Sie dieses nur falls Ihr tatsächliches Unterrichtsdatum abweicht!',
+				'text' => 'Unterrichtsdaten werden aus dem LV-Plan geladen, überschreiben Sie dieses nur falls Ihr tatsächliches Unterrichtsdatum abweicht!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -33363,6 +33718,338 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleDatumOutOfRange',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum liegt außerhalb der erlaubten Kontrollspanne!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date is outside the permitted control range!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'alertBetreuungSelected',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der ausgewählte LV-Teil hat die Lehrform Betreuung! Bitte überprüfen sie die korrekte Auswahl des LV-Teils um fehlerhafte Kontrollen zu vermeiden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The selected course component is taught in a supervised format! Please check that you have selected the correct course component to avoid incorrect assessments!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'editEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwUserEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitseintrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Entry',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'highlightsettings',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datumsmarkierung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date Highlighting',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'editAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Attendance Checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipAnwTimeline',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die "Digitale Anwesenheiten Timeline" ist ein experimentelles feature, welches eine zeitliche Visualisierung von Entschuldigungszeiträumen und Kontrollzeiträumen im Kontext eines Studenten anzeigt.
+
+					Wenn Sie auf eine aufgelistete Entschuldigung oder Kontrolle klicken, versucht die Timeline diese zu finden, falls diese im angegebenen Zeitraum liegt, welcher standardmäßig das gesamte aktuelle Jahr beträgt. Sie können diese Grenzen manuell anpassen.
+
+					Wenn man innerhalb der Timeline scrollt, ändert sich der visuelle Abstand zwischen einzelnen Tagen.
+
+					Bei Klick auf eine gerenderte Datumsreichweite in der Timeline, listet sich oben rechts eine Liste von zugehörigen Attributen auf, welche Administratoren und Entwicklern in Fehlerfällen helfen sollen den Zustand der digitalen Amwesenheiten im Kontext eines Studierenden nachzuvollziehen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The "Digital Attendance Timeline" is an experimental feature that displays a temporal visualization of excuse periods and check-in periods in the context of a student.
+
+					When you click on a listed excuse or check-in period, the timeline attempts to find it if it falls within the specified period, which by default is the entire current year. You can adjust these boundaries manually.
+
+					Scrolling within the timeline changes the visual spacing between individual days.
+
+					Clicking on a rendered date range in the timeline displays a list of associated attributes in the upper right corner. These attributes are intended to help administrators and developers understand the status of digital attendance in the context of a student in case of errors.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleRestart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Kontrolle wiederholen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Restart attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipLegende',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Status Legende für das Digitales Anwesenheiten und Entschuldigungsmanagement anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show status legend for the digital attendance and excuse note management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipCsv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Tabelle als CSV Datei exportiern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Export table as CSV file',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipEdit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Anwesenheitskontrollen bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit attendance checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipSaveChanges',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Manuell veränderte Anwesenheiten speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Save manually edited attendance entries',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipRestartKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Bestehende Anwesenheitskontrolle neu starten. Studierende, welche bereits gültig registriert sind, gelten weiterhin als anwesend!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Restart existing attendance check. Students who are already validly registered will continue to be considered present!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipDeleteKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Anwesenheitskontrolle löschen. Die dazugehörigen Statuseinträge der Studierenden werden auch gelöscht!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete attendance checks. The corresponding student status entries will also be deleted!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipEditKontrollzeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Zeitgrenzen einer Kontrolle bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit time limits of an attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwesenheit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Anwesenheit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//
@@ -309,7 +309,8 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			<text:p text:style-name="P4">(nz) ... nicht zugelassen</text:p>
 			<text:p text:style-name="P4">(ma) ... MitarbeiterIn</text:p>
 			<text:p text:style-name="P4">(a.o.) ... Außerordentliche/r HörerIn</text:p>
-			<text:p text:style-name="P4">(d.d.) ... Double Degree Program</text:p>
+			<text:p text:style-name="P4">(d.d.i) ... Double Degree Incoming Program</text:p>
+			<text:p text:style-name="P4">(d.d.o) ... Double Degree Outgoing Program</text:p>
 			<text:p text:style-name="P4"/>
 			<text:p text:style-name="P5">
 				<xsl:choose>
@@ -1167,8 +1167,7 @@ if ($where != '')
 				}
 			}
 			$status = mb_substr($status, 0, mb_strlen($status)-2);
-
-			echo '<tr valign="top"><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->wahlname</td><td>$row->vornamen</td><td>$row->gebdatum</td><td>$row->svnr</td><td>".($row->geschlecht=='m'?'männlich':'weiblich')."</td><td>";
+			echo '<tr valign="top"><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->wahlname</td><td>$row->vornamen</td><td>$row->gebdatum</td><td>".((strpos($status, 'Mitarbeiter') !== false) ? $row->svnr : '')."</td><td>".($row->geschlecht=='m'?'männlich':'weiblich')."</td><td>";
 			$qry_adr = "SELECT * FROM public.tbl_adresse WHERE person_id=".$db->db_add_param($row->person_id, FHC_INTEGER);
 			if ($result_adr = $db->db_query($qry_adr))
 				while ($row_adr = $db->db_fetch_object($result_adr))
@@ -125,6 +125,7 @@ $verband = (isset($_POST['verband'])?$_POST['verband']:'');
 $gruppe = (isset($_POST['gruppe'])?$_POST['gruppe']:'');
 $dms_id_lichtbild = '';

+$is_mitarbeiter = false;
 if($uid!='')
 {
 	$qry = "SELECT person_id, true as mitarbeiter FROM campus.vw_mitarbeiter WHERE uid=".$db->db_add_param($uid)."
@@ -144,7 +145,17 @@ if($uid!='')
 	else
 		die('Fehler beim Ermitteln der UID');
 }
-
+else if ($person_id !='')
+{
+	$qry = "SELECT person_id, true as mitarbeiter FROM campus.vw_mitarbeiter WHERE person_id=".$db->db_add_param($person_id);
+	if($result = $db->db_query($qry))
+	{
+		if($row = $db->db_fetch_object($result))
+		{
+			$is_mitarbeiter = ($row->mitarbeiter=='t'?true:false);
+		}
+	}
+}
 if(isset($_POST['saveperson']))
 {
 	if(!$rechte->isBerechtigt('student/stammdaten', null, 'su') && !$rechte->isBerechtigt('mitarbeiter/stammdaten', null, 'su'))
@@ -163,7 +174,8 @@ if(isset($_POST['saveperson']))
 	$person->gebdatum = $geburtsdatum;
 	$person->gebort = $geburtsort;
 	$person->geburtsnation = $geburtsnation;
-	$person->svnr = $svnr;
+	if ($is_mitarbeiter)
+		$person->svnr = $svnr;
 	$person->ersatzkennzeichen = $ersatzkennzeichen;
 	$person->gebzeit = $geburtszeit;
 	$person->staatsbuergerschaft = $staatsbuergerschaft;
@@ -332,7 +344,8 @@ if(!$error_person_save)
 	$geburtsdatum = $person->gebdatum;
 	$geburtsort = $person->gebort;
 	$geburtsnation = $person->geburtsnation;
-	$svnr = $person->svnr;
+	if ($is_mitarbeiter)
+		$svnr = $person->svnr;
 	$ersatzkennzeichen = $person->ersatzkennzeichen;
 	$geburtszeit = $person->gebzeit;
 	$staatsbuergerschaft = $person->staatsbuergerschaft;
@@ -398,10 +411,16 @@ foreach ($nation->nation as $row_nation)
 echo "</SELECT>
 	</td>
 </tr>
-<tr>
-	<td>SVNR</td>
-	<td><input type='text' name='svnr' value='".$svnr."'/></td>
-	<td>Ersatzkennzeichen</td>
+<tr>";
+
+if ($is_mitarbeiter)
+{
+	echo "<td>SVNR</td>
+	<td><input type='text' name='svnr' value='".$svnr."'/></td>";
+}
+
+echo
+	"<td>Ersatzkennzeichen</td>
 	<td><input type='text' name='ersatzkennzeichen' value='".$ersatzkennzeichen."'/></td>
 	<td>Geburtszeit</td>
 	<td><input type='text' name='geburtszeit' value='".$geburtszeit."'/></td>
@@ -140,7 +140,6 @@ function disablefields(obj)
 	document.getElementById('vorname').disabled=val;
 	document.getElementById('geschlecht').disabled=val;
 	document.getElementById('geburtsdatum').disabled=val;
-	document.getElementById('svnr').disabled=val;
 	document.getElementById('ersatzkennzeichen').disabled=val;
 	//document.getElementById('adresse').disabled=val;
 	//document.getElementById('plz').disabled=val;
@@ -159,21 +158,6 @@ function disablefields(obj)
 	}
 }

-function GeburtsdatumEintragen()
-{
-	svnr = document.getElementById('svnr').value;
-	gebdat = document.getElementById('geburtsdatum');
-	
-	if(svnr.length==10 && gebdat.value=='')
-	{
-		var tag = svnr.substr(4,2);
-		var monat = svnr.substr(6,2);
-		var jahr = svnr.substr(8,2);
-		
-		gebdat.value='19'+jahr+'-'+monat+'-'+tag;
-	}
-}
-
 function disablefields2(val)
 {
 	document.getElementById('adresse').disabled=val;
@@ -368,7 +352,6 @@ $email = (isset($_REQUEST['email'])?$_REQUEST['email']:'');
 $telefon = (isset($_REQUEST['telefon'])?$_REQUEST['telefon']:'');
 $mobil = (isset($_REQUEST['mobil'])?$_REQUEST['mobil']:'');
 $person_id = (isset($_REQUEST['person_id'])?$_REQUEST['person_id']:'');
-$svnr = (isset($_REQUEST['svnr'])?$_REQUEST['svnr']:'');
 $ersatzkennzeichen = (isset($_REQUEST['ersatzkennzeichen'])?$_REQUEST['ersatzkennzeichen']:'');
 $ueberschreiben = (isset($_REQUEST['ueberschreiben'])?$_REQUEST['ueberschreiben']:'');

@@ -413,7 +396,6 @@ if(isset($_POST['save']))
 		$person->geschlecht = $geschlecht;
 		$person->gebdatum = $datum_obj->formatDatum($geburtsdatum,'Y-m-d');
 		$person->staatsbuergerschaft = $nation;
-		$person->svnr = $svnr;
 		$person->ersatzkennzeichen = $ersatzkennzeichen;
 		$person->aktiv = true;
 		$person->insertamum = date('Y-m-d H:i:s');
@@ -689,39 +671,38 @@ if($result = $db->db_query($qry))
 }
 echo '</SELECT>';
 echo '</td></tr>';
-echo '<tr><td>SVNR</td><td><input type="text" id="svnr" size="10" maxlength="10" name="svnr" value="'.$svnr.'" onblur="GeburtsdatumEintragen()" /></td></tr>';
 echo '<tr><td>Ersatzkennzeichen</td><td><input type="text" id="ersatzkennzeichen" size="10" maxlength="10" name="ersatzkennzeichen" value="'.$ersatzkennzeichen.'" /></td></tr>';
 echo '<tr><td>Geburtsdatum</td><td><input type="text" id="geburtsdatum" size="10" maxlength="10" name="geburtsdatum" value="'.$geburtsdatum.'" /> (Format dd.mm.JJJJ)</td></tr>';
 echo '<tr><td>Geburtsort</td><td><input type="text" id="gebort" size="30" maxlength="255" name="gebort" value="'.$gebort.'" /></td></tr>';
-echo '<tr><td>Geburtsnation</td><td><SELECT name="geburtsnation">';
-$qry = "SELECT nation_code, kurztext FROM bis.tbl_nation ORDER BY kurztext";
-if($result = $db->db_query($qry))
-{
-	while($row = $db->db_fetch_object($result))
-	{
-		if($row->nation_code==$geburtsnation)
-			$selected='selected';
-		else
-			$selected='';
-
-		echo "<option value='$row->nation_code' $selected>$row->kurztext</option>";
-	}
-}
-echo '</SELECT>';
+echo '<tr><td>Geburtsnation</td><td><SELECT name="geburtsnation">';
+$qry = "SELECT nation_code, kurztext FROM bis.tbl_nation ORDER BY kurztext";
+if($result = $db->db_query($qry))
+{
+	while($row = $db->db_fetch_object($result))
+	{
+		if($row->nation_code==$geburtsnation)
+			$selected='selected';
+		else
+			$selected='';
+
+		echo "<option value='$row->nation_code' $selected>$row->kurztext</option>";
+	}
+}
+echo '</SELECT>';
 echo '</td></tr>';
-echo '<tr><td>Sprache</td><td><SELECT name="sprache">';
+echo '<tr><td>Sprache</td><td><SELECT name="sprache">';
 $sprache_obj = new sprache();
 $sprache_obj->getAll();
 foreach($sprache_obj->result as $row)
-{
-	if($row->sprache==$sprache)
-		$selected='selected';
-	else
-		$selected='';
-
-	echo "<option value='$row->sprache' $selected>".$row->bezeichnung_arr['German']."</option>";
-}
-echo '</SELECT>';
+{
+	if($row->sprache==$sprache)
+		$selected='selected';
+	else
+		$selected='';
+
+	echo "<option value='$row->sprache' $selected>".$row->bezeichnung_arr['German']."</option>";
+}
+echo '</SELECT>';
 echo '</td></tr>';
 echo '<tr><td colspan="2"><fieldset><legend>Adresse</legend><table>';
 echo '<tr><td>Nation</td><td><SELECT name="adresse_nation" id="adresse_nation" onchange="loadGemeindeData()">';
@@ -884,7 +865,7 @@ if($where!='')
 		$stg_obj = new studiengang();
 		$stg_obj->getAll('typ, kurzbz', false);
 		
-		echo '<table><tr><th></th><th>Nachname</th><th>Vorname</th><th>GebDatum</th><th>SVNR</th><th>Geschlecht</th><th>Adresse</th><th>Status</th><th>Details</th></tr>';
+		echo '<table><tr><th></th><th>Nachname</th><th>Vorname</th><th>GebDatum</th><th>Geschlecht</th><th>Adresse</th><th>Status</th><th>Details</th></tr>';
 		while($row = $db->db_fetch_object($result))
 		{
 			$status = '';
@@ -905,7 +886,7 @@ if($where!='')
 			}
 			$status = mb_substr($status, 0, mb_strlen($status)-2);
 			
-			echo '<tr valign="top"><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->gebdatum</td><td>$row->svnr</td><td>".($row->geschlecht=='m'?'männlich':'weiblich')."</td><td>";
+			echo '<tr valign="top"><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->gebdatum</td><td>".((strpos($status, 'Mitarbeiter') !== false) ? $row->svnr : '')."</td><td>".($row->geschlecht=='m'?'männlich':'weiblich')."</td><td>";
 			$qry_adr = "SELECT * FROM public.tbl_adresse WHERE person_id='$row->person_id'";
 			if($result_adr = $db->db_query($qry_adr))
 				while($row_adr=$db->db_fetch_object($result_adr))
@@ -338,7 +338,6 @@ if(isset($_POST['saveperson']))
 	$person->gebzeit = $_POST['gebzeit'];
 	$person->anmerkungen = $_POST['anmerkungen'];
 	$person->homepage = $_POST['homepage'];
-	$person->svnr = $_POST['svnr'];
 	$person->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
 	$person->familienstand = $_POST['familienstand'];
 	$person->geschlecht = $_POST['geschlecht'];
@@ -606,8 +605,6 @@ if($result = $db->db_query($qry))
 }
 echo '</SELECT></td>';
 echo '</tr><tr>';
-//SVNR
-echo "<td>SVNR:</td><td><input type='text' name='svnr' ".($disabled?'disabled':'')." value='".$person->svnr."'></td>";
 //Ersatzkennzeichen
 echo "<td>Ersatzkennzeichen</td><td><input type='text' name='ersatzkennzeichen' ".($disabled?'disabled':'')." value='".$person->ersatzkennzeichen."'></td>";
 //Geschlecht
@@ -61,7 +61,6 @@ header( 'Content-Disposition: attachment;filename='.$filename);
 $qry="
 SELECT * FROM (
 SELECT DISTINCT ON (matrikelnr) matrikelnr AS personenkennzeichen,
-	tbl_person.svnr,
 	tbl_person.ersatzkennzeichen,
 	tbl_person.gebdatum,
 	tbl_person.nachname,
@@ -60,7 +60,6 @@ header( 'Content-Disposition: attachment;filename='.$filename);
 $qry="
 SELECT * FROM (
 SELECT DISTINCT ON (matrikelnr) matrikelnr AS personenkennzeichen,
-	tbl_person.svnr,
 	tbl_person.ersatzkennzeichen,
 	tbl_person.gebdatum,
 	tbl_person.nachname,