mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
no message
This commit is contained in:
1 parent
d9eb4b0d16
commit
da8c2fce6c
2 files changed
+8
-6
No files matched your search
@@ -159,12 +159,12 @@ class SubTaskController extends Controller
|
||||
// ak je zadané employee_id, filtrovať podľa neho
|
||||
// draft sa zobrazuje: 1) creatorovi (user_id) ALEBO 2) zamestnancom v draft_data
|
||||
if (isset($parameters['employee_id'])) {
|
||||
$employeeId = $parameters['employee_id'];
|
||||
$employeeId = (int) $parameters['employee_id'];
|
||||
$query->where(function ($q) use ($employeeId) {
|
||||
// Creator vidí svoje drafty
|
||||
$q->where('user_id', $employeeId)
|
||||
// Alebo zamestnanec je v draft_data
|
||||
->orWhereRaw("JSON_CONTAINS(draft_data, JSON_OBJECT('id', CAST(? AS UNSIGNED)))", [$employeeId]);
|
||||
// Alebo zamestnanec je v draft_data array (hľadáme objekt s daným id)
|
||||
->orWhereRaw("JSON_CONTAINS(draft_data, CAST(? AS JSON), '\$')", [json_encode(['id' => $employeeId])]);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -343,7 +343,9 @@ class SubTaskController extends Controller
|
||||
|
||||
// Zistíme či ide o draft s viacerými zamestnancami a uložíme employees data pred úpravou requestu
|
||||
$employeesData = $request->all()['data']['employees'] ?? null;
|
||||
$isDraftWithMultipleEmployees = $subtask->is_draft && $employeesData && count($employeesData) > 1;
|
||||
// Draft má viacerých zamestnancov ak: má employees v requeste ALEBO má draft_data v DB
|
||||
$hasDraftData = $subtask->is_draft && ($employeesData || $subtask->draft_data);
|
||||
$isDraftWithMultipleEmployees = $hasDraftData;
|
||||
|
||||
// Pre drafty je validácia duration voliteľná
|
||||
if (! $subtask->is_draft) {
|
||||
|
||||
Reference in new issue
Block a user