Completed
Push — master ( c77994...f81130 )
by claudio
06:53
created
app/Console/Commands/Optimise/Optimise.php 2 patches
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -278,8 +278,8 @@  discard block
 block discarded – undo
278 278
 
279 279
     /**
280 280
      * @param \Illuminate\Support\Collection $timeSlots
281
-     * @param bool|true $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
282
-     * @return array
281
+     * @param boolean $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
282
+     * @return string[]
283 283
      */
284 284
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true)
285 285
     {
@@ -374,10 +374,10 @@  discard block
 block discarded – undo
374 374
     }
375 375
 
376 376
     /**
377
-     * @param array $users
378
-     * @param array $meetings
377
+     * @param string[] $users
378
+     * @param string[] $meetings
379 379
      * @param \Illuminate\Support\Collection $usersMeetings
380
-     * @return array
380
+     * @return string[]
381 381
      */
382 382
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
383 383
     {
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 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->max_time_slots + $this->time_slots) *
89
-                config('app.timeslots.duration')) . 'S'));
88
+        $this->endTime->add(new \DateInterval('PT'.(($this->max_time_slots + $this->time_slots) *
89
+                config('app.timeslots.duration')).'S'));
90 90
     }
91 91
 
92 92
     /**
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
          * @var $meetings \Illuminate\Support\Collection
214 214
          */
215 215
         $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime));
216
-        $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots
216
+        $timeslots = $meetings->groupBy('id')->map(function($item) { //convert timeslots
217 217
             return $this->durationConverter($this->timeSlotsConverter($item));
218 218
         });
219 219
         return $solver->setMeetings($timeslots->keys()->toArray())
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
227 227
      */
228 228
     private function durationConverter($item)
229 229
     {
230
-        return $item->each(function ($item2) {
231
-            $item2->duration = $this->convertDuration((int)$item2->duration);
230
+        return $item->each(function($item2) {
231
+            $item2->duration = $this->convertDuration((int) $item2->duration);
232 232
             return $item2;
233 233
             //TODO try catch
234 234
         });
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
      */
241 241
     static private function convertDuration($duration)
242 242
     {
243
-        return (int)ceil($duration / config('app.timeslots.duration'));
243
+        return (int) ceil($duration / config('app.timeslots.duration'));
244 244
     }
245 245
 
246 246
     /**
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
      */
250 250
     private function timeSlotsConverter($item)
251 251
     {
252
-        return $item->each(function ($item2) {
252
+        return $item->each(function($item2) {
253 253
             $item2->time_start = $this->toTimeSlot($item2->time_start);
254 254
             $item2->time_end = $this->toTimeSlot($item2->time_end);
255 255
             return $item2;
@@ -267,13 +267,13 @@  discard block
 block discarded – undo
267 267
         $dateTime = new \DateTime($time);
268 268
         $diff = $dateTime->diff($this->startTime);
269 269
         $diff = explode(':', $diff->format('%R:%d:%h:%i:%s'));
270
-        $diff = $diff[1] * 86400 + $diff[2] * 3600 + $diff[3] * 60 + $diff[4];
270
+        $diff = $diff[ 1 ] * 86400 + $diff[ 2 ] * 3600 + $diff[ 3 ] * 60 + $diff[ 4 ];
271 271
         //if($diff[0] != '-' && $diff != 0)
272 272
         //  throw new OptimiseException('timeslot time <= startTime');
273 273
         //TODO fix check
274 274
         //TODO check if diff makes sense
275 275
         //TODO check upper limit
276
-        return (int)(round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps?
276
+        return (int) (round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps?
277 277
     }
278 278
 
279 279
     /**
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
      */
284 284
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true)
285 285
     {
286
-        $ret = [];
286
+        $ret = [ ];
287 287
         foreach ($timeSlots as $id => $timeSlots2) {
288 288
             $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free ? '1' : '0');
289 289
             $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1');
@@ -302,9 +302,9 @@  discard block
 block discarded – undo
302 302
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
303 303
     {
304 304
         foreach ($timeSlots as $timeSlot) {
305
-            if (!isset($array[$id]))
306
-                $array[$id] = [];
307
-            $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
305
+            if (!isset($array[ $id ]))
306
+                $array[ $id ] = [ ];
307
+            $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill);
308 308
         }
309 309
         return $array;
310 310
     }
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
320 320
     {
321 321
         for ($i = $from; $i < $to; $i++)
322
-            $array[$i] = $pad;
322
+            $array[ $i ] = $pad;
323 323
         return $array;
324 324
     }
325 325
 
@@ -332,8 +332,8 @@  discard block
 block discarded – undo
332 332
     static private function fillRow(array $array, $id, $until, $fill = '0')
333 333
     {
334 334
         for ($i = 1; $i <= $until; $i++) {
335
-            if (!isset($array[$id][$i]))
336
-                $array[$id][$i] = $fill;
335
+            if (!isset($array[ $id ][ $i ]))
336
+                $array[ $id ][ $i ] = $fill;
337 337
         }
338 338
 
339 339
         return $array;
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
          * @var $users \Illuminate\Support\Collection
351 351
          */
352 352
         $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime));
353
-        $timeslots = $users->groupBy('id')->map(function ($item) { //convert timeslots
353
+        $timeslots = $users->groupBy('id')->map(function($item) { //convert timeslots
354 354
             return $this->timeSlotsConverter($item);
355 355
         });
356 356
         return $solver->setUsersAvailability(self::getAvailabilityArray($timeslots, $this->time_slots, false));
@@ -381,14 +381,14 @@  discard block
 block discarded – undo
381 381
      */
382 382
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
383 383
     {
384
-        $ret = [];
384
+        $ret = [ ];
385 385
         foreach ($users as $user) {
386 386
             $usersMeetingsTmp = $usersMeetings->get($user);
387 387
             foreach ($meetings as $meeting) {
388 388
                 if ($usersMeetingsTmp->contains('meeting_id', $meeting)) {
389
-                    $ret[$user][$meeting] = 1;
389
+                    $ret[ $user ][ $meeting ] = 1;
390 390
                 } else {
391
-                    $ret[$user][$meeting] = 0;
391
+                    $ret[ $user ][ $meeting ] = 0;
392 392
                 }
393 393
             }
394 394
         }
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
     {
429 429
         $meetings = $solver->getYResults();
430 430
         foreach ($meetings as $id => $meeting) {
431
-            $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error
431
+            $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error
432 432
             $meetingO->start_time = $this->toDateTime(array_search('1', $meeting));
433 433
             $meetingO->save();
434 434
         }
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
     private function toDateTime($timeslot)
442 442
     {
443 443
         $ret = clone $this->startTime;
444
-        return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S'));
444
+        return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * config('app.timeslots.duration')).'S'));
445 445
     }
446 446
 
447 447
     /**
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
         foreach ($employeesMeetings as $eId => $employeeMeetings) {
454 454
             $employee = \plunner\Employee::findOrFail($eId);
455 455
             $employeeMeetings = collect($employeeMeetings);
456
-            $employeeMeetings = $employeeMeetings->filter(function ($item) {
456
+            $employeeMeetings = $employeeMeetings->filter(function($item) {
457 457
                 return $item == 1;
458 458
             });
459 459
             $employee->meetings()->attach($employeeMeetings->keys()->toArray());
Please login to merge, or discard this patch.