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

be/app/Http/Controllers/MasterTaskController.php

@@ -22,11 +22,17 @@ class MasterTaskController extends Controller
 
         // filtrovanie na zaklade parametrov
         foreach ($parameters as $field => $value) {
-            if (!$value) continue;
+            if ( ! $value) {
+                continue;
+            }
 
             switch ($field) {
+                // deadline riesim, aby zobrazovalo aj mastertasky, ktore zacali v minulosti (v porovnani s prave zobrazenym mesiacom) ale deadline maju po tomto mesiaci
                 case 'month':
-                    $mastertasks->where('created_at', 'like', $parameters['year'] . '-'  .  $parameters['month'] . '-%');
+             
+                    $mastertasks->where('created_at', 'like', $parameters['year'] . '-' . $parameters['month'] . '-%')
+                                ->orWhereDate('deadline', '>=',
+                                    $parameters['year'] . '-' . $parameters['month'] . '-01');
                     break;
 
                 case 'employee_id':
@@ -89,12 +95,13 @@ class MasterTaskController extends Controller
         // validacia na max 50MB size pre attachmenty. neslo dat do klasickeho laravel validation, tak je to separe
         if ($files = $request->file('data')) {
             foreach ($files['files'] as $file) {
-                if ($file->getSize() > 52428800)
+                if ($file->getSize() > 52428800) {
                     return response()->json([
                         'files' => 'File size must be less than 50MB',
                     ], 400);
                 }
             }
+        }
 
 
         // upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
@@ -137,7 +144,6 @@ class MasterTaskController extends Controller
             'data.deadline'    => 'required',
             'data.project_id'  => 'required',
         ]);
-
         if ($validator->fails()) {
             return response()->json($validator->errors(), 400);
         }
@@ -172,10 +178,11 @@ class MasterTaskController extends Controller
                 }
             }
 
-            if (!$atLeastOneSubtaskHasTimesheet)
+            if ( ! $atLeastOneSubtaskHasTimesheet) {
                 return response()->json([
                     'message' => 'Finishing mastertask is only possible where at least one subtask contains timesheet',
                 ], 400);
+            }
 
             $mastertask->is_finished = 1;
             $mastertask->save();
@@ -187,16 +194,16 @@ class MasterTaskController extends Controller
         }
 
 
-
         // validacia na max 50MB size pre attachmenty. neslo dat do klasickeho laravel validation, tak je to separe
         if ($files = $request->file('data')) {
             foreach ($files['files'] as $file) {
-                if ($file->getSize() > 52428800)
+                if ($file->getSize() > 52428800) {
                     return response()->json([
                         'files' => 'File size must be less than 50MB',
                     ], 400);
                 }
             }
+        }
 
         // upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
         $data['data']                   = $request->all()['data'];

be/app/Http/Controllers/SubTaskController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Events\SubTaskCreated;
 use App\Http\Resources\BlockerResource;
 use App\Http\Resources\SubTaskResource;
 use App\Models\Attachment;
@@ -39,7 +38,6 @@ class SubTaskController extends Controller
         ]);
 
         $validator->after(function ($validator) use ($parameters) {
-
             if ( ! isset($parameters['employee_id']) && ! isset($parameters['team_id'])) {
                 $validator->errors()->add(
                     'error', 'You must provide either employee_id or team_id.'
@@ -66,9 +64,9 @@ class SubTaskController extends Controller
                                    $query->where('start', '>=', $start);
                                    $query->where('end', '<', $end);
                                })->get();
-
         } elseif (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('end', '<', $end);
                 })->get();
@@ -76,7 +74,8 @@ class SubTaskController extends Controller
             $userIdArray = [$parameters['user_id']];
         }
 
-        $blockers = Blocker::whereIn('user_id', $userIdArray)->where('start', '>', $start)->where('end', '<', $end)->get();
+        $blockers = Blocker::whereIn('user_id', $userIdArray)->where('start', '>', $start)->where('end', '<',
+            $end)->get();
 
         return response()->json([
             'subtasks' => SubTaskResource::collection($subtasks),
@@ -84,7 +83,8 @@ class SubTaskController extends Controller
         ], 200);
     }
 
