From 0202bb261f9d7f674366af92fbd502a55db1cc65 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 10:45:28 +0200
Subject: [PATCH] MergedStudent Results

---
 public/js/components/searchbar/result/mergedstudent.js | 3 +++
 public/js/components/searchbar/searchbar.js            | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/searchbar/result/mergedstudent.js b/public/js/components/searchbar/result/mergedstudent.js
index aa5d7739f..e8ed89b65 100644
--- a/public/js/components/searchbar/result/mergedstudent.js
+++ b/public/js/components/searchbar/result/mergedstudent.js
@@ -8,6 +8,7 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
@@ -20,6 +21,7 @@ export default {
 	template: `
 	<result-prestudent
 		v-if="prestudent"
+		:mode="mode"
 		:res="prestudent"
 		:actions="actions"
 		@actionexecuted="$emit('actionexecuted')"
@@ -27,6 +29,7 @@ export default {
 	></result-prestudent>
 	<result-student
 		v-else
+		:mode="mode"
 		:res="res.list[0]"
 		:actions="actions"
 		@actionexecuted="$emit('actionexecuted')"
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 8359b932d..49cbdb2ff 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,6 +4,7 @@ import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
+import mergedStudent from "./result/mergedstudent.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -30,7 +31,8 @@ export default {
       employee: employee,
       organisationunit: organisationunit,
       student: student,
-      prestudent: prestudent
+      prestudent: prestudent,
+      mergedStudent
     },
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
@@ -58,6 +60,7 @@ export default {
                     <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                     <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
+                    <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedstudent" @actionexecuted="this.hideresult"></merged-student>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
@@ -238,12 +241,12 @@ export default {
 
                         switch (this.searchoptions.mergeResults) {
                         case 'student':
-                            mergeTypes = ['student', 'prestudent'];
+                            mergeTypes = ['student', 'studentStv', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'uid';
                             break;
                         case 'person':
-                            mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'prestudent'];
+                            mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'studentStv', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'person_id';
                             break;