@@ -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()) |
@@ -240,8 +240,8 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | /** |
@@ -296,10 +296,10 @@ discard block |
||
| 296 | 296 | */ |
| 297 | 297 | static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $ids, $free = true) |
| 298 | 298 | { |
| 299 | - $ret = []; |
|
| 299 | + $ret = [ ]; |
|
| 300 | 300 | foreach ($ids as $id) { |
| 301 | - if(isset($timeSlots[$id])) |
|
| 302 | - $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0'); |
|
| 301 | + if (isset($timeSlots[ $id ])) |
|
| 302 | + $ret = self::fillTimeSlots($ret, $id, $timeSlots[ $id ], $free ? '1' : '0'); |
|
| 303 | 303 | $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1'); |
| 304 | 304 | } |
| 305 | 305 | |
@@ -316,9 +316,9 @@ discard block |
||
| 316 | 316 | static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0') |
| 317 | 317 | { |
| 318 | 318 | foreach ($timeSlots as $timeSlot) { |
| 319 | - if (!isset($array[$id])) |
|
| 320 | - $array[$id] = []; |
|
| 321 | - $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill); |
|
| 319 | + if (!isset($array[ $id ])) |
|
| 320 | + $array[ $id ] = [ ]; |
|
| 321 | + $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill); |
|
| 322 | 322 | } |
| 323 | 323 | return $array; |
| 324 | 324 | } |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | static private function arrayPadInterval(array $array, $from, $to, $pad = '0') |
| 334 | 334 | { |
| 335 | 335 | for ($i = $from; $i < $to; $i++) |
| 336 | - $array[$i] = $pad; |
|
| 336 | + $array[ $i ] = $pad; |
|
| 337 | 337 | return $array; |
| 338 | 338 | } |
| 339 | 339 | |
@@ -346,8 +346,8 @@ discard block |
||
| 346 | 346 | static private function fillRow(array $array, $id, $until, $fill = '0') |
| 347 | 347 | { |
| 348 | 348 | for ($i = 1; $i <= $until; $i++) { |
| 349 | - if (!isset($array[$id][$i])) |
|
| 350 | - $array[$id][$i] = $fill; |
|
| 349 | + if (!isset($array[ $id ][ $i ])) |
|
| 350 | + $array[ $id ][ $i ] = $fill; |
|
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | return $array; |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime)); |
| 367 | 367 | //if($users->count() == 0) |
| 368 | 368 | // throw ((new OptimiseException("No users for this company"))->withEmpty(true)); |
| 369 | - $timeslots = $users->groupBy('id')->map(function ($item) { //convert timeslots |
|
| 369 | + $timeslots = $users->groupBy('id')->map(function($item) { //convert timeslots |
|
| 370 | 370 | return $this->timeSlotsConverter($item); |
| 371 | 371 | }); |
| 372 | 372 | return $solver->setUsersAvailability(self::getAvailabilityArray($timeslots, $this->time_slots, $solver->getUsers(), |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | * @var $usersMeetings \Illuminate\Support\Collection |
| 387 | 387 | */ |
| 388 | 388 | $usersMeetings = collect($this->company->getUsersMeetings($users, $meetings))->groupBy('employee_id'); |
| 389 | - if($usersMeetings->count() == 0) |
|
| 389 | + if ($usersMeetings->count() == 0) |
|
| 390 | 390 | throw ((new OptimiseException("No users for any meeting"))->withEmpty(true)); |
| 391 | 391 | |
| 392 | 392 | return $solver->setUsersMeetings(self::getUsersMeetingsArray($users, $meetings, $usersMeetings)); |
@@ -400,14 +400,14 @@ discard block |
||
| 400 | 400 | */ |
| 401 | 401 | static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings) |
| 402 | 402 | { |
| 403 | - $ret = []; |
|
| 403 | + $ret = [ ]; |
|
| 404 | 404 | foreach ($users as $user) { |
| 405 | 405 | $usersMeetingsTmp = $usersMeetings->get($user); |
| 406 | 406 | foreach ($meetings as $meeting) { |
| 407 | 407 | if ($usersMeetingsTmp->contains('meeting_id', $meeting)) { |
| 408 | - $ret[$user][$meeting] = 1; |
|
| 408 | + $ret[ $user ][ $meeting ] = 1; |
|
| 409 | 409 | } else { |
| 410 | - $ret[$user][$meeting] = 0; |
|
| 410 | + $ret[ $user ][ $meeting ] = 0; |
|
| 411 | 411 | } |
| 412 | 412 | } |
| 413 | 413 | } |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | { |
| 450 | 450 | $meetings = $solver->getYResults(); |
| 451 | 451 | foreach ($meetings as $id => $meeting) { |
| 452 | - $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error |
|
| 452 | + $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error |
|
| 453 | 453 | $meetingO->start_time = $this->toDateTime(array_search('1', $meeting)); |
| 454 | 454 | $meetingO->save(); |
| 455 | 455 | } |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | private function toDateTime($timeslot) |
| 463 | 463 | { |
| 464 | 464 | $ret = clone $this->startTime; |
| 465 | - return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S')); |
|
| 465 | + return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * config('app.timeslots.duration')).'S')); |
|
| 466 | 466 | } |
| 467 | 467 | |
| 468 | 468 | /** |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | foreach ($employeesMeetings as $eId => $employeeMeetings) { |
| 475 | 475 | $employee = \plunner\Employee::findOrFail($eId); |
| 476 | 476 | $employeeMeetings = collect($employeeMeetings); |
| 477 | - $employeeMeetings = $employeeMeetings->filter(function ($item) { |
|
| 477 | + $employeeMeetings = $employeeMeetings->filter(function($item) { |
|
| 478 | 478 | return $item == 1; |
| 479 | 479 | }); |
| 480 | 480 | $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 | } |