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
56ab0176c1
commit
076d098fc3
1 file changed
+3
-11
@@ -29,18 +29,10 @@ 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':
|
||||
// get last day of month based on year and month
|
||||
$lastDayOfMonth = date('t', strtotime($parameters['year'] . '-' . $parameters['month'] . '-01'));
|
||||
|
||||
$mastertasks->whereDate('created_at', '<=',
|
||||
$parameters['year'] . '-' . $parameters['month'] . '-' . $lastDayOfMonth)
|
||||
->whereDate('deadline', '>=',
|
||||
|
||||
$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'] . '-%')
|
||||
// ->orWhereDate('deadline', '>=',
|
||||
// $parameters['year'] . '-' . $parameters['month'] . '-01');
|
||||
break;
|
||||
|
||||
case 'employee_id':
|
||||
|
||||
Reference in new issue
Block a user