diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index 558134a..545e75c 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -29,18 +29,10 @@ 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': - // get last day of month based on year and month - $lastDayOfMonth = date('t', strtotime($parameters['year'] . '-' . $parameters['month'] . '-01')); - - $mastertasks->whereDate('created_at', '<=', - $parameters['year'] . '-' . $parameters['month'] . '-' . $lastDayOfMonth) - ->whereDate('deadline', '>=', + + $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'] . '-%') -// ->orWhereDate('deadline', '>=', -// $parameters['year'] . '-' . $parameters['month'] . '-01'); break; case 'employee_id':