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-08-23 10:38:16 +02:00
1 parent 0260ebeb38
commit ef47d7f8d3
1 file changed
+14 -6
Download Patch File Download Diff File Expand all files Collapse all files
be/app/Http/Controllers/SubTaskController.php
+14 -6
View File
@@ -55,17 +55,25 @@ class SubTaskController extends Controller
$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 ($start, $end) {
$query->where('start', '>=', $start);
$query->where('end', '<', $end);
})->get();
// ak je zadany team, tak najdem vsetkych userov, ktori su v tomto teame. potom najdem vsetky subtasky, ktore su priradene ludom v tomto teame. nevyhladavam na zaklade team_id v master_taskoch, pretoze toto je nepresne. Jandl chce vidiet tasky aj pre jednotlivcov v danom teame aj ked ten task nebol assignuty pod tymto teamom
$userIdArray = User::whereHas('teams', function ($query) use ($parameters) {
$query->where('team_id', $parameters['team_id']);
})->get()->pluck('id')->toArray();
$subtasks = SubTask::whereIn('user_id', $userIdArray)
->whereHas('timeblocks', function ($query) use ($start, $end) {
$query->where('start', '>=', $start);
$query->where('end', '<', $end);
})->get();
// $subtasks = SubTask::whereHas('mastertask', function ($query) use ($parameters) {
// $query->where('team_id', $parameters['team_id']);
// })->whereHas('timeblocks', function ($query) use ($start, $end) {
// $query->where('start', '>=', $start);
// })->get();
} else if (isset($parameters['user_id'])) {
$subtasks = SubTask::where('user_id', $parameters['user_id'])->whereHas('timeblocks', function ($query) use ($start, $end) {
$query->where('start', '>', $start);