From b6585dc186cf0805c5ba7afae4fefee3dd769d5e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Dec 2023 16:05:52 +0100
Subject: [PATCH 1/2] add margin-right to prevent scrollbar from overlaying
 table

---
 cis/private/tools/zeitaufzeichnung.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/cis/private/tools/zeitaufzeichnung.php b/cis/private/tools/zeitaufzeichnung.php
index 0eb86bdb1..7937857ef 100644
--- a/cis/private/tools/zeitaufzeichnung.php
+++ b/cis/private/tools/zeitaufzeichnung.php
@@ -229,6 +229,21 @@ $( document ).ready(function()
 </script>
 ';
 
+echo <<<EOSBJS
+<script>
+	$(document).ready(function() {
+        const scrollDiv = document.createElement('div');
+        scrollDiv.style.cssText = 'width: 99px; height: 99px; overflow: scroll; position: absolute; top: -9999px;';
+        document.body.appendChild(scrollDiv);
+        const scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth;
+        document.body.removeChild(scrollDiv);
+		var marginright = Math.max((20 - scrollbarWidth), 0);
+        document.body.style.setProperty('width', 'calc(100% - ' + marginright + 'px)');
+    });
+</script>
+
+EOSBJS;
+
 echo '
         <script type="text/javascript">
 		$(document).ready(function()
@@ -1621,7 +1636,7 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 			        <td '.$style.' align="right"><b>'.$tagessaldo.$erstr.'</b><br>'.date('H:i', ($pausesumme-3600)).'</td>
 			        <td '.$style.' colspan="3" align="right">';
 					if ($tag > $sperrdatum)
-					echo '<a href="?von_datum='.$datum->formatDatum($tag,'d.m.Y').'&bis_datum='.$datum->formatDatum($tag,'d.m.Y').'" class="item">&lt;-</a>';
+					echo '<a href="?von_datum='.$datum->formatDatum($tag,'d.m.Y').'&bis_datum='.$datum->formatDatum($tag,'d.m.Y').'" class="item">&larr;</a>';
 
 					echo '</td></tr>';
 

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 2/2] 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>