@@ -37,7 +37,7 @@ |
||
37 | 37 | */ |
38 | 38 | public function map(Router $router) |
39 | 39 | { |
40 | - $router->group(['namespace' => $this->namespace], function ($router) { |
|
40 | + $router->group([ 'namespace' => $this->namespace ], function($router) { |
|
41 | 41 | require app_path('Http/routes.php'); |
42 | 42 | }); |
43 | 43 | } |
@@ -51,14 +51,14 @@ |
||
51 | 51 | * |
52 | 52 | * @var array |
53 | 53 | */ |
54 | - protected $fillable = ['name', 'email', 'password']; |
|
54 | + protected $fillable = [ 'name', 'email', 'password' ]; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * The attributes excluded from the model's JSON form. |
58 | 58 | * |
59 | 59 | * @var array |
60 | 60 | */ |
61 | - protected $hidden = ['password', 'remember_token']; |
|
61 | + protected $hidden = [ 'password', 'remember_token' ]; |
|
62 | 62 | |
63 | 63 | public function company() |
64 | 64 | { |
@@ -20,8 +20,8 @@ |
||
20 | 20 | */ |
21 | 21 | public function __construct() |
22 | 22 | { |
23 | - config(['auth.model' => \plunner\Company::class]); |
|
24 | - config(['jwt.user' => \plunner\Company::class]); |
|
23 | + config([ 'auth.model' => \plunner\Company::class ]); |
|
24 | + config([ 'jwt.user' => \plunner\Company::class ]); |
|
25 | 25 | $this->middleware('jwt.authandrefresh:mode-cn'); |
26 | 26 | } |
27 | 27 |
@@ -37,19 +37,19 @@ |
||
37 | 37 | /** |
38 | 38 | * @var array |
39 | 39 | */ |
40 | - protected $touches = ['calendar']; |
|
40 | + protected $touches = [ 'calendar' ]; |
|
41 | 41 | |
42 | 42 | /** |
43 | 43 | * @var array |
44 | 44 | */ |
45 | - protected $fillable = ['url', 'username', 'password', 'calendar_name']; |
|
45 | + protected $fillable = [ 'url', 'username', 'password', 'calendar_name' ]; |
|
46 | 46 | |
47 | 47 | /** |
48 | 48 | * The attributes excluded from the model's JSON form. |
49 | 49 | * |
50 | 50 | * @var array |
51 | 51 | */ |
52 | - protected $hidden = ['password']; |
|
52 | + protected $hidden = [ 'password' ]; |
|
53 | 53 | |
54 | 54 | /** |
55 | 55 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
@@ -37,7 +37,7 @@ |
||
37 | 37 | * |
38 | 38 | * @var array |
39 | 39 | */ |
40 | - protected $fillable = ['name', 'enabled']; |
|
40 | + protected $fillable = [ 'name', 'enabled' ]; |
|
41 | 41 | |
42 | 42 | /** |
43 | 43 | * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
@@ -46,14 +46,14 @@ |
||
46 | 46 | * |
47 | 47 | * @var array |
48 | 48 | */ |
49 | - protected $fillable = ['title', 'description', 'duration']; |
|
49 | + protected $fillable = [ 'title', 'description', 'duration' ]; |
|
50 | 50 | |
51 | 51 | /** |
52 | 52 | * The attributes excluded from the model's JSON form. |
53 | 53 | * |
54 | 54 | * @var array |
55 | 55 | */ |
56 | - protected $hidden = ['pivot']; |
|
56 | + protected $hidden = [ 'pivot' ]; |
|
57 | 57 | |
58 | 58 | |
59 | 59 | /** |
@@ -39,6 +39,6 @@ |
||
39 | 39 | */ |
40 | 40 | public function broadcastOn() |
41 | 41 | { |
42 | - return []; |
|
42 | + return [ ]; |
|
43 | 43 | } |
44 | 44 | } |
@@ -9,8 +9,8 @@ |
||
9 | 9 | namespace plunner\Console\Commands\Optimise; |
10 | 10 | |
11 | 11 | use Illuminate\Console\Scheduling\Schedule; |
12 | -use plunner\company; |
|
13 | 12 | use plunner\Events\Optimise\ErrorEvent; |
13 | +use plunner\company; |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Class Optimise |
@@ -85,8 +85,8 @@ discard block |
||
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 | /** |
@@ -158,11 +158,11 @@ discard block |
||
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 |
||
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 |
||
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()) |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | */ |
240 | 240 | private function durationConverter($item) |
241 | 241 | { |
242 | - return $item->each(function ($item2) { |
|
243 | - $item2->duration = $this->convertDuration((int)$item2->duration); |
|
242 | + return $item->each(function($item2) { |
|
243 | + $item2->duration = $this->convertDuration((int) $item2->duration); |
|
244 | 244 | return $item2; |
245 | 245 | //TODO try catch |
246 | 246 | }); |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | */ |
253 | 253 | static private function convertDuration($duration) |
254 | 254 | { |
255 | - return (int)ceil($duration / config('app.timeslots.duration')); |
|
255 | + return (int) ceil($duration / config('app.timeslots.duration')); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | /** |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | */ |
262 | 262 | private function timeSlotsConverter($item) |
263 | 263 | { |
264 | - return $item->each(function ($item2) { |
|
264 | + return $item->each(function($item2) { |
|
265 | 265 | $item2->time_start = $this->toTimeSlot($item2->time_start); |
266 | 266 | $item2->time_end = $this->toTimeSlot($item2->time_end); |
267 | 267 | return $item2; |
@@ -279,13 +279,13 @@ discard block |
||
279 | 279 | $dateTime = new \DateTime($time); |
280 | 280 | $diff = $dateTime->diff($this->startTime); |
281 | 281 | $diff = explode(':', $diff->format('%R:%d:%h:%i:%s')); |
282 | - $diff = $diff[1] * 86400 + $diff[2] * 3600 + $diff[3] * 60 + $diff[4]; |
|
282 | + $diff = $diff[ 1 ] * 86400 + $diff[ 2 ] * 3600 + $diff[ 3 ] * 60 + $diff[ 4 ]; |
|
283 | 283 | //if($diff[0] != '-' && $diff != 0) |
284 | 284 | // throw new OptimiseException('timeslot time <= startTime'); |
285 | 285 | //TODO fix check |
286 | 286 | //TODO check if diff makes sense |
287 | 287 | //TODO check upper limit |
288 | - return (int)(round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps? |
|
288 | + return (int) (round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps? |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | /** |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | */ |
296 | 296 | static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true) |
297 | 297 | { |
298 | - $ret = []; |
|
298 | + $ret = [ ]; |
|
299 | 299 | foreach ($timeSlots as $id => $timeSlots2) { |
300 | 300 | $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free ? '1' : '0'); |
301 | 301 | $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1'); |
@@ -314,9 +314,9 @@ discard block |
||
314 | 314 | static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0') |
315 | 315 | { |
316 | 316 | foreach ($timeSlots as $timeSlot) { |
317 | - if (!isset($array[$id])) |
|
318 | - $array[$id] = []; |
|
319 | - $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill); |
|
317 | + if (!isset($array[ $id ])) |
|
318 | + $array[ $id ] = [ ]; |
|
319 | + $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill); |
|
320 | 320 | } |
321 | 321 | return $array; |
322 | 322 | } |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | static private function arrayPadInterval(array $array, $from, $to, $pad = '0') |
332 | 332 | { |
333 | 333 | for ($i = $from; $i < $to; $i++) |
334 | - $array[$i] = $pad; |
|
334 | + $array[ $i ] = $pad; |
|
335 | 335 | return $array; |
336 | 336 | } |
337 | 337 | |
@@ -344,8 +344,8 @@ discard block |
||
344 | 344 | static private function fillRow(array $array, $id, $until, $fill = '0') |
345 | 345 | { |
346 | 346 | for ($i = 1; $i <= $until; $i++) { |
347 | - if (!isset($array[$id][$i])) |
|
348 | - $array[$id][$i] = $fill; |
|
347 | + if (!isset($array[ $id ][ $i ])) |
|
348 | + $array[ $id ][ $i ] = $fill; |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | return $array; |
@@ -362,9 +362,9 @@ discard block |
||
362 | 362 | * @var $users \Illuminate\Support\Collection |
363 | 363 | */ |
364 | 364 | $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime)); |
365 | - if($users->count() == 0) |
|
365 | + if ($users->count() == 0) |
|
366 | 366 | throw ((new OptimiseException("No users for this company"))->withEmpty(true)); |
367 | - $timeslots = $users->groupBy('id')->map(function ($item) { //convert timeslots |
|
367 | + $timeslots = $users->groupBy('id')->map(function($item) { //convert timeslots |
|
368 | 368 | return $this->timeSlotsConverter($item); |
369 | 369 | }); |
370 | 370 | return $solver->setUsersAvailability(self::getAvailabilityArray($timeslots, $this->time_slots, false)); |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | * @var $usersMeetings \Illuminate\Support\Collection |
384 | 384 | */ |
385 | 385 | $usersMeetings = collect($this->company->getUsersMeetings($users, $meetings))->groupBy('employee_id'); |
386 | - if($usersMeetings->count() == 0) |
|
386 | + if ($usersMeetings->count() == 0) |
|
387 | 387 | throw ((new OptimiseException("No users for any meeting"))->withEmpty(true)); |
388 | 388 | |
389 | 389 | return $solver->setUsersMeetings(self::getUsersMeetingsArray($users, $meetings, $usersMeetings)); |
@@ -397,14 +397,14 @@ discard block |
||
397 | 397 | */ |
398 | 398 | static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings) |
399 | 399 | { |
400 | - $ret = []; |
|
400 | + $ret = [ ]; |
|
401 | 401 | foreach ($users as $user) { |
402 | 402 | $usersMeetingsTmp = $usersMeetings->get($user); |
403 | 403 | foreach ($meetings as $meeting) { |
404 | 404 | if ($usersMeetingsTmp->contains('meeting_id', $meeting)) { |
405 | - $ret[$user][$meeting] = 1; |
|
405 | + $ret[ $user ][ $meeting ] = 1; |
|
406 | 406 | } else { |
407 | - $ret[$user][$meeting] = 0; |
|
407 | + $ret[ $user ][ $meeting ] = 0; |
|
408 | 408 | } |
409 | 409 | } |
410 | 410 | } |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | { |
447 | 447 | $meetings = $solver->getYResults(); |
448 | 448 | foreach ($meetings as $id => $meeting) { |
449 | - $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error |
|
449 | + $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error |
|
450 | 450 | $meetingO->start_time = $this->toDateTime(array_search('1', $meeting)); |
451 | 451 | $meetingO->save(); |
452 | 452 | } |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | private function toDateTime($timeslot) |
460 | 460 | { |
461 | 461 | $ret = clone $this->startTime; |
462 | - return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S')); |
|
462 | + return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * config('app.timeslots.duration')).'S')); |
|
463 | 463 | } |
464 | 464 | |
465 | 465 | /** |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | foreach ($employeesMeetings as $eId => $employeeMeetings) { |
472 | 472 | $employee = \plunner\Employee::findOrFail($eId); |
473 | 473 | $employeeMeetings = collect($employeeMeetings); |
474 | - $employeeMeetings = $employeeMeetings->filter(function ($item) { |
|
474 | + $employeeMeetings = $employeeMeetings->filter(function($item) { |
|
475 | 475 | return $item == 1; |
476 | 476 | }); |
477 | 477 | $employee->meetings()->attach($employeeMeetings->keys()->toArray()); |
@@ -39,6 +39,6 @@ |
||
39 | 39 | */ |
40 | 40 | public function broadcastOn() |
41 | 41 | { |
42 | - return []; |
|
42 | + return [ ]; |
|
43 | 43 | } |
44 | 44 | } |