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

changes the structure of the JSON data from the stundenplan

Browse Source
This commit is contained in:
SimonGschnell
2024-09-04 14:59:56 +02:00
parent 87f82b7f5d
commit e33162d20e
9 changed files with 176 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/Stundenplan.php
+22 -6
View File
@@ -28,9 +28,10 @@ class Stundenplan extends FHCAPI_Controller
{
parent::__construct([
'roomInformation' => self::PERM_LOGGED,
'getRoomplan' => self::PERM_LOGGED,
'Stunden' => self::PERM_LOGGED,
'Reservierungen' => self::PERM_LOGGED
'Reservierungen' => self::PERM_LOGGED,
'getStundenplan' => self::PERM_LOGGED,
]);
$this->load->library('LogLib');
@@ -69,7 +70,7 @@ class Stundenplan extends FHCAPI_Controller
* @access public
*
*/
public function roomInformation()
public function getRoomplan()
{
$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
@@ -88,7 +89,7 @@ class Stundenplan extends FHCAPI_Controller
$start_date = $this->input->get('start_date', TRUE);
$end_date = $this->input->get('end_date', TRUE);
$result = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
$result = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
$result = $this->getDataOrTerminateWithError($result);
@@ -96,6 +97,22 @@ class Stundenplan extends FHCAPI_Controller
}
public function getStundenplan(){
$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
/* $result = $this->StundenplanModel->loadForUid(get_uid());
if (isError($result))
return $this->outputJsonError(getError($result));
*/
$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid()));
$res = getData($res);
$this->outputJsonSuccess($res);
}
// reservierungen is not used in the prototype for the students
public function Reservierungen()
{
@@ -125,7 +142,7 @@ class Stundenplan extends FHCAPI_Controller
$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
$result = $this->getDataOrTerminateWithError($result);
$this->terminateWithSuccess($result);
// loop over the days
$day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
$final_reservierungen = array();
@@ -173,7 +190,6 @@ class Stundenplan extends FHCAPI_Controller
$grouped_uids[]= $entry->uid;
}
// grouping the
}