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

corrects the way how to active ampeln check whether an ampel was bestaetigt or not and adds the Ampel_Benutzer_Bestaetigt_model

Browse Source
This commit is contained in:
SimonGschnell
2024-08-07 11:52:50 +02:00
parent c5f57a0689
commit ceb8eb9671
5 changed files with 213 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/Ampeln.php
+5 -3
View File
@@ -56,7 +56,9 @@ class Ampeln extends FHCAPI_Controller
$this->form_validation->set_rules('ampel_id', 'Ampel ID', 'required|integer');
if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
$insert_into_result = $this->AmpelModel->confirmAmpel($ampel_id,$this->uid);
// load Ampel_benutzer_bestaetigt_model to confirm the ampel
$this->load->model('content/Ampel_Benutzer_Bestaetigt_model', 'AmpelBenutzerBestaetigtModel');
$insert_into_result = $this->AmpelBenutzerBestaetigtModel->insert(["ampel_id"=> $ampel_id, "uid"=> $this->uid]);
$insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
@@ -78,8 +80,8 @@ class Ampeln extends FHCAPI_Controller
$activeAmpeln = $this->getDataOrTerminateWithError($activeAmpeln);
foreach($activeAmpeln as $ampel){
// only include non confirmed active ampeln in the result
// only include non confirmed active ampeln in the result
if(!$ampel->bestaetigt){
// check if the user was assigned to the ampel