Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp

application/core/Notiz_Controller.php

@@ -300,26 +300,15 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		//update(1) loading all dms-entries with this notiz_id
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
-		$dms_uploaded = null;
+		#$dms_uploaded = null;//
 
 		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		elseif (!hasData($result))
-		{
-			$dms_id_arr = null;
-		}
-		else
-		{
-			$result = getData($result);
-			foreach($result as $doc) {
-				$dms_id_arr[] = array(
-					'name' => $doc->name,
-					'dms_id' => $doc->dms_id
-				);
-			}
+		$result = $this->getDataOrTerminateWithError($result);
+		foreach ($result as $doc) {
+			$dms_id_arr[$doc->dms_id] = array(
+				'name' => $doc->name,
+				'dms_id' => $doc->dms_id
+			);
 		}
 
 		foreach ($_FILES as $k => $file)
@@ -327,9 +316,9 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			//update(2) attach all new files (except type application/x.fhc-dms+json)
 			if($file["type"] == 'application/x.fhc-dms+json')
 			{
-				$dms_uploaded[] = array(
-					'name' => $file["name"]
-				);
+				$jsonFile = json_decode(file_get_contents($file['tmp_name']));
+				unset($dms_id_arr[$jsonFile->dms_id]);
+				#$dms_uploaded[] = $jsonFile->dms_id;
 			}
 			else
 			{
@@ -347,48 +336,23 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				//Todo define in dms component: readFile, downloadFile
 				$result = $this->dmslib->upload($dms, $k, array('*'));
 
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				$dms_id = $result->retval['dms_id'];
+				$result = $this->getDataOrTerminateWithError($result);
+				$dms_id = $result['dms_id'];
 
 				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
+
+				$this->getDataOrTerminateWithError($result);
 			}
 		}
 
 		//update(3) check if all files have been deleted
-		if(count($dms_uploaded) != count($dms_id_arr))
+		foreach ($dms_id_arr as $file)
 		{
-			if (count($dms_uploaded) == 0)
-			{
-				$filesDeleted = $dms_id_arr;
-			}
-			else
-			{
-				$upload_new_names = array_column($dms_uploaded, "name");
+			$result = $this->dmslib->removeAll($file['dms_id']);
 
-				$filesDeleted = array_filter($dms_id_arr, function ($file) use ($upload_new_names) {
-					return !in_array($file["name"], $upload_new_names);
-				});
-			}
-
-			foreach ($filesDeleted as $file)
-			{
-				$result = $this->dmslib->removeAll($file['dms_id']);
-
-				if (isError($result))
-				{
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-				else
-					$this->outputJson($result);
-			}
+			$this->getDataOrTerminateWithError($result);
 		}
+
 		return $this->terminateWithSuccess($result);
 	}
 
