diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index 6faa9a5..e18dac3 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -27,17 +27,17 @@ 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', '>=', + $mastertasks->whereDate('created_at', '<=', + $parameters['year'] . '-' . $parameters['month'] . '-31') + ->whereDate('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); -// }); +// $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%') +// ->orWhereDate('deadline', '>=', +// $parameters['year'] . '-' . $parameters['month'] . '-01'); break; case 'employee_id':