From ca2256bb32c8d15af1f75df9144c3974b9a93574 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 22 Nov 2023 14:57:06 +0100
Subject: [PATCH 1/2] Fix: Better handling of uninitialized variables

---
 .../Studierendenantrag/Form/AbmeldungStgl.js  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 3524bcd1f..64c9cc575 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -30,7 +30,7 @@ export default {
 	},
 	computed: {
 		statusSeverity() {
-			switch (this.data.status)
+			switch (this.data?.status)
 			{
 				case 'Erstellt': return 'info';
 				case 'Genehmigt': return 'success';
@@ -141,39 +141,39 @@ export default {
 					<table class="table">
 						<tr>
 							<th>{{p.t('lehre', 'studiengang')}}</th>
-							<td align="right">{{data.bezeichnung}}</td>
+							<td align="right">{{data?.bezeichnung}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'organisationsform')}}</th>
-							<td align="right">{{data.orgform_bezeichnung}}</td>
+							<td align="right">{{data?.orgform_bezeichnung}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
-							<td align="right">{{data.name}}</td>
+							<td align="right">{{data?.name}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('person', 'personenkennzeichen')}}</th>
-							<td align="right">{{data.matrikelnr}}</td>
+							<td align="right">{{data?.matrikelnr}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'studienjahr')}}</th>
-							<td align="right">{{data.studienjahr_kurzbz}}</td>
+							<td align="right">{{data?.studienjahr_kurzbz}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'studiensemester')}}</th>
-							<td align="right">{{data.studiensemester_kurzbz}}</td>
+							<td align="right">{{data?.studiensemester_kurzbz}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'semester')}}</th>
-							<td align="right">{{data.semester}}</td>
+							<td align="right">{{data?.semester}}</td>
 						</tr>
 					</table>
 				</div>
 
-				<div v-if="data.grund" class="mb-3">
+				<div v-if="data?.grund" class="mb-3">
 					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
 				
-					<pre class="text-prewrap">{{data.grund}}</pre>
+					<pre class="text-prewrap">{{data?.grund}}</pre>
 				</div>      
 				<div v-else class="col-sm-6 mb-3">
 					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
@@ -211,7 +211,7 @@ export default {
 				
 				<div class="col-12 text-end">
 					<button
-						v-if="!data.studierendenantrag_id"
+						v-if="!data?.studierendenantrag_id"
 						type="button"
 						class="btn btn-primary"
 						data-bs-toggle="modal"

From 8142982ac726147862cd40850e0ca2a48306720f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 22 Nov 2023 14:57:24 +0100
Subject: [PATCH 2/2] s&d

---
 application/controllers/jobs/AntragJob.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index cbd34a561..6d4617a73 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -349,6 +349,7 @@ class AntragJob extends JOB_Controller
 		$this->StudierendenantragModel->addSelect('prestudent_id');
 		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
 		$this->StudierendenantragModel->addSelect('s.insertamum');
+		$this->StudierendenantragModel->addSelect('s.insertvon');
 
 		$this->StudierendenantragModel->db->where_in('public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', $this->config->item('antrag_prestudentstatus_whitelist'));
 
@@ -372,7 +373,7 @@ class AntragJob extends JOB_Controller
 				$result = $this->prestudentlib->setAbbrecher(
                     $antrag->prestudent_id,
                     $antrag->studiensemester_kurzbz,
-                    $insertvon,
+                    $antrag->insertvon ?: $insertvon,
                     'abbrecherStgl',
                     $antrag->insertamum
                 );
@@ -413,7 +414,7 @@ class AntragJob extends JOB_Controller
 					}
 				}
 			}
-			$this->logInfo($count . " Students set to Abbrecher");
+			$this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher");
 		}
 		$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
 	}