-    private function indexUnscheduled(Request $request) {
+    private function indexUnscheduled(Request $request)
+    {
         // get query parameter from request
         $parameters = $request->query();
 
@@ -98,14 +98,16 @@ class SubTaskController extends Controller
 
         $parameters['user_id'] = $parameters['employee_id'];
 
-        $subtasks = SubTask::where('user_id', $parameters['user_id'])->where('is_finished', 0)->whereDoesntHave( 'timeblocks')->get();
+        $subtasks = SubTask::where('user_id', $parameters['user_id'])->where('is_finished',
+            0)->whereDoesntHave('timeblocks')->get();
 
         return response()->json([
             'subtasks' => SubTaskResource::collection($subtasks)
         ], 200);
     }
 
-    private function indexOngoing(Request $request) {
+    private function indexOngoing(Request $request)
+    {
         // get query parameter from request
         $parameters = $request->query();
 
@@ -127,7 +129,6 @@ class SubTaskController extends Controller
     }
 
 
-
     public function store($mastertask_id, Request $request)
     {
         $validator = Validator::make($request->all(), [
@@ -150,12 +151,13 @@ class SubTaskController extends Controller
         // validacia na max 50MB size pre attachmenty. neslo dat do klasickeho laravel validation, tak je to separe
         if ($files = $request->file('data')) {
             foreach ($files['files'] as $file) {
-                if ($file->getSize() > 52428800)
+                if ($file->getSize() > 52428800) {
                     return response()->json([
                         'files' => 'File size must be less than 50MB',
                     ], 400);
                 }
             }
+        }
 
         // upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
         $data['data'] = $request->all()['data'];
@@ -176,12 +178,14 @@ class SubTaskController extends Controller
 
         // syncnutie timeblocks
         foreach ($request->all()['data']['employees'] as $key => $employee) {
-            if (!isset($data['data']['employees'][$key]['timeblocks']) || $data['data']['employees'][$key]['timeblocks'] == null)
+            if ( ! isset($data['data']['employees'][$key]['timeblocks']) || $data['data']['employees'][$key]['timeblocks'] == null) {
                 continue;
+            }
 
-            if ($data['data']['employees'][$key]['user_id'] == $employee['id'])
+            if ($data['data']['employees'][$key]['user_id'] == $employee['id']) {
                 $subtasks[$key]->syncTimeblocks($data['data']['employees'][$key]['timeblocks']);
             }
+        }
 
         // upload attachmentu
         if ($request->file('data')) {
@@ -231,12 +235,13 @@ class SubTaskController extends Controller
         // validacia na max 50MB size pre attachmenty. neslo dat do klasickeho laravel validation, tak je to separe
         if ($files = $request->file('data')) {
             foreach ($files['files'] as $file) {
-                if ($file->getSize() > 52428800)
+                if ($file->getSize() > 52428800) {
                     return response()->json([
                         'files' => 'File size must be less than 50MB',
                     ], 400);
                 }
             }
+        }
 
         // upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
         $data['data']                   = $request->all()['data'];
@@ -258,12 +263,14 @@ class SubTaskController extends Controller
         }
 
         // syncnutie vykazu
-        if (isset($data['data']['timesheets']))
+        if (isset($data['data']['timesheets'])) {
             $subtask->syncTimesheets($data['data']['timesheets']);
+        }
 
         // syncnutie timeblocks
-        if (isset($data['data']['timeblocks']))
+        if (isset($data['data']['timeblocks'])) {
             $subtask->syncTimeblocks($data['data']['timeblocks']);
+        }
 
         return response()->json([
             'message' => 'Subtask updated successfully',
@@ -307,7 +314,8 @@ class SubTaskController extends Controller
         $validator->after(function ($validator) use ($subtask, $request) {
             if ($subtask->user_id != $request->all()['data']['employee_id']) {
                 $validator->errors()->add(
-                    'data.employee_id', 'This user cannot submit timesheet for the selected subtask. Subtask is assigned to user with id: ' . $subtask->user_id . '.'
+                    'data.employee_id',
+                    'This user cannot submit timesheet for the selected subtask. Subtask is assigned to user with id: ' . $subtask->user_id . '.'
                 );
             }
         });