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

adds the bestaetigt property of the ampel when fetching all the active ampeln

Browse Source
This commit is contained in:
SimonGschnell
2024-08-02 12:52:21 +02:00
parent 3bb87ef8d3
commit c5f57a0689
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/Ampeln.php
+3 -9
View File
@@ -73,18 +73,14 @@ class Ampeln extends FHCAPI_Controller
$userAmpeln = array();
// fetch active ampeln
$activeAmpeln = $this->AmpelModel->active();
$activeAmpeln = $this->AmpelModel->active(false, $this->uid);
$activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
foreach($activeAmpeln as $ampel){
// check if ampel is confirmed by user
$confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
$ampel->bestaetigt = $confirmedByUser;
// only include non confirmed active ampeln in the result
if(!$confirmedByUser){
if(!$ampel->bestaetigt){
// check if the user was assigned to the ampel
$zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);
@@ -107,13 +103,11 @@ class Ampeln extends FHCAPI_Controller
{
$userAmpeln = array();
$ampel_result = $this->AmpelModel->active();
$ampel_result = $this->AmpelModel->active(false, $this->uid);
$ampel_result = $this->getDataOrTerminateWithError($ampel_result);
foreach($ampel_result as $ampel){
$confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
$ampel->bestaetigt = $confirmedByUser;
// check if the ampel was assigned to the user
$zugeteilt = $this->AmpelModel->isZugeteilt($this->uid, $ampel->benutzer_select);