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

Merge branch 'merge_FHC4_C4'

Browse Source
This commit is contained in:
Harald Bamberger
2025-03-05 17:37:16 +01:00
parent 97ee1f8144 00b766cb69
commit bd7669ff5b
4 changed files with 90 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Mobility.php
+12 -4
View File
@@ -46,7 +46,10 @@ class Mobility extends FHCAPI_Controller
{
$this->BisioModel->addSelect("*");
$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
$this->BisioModel->addOrder('von', 'DESC');
$this->BisioModel->addOrder('bis', 'DESC');
$this->BisioModel->addOrder('bisio_id', 'DESC');
$result = $this->BisioModel->loadWhere(
array('student_uid' => $student_uid)
);
@@ -161,13 +164,17 @@ class Mobility extends FHCAPI_Controller
}
}
$this->terminateWithSuccess();
$this->terminateWithSuccess($bisio_id);
}
public function loadMobility($bisio_id)
{
$result = $this->BisioModel->load($bisio_id);
$this->BisioModel->addSelect("*");
$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
$result = $this->BisioModel->loadWhere(
array('bisio_id' => $bisio_id)
);
$data = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess(current($data));
@@ -175,6 +182,7 @@ class Mobility extends FHCAPI_Controller
public function updateMobility()
{
$this->load->library('form_validation');
$authUID = getAuthUID();