mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-24 02:12:17 +00:00
adds the lector and the gruppe as objects to the endpoint result instead of just strings
This commit is contained in:
@@ -35,8 +35,48 @@ class Stundenplan extends Auth_Controller
|
||||
if (isError($result))
|
||||
return $this->outputJsonError(getError($result));
|
||||
*/
|
||||
$res = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid()));
|
||||
$res = getData($res);
|
||||
|
||||
|
||||
$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid()));
|
||||
|
||||
$res = getData($res);
|
||||
|
||||
// get the benutzer object for the lektor of the lv
|
||||
$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
|
||||
$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
|
||||
foreach($res as $item){
|
||||
$lektor_obj_array = array();
|
||||
$gruppe_obj_array = array();
|
||||
foreach($item->lektor as $lv_lektor){
|
||||
$lektor_obj = $this->MitarbeiterModel->loadWhere(["kurzbz"=>$lv_lektor]);
|
||||
if (isError($lektor_obj)) {
|
||||
$this->outputJsonError(getError($lektor_obj));
|
||||
}
|
||||
$lektor_obj = getData($lektor_obj);
|
||||
$lektor_obj_array[] = $lektor_obj;
|
||||
}
|
||||
foreach ($item->gruppe as $lv_gruppe) {
|
||||
$lv_gruppe = str_replace("(","",$lv_gruppe);
|
||||
$lv_gruppe = str_replace(")", "", $lv_gruppe);
|
||||
$lv_gruppe_array = explode(",",$lv_gruppe);
|
||||
$gruppe = str_replace("\"","",$lv_gruppe_array[0]);
|
||||
$verband = $lv_gruppe_array[1];
|
||||
$semester = $lv_gruppe_array[2];
|
||||
$studiengang_kz = $lv_gruppe_array[3];
|
||||
$lehrverband_obj = $this->LehrverbandModel->loadWhere(["gruppe" => $gruppe, "verband" => $verband, "semester" => $semester, "studiengang_kz" => $studiengang_kz]);
|
||||
if (isError($lehrverband_obj)) {
|
||||
$this->outputJsonError(getError($lehrverband_obj));
|
||||
}
|
||||
$lehrverband_obj = getData($lehrverband_obj);
|
||||
$gruppe_obj_array[] = $lehrverband_obj;
|
||||
}
|
||||
//replace the array of lektor strings with the objects of lektor information
|
||||
$item->lektor = $lektor_obj_array;
|
||||
//replace the array of gruppen string with the lehrverband object information
|
||||
$item->gruppe = $gruppe_obj_array;
|
||||
|
||||
}
|
||||
|
||||
$this->outputJsonSuccess($res);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user