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

Merge branch 'production' of bitbucket.org:studiotem/jandl-taskmanager-app

Browse Source
This commit is contained in:
StudioTem committed 2024-03-28 16:13:57 +01:00
2 parents 076d098fc3 b771939bea
commit e325754b55
1 file changed
+10 -4
Download Patch File Download Diff File Expand all files Collapse all files
be/app/Http/Controllers/MasterTaskController.php
+10 -4
View File
@@ -29,10 +29,16 @@ 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':
$mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%') $mastertasks->where(function ($query) use ($parameters) {
->orWhereDate('deadline', '>=', $query->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%')
$parameters['year'] . '-' . $parameters['month'] . '-01'); ->orWhereDate('deadline', '>=',
$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':