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

Merge branch 'feature-39912/Room_planning_calendar' into feature-25999/C4_copy

Browse Source
This commit is contained in:
SimonGschnell
2024-09-11 13:54:45 +02:00
parent 8860d9a598 f2a57f85a8
commit d80761d952
24 changed files with 873 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/Cis/Stundenplan.php
+9 -4
View File
@@ -16,7 +16,7 @@ class Stundenplan extends Auth_Controller
parent::__construct([
'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
'Reservierungen' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
'Stunden' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
'Stunden' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
]);
}
@@ -29,12 +29,16 @@ class Stundenplan extends Auth_Controller
{
$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
$result = $this->StundenplanModel->loadForUid(get_uid());
/* $result = $this->StundenplanModel->loadForUid(get_uid());
if (isError($result))
return $this->outputJsonError(getError($result));
$this->outputJsonSuccess(getData($result));
*/
$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid()));
$res = getData($res);
$this->outputJsonSuccess($res);
}
/**
@@ -65,4 +69,5 @@ class Stundenplan extends Auth_Controller
$this->outputJsonSuccess(getData($result));
}
}