@@ -396,7 +360,6 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 	{
 		$this->load->library('DmsLib');
 
-		$_POST = json_decode(utf8_encode($this->input->raw_input_stream), true);
 		$notiz_id = $this->input->post('notiz_id');
 		$typeId = $this->input->post('type_id');
 		$id = $this->input->post('id');
@@ -404,43 +367,24 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		//TODO(manu): define Permissions for deletion document if filecomponent finished
 
 		//get dms_id from notizdokument
-		$dms_id_arr = [];
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 
 		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
 
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
+		$result = $this->getDataOrTerminateWithError($result);
 
-		if(hasData($result))
-		{
-			$result = getData($result);
-			foreach ($result as $doc) {
-				$dms_id_arr[] = $doc->dms_id;
-			}
-		}
-
-		if($dms_id_arr)
-		{
-			// Start DB transaction
-			$this->db->trans_start();
+		// Start DB transaction
+		$this->db->trans_start();
 
+		if ($result)
 			$this->load->library('DmsLib');
 
-
-			foreach($dms_id_arr as $dms_id)
+		foreach ($result as $doc) {
+			$res = $this->dmslib->removeAll($doc->dms_id);
+			if (isError($result))
 			{
-				$result = $this->dmslib->removeAll($dms_id);
-
-				if (isError($result))
-				{
-					$this->db->trans_rollback();
-					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-				}
-
-				$this->outputJson($result);
+				$this->db->trans_rollback();
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 		}
 
@@ -455,9 +399,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$this->load->model('person/Notiz_model', 'NotizModel');
 
 		//Delete Note
-		$result = $this->NotizModel->delete(
-			array('notiz_id' => $notiz_id)
-		);
+		$result = $this->NotizModel->delete($notiz_id);
 
 		if (isError($result))
 		{
@@ -469,8 +411,8 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
-		$this->db->trans_rollback();
-		return $this->terminateWithSuccess(current(getData($result)));
+		$this->db->trans_complete();
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function loadDokumente()

application/libraries/PrestudentstatusCheckLib.php

@@ -334,7 +334,7 @@ class PrestudentstatusCheckLib
 
 		foreach ($resultArr as $row)
 		{
-			// gerade bearbeiteten Status überspringen
+			// Status, der gerade in Bearbeitung ist, überspringen
 			if (isset($old_status_studiensemester)
 				&& isset($old_status_ausbildungssemester)
 				&& $row->status_kurzbz == $status_kurzbz

application/models/crm/Prestudent_model.php

@@ -709,7 +709,7 @@ class Prestudent_model extends DB_Model
 	{
 		$query = "
 			SELECT ps.studiensemester_kurzbz, p.priorisierung, p.studiengang_kz, sg.kurzbzlang, sg.orgform_kurzbz, ps.status_kurzbz, s.student_uid, sp.bezeichnung, ps.ausbildungssemester,
-			       CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status
+			       CONCAT(ps.status_kurzbz, ' (', ps.ausbildungssemester, '. Semester)') as status, p.prestudent_id
 			FROM public.tbl_prestudent p
 			JOIN (
 					SELECT DISTINCT ON(prestudent_id) *

application/views/Studentenverwaltung.php

@@ -34,8 +34,8 @@
 <?php
 $configArray = [
 	'generateAlias' => !defined('GENERATE_ALIAS_STUDENT') ? true : GENERATE_ALIAS_STUDENT,
-	'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? true : ZGV_DOKTOR_ANZEIGEN,
-	'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? true : ZGV_ERFUELLT_ANZEIGEN
+	'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? false : ZGV_DOKTOR_ANZEIGEN,
+	'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? false : ZGV_ERFUELLT_ANZEIGEN
 ];
 ?>
 

public/js/components/Betriebsmittel/Betriebsmittel.js

@@ -111,7 +111,8 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: '550',
 				selectableRangeMode: 'click',
-				selectable: true
+				selectable: true,
+				persistenceID: 'core-betriebsmittel'
 			},
 			tabulatorEvents: [
 				{

public/js/components/Notiz/Notiz.js

@@ -151,7 +151,8 @@ export default {
 				height: '250',
 				selectableRangeMode: 'click',
 				selectable: true,
-				index: 'notiz_id'
+				index: 'notiz_id',
+				persistenceID: 'core-notiz'
 			},
 			tabulatorEvents: [
 				{

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

@@ -1,4 +1,3 @@
-import {CoreRESTClient} from '../../../../RESTClient.js';
 import CoreForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import FormUploadImage from '../../../Form/Upload/Image.js';

public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js

@@ -97,6 +97,7 @@ export default{
 				height:	'auto',
 				selectable:	true,
 				index: 'adresse_id',
+				persistenceID: 'stv-details-kontakt-address'
 			},
 			tabulatorEvents: [
 				{

public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js

@@ -85,7 +85,8 @@ export default{
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
-				index: 'bankverbindung_id'
+				index: 'bankverbindung_id',
+				persistenceID: 'stv-details-kontakt-bankaccount'
 			},
 			tabulatorEvents: [
 				{
@@ -214,7 +215,7 @@ export default{
 		},
 	},
 	template: `	
-		<div class="stv-list h-100 pt-3">
+		<div class="stv-details-kontakt-bankaccount h-100 pt-3">
 		
 		<!--Modal: Bankverbindung-->
 		<BsModal title="Bankverbindung anlegen" ref="bankverbindungModal">

public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js

@@ -73,7 +73,8 @@ export default{
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
-				index: 'kontakt_id'
+				index: 'kontakt_id',
+				persistenceID: 'stv-details-kontakt-contact'
 			},
 			tabulatorEvents: [
 				{
@@ -243,7 +244,7 @@ export default{
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `	
-		<div class="stv-list h-100 pt-3">
+		<div class="stv-details-kontakt-contact h-100 pt-3">
 
 		<!--Modal: contactModal-->
 		<BsModal ref="contactModal">

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

@@ -100,6 +100,7 @@ export default {
 				selectable: true,
 				selectableRangeMode: 'click',
 				index: 'buchungsnr',
+				persistenceID: 'stv-details-konto'
 			}, this);
 		}
 	},

public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js

@@ -58,7 +58,7 @@ export default {
 				height: '100%',
 				selectable: true,
 				selectableRangeMode: 'click',
-				persistence: true
+				persistenceID: 'stv-details-noten-zeugnis'
 			};
 		}
 	},

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

@@ -8,7 +8,7 @@ export default {
 		modelValue: Object
 	},
 	template: `
-	<div class="stv-details-notizen h-100 pb-3">
+	<div class="stv-details-notizen h-100 pb-3 overflow-hidden">
 <!--	mit factory als endpoint	-->
 		<core-notiz
 			:endpoint="$fhcApi.factory.notiz.person"

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

@@ -1,11 +1,9 @@
-import {CoreRESTClient} from '../../../../RESTClient.js';
 import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import TblHistory from "./Prestudent/History.js";
 
 export default {
 	components: {
-		CoreRESTClient,
 		FormForm,
 		FormInput,
 		TblHistory
@@ -174,351 +172,341 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="stv-details-prestudent h-100 pb-3">	
+	<div class="stv-details-prestudent h-100 pb-3">
 		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
-		<div class="position-sticky top-0 z-1">
-			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
-		</div>
-			<fieldset>
+			<div class="position-sticky top-0 z-1">
+				<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
+			</div>
+			<fieldset class="overflow-hidden">
 				<legend>{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}</legend>
-
-						<div class="row mb-3">
-							<form-input
-								container-class="col-3"
-								label="Prestudent_id"
-								type="text"
-								v-model="data.prestudent_id"
-								name="prestudent_id"
-								readonly
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								label="Person_id"
-								type="text"
-								v-model="data.person_id"
-								name="person_id"
-								readonly
-								>
-							</form-input>
-						</div>
-						<div class="row mb-3">
-							<form-input
-								container-class="col-3"
-								label="ZGV"
-								type="select"
-								v-model="data.zgv_code"
-								name="zgvcode"
-								>
-							<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('infocenter', 'zgvOrt')"
-								type="text"
-								v-model="data.zgvort"
-								name="zgvort"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('infocenter', 'zgvDatum')"
-								type="DatePicker"
-								v-model="data.zgvdatum"
-								name="zgvdatum"
-								no-today
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('infocenter', 'zgvNation')"
-								type="select"
-								v-model="data.zgvnation"
-								name="zgvnation"
-								>
-								<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-							</form-input>
-						</div>
-						<div class="row mb-3">
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvMaster')"
-								type="select"
-								v-model="data.zgvmas_code"
-								name="zgvmascode"
-								>
-								<option v-for="mzgv in listZgvsmaster" :key="mzgv.zgvmas_code" :value="mzgv.zgvmas_code">{{mzgv.zgvmas_bez}}</option>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvMasterOrt')"
-								type="text"
-								v-model="data.zgvmaort"
-								name="zgvmaort"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvMasterDatum')"
-								type="DatePicker"
-								v-model="data.zgvmadatum"
-								name="zgvmadatum"
-								no-today
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvMasterNation')"
-								type="select"
-								v-model="data.zgvmanation"
-								name="zgvmanation"
-								>
-								<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-							</form-input>
-						</div>
-						<!--ZGV Doktor-->
-						<div v-if="showZgvDoktor" class="row mb-3">
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvDoktor')"
-								type="select"
-								v-model="data.zgvdoktor_code"
-								name="zgvdoktor_code"
-								>
-								<option v-for="zgv in listZgvsdoktor" :key="zgv.zgvdoktor_code" :value="zgv.zgvdoktor_code">{{zgv.zgvdoktor_bez}}</option>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvDoktorOrt')"
-								type="text"
-								v-model="data.zgvdoktorort"
-								name="zgvdoktorort"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvDoktorDatum')"
-								type="DatePicker"
-								v-model="data.zgvdoktordatum"
-								name="zgvdoktordatum"
-								no-today
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
-							<form-input
-								container-class="col-3"
-								:label="$p.t('lehre', 'zgvDoktorNation')"
-								type="select"
-								v-model="data.zgvdoktornation"
-								name="zgvdoktornation"
-								>
-								<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-							</form-input>
-						</div>
-																		
-						<div v-if="showZgvErfuellt" class="row mb-3">
-							<div class="col-3 pt-4 d-flex align-items-center">
-								<form-input
-									container-class="form-check"
-									:label="$p.t('infocenter', 'zgvErfuellt')"
-									type="checkbox"
-									v-model="data.zgv_erfuellt"
-									name="zgv_erfuellt"
-									>
-								</form-input>
-							</div>
-							<div class="col-3 pt-4 d-flex align-items-center">
-								<form-input
-									container-class="form-check"
-									:label="$p.t('infocenter', 'zgvMasterErfuellt')"
-									type="checkbox"
-									v-model="data.zgvmas_erfuellt"
-									name="zgvmas_erfuellt"
-									>
-								</form-input>
-							</div>
-							<div v-if="showZgvDoktor" class="col-3 pt-4 d-flex align-items-center">
-								<form-input
-									container-class="form-check"
-									:label="$p.t('infocenter', 'zgvDoktorErfuellt')"
-									type="checkbox"
-									v-model="data.zgvdoktor_erfuellt"
-									name="zgvdoktor_erfuellt"
-									>
-								</form-input>
-							</div>
-						</div>
-						
-						
-						
-		<!--			</template>-->
+				<div class="row mb-3">
+					<form-input
+						container-class="col-3"
+						label="Prestudent_id"
+						type="text"
+						v-model="data.prestudent_id"
+						name="prestudent_id"
+						readonly
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						label="Person_id"
+						type="text"
+						v-model="data.person_id"
+						name="person_id"
+						readonly
+						>
+					</form-input>
+				</div>
+				<div class="row mb-3">
+					<form-input
+						container-class="col-3"
+						label="ZGV"
+						type="select"
+						v-model="data.zgv_code"
+						name="zgvcode"
+						>
+					<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('infocenter', 'zgvOrt')"
+						type="text"
+						v-model="data.zgvort"
+						name="zgvort"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('infocenter', 'zgvDatum')"
+						type="DatePicker"
+						v-model="data.zgvdatum"
+						name="zgvdatum"
+						no-today
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('infocenter', 'zgvNation')"
+						type="select"
+						v-model="data.zgvnation"
+						name="zgvnation"
+						>
+						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+					</form-input>
+				</div>
+				<div class="row mb-3">
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvMaster')"
+						type="select"
+						v-model="data.zgvmas_code"
+						name="zgvmascode"
+						>
+						<option v-for="mzgv in listZgvsmaster" :key="mzgv.zgvmas_code" :value="mzgv.zgvmas_code">{{mzgv.zgvmas_bez}}</option>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvMasterOrt')"
+						type="text"
+						v-model="data.zgvmaort"
+						name="zgvmaort"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvMasterDatum')"
+						type="DatePicker"
+						v-model="data.zgvmadatum"
+						name="zgvmadatum"
+						no-today
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvMasterNation')"
+						type="select"
+						v-model="data.zgvmanation"
+						name="zgvmanation"
+						>
+						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+					</form-input>
+				</div>
+				<!--ZGV Doktor-->
+				<div v-if="showZgvDoktor" class="row mb-3">
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvDoktor')"
+						type="select"
+						v-model="data.zgvdoktor_code"
+						name="zgvdoktor_code"
+						>
+						<option v-for="zgv in listZgvsdoktor" :key="zgv.zgvdoktor_code" :value="zgv.zgvdoktor_code">{{zgv.zgvdoktor_bez}}</option>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvDoktorOrt')"
+						type="text"
+						v-model="data.zgvdoktorort"
+						name="zgvdoktorort"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvDoktorDatum')"
+						type="DatePicker"
+						v-model="data.zgvdoktordatum"
+						name="zgvdoktordatum"
+						no-today
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'zgvDoktorNation')"
+						type="select"
+						v-model="data.zgvdoktornation"
+						name="zgvdoktornation"
+						>
+						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
+					</form-input>
+				</div>
+																
+				<div v-if="showZgvErfuellt" class="row mb-3">
+					<div class="col-3 pt-4 d-flex align-items-center">
+						<form-input
+							container-class="form-check"
+							:label="$p.t('infocenter', 'zgvErfuellt')"
+							type="checkbox"
+							v-model="data.zgv_erfuellt"
+							name="zgv_erfuellt"
+							>
+						</form-input>
+					</div>
+					<div class="col-3 pt-4 d-flex align-items-center">
+						<form-input
+							container-class="form-check"
+							:label="$p.t('infocenter', 'zgvMasterErfuellt')"
+							type="checkbox"
+							v-model="data.zgvmas_erfuellt"
+							name="zgvmas_erfuellt"
+							>
+						</form-input>
+					</div>
+					<div v-if="showZgvDoktor" class="col-3 pt-4 d-flex align-items-center">
+						<form-input
+							container-class="form-check"
+							:label="$p.t('infocenter', 'zgvDoktorErfuellt')"
+							type="checkbox"
+							v-model="data.zgvdoktor_erfuellt"
+							name="zgvdoktor_erfuellt"
+							>
+						</form-input>
+					</div>
+				</div>
 			</fieldset>
-			<fieldset>
+			<fieldset class="overflow-hidden">
 				<legend>PrestudentIn</legend>
+				<div class="row mb-3">
+					<form-input
+						container-class="col-4"
+						:label="$p.t('person', 'aufmerksamDurch')"
+						type="select"
+						v-model="data.aufmerksamdurch_kurzbz"
+						name="aufmerksamDurch"
+						>
+						<option v-for="adurch in listAufmerksamdurch" :key="adurch.aufmerksamdurch_kurzbz" :value="adurch.aufmerksamdurch_kurzbz">{{adurch.beschreibung}}</option>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						:label="$p.t('person', 'berufstaetigkeit')"
+						type="select"
+						v-model="data.berufstaetigkeit_code"
+						name="berufstaetigkeit_code"
+						>
+						<option v-for="beruf in listBerufe" :key="beruf.berufstaetigkeit_code" :value="beruf.berufstaetigkeit_code">{{beruf.berufstaetigkeit_bez}} </option>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						:label="$p.t('person', 'ausbildung')"
+						type="select"
+						v-model="data.ausbildungcode"
+						name="ausbildungcode"
+						>
+						<option v-for="ausbld in listAusbildung" :key="ausbld.ausbildungcode" :value="ausbld.ausbildungcode">{{ausbld.ausbildungbez}} </option>
+					</form-input>
+				</div>
 				
-					<div class="row mb-3">
+				<div class="row mb-3">
+					<form-input
+						container-class="col-4"
+						label="Aufnahmeschlüssel"
+						type="text"
+						v-model="data.aufnahmeschluessel"
+						name="aufnahmeschluessel"
+						disabled							
+						>
+					</form-input>
+					
+					<div class="col-4 pt-4 d-flex align-items-center">
 						<form-input
-							container-class="col-4"
-							:label="$p.t('person', 'aufmerksamDurch')"
-							type="select"
-							v-model="data.aufmerksamdurch_kurzbz"
-							name="aufmerksamDurch"
+							container-class="form-check"
+							:label="$p.t('person', 'facheinschlaegigBerufstaetig')"
+							type="checkbox"
+							v-model="data.facheinschlberuf"
+							name="facheinschlberuf"
 							>
-							<option v-for="adurch in listAufmerksamdurch" :key="adurch.aufmerksamdurch_kurzbz" :value="adurch.aufmerksamdurch_kurzbz">{{adurch.beschreibung}}</option>
-						</form-input>
-						<form-input
-							container-class="col-4"
-							:label="$p.t('person', 'berufstaetigkeit')"
-							type="select"
-							v-model="data.berufstaetigkeit_code"
-							name="berufstaetigkeit_code"
-							>
-							<option v-for="beruf in listBerufe" :key="beruf.berufstaetigkeit_code" :value="beruf.berufstaetigkeit_code">{{beruf.berufstaetigkeit_bez}} </option>
-						</form-input>
-						<form-input
-							container-class="col-4"
-							:label="$p.t('person', 'ausbildung')"
-							type="select"
-							v-model="data.ausbildungcode"
-							name="ausbildungcode"
-							>
-							<option v-for="ausbld in listAusbildung" :key="ausbld.ausbildungcode" :value="ausbld.ausbildungcode">{{ausbld.ausbildungbez}} </option>
 						</form-input>
 					</div>
 					
-					<div class="row mb-3">
+					<!--Todo(manu) validierung Integer, liste hier null-->
+					<form-input
+						container-class="col-4"
+						:label="$p.t('person', 'bisstandort')"
+						type="text"
+						v-model="data.standort_code"
+						name="standort_code"
+						disabled
+						>
+					</form-input>
+				 
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="col-4"
+						:label="$p.t('lehre', 'studiengang')"
+						type="select"
+						v-model="data.studiengang_kz"
+						name="studiengang_kz"
+						disabled
+						>
+						<option v-for="stg in listStgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}} - {{stg.bezeichnung}} </option>
+					</form-input>
+					<form-input
+						container-class="col-4"
+						:label="$p.t('lehre', 'studientyp')"
+						type="select"
+						v-model="data.gsstudientyp_kurzbz"
+						name="gsstudientyp_kurzbz"
+						>
+						<option v-for="typ in listStgTyp" :key="typ.typ" :value="typ.typ">{{typ.bezeichnung}} </option>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="col-4"
+						:label="$p.t('global', 'anmerkung')"
+						type="text"
+						v-model="data.anmerkung"
+						name="anmerkung"
+						>
+					</form-input>
+					<div class="col-2 pt-4 d-flex align-items-center">
 						<form-input
-							container-class="col-4"
-							label="Aufnahmeschlüssel"
-							type="text"
-							v-model="data.aufnahmeschluessel"
-							name="aufnahmeschluessel"
-							disabled							
+							container-class="form-check"
+							:label="$p.t('person', 'bismelden')"
+							type="checkbox"
+							v-model="data.bismelden"
+							name="bismelden"
 							>
 						</form-input>
-						
-						<div class="col-4 pt-4 d-flex align-items-center">
-							<form-input
-								container-class="form-check"
-								:label="$p.t('person', 'facheinschlaegigBerufstaetig')"
-								type="checkbox"
-								v-model="data.facheinschlberuf"
-								name="facheinschlberuf"
-								>
-							</form-input>
-						</div>
-						
-						<!--Todo(manu) validierung Integer, liste hier null-->
-						<form-input
-							container-class="col-4"
-							:label="$p.t('person', 'bisstandort')"
-							type="text"
-							v-model="data.standort_code"
-							name="standort_code"
-							disabled
-							>
-						</form-input>
-					 
-					</div>
-					
-					<div class="row mb-3">
-						<form-input
-							container-class="col-4"
-							:label="$p.t('lehre', 'studiengang')"
-							type="select"
-							v-model="data.studiengang_kz"
-							name="studiengang_kz"
-							disabled
-							>
-							<option v-for="stg in listStgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">{{stg.kuerzel}} - {{stg.bezeichnung}} </option>
-						</form-input>
-						<form-input
-							container-class="col-4"
-							:label="$p.t('lehre', 'studientyp')"
-							type="select"
-							v-model="data.gsstudientyp_kurzbz"
-							name="gsstudientyp_kurzbz"
-							>
-							<option v-for="typ in listStgTyp" :key="typ.typ" :value="typ.typ">{{typ.bezeichnung}} </option>
-						</form-input>
 					</div>
+					<div class="col-2 pt-4 d-flex align-items-center">
+						<form-input
+							container-class="form-check"
+							:label="$p.t('lehre', 'dual')"
+							type="checkbox"
+							v-model="data.dual"
+							name="dual"
+							>
+						</form-input>
+					</div>
+					<form-input
+						container-class="col-3"
+						:label="$p.t('lehre', 'foerderrelevant')"
+						type="select"
+						v-model="data.foerderrelevant"
+						name="foerderrelevant"
+						>
+						<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
+					</form-input>
 					
-					<div class="row mb-3">
-						<form-input
-							container-class="col-4"
-							:label="$p.t('global', 'anmerkung')"
-							type="text"
-							v-model="data.anmerkung"
-							name="anmerkung"
-							>
-						</form-input>
-						<div class="col-2 pt-4 d-flex align-items-center">
-							<form-input
-								container-class="form-check"
-								:label="$p.t('person', 'bismelden')"
-								type="checkbox"
-								v-model="data.bismelden"
-								name="bismelden"
-								>
-							</form-input>
-						</div>
-						<div class="col-2 pt-4 d-flex align-items-center">
-							<form-input
-								container-class="form-check"
-								:label="$p.t('lehre', 'dual')"
-								type="checkbox"
-								v-model="data.dual"
-								name="dual"
-								>
-							</form-input>
-						</div>
-						<form-input
-							container-class="col-3"
-							:label="$p.t('lehre', 'foerderrelevant')"
-							type="select"
-							v-model="data.foerderrelevant"
-							name="foerderrelevant"
-							>
-							<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
-						</form-input>
-						
-						<form-input
-							container-class="col-1"
-							:label="$p.t('lehre', 'prioritaet')"
-							type="text"
-							v-model="data.priorisierung"
-							name="priorisierung"
-							:disabled="!hasPrestudentPermission"
-							>
-						</form-input>
-						</div>
-					</fieldset>
-										
+					<form-input
+						container-class="col-1"
+						:label="$p.t('lehre', 'prioritaet')"
+						type="text"
+						v-model="data.priorisierung"
+						name="priorisierung"
+						:disabled="!hasPrestudentPermission"
+						>
+					</form-input>
+				</div>
+			</fieldset>
 		</form-form>
-		<br>				
-		<div class="col-8">
+		<div>
 			<legend>Gesamthistorie</legend>
-			<TblHistory :person_id="modelValue.person_id"></TblHistory>		
+			<tbl-history :person-id="modelValue.person_id" :prestudent-id="modelValue.prestudent_id"></tbl-history>
 		</div>
-					
-		
 	</div>
 	`
 };

public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js

@@ -5,12 +5,14 @@ export default{
 		CoreFilterCmpt
 	},
 	props: {
-		person_id: Number
+		personId: Number,
+		prestudentId: Number
 	},
 	data() {
+		let prestudent_id = this.prestudentId;
 		return {
 			tabulatorOptions: {
-				ajaxURL: 'api/frontend/v1/stv/Prestudent/getHistoryPrestudents/' + this.person_id,
+				ajaxURL: 'api/frontend/v1/stv/Prestudent/getHistoryPrestudents/' + this.personId,
 				ajaxRequestFunc: this.$fhcApi.get,
 				ajaxResponse: (url, params, response) => response.data,
 				//autoColumns: true,
@@ -21,12 +23,22 @@ export default{
 					{title:"Orgform", field:"orgform_kurzbz"},
 					{title:"Studienplan", field:"bezeichnung"},
 					{title:"UID", field:"student_uid"},
-					{title:"Status", field:"status"}
+					{title:"Status", field:"status"},
+					{title:"PrestudentId", field:"prestudent_id", visible:false}
 				],
+				rowFormatter(row) {
+					if (["Abgewiesener","Abbrecher","Absolvent"].includes(row.getData().status_kurzbz)) {
+						row.getElement().classList.add('text-muted');
+					}
+					if (row.getData().prestudent_id == prestudent_id) {
+						row.getElement().classList.add('fw-bold');
+					}
+				},
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	false,
+				persistenceID: 'stv-details-prestudent-history'
 			},
 			tabulatorEvents: [
 				{
@@ -49,14 +61,14 @@ export default{
 		}
 	},
 	template: `
-		<div class="stv-list h-100 pt-3">
-			<core-filter-cmpt
-				ref="table"
-				:tabulator-options="tabulatorOptions"
-				:tabulator-events="tabulatorEvents"
-				table-only
-				:side-menu="false"
+	<div class="stv-details-prestudent-history h-100 pt-3">
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
 			>
 		</core-filter-cmpt>
-		</div>`
+	</div>`
 }

public/js/components/Stv/Studentenverwaltung/List.js

@@ -90,7 +90,7 @@ export default {
 				selectable: true,
 				selectableRangeMode: 'click',
 				index: 'prestudent_id',
-				persistence: true
+				persistenceID: 'stv-list'
 			},
 			tabulatorEvents: [
 				{

public/js/components/Udf/Udf.js

@@ -131,7 +131,7 @@ export default {
 			@data-fetched="init"
 			>
 			<template #default>
-				<div v-for="field in filteredFields" :key="field.name" class="col">
+				<div v-for="field in filteredFields" :key="field.name" class="col" :class="field.type == 'checkbox' ? 'pt-4 d-flex align-items-center' : ''">
 					<form-input
 						v-model="internModelValue[field.name]"
 						:name="field.name"