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 10:59:15 +01:00
1 parent 24df916af8
commit d647441e4b
1 file changed
+10 -1
Download Patch File Download Diff File Expand all files Collapse all files
be/app/Http/Controllers/MasterTaskController.php
+10 -1
View File
@@ -28,7 +28,16 @@ class MasterTaskController extends Controller
switch ($field) { switch ($field) {
case 'month': 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; break;
case 'employee_id': case 'employee_id':