From eade9b7bebf663a65f79d3e9a67269f2a175645d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 10 Dec 2025 17:41:01 +0100
Subject: [PATCH] fixed accordion header padding size; student sees public
 mail, lektor gets notifs to private; remove unused injections; rewrite
 viewData validation for old Cis to remove console.warnings; clear
 abgabetermin.kurzbz when changing to smth not quality gate to avoid leaky
 kurzbz; fixed accordion header style offset for both cis environments;
 tooltip fix; only show abgabedatum if termin has upload_allowed; lower
 max-width in old cis; activated custom persistence for assistenz page +
 stricter promise handling around tableBuilt; activeIndex Handling on Student
 Page in case of several Projektarbetien; Phrasen gendering;

---
 .../controllers/api/frontend/v1/Abgabe.php    |  12 +-
 application/views/Cis/Abgabetool.php          |   2 +-
 public/css/components/abgabetool/abgabe.css   |   4 +
 public/js/apps/Abgabetool/Abgabetool.js       |   1 +
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  13 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  14 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 241 ++++++++++--------
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |   4 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   5 +-
 system/phrasesupdate.php                      |  34 ++-
 10 files changed, 193 insertions(+), 137 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index e1c35ba5b..5558beafb 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -190,12 +190,9 @@ class Abgabe extends FHCAPI_Controller
 					$pa->downloadLink1 = $downloadLink1;
 				}
 				
-				$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($pa->projektarbeit_id);
 				
-				$data = getData($result);
-				if(count($data) > 0) {
-					$pa->email = $data[0]->private_email;
-				}
+				$pa->email = $pa->mitarbeiter_uid.'@'.DOMAIN;
+				
 				if($pa->zweitbetreuer_person_id !== null) {
 
 					if($pa->zweitbetreuer_abgeschickt) {
@@ -240,7 +237,7 @@ class Abgabe extends FHCAPI_Controller
 			}
 		}
 		
-		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));
+		$this->terminateWithSuccess(array($projektarbeiten));
 	}
 
 
@@ -857,8 +854,7 @@ class Abgabe extends FHCAPI_Controller
 			
 			
 			if(file_exists($file_path)) {
-				$this->terminateWithFileOutput('application/octet-stream', filesize($file_path), basename($file_path));
-
+				$this->terminateWithFileOutput('application/octet-stream', file_get_contents($file_path), basename($file_path));
 			} else {
 				$this->terminateWithError('File not found');
 			}
diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
index 1d53cfa77..416f626e6 100644
--- a/application/views/Cis/Abgabetool.php
+++ b/application/views/Cis/Abgabetool.php
@@ -37,7 +37,7 @@ $includesArray = array(
 
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
-<div id="abgabetoolroot" class="h-100" route=<?php echo json_encode($route) ?> 
+<div id="abgabetoolroot" class="h-100" style="max-width: 95%;" route=<?php echo json_encode($route) ?> 
 	uid=<?php echo $uid ?> student_uid_prop=<?php echo $student_uid_prop ?? '""' ?>
 	stg_kz_prop=<?php echo $stg_kz_prop ?? '""' ?>
 	>
diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index ea980dc29..b1d8c2507 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -189,4 +189,8 @@
 
 .bordered-modal  .modal-body {
 	overflow-y: visible;
+}
+
+.p-accordion .p-accordion-header .p-accordion-header-link {
+	padding: 12px!important;
 }
\ No newline at end of file
diff --git a/public/js/apps/Abgabetool/Abgabetool.js b/public/js/apps/Abgabetool/Abgabetool.js
index 9d9e34214..d1c3e134c 100644
--- a/public/js/apps/Abgabetool/Abgabetool.js
+++ b/public/js/apps/Abgabetool/Abgabetool.js
@@ -69,5 +69,6 @@ app.use(primevue.config.default, {
 		tooltip: 8000
 	}
 })
