diff --git a/be/app/Http/Controllers/MasterTaskController.php b/be/app/Http/Controllers/MasterTaskController.php index 08d7411..eb3460f 100644 --- a/be/app/Http/Controllers/MasterTaskController.php +++ b/be/app/Http/Controllers/MasterTaskController.php @@ -33,6 +33,16 @@ class MasterTaskController extends Controller }); break; + case 'team_id': + // 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(); + + $mastertasks->whereIn('user_id', $userIdArray); + break; + default: $mastertasks->where($field, $value); break; diff --git a/be/app/Http/Controllers/SubTaskController.php b/be/app/Http/Controllers/SubTaskController.php index 9a96111..f7b6f30 100644 --- a/be/app/Http/Controllers/SubTaskController.php +++ b/be/app/Http/Controllers/SubTaskController.php @@ -67,13 +67,6 @@ class SubTaskController extends Controller $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);