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 2023-04-14 10:29:16 +02:00
1 parent e1a8a3fe1a
commit eaceee3f7f
5 files changed
+87 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

be/app/Http/Controllers/SubTaskController.php
+10 -7
View File
@@ -51,12 +51,15 @@ class SubTaskController extends Controller
return response()->json($validator->errors(), 400);
}
$start = Carbon::parse($parameters['start']);
$end = Carbon::parse($parameters['end'])->addDay();
if (isset($parameters['team_id'])) {
$subtasks = SubTask::whereHas('mastertask', function ($query) use ($parameters) {
$query->where('team_id', $parameters['team_id']);
})->whereHas('timeblocks', function ($query) use ($parameters) {
$query->where('start', '>', $parameters['start']);
$query->where('end', '<=', $parameters['end']);
})->whereHas('timeblocks', function ($query) use ($start, $end) {
$query->where('start', '>', $start);
$query->where('end', '<', $end);
})->get();
$userIdArray = User::whereHas('teams', function ($query) use ($parameters) {
@@ -64,15 +67,15 @@ class SubTaskController extends Controller
})->get()->pluck('id')->toArray();
} else if (isset($parameters['user_id'])) {
$subtasks = SubTask::where('user_id', $parameters['user_id'])->whereHas('timeblocks', function ($query) use ($parameters) {
$query->where('start', '>', $parameters['start']);
$query->where('end', '<=', $parameters['end']);
$subtasks = SubTask::where('user_id', $parameters['user_id'])->whereHas('timeblocks', function ($query) use ($start, $end) {
$query->where('start', '>', $start);
$query->where('end', '<', $end);
})->get();
$userIdArray = [$parameters['user_id']];
}
$blockers = Blocker::whereIn('user_id', $userIdArray)->where('start', '>=', $parameters['start'])->where('end', '<=', $parameters['end'])->get();
$blockers = Blocker::whereIn('user_id', $userIdArray)->where('start', '>', $start)->where('end', '<', $end)->get();
return response()->json([
'subtasks' => SubTaskResource::collection($subtasks),