+app.directive('tooltip', primevue.tooltip);
 app.use(PluginsPhrasen);
 app.mount('#abgabetoolroot');
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 289102f87..2e617f02b 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -22,8 +22,7 @@ export const AbgabeMitarbeiterDetail = {
 		'abgabetypenBetreuer',
 		'allowedNotenOptions',
 		'turnitin_link',
-		'old_abgabe_beurteilung_link',
-		'isMobile'
+		'old_abgabe_beurteilung_link'
 	],
 	props: {
 		projektarbeit: {
@@ -472,9 +471,11 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		handleChangeAbgabetyp(termin) {
 			// if paabgabetype qualgate is selected, fill out kurzbz textfield with bezeichnung of quality gate so users
-			// are possibly less confused, which is a pursuit in vain
+			// are possibly less confused
 			if(termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2') {
 				termin.kurzbz = termin.bezeichnung.bezeichnung
+			} else {
+				termin.kurzbz = ''
 			}
 		}
 			
@@ -608,8 +609,6 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	watch: {
 		'newTermin.bezeichnung'(newVal) {
-			console.log('\'newTermin.bezeichnung\' watcher', newVal)
-
 			if(newVal?.paabgabetyp_kurzbz === 'qualgate1' || newVal?.paabgabetyp_kurzbz === 'qualgate2') {
 				this.newTermin.kurzbz = newVal.bezeichnung
 			}
@@ -760,8 +759,8 @@ export const AbgabeMitarbeiterDetail = {
 			<template v-for="termin in this.projektarbeit?.abgabetermine">
 				<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
 					<template #header>
-						<div class="d-flex row w-100">
-							<div class="col-auto" style="transform: translateX(-62px)">
+						<div class="d-flex row w-100 flex-nowrap align-items-center">
+							<div class="col-auto" style="transform: translateX(-58px); height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 								<i v-if="getDateStyleClass(termin) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index dd6c86f78..8eee7e41e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -310,7 +310,13 @@ export const AbgabeStudentDetail = {
 					class: "custom-tooltip"
 				}
 			}
-		}
+		},
+		getTooltipBeurteilungerforderlich() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipBeurteilungerfolderlich'),
+				class: "custom-tooltip"
+			}
+		},
 	},
 	created() {
 		
@@ -333,8 +339,8 @@ export const AbgabeStudentDetail = {
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
 					<AccordionTab :headerClass="termin.dateStyle + '-header'">
 						<template #header>
-							<div class="d-flex row w-100 flex-nowrap">
-								<div class="col-auto" style="transform: translateX(-62px)">
+							<div class="d-flex row w-100 flex-nowrap align-items-center">
+								<div class="col-auto" style="transform: translateX(-58px); height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 									<i v-if="termin.dateStyle == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
 									<i v-else-if="termin.dateStyle == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 									<i v-else-if="termin.dateStyle == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
@@ -440,7 +446,7 @@ export const AbgabeStudentDetail = {
 							</div>
 						</div>
 						
-						<div class="row mt-2">
+						<div class="row mt-2" v-if="termin.upload_allowed">
 							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
 							<div class="col-12 col-md-9">
 							<template v-if="termin?.abgabedatum">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 0da8c2f5e..72e9e8728 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -38,7 +38,8 @@ export const AbgabetoolAssistenz = {
 			abgabeTypeOptions: Vue.computed(() => this.abgabeTypeOptions),
 			allowedNotenOptions: Vue.computed(() => this.allowedNotenOptions),
 			turnitin_link: Vue.computed(() => this.turnitin_link),
-			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link)
+			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link),
+			abgabetypenBetreuer: Vue.computed(() => this.abgabeTypeOptions)
 		}
 	},
 	props: {
@@ -50,7 +51,7 @@ export const AbgabetoolAssistenz = {
 			required: true,
 			default: () => ({name: '', uid: ''}),
 			validator(value) {
-				return value && value.name && value.uid
+				return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
 			}
 		}
 	},
