blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-11 17:19:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix generateMatrikelnnummer, Reihenfolge validierung turnIntoStudent

Browse Source
This commit is contained in:
ma0068
2024-07-12 09:20:42 +02:00
parent 3706b0f972
commit 0bb5cb1fdc
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Status.php
+12 -12
View File
@@ -293,7 +293,9 @@ class Status extends FHCAPI_Controller
//TODO(manu) check Berechtigung
//check if Bismeldestichtag erreicht ADDNEW status
$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum, $studiensemester_kurzbz);
return $this->terminateWithError("here", self::ERROR_TYPE_GENERAL);
//just testing
//return $this->terminateWithError("here", self::ERROR_TYPE_GENERAL);
if (isError($result))
{
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -509,11 +511,6 @@ class Status extends FHCAPI_Controller
$isStudent = true;
if (!$isStudent) {
//check if bewerberstatus exists
$result = $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
if (isError($result)) {
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
//Check ZGV
if ($status_kurzbz == Prestudentstatus_model::STATUS_BEWERBER) {
@@ -544,11 +541,16 @@ class Status extends FHCAPI_Controller
}
}
//check if bewerberstatus exists
$result = $result = $this->prestudentstatuschecklib->checkIfExistingBewerberstatus($prestudent_id);
if (isError($result)) {
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
//checkIf Kaution bezahlt
//TODO(Manu)
//generate Personenkennzeichen(matrikelnr)
//TODO(manu) check if generateMatrikelnummer verwenden or use new version2 (with Type Param)
$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $studiensemester_kurzbz, $typ);
if (isError($resultMat)) {
return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
@@ -557,7 +559,6 @@ class Status extends FHCAPI_Controller
$jahr = mb_substr($matrikelnr, 0, 2);
//generate UID
//TODO(Manu) check ausbildungssemester: testfall prestudent_id 26381
$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
if (isError($resultMat)) {
return $this->terminateWithError("in generateUid" . $resultUid, self::ERROR_TYPE_GENERAL);
@@ -590,8 +591,8 @@ class Status extends FHCAPI_Controller
}
}
//TODO(Manu) check if benutzer already exists ok?
//person kann mehrere Benutzer haben...
//TODO(Manu) check if benutzer already exists to avoid conflicts..
//person kann mehrere Benutzer haben... student_uid?
//add benutzerdatensatz mit Aktierungscode
$this->load->model('person/Benutzer_model', 'BenutzerModel');
$result = $this->BenutzerModel->checkIfExistingBenutzer($person_id);
@@ -1192,8 +1193,7 @@ class Status extends FHCAPI_Controller
//check if Bismeldestichtag erreicht
if(!$isBerechtigtNoStudstatusCheck)
{
$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($new_status_datum);
return $this->terminateWithError("here2", self::ERROR_TYPE_GENERAL);
$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($datum);
if (isError($result))
{
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
application/models/crm/Student_model.php
+2 -2
View File
@@ -108,9 +108,9 @@ class Student_model extends DB_Model
$max = 0;
if ($matrikelnrres && hasData($matrikelnrres)) {
$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
if (!is_numeric($max)) {
/* if (!is_numeric($max)) {
$max = 0;
}
}*/
}
$max += 1;