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

corrects the translation of the ampel queries

Browse Source
This commit is contained in:
SimonGschnell
2024-08-02 11:44:58 +02:00
parent 4811f223b9
commit 3bb87ef8d3
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/Ampeln.php
+7 -8
View File
@@ -74,10 +74,10 @@ class Ampeln extends FHCAPI_Controller
// fetch active ampeln
$activeAmpeln = $this->AmpelModel->active();
$activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
foreach($activeAmpeln as $ampel){
foreach($activeAmpeln as $ampel){
// check if ampel is confirmed by user
$confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
@@ -108,8 +108,8 @@ class Ampeln extends FHCAPI_Controller
$userAmpeln = array();
$ampel_result = $this->AmpelModel->active();
$ampel_result = $this->getDataOrTerminateWithError($ampel_result);
$ampel_result = $this->getDataOrTerminateWithError($ampel_result);
foreach($ampel_result as $ampel){
$confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
@@ -120,7 +120,7 @@ class Ampeln extends FHCAPI_Controller
$zugeteilt = $this->getDataOrTerminateWithError($zugeteilt);
if($zugeteilt) $userAmpeln[] = $this->translateAmpel($ampel);
if($zugeteilt) $userAmpeln[] = $ampel;
}
$this->terminateWithSuccess($userAmpeln);
@@ -142,8 +142,7 @@ class Ampeln extends FHCAPI_Controller
// check if ampel is confirmed by user
$confirmedByUser = $this->AmpelModel->isConfirmed($ampel->ampel_id,$this->uid);
$ampel->bestaetigt = $confirmedByUser;
// translate ampeln
return $this->translateAmpel($ampel);
return $ampel;
}, $alle_ampeln);
$this->terminateWithSuccess($alle_ampeln);