From bc5d42b310a5ff9b196db2a8ce041927f8b3bb2d Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Thu, 14 Mar 2024 08:52:55 +0100 Subject: [PATCH] Studstatus: ausbildungssemester in getAllPrestudentsWhereCommitteeExamFailed --- application/controllers/jobs/AntragJob.php | 8 +------- application/models/education/Pruefung_model.php | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index c4e7685b4..717561589 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -624,12 +624,6 @@ class AntragJob extends JOB_Controller } } - $this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel'); - $result = $this->StudierendenantragModel->getStgAndSem($prestudent->studierendenantrag_id); - if (hasData($result)) { - $ausbildungssemester = current(getData($result))->ausbildungssemester; - } - $dataMail = array( 'name'=> trim($prestudent->vorname . ' '. $prestudent->nachname), 'vorname' => $prestudent->vorname, @@ -646,7 +640,7 @@ class AntragJob extends JOB_Controller 'fristablauf' => $fristende->format('d.m.Y'), 'pre_wiederholer_sem' => $next_sem, 'wiederholer_sem' => $sem_after_next_sem, - 'sem' => $ausbildungssemester + 'sem' => $prestudent->ausbildungssemester ); // NOTE(chris): Sancho mail diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php index 241b6a4d7..214d6519f 100644 --- a/application/models/education/Pruefung_model.php +++ b/application/models/education/Pruefung_model.php @@ -173,6 +173,7 @@ class Pruefung_model extends DB_Model $this->addSelect('a.studierendenantrag_id'); $this->addSelect('a.typ'); $this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status'); + $this->addSelect('pss.ausbildungssemester'); $this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id'); $this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');