blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-17 12:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-52735/C4_stundenplan_query_fix' into feature-25999/C4_cleanup

Browse Source
This commit is contained in:
Harald Bamberger
2024-10-21 17:16:21 +02:00
parent 690080035a 2e3bc855aa
commit c763e332d8
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/ressource/Stundenplan_model.php
+9 -4
View File
@@ -203,7 +203,7 @@ class Stundenplan_model extends DB_Model
if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
{
$query .= "AND ( ";
$query .= " AND ( ";
}
if(count($gruppen) != 0)
@@ -211,8 +211,13 @@ class Stundenplan_model extends DB_Model
$query .="sp.gruppe_kurzbz IN (".implode(',',$gruppen).")";
}
foreach($studentlehrverbaende as $lehrverband){
$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe).")";
foreach($studentlehrverbaende as $key=>$lehrverband){
// only append OR if not first entry or previous condition was added
if(($key == 0 && count($gruppen) != 0) || ($key > 0))
{
$query .= " OR ";
}
$query .= "(sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe).")";
}
if(count($gruppen) != 0 || count($studentlehrverbaende) != 0)
@@ -262,4 +267,4 @@ class Stundenplan_model extends DB_Model
return $this->execQuery($query, [$uid, $uid]);
}
}
}