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

bundles the room_events and the reservierungen api calls together with Promise.allSettled

Browse Source
This commit is contained in:
SimonGschnell
2024-09-06 11:02:14 +02:00
parent f9b69fe08c
commit 8376e8b92d
3 changed files with 52 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/ressource/Stundenplan_model.php
+7 -11
View File
@@ -144,18 +144,16 @@ class Stundenplan_model extends DB_Model
{
$gruppierteEvents = $this->execReadOnlyQuery("
SELECT
unr, beginn, ende, subquery.stunde, datum,
CONCAT(lehrfach,'-',lehrform) as topic,
array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
array_agg(DISTINCT lektor) as lektor,
array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
unr,datum, sp.stunde, ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, beginn, ende
ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez
FROM
(
SELECT
unr,datum, sp.stunde,beginn, ende,
SELECT unr,datum, sp.stunde,beginn, ende,
CASE
WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
ELSE lektor
@@ -169,13 +167,11 @@ class Stundenplan_model extends DB_Model
FROM (".$stundenplanViewQuery.") sp
JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
) as sp
) as subquery
GROUP BY
GROUP BY unr, datum, subquery.stunde, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez
unr, datum, sp.stunde, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, beginn, ende
ORDER BY datum, sp.stunde
ORDER BY datum, subquery.stunde
");
if(isError($gruppierteEvents)){