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

- added room suggestion priority

Browse Source 
- return erro codes
- config for from/to without grid
- bug fixes and optimizations
This commit is contained in:
ma0048
2026-06-15 11:47:36 +02:00
parent 72692812ff
commit 6565399633
17 changed files with 680 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/collision/checks/StudentCollisionCheck.php
+15 -6
View File
@@ -130,12 +130,19 @@ class StudentCollisionCheck implements ICollisionCheck
if (isError($result2) || !hasData($result2)) return [];
$conflicts = [];
foreach (getData($result2) as $row) {
if (isset($curUids[$row->uid])) {
$conflicts[] = $this->_ci->phraseslib->t('ui', 'student_kollision')
. ': ' . $row->uid
. ' (' . date('d.m.Y H:i', strtotime($row->von))
. ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
foreach (getData($result2) as $row)
{
if (isset($curUids[$row->uid]))
{
$conflicts[] = [
'message' =>
$this->_ci->phraseslib->t('ui', 'student_kollision')
. ': ' . $row->uid
. ' (' . date('d.m.Y H:i', strtotime($row->von))
. ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')',
'errorCode' => 'student_collision'
];
}
}
@@ -231,7 +238,9 @@ class StudentCollisionCheck implements ICollisionCheck
$grouped = [];
foreach (getData($result) as $row)
{
$grouped[$row->kalender_id][] = true;
}
return $grouped;
}