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

update(LvPlan Feiertage): checks if the query result is array before performing array operations and returns success status instead of raw data

Browse Source
This commit is contained in:
SimonGschnell
2025-07-02 08:55:21 +02:00
parent 34220a8f39
commit bf1dac3fd9
3 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/LvPlan.php
+1 -1
View File
@@ -119,7 +119,7 @@ class LvPlan extends FHCAPI_Controller
}
$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang);
$ferienEvents = $this->getDataOrTerminateWithError($ferienEvents);
$allEvents = array_merge($lvAndMoodleEvents,$ferienEvents);
// sort array with moodle events first
usort($lvAndMoodleEvents, function($a, $b){
application/controllers/api/frontend/v1/Studium.php
+1 -3
View File
@@ -311,9 +311,7 @@ SELECT tbl_lehrveranstaltung.*,
private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
$this->load->library('StundenplanLib');
$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
if(!$lektoren){
return [];
}
$lektoren = $this->getDataOrTerminateWithError($lektoren);
$lektoren = array_map(function($lektor){
return ["name"=>$this->getDataOrTerminateWithError($this->PersonModel->getFullName($lektor)), "email"=>$lektor."@".DOMAIN];
},$lektoren);