JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
StudioTem committed 2024-03-27 11:38:34 +01:00
1 parent 56ab0176c1
commit 076d098fc3
1 file changed
+2 -10
Download Patch File Download Diff File Expand all files Collapse all files
be/app/Http/Controllers/MasterTaskController.php
+2 -10
View File
@@ -29,18 +29,10 @@ class MasterTaskController extends Controller
switch ($field) { switch ($field) {
// deadline riesim, aby zobrazovalo aj mastertasky, ktore zacali v minulosti (v porovnani s prave zobrazenym mesiacom) ale deadline maju po tomto mesiaci // deadline riesim, aby zobrazovalo aj mastertasky, ktore zacali v minulosti (v porovnani s prave zobrazenym mesiacom) ale deadline maju po tomto mesiaci
case 'month': 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', '<=', $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%')
$parameters['year'] . '-' . $parameters['month'] . '-' . $lastDayOfMonth) ->orWhereDate('deadline', '>=',
->whereDate('deadline', '>=',
$parameters['year'] . '-' . $parameters['month'] . '-01'); $parameters['year'] . '-' . $parameters['month'] . '-01');
// $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%')
// ->orWhereDate('deadline', '>=',
// $parameters['year'] . '-' . $parameters['month'] . '-01');
break; break;
case 'employee_id': case 'employee_id':