Completed
Push — master ( 3cf93c...659348 )
by claudio
39:59
created
app/Listeners/Optimise/ErrorListener.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     public function handle(ErrorEvent $event)
26 26
     {
27 27
         //
28
-        \Log::error('problems during optimise (company id = ' . $event->getCompany()->id . '): ' . $event->getError());
28
+        \Log::error('problems during optimise (company id = '.$event->getCompany()->id.'): '.$event->getError());
29 29
         $company = $event->getCompany();
30 30
         //$company = $event->getCompany()->fresh();
31 31
         self::sendEmail($company->email, $event->getError());
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
      */
38 38
     static private function sendEmail($email, $error)
39 39
     {
40
-        \Mail::queue('emails.optimise.error', ['error' => $error], function ($message) use ($email) {
40
+        \Mail::queue('emails.optimise.error', [ 'error' => $error ], function($message) use ($email) {
41 41
             $message->from(config('mail.from.address'), config('mail.from.name'));
42 42
             $message->to($email)->subject('Problems during optimisation');
43 43
         });
Please login to merge, or discard this patch.
app/Listeners/Optimise/OkListener.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,14 +25,14 @@  discard block
 block discarded – undo
25 25
     public function handle(OkEvent $event)
26 26
     {
27 27
         //
28
-        \Log::info('Meeting correctly optimised (company id = ' . $event->getCompany()->id . ')');
28
+        \Log::info('Meeting correctly optimised (company id = '.$event->getCompany()->id.')');
29 29
         $company = $event->getCompany()->fresh();
30 30
         //send email to company
31 31
         self::sendCompanyEmail($company->email);
32 32
         //send emails to employees
33
-        $employees = $company->employees()->with(['meetings'=>function($query){
33
+        $employees = $company->employees()->with([ 'meetings'=>function($query) {
34 34
             $query->where('start_time', '>=', new \DateTime());
35
-        }])->get();
35
+        } ])->get();
36 36
         foreach ($employees as $employee)
37 37
             self::sendEmployeeEmail($employee->email, $employee->meetings);
38 38
     }
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     static private function sendCompanyEmail($email)
44 44
     {
45
-        \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) {
45
+        \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) {
46 46
             $message->from(config('mail.from.address'), config('mail.from.name'));
47 47
             $message->to($email)->subject('Meetings optimised');
48 48
         });
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
      */
55 55
     static private function sendEmployeeEmail($email, $meetings)
56 56
     {
57
-        \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) {
57
+        \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) {
58 58
             $message->from(config('mail.from.address'), config('mail.from.name'));
59 59
             $message->to($email)->subject('Meetings of next week');
60 60
         });
Please login to merge, or discard this patch.
app/Timeslot.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,19 +26,19 @@
 block discarded – undo
26 26
      *
27 27
      * @var array
28 28
      */
29
-    protected $fillable = ['time_start', 'time_end'];
29
+    protected $fillable = [ 'time_start', 'time_end' ];
30 30
 
31 31
     /**
32 32
      * The attributes excluded from the model's JSON form.
33 33
      *
34 34
      * @var array
35 35
      */
36
-    protected $hidden = ['pivot', 'calendar'];
36
+    protected $hidden = [ 'pivot', 'calendar' ];
37 37
 
38 38
     /**
39 39
      * @var array
40 40
      */
41
-    protected $touches = ['calendar'];
41
+    protected $touches = [ 'calendar' ];
42 42
 
43 43
     /**
44 44
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
Please login to merge, or discard this patch.
app/Http/Middleware/GetUserAndRefresh.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,12 +34,12 @@
 block discarded – undo
34 34
                 \JWTFactory::setTTL(43200);
35 35
                 //config(['jwt.ttl' =>'43200']); //30 days
36 36
             }
37
-        }catch(JWTException $e)
37
+        } catch (JWTException $e)
38 38
         {}
39 39
 
40 40
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
41 41
         //overhead
42
-        $custom = $custom . ';remember-' . $remember == 'true' ? 'true' : 'false';
42
+        $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false';
43 43
         return parent::handle($request, $next, $custom);
44 44
     }
45 45
 
Please login to merge, or discard this patch.
app/Console/Commands/Optimise/Solver.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
     public function setTimeSlots($timeSlots)
195 195
     {
196 196
         if (!is_int($timeSlots) || $timeSlots <= 0)
197
-            throw new OptimiseException($timeSlots . ' is not integer or it is not >0');
197
+            throw new OptimiseException($timeSlots.' is not integer or it is not >0');
198 198
 
199 199
         $this->timeSlots = $timeSlots;
200 200
         return $this;
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
     public function setMaxTimeSlots($maxTimeSlots)
217 217
     {
218 218
         if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0)
219
-            throw new OptimiseException($maxTimeSlots . ' is not integer or it is not >0');
219
+            throw new OptimiseException($maxTimeSlots.' is not integer or it is not >0');
220 220
 
221 221
         $this->maxTimeSlots = $maxTimeSlots;
222 222
         return $this;
@@ -241,11 +241,11 @@  discard block
 block discarded – undo
241 241
         if (array_diff($meetings, $this->meetings))
242 242
             throw new OptimiseException('meetings different from meetings set');
243 243
         foreach ($meetingsAvailability as $key => $meetingsAvailabilityS) {
244
-            $timeSlots = array_keys($meetingsAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
244
+            $timeSlots = array_keys($meetingsAvailabilityS); //TODO this is useless, we can use directly $usersAvailabilityS
245 245
             //TODO check if keys are sequential and the last is the same with $this->timeSlots
246 246
             if (count($timeSlots) != $this->timeSlots)
247 247
                 throw new OptimiseException('timeSlots different from timeSlots set');
248
-            $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
248
+            $meetingsAvailability[ $key ] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
249 249
         }
250 250
 
251 251
         $this->meetingsAvailability = $meetingsAvailability;
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
     {
263 263
         $len = $len - count($array);
264 264
         for ($i = 0; $i < $len; $i++)
265
-            $array[] = $pad;
265
+            $array[ ] = $pad;
266 266
         return $array;
267 267
     }
268 268
 
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
             throw new OptimiseException('meetings different from meetings set');
287 287
         }
288 288
         foreach ($meetingsDuration as $duration) {
289
-            $duration = (int)$duration; //TODO fix this (fix for optimise)
289
+            $duration = (int) $duration; //TODO fix this (fix for optimise)
290 290
             if (!is_int($duration) || $duration <= 0)
291 291
                 throw new OptimiseException('duration is not integer or it is not >0');
292 292
         }
@@ -314,11 +314,11 @@  discard block
 block discarded – undo
314 314
         if (array_diff($users, $this->users))
315 315
             throw new OptimiseException('users different from users set');
316 316
         foreach ($usersAvailability as $key => $usersAvailabilityS) {
317
-            $timeSlots = array_keys($usersAvailabilityS);//TODO this is useless, we can use directly $usersAvailabilityS
317
+            $timeSlots = array_keys($usersAvailabilityS); //TODO this is useless, we can use directly $usersAvailabilityS
318 318
             if (count($timeSlots) != $this->timeSlots)
319 319
                 throw new OptimiseException('timeSlots different from timeSlots set');
320 320
 
321
-            $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
321
+            $usersAvailability[ $key ] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
322 322
         }
323 323
 
324 324
         $this->usersAvailability = $usersAvailability;
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
     {
362 362
         $this->writeData();
363 363
         $this->writeModelFile();
364
-        $event = $this->schedule->exec('glpsol --math ' . $this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () {
364
+        $event = $this->schedule->exec('glpsol --math '.$this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function() {
365 365
         }); //this just to execute in foreground
366 366
         if ($event->isDue($this->laravel))
367 367
             $event->run($this->laravel);
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
388 388
      */
389 389
     private function checkData()
390 390
     {
391
-        $this->checkArrayProprieties(['users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings']);
392
-        $this->checkIntProprieties(['timeSlots', 'maxTimeSlots']);
391
+        $this->checkArrayProprieties([ 'users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings' ]);
392
+        $this->checkIntProprieties([ 'timeSlots', 'maxTimeSlots' ]);
393 393
     }
394 394
 
395 395
     /**
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
     {
401 401
         foreach ($proprieties as $propriety)
402 402
             if (count($this->$propriety) == 0)
403
-                throw new OptimiseException($propriety . ' property is not set correctly');
403
+                throw new OptimiseException($propriety.' property is not set correctly');
404 404
     }
405 405
 
406 406
     /**
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
     {
412 412
         foreach ($proprieties as $propriety)
413 413
             if (!is_int($this->$propriety) || $this->$propriety <= 0)
414
-                throw new OptimiseException($propriety . ' property is not set correctly');
414
+                throw new OptimiseException($propriety.' property is not set correctly');
415 415
     }
416 416
 
417 417
     /**
@@ -429,13 +429,13 @@  discard block
 block discarded – undo
429 429
      */
430 430
     static private function writeCSVArrayNoKey($file, $data)
431 431
     {
432
-        $f = function ($fp, $data) {
432
+        $f = function($fp, $data) {
433 433
             foreach ($data as $field) {
434
-                fputcsv($fp, [$field]);
434
+                fputcsv($fp, [ $field ]);
435 435
             }
436 436
         };
437 437
 
438
-        self::writeCSV($file, $data, ['i'], $f);
438
+        self::writeCSV($file, $data, [ 'i' ], $f);
439 439
     }
440 440
 
441 441
     /**
@@ -484,13 +484,13 @@  discard block
 block discarded – undo
484 484
      */
485 485
     static private function writeCSVArray($file, $data, $name)
486 486
     {
487
-        $f = function ($fp, $data) {
487
+        $f = function($fp, $data) {
488 488
             foreach ($data as $key => $field) {
489
-                fputcsv($fp, [$key, $field]);
489
+                fputcsv($fp, [ $key, $field ]);
490 490
             }
491 491
         };
492 492
 
493
-        self::writeCSV($file, $data, ['i', $name], $f);
493
+        self::writeCSV($file, $data, [ 'i', $name ], $f);
494 494
     }
495 495
 
496 496
     /**
@@ -509,14 +509,14 @@  discard block
 block discarded – undo
509 509
      */
510 510
     static private function writeCSVMatrix($file, $data, $name)
511 511
     {
512
-        $f = function ($fp, $data) {
512
+        $f = function($fp, $data) {
513 513
             foreach ($data as $key => $field) {
514 514
                 foreach ($field as $key2 => $field2)
515
-                    fputcsv($fp, [$key, $key2, $field2]);
515
+                    fputcsv($fp, [ $key, $key2, $field2 ]);
516 516
             }
517 517
         };
518 518
 
519
-        self::writeCSV($file, $data, ['i', 'j', $name], $f);
519
+        self::writeCSV($file, $data, [ 'i', 'j', $name ], $f);
520 520
     }
521 521
 
522 522
     /**
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
         $f = @fopen($this->path->getModelPath(), "w");
546 546
         if (!$f)
547 547
             throw new OptimiseException('problem during creation of a file');
548
-        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
548
+        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__."/model.stub")));
549 549
         fclose($f);
550 550
     }
551 551
 
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
         if (!$handle)
573 573
             throw new OptimiseException('problems during reading the file');
574 574
 
575
-        $ret = [];
575
+        $ret = [ ];
576 576
         fgetcsv($handle); //skip head
577 577
         while (($data = fgetcsv($handle)) !== FALSE) {
578 578
             if (count($data) != 3) {
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
                 throw new OptimiseException('problems during parsing the file');
581 581
             }
582 582
 
583
-            $ret[$data[0]][$data[1]] = $data[2];
583
+            $ret[ $data[ 0 ] ][ $data[ 1 ] ] = $data[ 2 ];
584 584
         }
585 585
 
586 586
         fclose($handle);
Please login to merge, or discard this patch.
app/Console/Commands/Optimise/Optimise.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
     {
86 86
         $this->startTime = clone $startTime;
87 87
         $this->endTime = clone $this->startTime;
88
-        $this->endTime->add(new \DateInterval('PT' . ($this->time_slots *
89
-                config('app.timeslots.duration')) . 'S'));
88
+        $this->endTime->add(new \DateInterval('PT'.($this->time_slots *
89
+                config('app.timeslots.duration')).'S'));
90 90
     }
91 91
 
92 92
     /**
@@ -158,11 +158,11 @@  discard block
 block discarded – undo
158 158
             $solver = $this->setData($solver);
159 159
             $solver = $solver->solve();
160 160
             $this->solver = $solver;
161
-        }catch(OptimiseException $e) {
162
-            if(!$e->isEmpty())
161
+        } catch (OptimiseException $e) {
162
+            if (!$e->isEmpty())
163 163
                 \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
164 164
             throw $e;
165
-        }catch (\Exception $e) {
165
+        } catch (\Exception $e) {
166 166
             //TODO use the correct exceptions to avoid to share private data
167 167
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
168 168
             throw new OptimiseException('Optimising error', 0, $e);
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
     {
208 208
         //since we consider busy timeslots, we need to get all users
209 209
         $users = $this->company->employees->pluck('id')->toArray();
210
-        if(count($users) == 0)
210
+        if (count($users) == 0)
211 211
             throw ((new OptimiseException("No users for this company"))->withEmpty(true));
212 212
         return $solver->setUsers($users);
213 213
     }
@@ -223,9 +223,9 @@  discard block
 block discarded – undo
223 223
          * @var $meetings \Illuminate\Support\Collection
224 224
          */
225 225
         $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime));
226
-        if($meetings->count() == 0)
226
+        if ($meetings->count() == 0)
227 227
             throw ((new OptimiseException("No meetings for this week"))->withEmpty(true));
228
-        $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots
228
+        $timeslots = $meetings->groupBy('id')->map(function($item) { //convert timeslots
229 229
             return $this->durationConverter($this->timeSlotsConverter($item));
230 230
         });
231 231
         return $solver->setMeetings($timeslots->keys()->toArray())
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
      */
241 241
     private function durationConverter($item)
242 242
     {
243
-        return $item->each(function ($item2) {
244
-            $item2->duration = $this->convertDuration((int)$item2->duration);
243
+        return $item->each(function($item2) {
244
+            $item2->duration = $this->convertDuration((int) $item2->duration);
245 245
             return $item2;
246 246
             //TODO try catch
247 247
         });
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
      */
254 254
     static private function convertDuration($duration)
255 255
     {
256
-        return (int)ceil($duration / config('app.timeslots.duration'));
256
+        return (int) ceil($duration / config('app.timeslots.duration'));
257 257
     }
258 258
 
259 259
     /**
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
      */
263 263
     private function timeSlotsConverter($item)
264 264
     {
265
-        return $item->each(function ($item2) {
265
+        return $item->each(function($item2) {
266 266
             $item2->time_start = $this->toTimeSlot($item2->time_start);
267 267
             $item2->time_end = $this->toTimeSlot($item2->time_end);
268 268
             return $item2;
@@ -280,13 +280,13 @@  discard block
 block discarded – undo
280 280
         $dateTime = new \DateTime($time);
281 281
         $diff = $dateTime->diff($this->startTime);
282 282
         $diff = explode(':', $diff->format('%R:%d:%h:%i:%s'));
283
-        $diff = $diff[1] * 86400 + $diff[2] * 3600 + $diff[3] * 60 + $diff[4];
283
+        $diff = $diff[ 1 ] * 86400 + $diff[ 2 ] * 3600 + $diff[ 3 ] * 60 + $diff[ 4 ];
284 284
         //if($diff[0] != '-' && $diff != 0)
285 285
         //  throw new OptimiseException('timeslot time <= startTime');
286 286
         //TODO fix check
287 287
         //TODO check if diff makes sense
288 288
         //TODO check upper limit
289
-        return (int)(round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps?
289
+        return (int) (round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps?
290 290
     }
291 291
 
292 292
     /**
@@ -299,10 +299,10 @@  discard block
 block discarded – undo
299 299
      */
300 300
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeSlotsN, array $ids, $free = true)
301 301
     {
302
-        $ret = [];
302
+        $ret = [ ];
303 303
         foreach ($ids as $id) {
304
-            if(isset($timeSlots[$id]))
305
-                $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0');
304
+            if (isset($timeSlots[ $id ]))
305
+                $ret = self::fillTimeSlots($ret, $id, $timeSlots[ $id ], $free ? '1' : '0');
306 306
             $ret = self::fillRow($ret, $id, $timeSlotsN, $free ? '0' : '1');
307 307
         }
308 308
 
@@ -319,9 +319,9 @@  discard block
 block discarded – undo
319 319
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
320 320
     {
321 321
         foreach ($timeSlots as $timeSlot) {
322
-            if (!isset($array[$id]))
323
-                $array[$id] = [];
324
-            $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
322
+            if (!isset($array[ $id ]))
323
+                $array[ $id ] = [ ];
324
+            $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill);
325 325
         }
326 326
         return $array;
327 327
     }
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
337 337
     {
338 338
         for ($i = $from; $i < $to; $i++)
339
-            $array[$i] = $pad;
339
+            $array[ $i ] = $pad;
340 340
         return $array;
341 341
     }
342 342
 
@@ -349,8 +349,8 @@  discard block
 block discarded – undo
349 349
     static private function fillRow(array $array, $id, $until, $fill = '0')
350 350
     {
351 351
         for ($i = 1; $i <= $until; $i++) {
352
-            if (!isset($array[$id][$i]))
353
-                $array[$id][$i] = $fill;
352
+            if (!isset($array[ $id ][ $i ]))
353
+                $array[ $id ][ $i ] = $fill;
354 354
         }
355 355
 
356 356
         return $array;
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
         $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime));
370 370
         //if($users->count() == 0)
371 371
         //    throw ((new OptimiseException("No users for this company"))->withEmpty(true));
372
-        $timeslots = $users->groupBy('id')->map(function ($item) { //convert timeslots
372
+        $timeslots = $users->groupBy('id')->map(function($item) { //convert timeslots
373 373
             return $this->timeSlotsConverter($item);
374 374
         });
375 375
         return $solver->setUsersAvailability(self::getAvailabilityArray($timeslots, $this->time_slots, $solver->getUsers(),
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
          * @var $usersMeetings \Illuminate\Support\Collection
390 390
          */
391 391
         $usersMeetings = collect($this->company->getUsersMeetings($users, $meetings))->groupBy('employee_id');
392
-        if($usersMeetings->count() == 0)
392
+        if ($usersMeetings->count() == 0)
393 393
             throw ((new OptimiseException("No users for any meeting"))->withEmpty(true));
394 394
 
395 395
         return $solver->setUsersMeetings(self::getUsersMeetingsArray($users, $meetings, $usersMeetings));
@@ -403,14 +403,14 @@  discard block
 block discarded – undo
403 403
      */
404 404
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
405 405
     {
406
-        $ret = [];
406
+        $ret = [ ];
407 407
         foreach ($users as $user) {
408 408
             $usersMeetingsTmp = $usersMeetings->get($user);
409 409
             foreach ($meetings as $meeting) {
410 410
                 if ($usersMeetingsTmp != null && $usersMeetingsTmp->contains('meeting_id', $meeting)) {
411
-                    $ret[$user][$meeting] = 1;
411
+                    $ret[ $user ][ $meeting ] = 1;
412 412
                 } else {
413
-                    $ret[$user][$meeting] = 0;
413
+                    $ret[ $user ][ $meeting ] = 0;
414 414
                 }
415 415
             }
416 416
         }
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
     {
454 454
         $meetings = $solver->getYResults();
455 455
         foreach ($meetings as $id => $meeting) {
456
-            $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error
456
+            $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error
457 457
             $meetingO->start_time = $this->toDateTime(array_search('1', $meeting));
458 458
             $meetingO->save();
459 459
         }
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
         //TODO check, because the meetings cannot have this date available -> this to avoid errors if we don't have a date for a meeting
470 470
         if ($timeslot <= 1) //false == 0
471 471
             return $ret;
472
-        return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S'));
472
+        return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * config('app.timeslots.duration')).'S'));
473 473
     }
474 474
 
475 475
     /**
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
         foreach ($employeesMeetings as $eId => $employeeMeetings) {
482 482
             $employee = \plunner\Employee::findOrFail($eId);
483 483
             $employeeMeetings = collect($employeeMeetings);
484
-            $employeeMeetings = $employeeMeetings->filter(function ($item) {
484
+            $employeeMeetings = $employeeMeetings->filter(function($item) {
485 485
                 return $item == 1;
486 486
             });
487 487
             $employee->meetings()->attach($employeeMeetings->keys()->toArray());
Please login to merge, or discard this patch.
app/Console/Commands/MeetingsList.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,12 +47,12 @@
 block discarded – undo
47 47
 
48 48
     private static function withFilter()
49 49
     {
50
-        return ['groups' => function ($query) {
50
+        return [ 'groups' => function($query) {
51 51
             $query->select('id', 'company_id');
52
-        }, 'groups.meetings' => function ($query) {
52
+        }, 'groups.meetings' => function($query) {
53 53
             $query->select('id', 'group_id', 'start_time');
54
-        }, 'groups.meetings.employees' => function ($query) {
54
+        }, 'groups.meetings.employees' => function($query) {
55 55
             $query->select('id');
56
-        }];
56
+        } ];
57 57
     }
58 58
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Auth/AuthController.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -42,13 +42,13 @@  discard block
 block discarded – undo
42 42
      * en = employee normal
43 43
      * @var array
44 44
      */
45
-    protected $custom = ['mode' => 'en'];
45
+    protected $custom = [ 'mode' => 'en' ];
46 46
 
47 47
     /**
48 48
      * unique identifiers of the user
49 49
      * @var array
50 50
      */
51
-    protected $username = ['company_id', 'email'];
51
+    protected $username = [ 'company_id', 'email' ];
52 52
 
53 53
     /**
54 54
      * @var company
@@ -61,13 +61,13 @@  discard block
 block discarded – undo
61 61
      */
62 62
     public function __construct()
63 63
     {
64
-        config(['auth.model' => \plunner\Employee::class]);
65
-        config(['jwt.user' => \plunner\Employee::class]);
64
+        config([ 'auth.model' => \plunner\Employee::class ]);
65
+        config([ 'jwt.user' => \plunner\Employee::class ]);
66 66
     }
67 67
 
68 68
     public function postRegister(Request $request)
69 69
     {
70
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
70
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
71 71
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
72 72
         return $this->postRegisterOriginal($request);
73 73
     }
@@ -75,17 +75,17 @@  discard block
 block discarded – undo
75 75
     public function postLogin(Request $request)
76 76
     {
77 77
         //get company ID and impiled it in the request
78
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
78
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
79 79
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
80
-        $request->merge(['company_id' => $this->company->id]);
80
+        $request->merge([ 'company_id' => $this->company->id ]);
81 81
 
82 82
         //remember me
83
-        $this->validate($request, ['remember' => 'required|boolean']);
83
+        $this->validate($request, [ 'remember' => 'required|boolean' ]);
84 84
         if ($request->input('remember', false)) {
85
-            config(['jwt.ttl' => '43200']); //30 days
86
-            $this->custom = array_merge($this->custom, ['remember' => 'true']);
85
+            config([ 'jwt.ttl' => '43200' ]); //30 days
86
+            $this->custom = array_merge($this->custom, [ 'remember' => 'true' ]);
87 87
         } else
88
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
88
+            $this->custom = array_merge($this->custom, [ 'remember' => 'false' ]);
89 89
 
90 90
         return $this->postLoginOriginal($request);
91 91
     }
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
     {
101 101
         return Validator::make($data, [
102 102
             'name' => 'required|min:1|max:255',
103
-            'email' => 'required|email|max:255|unique:employees,email,NULL,id,company_id,' . $this->company->id,
103
+            'email' => 'required|email|max:255|unique:employees,email,NULL,id,company_id,'.$this->company->id,
104 104
             'password' => 'required|confirmed|min:6',
105 105
         ]);
106 106
     }
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
     protected function create(array $data)
115 115
     {
116 116
         return $this->company->save(new employee([
117
-            'name' => $data['name'],
118
-            'email' => $data['email'],
119
-            'password' => bcrypt($data['password']),
117
+            'name' => $data[ 'name' ],
118
+            'email' => $data[ 'email' ],
119
+            'password' => bcrypt($data[ 'password' ]),
120 120
         ]));
121 121
     }
122 122
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/MeetingsController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@  discard block
 block discarded – undo
14 14
 {
15 15
     public function __construct()
16 16
     {
17
-        config(['auth.model' => \plunner\Planner::class]);
18
-        config(['jwt.user' => \plunner\Planner::class]);
17
+        config([ 'auth.model' => \plunner\Planner::class ]);
18
+        config([ 'jwt.user' => \plunner\Planner::class ]);
19 19
         $this->middleware('jwt.authandrefresh:mode-en');
20 20
     }
21 21
 
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
         $this->authorize($group);
34 34
         $meetings = $group->meetings();
35 35
         if ($request->query('current'))
36
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
37
-                $query->where('start_time', '=', NULL);//to be planned
36
+            $meetings->where(function($query) { //parenthesis for conditions ...(C1 OR C2)...
37
+                $query->where('start_time', '=', NULL); //to be planned
38 38
                 //datetime to consider timezone, don't use mysql NOW()
39
-                $query->orWhere('start_time', '>=', new \DateTime());//planned
39
+                $query->orWhere('start_time', '>=', new \DateTime()); //planned
40 40
             });
41 41
 
42 42
         return $meetings->get();
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
         $meeting = Meeting::findOrFail($meetingId);
92 92
         $this->authorize($meeting);
93 93
         $input = $request->all();
94
-        if ($meeting->start_time != NULL && $meeting->duration != $input['duration'])
95
-            return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
94
+        if ($meeting->start_time != NULL && $meeting->duration != $input[ 'duration' ])
95
+            return Response::json([ 'error' => 'the meeting is already planned, you cannot change the duration' ], 422);
96 96
         $meeting->update($input);
97 97
         return $meeting;
98 98
     }
Please login to merge, or discard this patch.