diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php index 84c7933ad..815631d60 100644 --- a/application/controllers/api/frontend/v1/Stundenplan.php +++ b/application/controllers/api/frontend/v1/Stundenplan.php @@ -172,6 +172,7 @@ class Stundenplan extends FHCAPI_Controller */ public function getRoomplan() { + $this->load->library('StundenplanLib'); // form validation $this->load->library('form_validation'); $this->form_validation->set_data($_GET); @@ -188,8 +189,7 @@ class Stundenplan extends FHCAPI_Controller $roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date)); $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data); - - $this->expand_object_information($roomplan_data); + $this->stundenplanlib->expand_object_information($roomplan_data); $this->terminateWithSuccess($roomplan_data); @@ -198,6 +198,7 @@ class Stundenplan extends FHCAPI_Controller // gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student public function Reservierungen($ort_kurzbz = null) { + $this->load->library('StundenplanLib'); //form validation $this->load->library('form_validation'); $this->form_validation->set_data($_GET); @@ -211,7 +212,6 @@ class Stundenplan extends FHCAPI_Controller $start_date = $this->input->get('start_date', TRUE); $end_date = $this->input->get('end_date', TRUE); - $this->load->library('StundenplanLib'); $result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz); $result = $this->getDataOrTerminateWithError($result); $this->terminateWithSuccess($result); diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php index 5a741e10c..e0691ecab 100644 --- a/application/libraries/StundenplanLib.php +++ b/application/libraries/StundenplanLib.php @@ -144,8 +144,8 @@ class StundenplanLib{ } - private function expand_object_information($data){ - + public function expand_object_information($data){ + $this->_ci =& get_instance(); foreach ($data as $item) { diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js index 8a7354305..379f60498 100644 --- a/public/js/components/Cis/Mylv/RoomInformation.js +++ b/public/js/components/Cis/Mylv/RoomInformation.js @@ -219,25 +219,25 @@ const RoomInformation = {