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

Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-06-02 13:58:10 +02:00
2 parents ac61d77122 dedd93d274
commit 27e35ee67f
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
be/app/Http/Controllers/SubTaskController.php
+2 -2
View File
@@ -161,7 +161,7 @@ class SubTaskController extends Controller
foreach ( $request->all()['data']['employees'] as $key => $employee ) {
$data['data']['employees'][$key]['user_id'] = $employee['id'];
$data['data']['employees'][$key]['title'] = isset($request->all()['data']['name']) ? $request->all()['data']['name']: null;
$data['data']['employees'][$key]['title'] = isset($request->all()['data']['title']) ? $request->all()['data']['title']: null;
$data['data']['employees'][$key]['estimated_time'] = $employee['duration'];
$data['data']['employees'][$key]['created_by'] = User::getUserIdFromBearerToken($request->bearerToken());
$data['data']['employees'][$key]['description'] = $request->all()['data']['description'];
@@ -231,7 +231,7 @@ class SubTaskController extends Controller
// upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
$data['data'] = $request->all()['data'];
$data['data']['user_id'] = $request->all()['data']['employee_id'];
$data['data']['title'] = isset($request->all()['data']['name']) ? $request->all()['data']['name'] : null;
$data['data']['title'] = isset($request->all()['data']['title']) ? $request->all()['data']['title'] : null;
$data['data']['estimated_time'] = $request->all()['data']['duration'];
$data['data']['updated_by'] = User::getUserIdFromBearerToken($request->bearerToken());