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

Conflict resolved

Browse Source
This commit is contained in:
Ivymaster
2026-07-09 10:50:16 +02:00
parent a50ee86940 8172df5782
commit c9cdd4725a
27 changed files with 1634 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/collision/checks/RoomCollisionCheck.php
+3 -2
View File
@@ -20,7 +20,7 @@ class RoomCollisionCheck implements ICollisionCheck
public function check($data)
{
if (!isset($data->ort_kurzbz, $data->von, $data->bis, $data->kalender_id)) return [];
if (!isset($data->ort_kurzbz, $data->von, $data->bis, $data->kalender_id) || isEmptyArray($data->ort_kurzbz)) return [];
if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
@@ -31,10 +31,10 @@ class RoomCollisionCheck implements ICollisionCheck
$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
$this->_ci->KalenderModel->db->where_in('ort_kurzbz', $data->ort_kurzbz);
$result = $this->_ci->KalenderModel->loadWhere(array(
'von <' => $data->bis,
'bis >' => $data->von,
'ort_kurzbz' => $data->ort_kurzbz,
));
if (isError($result)) return [];
@@ -67,6 +67,7 @@ class RoomCollisionCheck implements ICollisionCheck
$result = $this->_ci->KalenderModel->load();
if (isError($result) || !hasData($result)) return [];
$grouped = [];