From 9fa7e6e56c07ec0af08b131221ec480b33133a0a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Dec 2023 17:12:38 +0100
Subject: [PATCH] modify label of Studiengaenge in Dropdown and Table

---
 application/models/education/Studierendenantrag_model.php | 2 +-
 public/js/components/Studierendenantrag/Leitung/Header.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 4931896cd..a11df6981 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -30,7 +30,7 @@ class Studierendenantrag_model extends DB_Model
 	{
 		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
 
-		$this->addSelect('stg.bezeichnung');
+		$this->addSelect('UPPER(stg.typ) || UPPER(stg.kurzbz) || \' \' || stg.bezeichnung AS bezeichnung');
 		$this->addSelect('bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform', false);
 		$this->addSelect('s.studierendenantrag_id');
 		$this->addSelect('matrikelnr');
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
index 12bfcbe82..3d6287afa 100644
--- a/public/js/components/Studierendenantrag/Leitung/Header.js
+++ b/public/js/components/Studierendenantrag/Leitung/Header.js
@@ -12,7 +12,7 @@ export default {
 			<select ref="stg_select" class="form-select" @input="$emit('input', $event)">
 				<option value="">{{$p.t('global', 'alle')}}</option>
 				<option v-for="stg in stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
-					{{stg.bezeichnung}} ({{stg.orgform}})
+					{{stg.bezeichnung}}
 				</option>
 			</select>
 		</div>