From ef47d7f8d337151ad0f37b1ff3c7f325ca4f39a2 Mon Sep 17 00:00:00 2001
From: Michal Feher <feher@studiotem.com>
Date: Wed, 23 Aug 2023 10:38:16 +0200
Subject: [PATCH] no message

---
 be/app/Http/Controllers/SubTaskController.php | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/be/app/Http/Controllers/SubTaskController.php b/be/app/Http/Controllers/SubTaskController.php
index 2fb46d8..9a96111 100644
--- a/be/app/Http/Controllers/SubTaskController.php
+++ b/be/app/Http/Controllers/SubTaskController.php
@@ -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);