blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes in Students Controller

Browse Source
This commit is contained in:
cgfhtw
2024-08-09 13:24:39 +02:00
parent 59e501e52b
commit d57bd7d7ba
2 changed files with 6 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Students.php
+6 -5
View File
@@ -124,10 +124,10 @@ class Students extends FHCAPI_Controller
$org = $params[0];
if ($count > 1 && $params[1] == 'prestudent') {
if ($count == 2)
return $this->getPrestudents(null, null, $org);
return $this->getPrestudents($method, null, null, $org);
if ($count == 3)
return $this->getPrestudents($params[2], null, $org);
return $this->getPrestudents($params[2], $params[$count-1], $org);
return $this->getPrestudents($method, $params[2], null, $org);
return $this->getPrestudents($method, $params[2], $params[$count-1], $org);
}
$sem = $count > 1 ? $params[1] : null;
if ($count == 4 && $params[2] == 'grp') {
@@ -310,6 +310,7 @@ class Students extends FHCAPI_Controller
break;
default:
if (!$studiensemester_kurzbz) {
// TODO(chris): this does not work with $orgform_kurzbz != null
$where['ps.status_kurzbz'] = null;
} else {
$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
@@ -348,7 +349,7 @@ class Students extends FHCAPI_Controller
$this->addSelectPrioRel();
$this->addFilter($studiensemester_kurzbz);
$result = $this->PrestudentModel->loadWhere($where);
$data = $this->getDataOrTerminateWithError($result);
@@ -422,7 +423,7 @@ class Students extends FHCAPI_Controller
WHERE prestudent_id=tbl_prestudent.prestudent_id
AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
)",
) =",
$this->PrestudentModel->escape($orgform_kurzbz),
false
);