JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 06:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
StudioTem committed 2026-01-19 21:55:20 +00:00
1 parent e93fcce244
commit d9eb4b0d16
1 file changed
+18 -6
Download Patch File Download Diff File Expand all files Collapse all files
be/app/Http/Controllers/SubTaskController.php
+18 -6
View File
@@ -341,11 +341,9 @@ class SubTaskController extends Controller
} }
} }
// Pre drafty s employees dátami - aktualizujeme aj draft_data // Zistíme či ide o draft s viacerými zamestnancami a uložíme employees data pred úpravou requestu
if ($subtask->is_draft && isset($request->all()['data']['employees'])) { $employeesData = $request->all()['data']['employees'] ?? null;
$subtask->draft_data = $request->all()['data']['employees']; $isDraftWithMultipleEmployees = $subtask->is_draft && $employeesData && count($employeesData) > 1;
$subtask->save();
}
// Pre drafty je validácia duration voliteľná // Pre drafty je validácia duration voliteľná
if (! $subtask->is_draft) { if (! $subtask->is_draft) {
@@ -371,7 +369,12 @@ class SubTaskController extends Controller
// upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka // upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
$data['data'] = $request->all()['data']; $data['data'] = $request->all()['data'];
$data['data']['user_id'] = $request->all()['data']['employee_id'] ?? $subtask->user_id; // Pre draft s viacerými zamestnancami: NEMENIME user_id - zostáva na creatorovi
if ($isDraftWithMultipleEmployees) {
$data['data']['user_id'] = $subtask->user_id;
} else {
$data['data']['user_id'] = $request->all()['data']['employee_id'] ?? $subtask->user_id;
}
$data['data']['title'] = isset($request->all()['data']['title']) ? $request->all()['data']['title'] : null; $data['data']['title'] = isset($request->all()['data']['title']) ? $request->all()['data']['title'] : null;
$data['data']['deadline'] = isset($request->all()['data']['deadline']) ? $request->all()['data']['deadline'] : null; $data['data']['deadline'] = isset($request->all()['data']['deadline']) ? $request->all()['data']['deadline'] : null;
$data['data']['estimated_time'] = $request->all()['data']['duration'] ?? $subtask->estimated_time; $data['data']['estimated_time'] = $request->all()['data']['duration'] ?? $subtask->estimated_time;
@@ -382,10 +385,19 @@ class SubTaskController extends Controller
$data['data']['is_draft'] = $request->all()['data']['is_draft']; $data['data']['is_draft'] = $request->all()['data']['is_draft'];
} }
// Odstránime employees z data payloadu aby sa neprepísalo draft_data pri update()
unset($data['data']['employees']);
$request->merge($data); $request->merge($data);
$subtask->update($request->all()['data']); $subtask->update($request->all()['data']);
// Pre drafty s employees dátami - aktualizujeme draft_data SEPARÁTNE (po update)
if ($subtask->is_draft && $employeesData) {
$subtask->draft_data = $employeesData;
$subtask->save();
}
// upload attachmentu // upload attachmentu
if ($request->file('data')) { if ($request->file('data')) {
$attachments = Attachment::uploadAttachmentsToS3($request->file('data')['files'], $subtask->mastertask); $attachments = Attachment::uploadAttachmentsToS3($request->file('data')['files'], $subtask->mastertask);