mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
zmena logiky pristupu k teams overview
This commit is contained in:
1 parent
ef47d7f8d3
commit
468422fe7e
2 files changed
+10
-7
No files matched your search
@@ -33,6 +33,16 @@ class MasterTaskController extends Controller
|
|||||||
});
|
});
|
||||||
break;
|
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:
|
default:
|
||||||
$mastertasks->where($field, $value);
|
$mastertasks->where($field, $value);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -67,13 +67,6 @@ class SubTaskController extends Controller
|
|||||||
$query->where('end', '<', $end);
|
$query->where('end', '<', $end);
|
||||||
})->get();
|
})->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'])) {
|
} else if (isset($parameters['user_id'])) {
|
||||||
$subtasks = SubTask::where('user_id', $parameters['user_id'])->whereHas('timeblocks', function ($query) use ($start, $end) {
|
$subtasks = SubTask::where('user_id', $parameters['user_id'])->whereHas('timeblocks', function ($query) use ($start, $end) {
|
||||||
$query->where('start', '>', $start);
|
$query->where('start', '>', $start);
|
||||||
|
|||||||
Reference in new issue
Block a user