mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
no message
This commit is contained in:
1 parent
985c953fe0
commit
f0e6a98dd7
1 file changed
+2
-2
@@ -55,7 +55,7 @@ class SubTaskController extends Controller
|
|||||||
$subtasks = SubTask::whereHas('mastertask', function ($query) use ($parameters) {
|
$subtasks = SubTask::whereHas('mastertask', function ($query) use ($parameters) {
|
||||||
$query->where('team_id', $parameters['team_id']);
|
$query->where('team_id', $parameters['team_id']);
|
||||||
})->whereHas('timeblocks', function ($query) use ($parameters) {
|
})->whereHas('timeblocks', function ($query) use ($parameters) {
|
||||||
$query->where('start', '>', $parameters['start']);
|
$query->where('start', '>=', $parameters['start']);
|
||||||
$query->where('end', '<=', $parameters['end']);
|
$query->where('end', '<=', $parameters['end']);
|
||||||
})->get();
|
})->get();
|
||||||
|
|
||||||
@@ -65,7 +65,7 @@ class SubTaskController extends Controller
|
|||||||
|
|
||||||
} else if (isset($parameters['user_id'])) {
|
} else if (isset($parameters['user_id'])) {
|
||||||
$subtasks = SubTask::where('user_id', $parameters['user_id'])->whereHas('timeblocks', function ($query) use ($parameters) {
|
$subtasks = SubTask::where('user_id', $parameters['user_id'])->whereHas('timeblocks', function ($query) use ($parameters) {
|
||||||
$query->where('start', '>', $parameters['start']);
|
$query->where('start', '>=', $parameters['start']);
|
||||||
$query->where('end', '<=', $parameters['end']);
|
$query->where('end', '<=', $parameters['end']);
|
||||||
})->get();
|
})->get();
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user