From 749b29a2395682a455168905775314180ee5472c Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 6 Aug 2024 16:30:50 +0200 Subject: [PATCH] Status: Bewerber --- .../api/frontend/v1/stv/Status.php | 14 +++---- application/libraries/PrestudentLib.php | 37 +++++++++++-------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php index db59541b5..35c480b37 100644 --- a/application/controllers/api/frontend/v1/stv/Status.php +++ b/application/controllers/api/frontend/v1/stv/Status.php @@ -491,15 +491,11 @@ class Status extends FHCAPI_Controller ); break; case Prestudentstatus_model::STATUS_BEWERBER: - $this->load->library('PrestudentLib'); - $result = $this->prestudentlib->setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester); - - if (isError($result)) - { - return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - else - $this->terminateWithSuccess($prestudent_id); + $result = $this->prestudentlib->setBewerber( + $prestudent_id, + $studiensemester_kurzbz, + $ausbildungssemester + ); break; case Prestudentstatus_model::STATUS_AUFGENOMMENER: $this->load->library('PrestudentLib'); diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php index f48084dc0..ba51c4d6a 100644 --- a/application/libraries/PrestudentLib.php +++ b/application/libraries/PrestudentLib.php @@ -567,7 +567,9 @@ class PrestudentLib $prestudent_status = current(getData($result)); - //Status updaten + // Update Aktionen + + // Status updaten $result = $this->_ci->PrestudentstatusModel->insert([ 'prestudent_id' => $prestudent_id, 'status_kurzbz' => Prestudentstatus_model::STATUS_ABSOLVENT, @@ -590,18 +592,21 @@ class PrestudentLib public function setBewerber($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester) { - $resultLastStatus = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); - if (isError($resultLastStatus)) - return $resultLastStatus; - $resultLastStatus = getData($resultLastStatus); + $result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id); - $prestudent_status = current($resultLastStatus); + if (isError($result)) + return $result; + if (!hasData($result)) + return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', [ + 'prestudent_id' => $prestudent_id + ])); - //check studiensemester_kurzbz TODO(Manu) check if Necessary: already checked in staus.php changeStatus() - /* $studiensemester_kurzbz = $prestudent_status->studiensemester_kurzbz != $studiensemester_kurzbz ? - $prestudent_status->studiensemester_kurzbz : $studiensemester_kurzbz;*/ + $prestudent_status = current(getData($result)); - //Status updaten + + // Update Aktionen + + // Status updaten $result = $this->_ci->PrestudentstatusModel->insert([ 'prestudent_id' => $prestudent_id, 'status_kurzbz' => Prestudentstatus_model::STATUS_BEWERBER, @@ -616,12 +621,14 @@ class PrestudentLib 'bestaetigtam' => date('c') ]); - if (isError($result)) - { - return $result; + if (SEND_BEWERBER_INFOMAIL) { + // TODO(chris): IMPLEMENT! } - else - return success(); + + if (isError($result)) + return $result; + + return success(); } public function setAufgenommener($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester)