From e907c0b5962caa0f593835b2f93775a257eeac91 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 9 Jan 2024 15:05:05 +0100 Subject: [PATCH] Studstatus: use current semester in WiederholerDeadline Job --- application/controllers/jobs/AntragJob.php | 2 +- application/libraries/PrestudentLib.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index 131cfdced..61c77c6e7 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -306,7 +306,7 @@ class AntragJob extends JOB_Controller foreach ($prestudents as $prestudent) { - $result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz, $insertvon); + $result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, '', $insertvon); if (isError($result)) $this->logError(getError($result)); else diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index 989e14585..ae4ad59c6 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -74,7 +74,7 @@ class PrestudentLib $result = $this->_ci->PrestudentstatusModel->withGrund($statusgrund_kurzbz)->insert([ 'prestudent_id' => $prestudent_id, 'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER, - 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz, 'ausbildungssemester' => $prestudent_status->ausbildungssemester, 'datum' => $datum, 'insertvon' => $insertvon, @@ -135,7 +135,7 @@ class PrestudentLib } //noch nicht eingetragene Zeugnisnoten auf 9 setzen - $result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz); + $result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $prestudent_status->studiensemester_kurzbz); if (isError($result)) return $result; $result = getData($result) ?: []; @@ -181,7 +181,7 @@ class PrestudentLib //Studentlehrverband setzen $this->_ci->StudentlehrverbandModel->update([ - 'studiensemester_kurzbz' => $studiensemester_kurzbz, + 'studiensemester_kurzbz' => $prestudent_status->studiensemester_kurzbz, 'student_uid' => $student->student_uid ], [ 'studiengang_kz' => $student->studiengang_kz,