From b771939bea8d43fdc6e70cc73df05f10b5f6c183 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Thu, 28 Mar 2024 16:05:10 +0100 Subject: [PATCH] no message --- be/app/Http/Controllers/MasterTaskController.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index 545e75c..8a63d88 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -29,10 +29,16 @@ class MasterTaskController extends Controller switch ($field) { // deadline riesim, aby zobrazovalo aj mastertasky, ktore zacali v minulosti (v porovnani s prave zobrazenym mesiacom) ale deadline maju po tomto mesiaci case 'month': - - $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%') - ->orWhereDate('deadline', '>=', - $parameters['year'] . '-' . $parameters['month'] . '-01'); + + $mastertasks->where(function ($query) use ($parameters) { + $query->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%') + ->orWhereDate('deadline', '>=', + $parameters['year'] . '-' . $parameters['month'] . '-01'); + }); + +// $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%') +// ->orWhereDate('deadline', '>=', +// $parameters['year'] . '-' . $parameters['month'] . '-01'); break; case 'employee_id':