correct student check

This commit is contained in:
cgfhtw
2024-08-07 15:51:19 +02:00
parent 0621073f8d
commit 24d74dd332
3 changed files with 9 additions and 66 deletions
@@ -254,7 +254,7 @@ class Status extends FHCAPI_Controller
)
return true; // Only test if new status is Student
$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
$result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
return $this->getDataOrTerminateWithError($result);
}],
@@ -1059,7 +1059,7 @@ class Status extends FHCAPI_Controller
if ($value != Prestudentstatus_model::STATUS_STUDENT)
return true; // Only test if new status is Student
$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
$result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
return $this->getDataOrTerminateWithError($result);
}]
@@ -1600,7 +1600,7 @@ class Status extends FHCAPI_Controller
if ($value != Prestudentstatus_model::STATUS_STUDENT)
return true;
$result = $this->prestudentstatuschecklib->checkIfExistingStudentRolle($prestudent_id);
$result = $this->prestudentstatuschecklib->checkIfExistingStudent($prestudent_id);
return $this->getDataOrTerminateWithError($result);
}]
@@ -127,20 +127,22 @@ class PrestudentstatusCheckLib
}
/**
* Checks if a student role already exists.
* Checks if a student already exists.
*
* @param integer $prestudent_id
*
* @return stdClass
*/
public function checkIfExistingStudentRolle($prestudent_id)
public function checkIfExistingStudent($prestudent_id)
{
$result = $this->_ci->StudentModel->checkIfExistingStudentRolle($prestudent_id);
$result = $this->_ci->StudentModel->loadWhere([
'prestudent_id' => $prestudent_id
]);
if (isError($result))
return $result;
return success(getData($result) != '0');
return success(hasData($result));
}
/**
@@ -229,23 +231,6 @@ class PrestudentstatusCheckLib
return success(hasData($result));
}
/**
* Checks if is the first student Status
*
* @param integer $prestudent_id
*
* @return stdClass
*/
public function checkIfIsErsterStudent($prestudent_id)
{
$result = $this->_ci->StudentModel->checkIfExistingStudentRolle($prestudent_id);
if (isError($result))
return $result;
return success(getData($result) == '0');
}
/**
* Check if Bismeldestichtag erreicht
*
-42
View File
@@ -230,46 +230,4 @@ class Student_model extends DB_Model
{
return $student_uid . '@' . DOMAIN;
}
/**
* Check if StudentenRolle already exists
* @param integer $prestudent_id
* @return 0 if not exists, count(rollen) if it does
* Copy from studentDBDML.php
*/
public function checkIfExistingStudentRolle($prestudent_id)
{
$qry = "SELECT
count(*) as anzahl
FROM
public.tbl_student
WHERE
prestudent_id = ? ";
$result = $this->execQuery($qry, array($prestudent_id));
if (isError($result))
{
return error($result);
}
else
{
$resultObject = current(getData($result));
if (property_exists($resultObject, 'anzahl')) {
$resultValue = (int)$resultObject->anzahl;
if ($resultValue > 0)
{
return success($resultValue, $resultValue . " vorhandene Rollen");
}
else
{
return success("0");
}
} else {
return error("StudentModel: Error During Check if Existing Student Rolle.");
}
}
}
}