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

zmena logiky pristupu k teams overview

Browse Source
This commit is contained in:
StudioTem committed 2023-08-23 10:51:24 +02:00
1 parent ef47d7f8d3
commit 468422fe7e
2 files changed
+10 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

be/app/Http/Controllers/MasterTaskController.php
+10
View File
@@ -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;
be/app/Http/Controllers/SubTaskController.php
-7
View File
@@ -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);