@@ -89,7 +90,6 @@ export const AbgabetoolAssistenz = {
 				kurzbz: '',
 				fixtermin: false,
 				upload_allowed: false
-				
 			}),
 			showAll: false,
 			tabulatorUuid: Vue.ref(0),
@@ -125,7 +125,7 @@ export const AbgabetoolAssistenz = {
 						frozen: true,
 						width: 40
 					},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150, visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, responsive: 1, minWidth: 150},
 					// {title: 'pa_id', field: 'projektarbeit_id', visible: true},
 					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1,responsive:0,  tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter,responsive:0, widthGrow: 1, tooltip: false},
@@ -135,26 +135,21 @@ export const AbgabetoolAssistenz = {
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4studstatus'))), field: 'studienstatus', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4orgform'))), field: 'orgform', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4note'))), field: 'note_bez', headerFilter: true,
-						responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, visible: true, responsive:2,formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
+						responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, responsive:2,formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
-				persistenceID: "abgabetableV27"
-			},
-			abgabeTableEventHandlers: [{
-				event: "tableBuilt",
-				handler: async () => {
-					this.tableBuiltResolve()
-				}
+				persistenceID: "abgabetool_2025_12"
 			},
+			abgabeTableEventHandlers: [
 			{
 				event: "rowSelectionChanged",
 				handler: async(data) => {
@@ -164,6 +159,28 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
+		getItemBezeichnung(item){
+			if(!item.bezeichnung) return ''
+			
+			return item?.bezeichnung?.bezeichnung ?? item?.bezeichnung
+		},
+		getItemNote(item) {
+			if(!item?.note) return ''
+			
+			const notenOption = this.notenOptions.find(note => note.note == item.note)
+			if(!notenOption) return item.note
+			
+			return notenOption.bezeichnung
+		},
+		handleChangeAbgabetypSerientermin(termin) {
+			// if paabgabetype qualgate is selected, fill out kurzbz textfield with bezeichnung of quality gate so users
+			// are possibly less confused
+			if(termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2') {
+				termin.kurzbz = termin.bezeichnung.bezeichnung
+			} else {
+				termin.kurzbz = ''
+			}
+		},
 		semesterChanged(e) {
 			if(this.$refs.abgabeTable.tabulator) {
 				const table = this.$refs.abgabeTable.tabulator
@@ -230,91 +247,94 @@ export const AbgabetoolAssistenz = {
 		},
 		handleTableBuilt() {
 			const table = this.$refs.abgabeTable.tabulator
-			// table.on("columnMoved", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("columnResized", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("columnVisibilityChanged", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("filterChanged", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("headerFilterChanged", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("dataSorted", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("columnSorted", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("sortersChanged", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// const saved = this.loadState();
+
+			this.tableBuiltResolve()
 			
-			// table.on("renderComplete", () => {
-			// 	if(!this.stateRestored) {
-			//		
-			// 		if (saved?.columns && !this.colLayoutRestored) {
-			// 			const layout = saved.columns.map(col => ({
-			// 				field: col.field,
-			// 				width: col.width,
-			// 				visible: col.visible,
-			// 				// add more if needed, but keep it simple
-			// 			}));
-			//
-			// 			const safeLayout = layout.filter(col =>
-			// 				col.field && !["rowSelection", "rowHandle", "rowNum", "zweitbetreuer"].includes(col.field)
-			// 			);
-			//			
-			// 			table.setColumnLayout(safeLayout);
-			//
-			// 			this.colLayoutRestored = true;
-			// 		}
-			//
-			// 		if (saved?.filters && !this.filtersRestored) {
-			// 			this.filtersRestored = true // instantly avoid retriggers
-			// 			table.setFilter(saved.filters);
-			// 		}
-			// 		if (saved?.headerFilters && !this.headerFiltersRestored) {
-			// 			this.headerFiltersRestored = true // instantly avoid retriggers
-			// 			for (let hf of saved.headerFilters) {
-			// 				table.setHeaderFilterValue(hf.field, hf.value);
-			// 			}
-			// 		}
-			//
-			// 		if (saved?.sort?.length && !this.sortRestored) {
-			// 			this.sortRestored = true;
-			//
-			// 			setTimeout(() => {
-			// 				const sortList = saved.sort.map(s => {
-			// 					const col = table.columnManager.findColumn(s.field);
-			// 					if (!col) {
-			// 						return null;
-			// 					}
-			// 					return { column: col, dir: s.dir };
-			// 				}).filter(Boolean);
-			//
-			// 				table.setSort(sortList);
-			// 			}, 100);
-			// 		}
-			// 		this.stateRestored = true
-			//
-			// 	}
-			//
-			// });
+			table.on("columnMoved", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnResized", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnVisibilityChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("filterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("headerFilterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("dataSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("sortersChanged", () => {
+				this.saveState(table);
+			});
+
+			const saved = this.loadState();
+			
+			table.on("renderComplete", () => {
+				if(!this.stateRestored) {
+
+					if (saved?.columns && !this.colLayoutRestored) {
+						const layout = saved.columns.map(col => ({
+							field: col.field,
+							width: col.width,
+							visible: col.visible,
+							// add more if needed, but keep it simple
+						}));
+
+						const safeLayout = layout.filter(col =>
+							col.field && !["rowSelection", "rowHandle", "rowNum", "zweitbetreuer"].includes(col.field)
+						);
+
+						table.setColumnLayout(safeLayout);
+
+						this.colLayoutRestored = true;
+					}
+
+					if (saved?.filters && !this.filtersRestored) {
+						this.filtersRestored = true // instantly avoid retriggers
+						table.setFilter(saved.filters);
+					}
+					if (saved?.headerFilters && !this.headerFiltersRestored) {
+						this.headerFiltersRestored = true // instantly avoid retriggers
+						for (let hf of saved.headerFilters) {
+							table.setHeaderFilterValue(hf.field, hf.value);
+						}
+					}
+
+					if (saved?.sort?.length && !this.sortRestored) {
+						this.sortRestored = true;
+
+						setTimeout(() => {
+							const sortList = saved.sort.map(s => {
+								const col = table.columnManager.findColumn(s.field);
+								if (!col) {
+									return null;
+								}
+								return { column: col, dir: s.dir };
+							}).filter(Boolean);
+
+							table.setSort(sortList);
+						}, 100);
+					}
+					this.stateRestored = true
+
+				}
+
+			});
 		},
 		handleToggleFullscreenDetail() {
 			this.detailIsFullscreen = !this.detailIsFullscreen
@@ -608,7 +628,7 @@ export const AbgabetoolAssistenz = {
 			const val = cell.getValue()
 
 			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+				'<a style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</a></div>'
 		},
 		abgabterminFormatter(cell) {
 			const val = cell.getValue()
@@ -668,14 +688,15 @@ export const AbgabetoolAssistenz = {
 		buildZweitbetreuer(projekt) {
 			return projekt.zweitbetreuer_full_name ?? ''
 		},
-		setupData(data){
+		async setupData(data){
 			this.projektarbeiten = data[0]
 			this.domain = data[1]
 			
 			const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
+
+			await this.tableBuiltPromise
 			
 			// this.$refs.abgabeTable.tabulator.clearData()
-			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 			this.$refs.abgabeTable.tabulator.setData(mappedData);
 		},
 		loadProjektarbeiten(all = false, callback) {
@@ -725,6 +746,13 @@ export const AbgabetoolAssistenz = {
 		}
 	},
 	watch: {
+		'serienTermin.bezeichnung'(newVal) {
+			if(newVal?.paabgabetyp_kurzbz === 'qualgate1' || newVal?.paabgabetyp_kurzbz === 'qualgate2') {
+				this.serienTermin.kurzbz = newVal.bezeichnung
+			}
+
+			this.serienTermin.upload_allowed = newVal.upload_allowed_default
+		},
 		selectedStudiengangOption(newVal, oldVal) {
 			// implicitely avoids juggling around promises for created api calls,
 			// since we need note & stg flags for loadProjektarbeiten
@@ -883,6 +911,7 @@ export const AbgabetoolAssistenz = {
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
 							:options="abgabeTypeOptions"
+							@change="handleChangeAbgabetypSerientermin(termin)"
 							:optionLabel="getOptionLabelAbgabetyp">
 						</Dropdown>
 					</div>
@@ -992,7 +1021,7 @@ export const AbgabetoolAssistenz = {
 							{{ $capitalize($p.t('abgabetool/c4abgabetyp')) }}:
 						</div>
 						<div class="col-7">
-							{{ slotProps?.item?.bezeichnung?.bezeichnung ?? slotProps?.item?.bezeichnung }}
+							{{ getItemBezeichnung(slotProps.item) }}
 						</div>
 				
 						<div class="col-5 fw-semibold text-end">
@@ -1006,7 +1035,7 @@ export const AbgabetoolAssistenz = {
 							{{ $capitalize($p.t('abgabetool/c4note')) }}:
 						</div>
 						<div v-if="slotProps.item.benotbar" class="col-7">
-							{{ slotProps.item.note }}
+							{{ getItemNote(slotProps.item) }}
 						</div>
 				 	</div>
 				 	<hr/>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 387a6606e..0e24a496c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -32,7 +32,7 @@ export const AbgabetoolMitarbeiter = {
 			required: true,
 			default: () => ({name: '', uid: ''}),
 			validator(value) {
-				return value && value.name && value.uid
+				return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
 			}
 		}
 	},
@@ -268,7 +268,7 @@ export const AbgabetoolMitarbeiter = {
 			const val = cell.getValue()
 
 			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+				'<a style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</a></div>'
 		},
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index e8ed7eef4..5276d9a8c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -35,6 +35,7 @@ export const AbgabetoolStudent = {
 	},
 	data() {
 		return {
+			activeTabIndex: [0],
 			phrasenPromise: null,
 			phrasenResolved: false,
 			loading: false,
@@ -265,7 +266,7 @@ export const AbgabetoolStudent = {
 		getAccTabHeaderForProjektarbeit(projektarbeit) {
 			let title = ''
 			
-			title += projektarbeit.titel
+			title += projektarbeit.titel ?? this.$p.t('abgabetool/keinTitel')
 			
 			return title
 		},
@@ -342,7 +343,7 @@ export const AbgabetoolStudent = {
 		{{$capitalize( $p.t('abgabetool/c4abgabeStudentNoProjectsFound') )}}
 	</div>
 	
-	<Accordion :multiple="true" :activeIndex="[0]">
+	<Accordion :multiple="true" :activeIndex="activeTabIndex">
 		<template v-for="projektarbeit in projektarbeiten">
 			<AccordionTab>
 				
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 2158fa869..30b4b71ea 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41079,7 +41079,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Dokumentabgabe - Mitarbeiterbereich",
+				'text' => "Dokumentabgabe - MitarbeiterInbereich",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -42757,6 +42757,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'keinTitel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Kein Titel",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "No Title",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -43905,7 +43925,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Projektarbeit Detailansicht Mitarbeiter",
+				'text' => "Projektarbeit Detailansicht MitarbeiterIn",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44401,13 +44421,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Emailkontakt BetreuerIn",
+				'text' => "E-Mail BetreuerIn",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Emailcontact Assessor',
+				'text' => 'Email Assessor',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -44441,7 +44461,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Erstbetreuer Beurteilung herunterladen",
+				'text' => "ErstbetreuerIn Beurteilung herunterladen",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44461,7 +44481,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Zweitbetreuer Beurteilung herunterladen",
+				'text' => "ZweitbetreuerIn Beurteilung herunterladen",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44956,7 +44976,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Studenten Details anzeigen',
+				'text' => 'Studierende Details anzeigen',
 				'description' => '',
 				'insertvon' => 'system'
 			),