mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 06:20:21 +00:00
no message
This commit is contained in:
1 parent
24df916af8
commit
d647441e4b
1 file changed
+10
-1
@@ -28,7 +28,16 @@ class MasterTaskController extends Controller
|
||||
|
||||
switch ($field) {
|
||||
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;
|
||||
|
||||
case 'employee_id':
|
||||
|
||||
Reference in new issue
Block a user