Merge branch 'master' into bugfix/78127-degree-programs-page-localization-ineffective

.gitignore

@@ -1,5 +1,6 @@
 documents/
 vendor/
+public/vendor
 
 /nbproject/
 .vscode

application/config/routes.php

@@ -91,11 +91,13 @@ $route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/incoming/1'] = 'a
 $route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/outgoing/1'] = 'api/frontend/v1/stv/students/getOutgoing/$1';
 $route['api/frontend/v1/treemenudata/stv/stdsem/(:any)/inout/1/shared_studies/1'] = 'api/frontend/v1/stv/students/getGemeinsamestudien/$1';
 
+$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/:any/1/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
 $route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
 $route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2/$3';
 $route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudents/$1/$2';
 $route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/prestudent/1'] = 'api/frontend/v1/stv/students/getPrestudents/$1';
 
+$route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/:any/1/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
 $route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/:any/1/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
 $route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)/(:any)/1'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3/$4';
 $route['api/frontend/v1/treemenudata/stv/stdsem/:any/stg/(:any)/orgform/(:any)/prestudent/1/stdsem/(:any)'] = 'api/frontend/v1/stv/students/getPrestudentsOrgform/$1/$2/$3';

application/libraries/stv/StudentListLib.php

@@ -77,7 +77,7 @@ class StudentListLib
 			CASE
 				WHEN pls.status_kurzbz IN ('Interessent','Aufgenommener','Bewerber','Wartender')
 				THEN pls.ausbildungssemester
-				ELSE s.semester
+				ELSE v.semester
 			END AS semester_berechnet
 		");
 		$this->addSelect(

public/js/components/Cis/Renderer/Lehreinheit/modalContent.js

@@ -51,6 +51,16 @@ export default {
 			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
 		}
 	},
+	watch: {
+		event: {
+			async handler() {
+				if (this.$props.event.type == "lehreinheit") {
+					await this.getLvMenu();
+				}
+			},
+			deep: true,
+		},
+	},
 	methods: {
 		mehtodNumberPadding: function (number) {
 			return numberPadding(number);
@@ -58,21 +68,31 @@ export default {
 		methodFormatDate: function (d) {
 			return formatDate(d);
 		},
+		async getLvMenu() {
+			const semesterResponse = await this.$api.call(
+				ApiLvPlan.getLehreinheitStudiensemester(
+					Array.isArray(this.event.lehreinheit_id)
+						? this.event.lehreinheit_id[0]
+						: this.event.lehreinheit_id,
+				),
+			);
+			if (semesterResponse.meta.status !== "success") return;
+
+			const studiensemesterKurzbz = semesterResponse.data;
+			const lvMenuResponse = await this.$api.call(
+				ApiAddons.getLvMenu(
+					this.event.lehrveranstaltung_id,
+					studiensemesterKurzbz,
+				),
+			);
+			if (lvMenuResponse.meta.status !== "success") return;
+
+			this.lvMenu = lvMenuResponse.data;
+		},
 	},
-	created() {
-		if (this.event.type == 'lehreinheit') {
-			this.$api
-				.call(ApiLvPlan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
-				.then(res => res.data)
-				.then(studiensemester_kurzbz => this.$api.call(
-					ApiAddons.getLvMenu(
-						this.event.lehrveranstaltung_id,
-						studiensemester_kurzbz
-					)
-				))
-				.then(res => {
-					this.lvMenu = res.data;
-				});
+	async created() {
+		if (this.$props.event.type == 'lehreinheit') {
+			await this.getLvMenu();
 		}
 	},
 	template: `

public/js/components/DetailHeader/DetailHeader.js

@@ -82,6 +82,9 @@ export default {
 		hasTileGammaSlot() {
 			return !!this.$slots.titleGammaTile
 		},
+		hasTileDeltaSlot() {
+			return !!this.$slots.titleDeltaTile
+		},
 		hasTileUIDSlot() {
 			return !!this.$slots.uid
 		},
@@ -492,6 +495,13 @@ export default {
 					<div class="px-2" style="min-width: 100px;">
 						<slot name="issues"></slot>
 					</div>
+					<div v-if="hasTileDeltaSlot" class="px-2" style="border-left: 1px solid #EEE">
+						<h4 class="mb-1 text-center"><slot name="titleDeltaTile"></slot></h4>
+						<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
+							<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
+							<slot v-else name="valueDeltaTile"></slot>
+						</h6>
+					</div>
 					<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
 						<h4 class="mb-1 text-center"><slot name="titleGammaTile"></slot></h4>
 						<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
@@ -612,6 +622,13 @@ export default {
 						<div class="px-2" style="min-width: 100px;">
 							<slot name="issues"></slot>
 						</div>
+						<div v-if="hasTileDeltaSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1 text-center"><slot name="titleDeltaTile"></slot></h4>
+							<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">
+								<pv-skeleton v-if="isLoading" width="4rem"></pv-skeleton>
+								<slot v-else name="valueDeltaTile"></slot>
+							</h6>
+						</div>
 						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1 text-center"><slot name="titleGammaTile"></slot></h4>
 							<h6 class="text-muted d-flex align-items-center justify-content-center flex-wrap gap-1">

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

@@ -63,6 +63,14 @@ export default {
 			let tile = this.students[0].matrikelnr != null ? this.students[0].matrikelnr : '-';
 			return tile;
 		},
+		tile_PrestdId(){
+			let tile = this.students[0].prestudent_id != null ? this.students[0].prestudent_id : '-';
+			return tile;
+		},
+		tile_UID(){
+			let tile = this.students[0].uid != null ? this.students[0].uid : '-';
+			return tile;
+		},
 	},
 	watch: {
 		'$p.user_language.value'(n, o) {
@@ -143,13 +151,15 @@ export default {
 				fotoEditable
 				:isLoading="isLoading"
 			>
-				<template #uid>{{students[0].uid}}</template>
-				<template #titleAlphaTile>PersID</template>
-				<template #valueAlphaTile>{{tile_PersId}}</template>
-				<template #titleBetaTile>MatrNr</template>
-				<template #valueBetaTile>{{tile_MatrNr}}</template>
-				<template #titleGammaTile>PersKz</template>
-				<template #valueGammaTile>{{tile_PersKz}}</template>
+				<template #uid>{{tile_UID}}</template>
+				<template #titleAlphaTile>PrestdID</template>
+				<template #valueAlphaTile>{{tile_PrestdId}}</template>
+				<template #titleBetaTile>PersID</template>
+				<template #valueBetaTile>{{tile_PersId}}</template>
+				<template #titleGammaTile>MatrNr</template>
+				<template #valueGammaTile>{{tile_MatrNr}}</template>
+				<template #titleDeltaTile>PersKz</template>
+				<template #valueDeltaTile>{{tile_PersKz}}</template>
 			</fhc-header>
 			<fhc-tabs
 				v-if="students.length == 1"