From a3963248dda37db5bd1c3c361af357d9c5c84b9d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 29 Nov 2023 14:37:35 +0100
Subject: [PATCH 1/4] s&d

---
 application/libraries/AntragLib.php      | 37 ++++++++++++++----------
 application/models/crm/Student_model.php |  2 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index f3eb4d152..ff4d5dc63 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -123,6 +123,8 @@ class AntragLib
 	 */
 	public function approveAbmeldung($studierendenantrag_ids, $insertvon)
 	{
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+
 		$errors = [];
 		foreach ($studierendenantrag_ids as $studierendenantrag_id) {
 			$result = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
@@ -251,10 +253,9 @@ class AntragLib
 						$vorname = '';
 						$nachname = $name;
 					}
-					$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
+					$res = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 					if (hasData($res)) {
-						$kontakt = current(getData($res));
-						$email = $kontakt->kontakt;
+						$email = $this->_ci->StudentModel->getEmailFH(current(getData($res))->student_uid);
 						$vorlage = $antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG ? 'Student' : 'Stgl';
 
 						// NOTE(chris): Sancho mail
@@ -335,6 +336,8 @@ class AntragLib
 			$res = $this->_ci->PrestudentModel->load($antrag->prestudent_id);
 
 			if (hasData($res)) {
+				$this->_ci->load->model('crm/Student_model', 'StudentModel');
+
 				$prestudent = current(getData($res));
 				$res = $this->_ci->PersonModel->load($prestudent->person_id);
 				if (hasData($res)) {
@@ -345,10 +348,10 @@ class AntragLib
 				} else {
 					$name = $this->_ci->p->t('person', 'studentIn');
 				}
-				$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
+
+				$res = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 				if (hasData($res)) {
-					$kontakt = current(getData($res));
-					$email = $kontakt->kontakt;
+					$email = $this->_ci->StudentModel->getEmailFH(current(getData($res))->student_uid);
 
 					$res = $this->_ci->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 					$stg = '';
@@ -432,6 +435,7 @@ class AntragLib
 	public function approveUnterbrechung($studierendenantrag_ids, $insertvon)
 	{
 		$this->_ci->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 
 		$errors = [];
 
@@ -609,6 +613,7 @@ class AntragLib
 	public function rejectUnterbrechung($studierendenantrag_ids, $insertvon, $grund)
 	{
 		$this->_ci->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 
 		$errors = [];
 
@@ -755,7 +760,7 @@ class AntragLib
 					}
 				}
 
-				$res = $this->_ci->KontaktModel->getZustellKontakt($person_id, ['email']);
+				$res = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
 				if (isError($res)) {
 					$errors['email'] = getError($res);
 				} else {
@@ -764,7 +769,7 @@ class AntragLib
 					if (!$res) {
 						$errors['email'] = $this->_ci->p->t('studierendenantrag', 'error_no_email', ['person_id' => $person_id]);
 					} else {
-						$result['email'] = current($res)->kontakt;
+						$result['email'] = $this->_ci->StudentModel->getEmailFH(current($res)->student_uid);
 					}
 				}
 			}
@@ -1517,6 +1522,8 @@ class AntragLib
 
 	public function approveWiederholung($antrag_id, $insertvon)
 	{
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+
 		$result = $this->_ci->StudierendenantragstatusModel->insert([
 			'studierendenantrag_id' => $antrag_id,
 			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
@@ -1571,10 +1578,10 @@ class AntragLib
 			$mitarbeiter = getData($result);
 		}
 
-		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id'=> $antrag->prestudent_id]);
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id'=> $prestudent_id]);
 		if (hasData($result)) {
-			$student = current(getData($result));
-			$student_uid = $student->student_uid;
+			$studentObj = current(getData($result));
+			$student_uid = $studentObj->student_uid;
 		}
 		else
 			$student_uid = '';
@@ -1596,10 +1603,8 @@ class AntragLib
 		))
 			return error($this->_ci->p->t('studierendenantrag', 'error_mail_to', ['email' => $email]));
 
-		$result = $this->_ci->KontaktModel->getZustellKontakt($person->person_id, ['email']);
-		if (hasData($result)) {
-			$kontakt = current(getData($result));
-			$email = $kontakt->kontakt;
+		if ($student_uid) {
+			$email = $this->_ci->StudentModel->getEmailFH($student_uid);
 
 			$sem_not_allowed = $sem_to_repeat = '';
 			$list_not_allowed = $list_to_repeat = $this->_ci->p->t('studierendenantrag', 'mail_part_error_no_lvs');
@@ -1609,7 +1614,7 @@ class AntragLib
 				$lvs = getData($result);
 				foreach ($lvs as $sem => $lv_list) {
 					$lvs_filtered = array_filter($lv_list, function ($el) {
-						return $el->antrag_zugelassen;
+						return property_exists($el, 'antrag_zugelassen') && $el->antrag_zugelassen;
 					});
 					if (substr($sem, 0, 1) == '1') {
 						$sem_not_allowed = substr($sem, 1);
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index e27fa68dc..4b0a70b1a 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -84,7 +84,7 @@ class Student_model extends DB_Model
 	}
 
 	/**
-	 * Get the FH-Email for a student (not the private kontakt emailt)
+	 * Get the FH-Email for a student (not the private kontakt email)
 	 * @param $student_uid
 	 * @return string
 	 */

From 483b6171c76727e1d027ee353ee346059ff0fc12 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Dec 2023 09:39:46 +0100
Subject: [PATCH 2/4] add space between firstname and surname

---
 rdf/AntragAbmeldung.xml.php     | 2 +-
 rdf/AntragAbmeldungStgl.xml.php | 2 +-
 rdf/AntragUnterbrechung.xml.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
index 0de936e0a..515b1809a 100644
--- a/rdf/AntragAbmeldung.xml.php
+++ b/rdf/AntragAbmeldung.xml.php
@@ -57,7 +57,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
 	<antrag>
-        <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+        <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
         <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
         <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
         <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
index cccd677b0..4511be232 100644
--- a/rdf/AntragAbmeldungStgl.xml.php
+++ b/rdf/AntragAbmeldungStgl.xml.php
@@ -57,7 +57,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
         <antrag>
-            <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+            <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
             <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
             <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
             <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
index 70a056b8a..ff3e68afa 100644
--- a/rdf/AntragUnterbrechung.xml.php
+++ b/rdf/AntragUnterbrechung.xml.php
@@ -58,7 +58,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
 	<antrag>
-        <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+        <name><![CDATA[<?= trim($row->vorname . ' ' . $row->nachname); ?>]]></name>
         <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
         <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
         <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>

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 3/4] 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 4/4] 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>