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

Conflicts resolved

Browse Source
This commit is contained in:
Ivymaster
2026-06-15 12:47:29 +02:00
parent 245b724314 6565399633
commit de60d0d09e
17 changed files with 679 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/tempus/Kalender.php
+22 -38
View File
@@ -16,6 +16,7 @@ class Kalender extends FHCAPI_Controller
{
parent::__construct([
'getStunden' => self::PERM_LOGGED,
'getCalendarHours' => self::PERM_LOGGED,
'getPlan' => self::PERM_LOGGED,
'getPlanByOrt' => self::PERM_LOGGED,
'getRaumvorschlag' => self::PERM_LOGGED,
@@ -38,9 +39,11 @@ class Kalender extends FHCAPI_Controller
$this->_ci->load->library('LogLib');
$this->_ci->load->library('form_validation');
$this->_ci->load->library('KalenderLib');
$this->_ci->load->library('RaumvorschlagLib');
$this->loadPhrases([
'ui'
]);
$this->_ci->load->config('tempus');
$this->_ci->loglib->setConfigs(array(
@@ -71,6 +74,17 @@ class Kalender extends FHCAPI_Controller
$this->terminateWithSuccess($stunden);
}
public function getCalendarHours()
{
$calender_start = $this->_ci->config->item('calendar_start') ?? 7;
$calender_end = $this->_ci->config->item('calendar_end') ?? 23;
$this->terminateWithSuccess(array(
'start' => $calender_start,
'end' => $calender_end
));
}
public function getPlan()
{
$this->_ci->form_validation->set_data($_GET);
@@ -206,7 +220,7 @@ class Kalender extends FHCAPI_Controller
$result = $this->_ci->kalenderlib->updateKalenderEvent($kalender_id, $updateFields->ort_kurzbz ?? null, $updateFields->start_time ?? null, $updateFields->end_time ?? null);
if (isError($result))
$this->terminateWithError(getError($result));
$this->terminateWithError(getError($result), $result->code);
$this->terminateWithSuccess(getData($result));
}
@@ -214,39 +228,9 @@ class Kalender extends FHCAPI_Controller
public function getRaumvorschlag()
{
$this->_ci->form_validation->set_data($_GET);
$this->_ci->form_validation->set_rules('start_date',"start_date","required");
$this->_ci->form_validation->set_rules('end_date',"end_date","required");
if($this->_ci->form_validation->run() === FALSE)
$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
$start_date = $this->_ci->input->get('start_date', TRUE);
$end_date = $this->_ci->input->get('end_date', TRUE);
$filter = $this->_checkFilter(self::ALLOWED_ROOM_FILTER);
if (isset($filter->lehreinheit_id))
{
$result = $this->_ci->kalenderlib->getRaumvorschlagByLehreinheitID(
$start_date,
$end_date,
$filter->lehreinheit_id
);
}
if (isset($filter->kalender_id))
{
$result = $this->_ci->kalenderlib->getRaumvorschlagByKalenderID(
$start_date,
$end_date,
$filter->kalender_id
);
}
if (isError($result))
$this->terminateWithError(getError($result));
$this->terminateWithSuccess(getData($result));
$this->terminateWithSuccess($this->_ci->raumvorschlaglib->getVorschlaege($filter->kalender_id));
}
public function getHistory()
@@ -282,13 +266,13 @@ class Kalender extends FHCAPI_Controller
if (isError($result))
$this->terminateWithError(getError($result));
$this->terminateWithSuccess($result);
$this->terminateWithSuccess(getData($result));
}
public function sync()
{
$result = $this->_ci->kalenderlib->sync();
$this->terminateWithSuccess($result);
$this->terminateWithSuccess(getData($result));
}
public function syncToLecturer()
{
@@ -305,7 +289,7 @@ class Kalender extends FHCAPI_Controller
if (isError($result))
$this->terminateWithError(getError($result));
$this->terminateWithSuccess($result);
$this->terminateWithSuccess(getData($result));
}
public function syncToStudent()
{
@@ -322,7 +306,7 @@ class Kalender extends FHCAPI_Controller
if (isError($result))
$this->terminateWithError(getError($result));
$this->terminateWithSuccess($result);
$this->terminateWithSuccess(getData($result));
}
public function addKalenderEvent()
{
@@ -345,7 +329,7 @@ class Kalender extends FHCAPI_Controller
if (isError($result))
$this->terminateWithError(getError($result));
$this->terminateWithSuccess('Erfolgreich');
$this->terminateWithSuccess(getData($result));
}
public function addReservierung()
@@ -372,7 +356,7 @@ class Kalender extends FHCAPI_Controller
if (isError($result))
$this->terminateWithError(getError($result));
$this->terminateWithSuccess('Erfolgreich');
$this->terminateWithSuccess(getData($result));
}
private function _checkFilter($filters)
application/controllers/api/frontend/v1/tempus/Reservierung.php
+2 -2
View File
@@ -65,7 +65,7 @@ class Reservierung extends FHCAPI_Controller
$studiengaenge = $this->_ci->StudiengangModel->loadWhere(array('aktiv' => true));
if (isError($studiengaenge))
$this->terminateWithError($studiengaenge);
$this->terminateWithError(getError($studiengaenge));
$language = getUserLanguage() == 'German' ? 0 : 1;
$this->_ci->KalenderEventRolleModel->addOrder('sort');
$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
@@ -193,7 +193,7 @@ class Reservierung extends FHCAPI_Controller
if (isError($result))
$this->terminateWithError(getError($result));
$this->terminateWithSuccess('Erfolgreich');
$this->terminateWithSuccess($result);
}