From d647441e4b9227c1bc691bec40b761fa790af9b0 Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Wed, 27 Mar 2024 10:59:15 +0100 Subject: [PATCH] no message --- be/app/Http/Controllers/MasterTaskController.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index 283d101..6faa9a5 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -28,7 +28,16 @@ class MasterTaskController extends Controller switch ($field) { case 'month': - $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%'); + $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%') + ->orWhereDate('deadline', '>=', + $parameters['year'] . '-' . $parameters['month'] . '-01'); + +// $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%') +// ->orWhere(function ($query) use ($parameters) { +// $query->where('deadline', 'like', $parameters['year']) +// ->where('is_finished', 1); +// }); + break; case 'employee_id':