@@ -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 |
@@ -158,11 +158,12 @@ 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()) |
|
163 | - \Event::fire(new ErrorEvent($this->company, $e->getMessage())); |
|
161 | + } catch(OptimiseException $e) { |
|
162 | + if(!$e->isEmpty()) { |
|
163 | + \Event::fire(new ErrorEvent($this->company, $e->getMessage())); |
|
164 | + } |
|
164 | 165 | throw $e; |
165 | - }catch (\Exception $e) { |
|
166 | + } catch (\Exception $e) { |
|
166 | 167 | //TODO use the correct exceptions to avoid to share private data |
167 | 168 | \Event::fire(new ErrorEvent($this->company, $e->getMessage())); |
168 | 169 | throw new OptimiseException('Optimising error', 0, $e); |
@@ -207,8 +208,9 @@ discard block |
||
207 | 208 | { |
208 | 209 | //since we consider busy timeslots, we need to get all users |
209 | 210 | $users = $this->company->employees->pluck('id')->toArray(); |
210 | - if(count($users) == 0) |
|
211 | - throw ((new OptimiseException("No users for this company"))->withEmpty(true)); |
|
211 | + if(count($users) == 0) { |
|
212 | + throw ((new OptimiseException("No users for this company"))->withEmpty(true)); |
|
213 | + } |
|
212 | 214 | return $solver->setUsers($users); |
213 | 215 | } |
214 | 216 | |
@@ -223,8 +225,9 @@ discard block |
||
223 | 225 | * @var $meetings \Illuminate\Support\Collection |
224 | 226 | */ |
225 | 227 | $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime)); |
226 | - if($meetings->count() == 0) |
|
227 | - throw ((new OptimiseException("No meetings for this week"))->withEmpty(true)); |
|
228 | + if($meetings->count() == 0) { |
|
229 | + throw ((new OptimiseException("No meetings for this week"))->withEmpty(true)); |
|
230 | + } |
|
228 | 231 | $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots |
229 | 232 | return $this->durationConverter($this->timeSlotsConverter($item)); |
230 | 233 | }); |
@@ -298,8 +301,9 @@ discard block |
||
298 | 301 | { |
299 | 302 | $ret = []; |
300 | 303 | foreach ($ids as $id) { |
301 | - if(isset($timeSlots[$id])) |
|
302 | - $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 | + } |
|
303 | 307 | $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1'); |
304 | 308 | } |
305 | 309 | |
@@ -316,8 +320,9 @@ discard block |
||
316 | 320 | static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0') |
317 | 321 | { |
318 | 322 | foreach ($timeSlots as $timeSlot) { |
319 | - if (!isset($array[$id])) |
|
320 | - $array[$id] = []; |
|
323 | + if (!isset($array[$id])) { |
|
324 | + $array[$id] = []; |
|
325 | + } |
|
321 | 326 | $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill); |
322 | 327 | } |
323 | 328 | return $array; |
@@ -332,8 +337,9 @@ discard block |
||
332 | 337 | */ |
333 | 338 | static private function arrayPadInterval(array $array, $from, $to, $pad = '0') |
334 | 339 | { |
335 | - for ($i = $from; $i < $to; $i++) |
|
336 | - $array[$i] = $pad; |
|
340 | + for ($i = $from; $i < $to; $i++) { |
|
341 | + $array[$i] = $pad; |
|
342 | + } |
|
337 | 343 | return $array; |
338 | 344 | } |
339 | 345 | |
@@ -346,8 +352,9 @@ discard block |
||
346 | 352 | static private function fillRow(array $array, $id, $until, $fill = '0') |
347 | 353 | { |
348 | 354 | for ($i = 1; $i <= $until; $i++) { |
349 | - if (!isset($array[$id][$i])) |
|
350 | - $array[$id][$i] = $fill; |
|
355 | + if (!isset($array[$id][$i])) { |
|
356 | + $array[$id][$i] = $fill; |
|
357 | + } |
|
351 | 358 | } |
352 | 359 | |
353 | 360 | return $array; |
@@ -386,8 +393,9 @@ discard block |
||
386 | 393 | * @var $usersMeetings \Illuminate\Support\Collection |
387 | 394 | */ |
388 | 395 | $usersMeetings = collect($this->company->getUsersMeetings($users, $meetings))->groupBy('employee_id'); |
389 | - if($usersMeetings->count() == 0) |
|
390 | - throw ((new OptimiseException("No users for any meeting"))->withEmpty(true)); |
|
396 | + if($usersMeetings->count() == 0) { |
|
397 | + throw ((new OptimiseException("No users for any meeting"))->withEmpty(true)); |
|
398 | + } |
|
391 | 399 | |
392 | 400 | return $solver->setUsersMeetings(self::getUsersMeetingsArray($users, $meetings, $usersMeetings)); |
393 | 401 | } |
@@ -464,8 +472,10 @@ discard block |
||
464 | 472 | { |
465 | 473 | $ret = clone $this->startTime; |
466 | 474 | //TODO check, because the meetings cannot have this date available -> this to avoid errors if we don't have a date for a meeting |
467 | - if ($timeslot <= 1) //false == 0 |
|
475 | + if ($timeslot <= 1) { |
|
476 | + //false == 0 |
|
468 | 477 | return $ret; |
478 | + } |
|
469 | 479 | return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S')); |
470 | 480 | } |
471 | 481 |
@@ -2,11 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace plunner\Http\Controllers\Employees\Planners; |
4 | 4 | |
5 | -use Illuminate\Http\Request; |
|
6 | 5 | use Illuminate\Support\Facades\Response; |
7 | 6 | use plunner\Group; |
8 | 7 | use plunner\Http\Controllers\Controller; |
9 | -use plunner\Http\Requests; |
|
10 | 8 | use plunner\Http\Requests\Employees\Meeting\MeetingTimeslotRequest; |
11 | 9 | use plunner\Meeting; |
12 | 10 | use plunner\MeetingTimeslot; |
@@ -33,8 +33,9 @@ discard block |
||
33 | 33 | $meeting = Meeting::findOrFail($meetingId); |
34 | 34 | $this->authorize($meeting); |
35 | 35 | |
36 | - if ($meeting->group_id == $groupId) |
|
37 | - return $meeting->timeslots; |
|
36 | + if ($meeting->group_id == $groupId) { |
|
37 | + return $meeting->timeslots; |
|
38 | + } |
|
38 | 39 | return Response::json(['error' => 'meeting->group_id <> groupId'], 403); |
39 | 40 | } |
40 | 41 | |
@@ -55,8 +56,9 @@ discard block |
||
55 | 56 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
56 | 57 | $this->authorize($timeslot); |
57 | 58 | |
58 | - if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) |
|
59 | - return $timeslot; |
|
59 | + if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) { |
|
60 | + return $timeslot; |
|
61 | + } |
|
60 | 62 | return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); |
61 | 63 | } |
62 | 64 | |
@@ -72,8 +74,9 @@ discard block |
||
72 | 74 | $this->authorize($group); |
73 | 75 | $meeting = Meeting::findOrFail($meetingId); |
74 | 76 | $this->authorize($meeting); |
75 | - if ($meeting->start_time != NULL) |
|
76 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
77 | + if ($meeting->start_time != NULL) { |
|
78 | + return Response::json(['error' => 'the meeting is already planned'], 422); |
|
79 | + } |
|
77 | 80 | |
78 | 81 | $input = $request->all(); |
79 | 82 | |
@@ -96,8 +99,9 @@ discard block |
||
96 | 99 | $this->authorize($group); |
97 | 100 | $meeting = Meeting::findOrFail($meetingId); |
98 | 101 | $this->authorize($meeting); |
99 | - if ($meeting->start_time != NULL) |
|
100 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
102 | + if ($meeting->start_time != NULL) { |
|
103 | + return Response::json(['error' => 'the meeting is already planned'], 422); |
|
104 | + } |
|
101 | 105 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
102 | 106 | $this->authorize($timeslot); |
103 | 107 | |
@@ -124,8 +128,9 @@ discard block |
||
124 | 128 | $this->authorize($group); |
125 | 129 | $meeting = Meeting::findOrFail($meetingId); |
126 | 130 | $this->authorize($meeting); |
127 | - if ($meeting->start_time != NULL) |
|
128 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
131 | + if ($meeting->start_time != NULL) { |
|
132 | + return Response::json(['error' => 'the meeting is already planned'], 422); |
|
133 | + } |
|
129 | 134 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
130 | 135 | $this->authorize($timeslot); |
131 | 136 |
@@ -3,11 +3,11 @@ |
||
3 | 3 | namespace plunner\Http\Controllers\Companies\Auth; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | -use plunner\Company; |
|
7 | -use plunner\Http\Controllers\Controller; |
|
8 | 6 | use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers; |
9 | 7 | use Tymon\JWTAuth\Support\auth\ThrottlesLogins; |
10 | 8 | use Validator; |
9 | +use plunner\Company; |
|
10 | +use plunner\Http\Controllers\Controller; |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * Class AuthController |
@@ -79,8 +79,9 @@ |
||
79 | 79 | if ($request->input('remember', false)) { |
80 | 80 | config(['jwt.ttl' => '43200']); //30 days |
81 | 81 | $this->custom = array_merge($this->custom, ['remember' => 'true']); |
82 | - } else |
|
83 | - $this->custom = array_merge($this->custom, ['remember' => 'false']); |
|
82 | + } else { |
|
83 | + $this->custom = array_merge($this->custom, ['remember' => 'false']); |
|
84 | + } |
|
84 | 85 | |
85 | 86 | return $this->postLoginOriginal($request); |
86 | 87 | } |
@@ -3,9 +3,9 @@ |
||
3 | 3 | namespace plunner\Http\Controllers\Employees\Auth; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | +use Tymon\JWTAuth\Support\auth\ResetsPasswords; |
|
6 | 7 | use plunner\Company; |
7 | 8 | use plunner\Http\Controllers\Controller; |
8 | -use Tymon\JWTAuth\Support\auth\ResetsPasswords; |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * Class PasswordController |
@@ -50,12 +50,16 @@ discard block |
||
50 | 50 | { |
51 | 51 | $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure |
52 | 52 | unlink($path->getPath()); //remove file to create a dir |
53 | - if (file_exists($path->getPath())) |
|
54 | - throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); |
|
55 | - if (!@mkdir($path->getPath())) |
|
56 | - throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');; |
|
57 | - if (!is_dir($path->getPath())) |
|
58 | - throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); |
|
53 | + if (file_exists($path->getPath())) { |
|
54 | + throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); |
|
55 | + } |
|
56 | + if (!@mkdir($path->getPath())) { |
|
57 | + throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); |
|
58 | + } |
|
59 | + ; |
|
60 | + if (!is_dir($path->getPath())) { |
|
61 | + throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); |
|
62 | + } |
|
59 | 63 | return $path; |
60 | 64 | } |
61 | 65 | |
@@ -80,8 +84,9 @@ discard block |
||
80 | 84 | */ |
81 | 85 | public function __destruct() |
82 | 86 | { |
83 | - if ($this->path && is_dir($this->path) && !self::delTree($this->path)) |
|
84 | - throw new OptimiseException('problems during removing of path directory'); |
|
87 | + if ($this->path && is_dir($this->path) && !self::delTree($this->path)) { |
|
88 | + throw new OptimiseException('problems during removing of path directory'); |
|
89 | + } |
|
85 | 90 | } |
86 | 91 | |
87 | 92 | /** |
@@ -59,10 +59,11 @@ discard block |
||
59 | 59 | { |
60 | 60 | // |
61 | 61 | $calendarId = $this->argument('calendarId'); |
62 | - if (is_numeric($calendarId)) |
|
63 | - $this->makeForeground(Caldav::findOrFail($calendarId)); |
|
64 | - else |
|
65 | - $this->syncAll(); |
|
62 | + if (is_numeric($calendarId)) { |
|
63 | + $this->makeForeground(Caldav::findOrFail($calendarId)); |
|
64 | + } else { |
|
65 | + $this->syncAll(); |
|
66 | + } |
|
66 | 67 | } |
67 | 68 | |
68 | 69 | /** |
@@ -82,13 +83,15 @@ discard block |
||
82 | 83 | if ($this->option('background')) { |
83 | 84 | \Log::debug(self::BACKGROUND_MOD_MEX); |
84 | 85 | $this->info(self::BACKGROUND_MOD_MEX); |
85 | - foreach ($calendars as $calendar) |
|
86 | - $this->makeBackground($calendar); |
|
86 | + foreach ($calendars as $calendar) { |
|
87 | + $this->makeBackground($calendar); |
|
88 | + } |
|
87 | 89 | \Log::debug(self::BACKGROUND_COMPLETED_MEX); |
88 | 90 | $this->info(self::BACKGROUND_COMPLETED_MEX); |
89 | - } else |
|
90 | - foreach ($calendars as $calendar) |
|
91 | + } else { |
|
92 | + foreach ($calendars as $calendar) |
|
91 | 93 | $this->makeForeground($calendar); |
94 | + } |
|
92 | 95 | } |
93 | 96 | |
94 | 97 | /** |
@@ -98,7 +101,8 @@ discard block |
||
98 | 101 | private function makeBackground(Caldav $calendar) |
99 | 102 | { |
100 | 103 | $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping(); |
101 | - if ($event->isDue($this->laravel)) |
|
102 | - $event->run($this->laravel); |
|
104 | + if ($event->isDue($this->laravel)) { |
|
105 | + $event->run($this->laravel); |
|
106 | + } |
|
103 | 107 | } |
104 | 108 | } |
@@ -97,14 +97,16 @@ |
||
97 | 97 | public function getEmailForPasswordReset() |
98 | 98 | { |
99 | 99 | list(, $caller) = debug_backtrace(false); |
100 | - if (isset($caller['class'])) |
|
101 | - $caller = explode('\\', $caller['class']); |
|
102 | - else |
|
103 | - $caller = ''; |
|
100 | + if (isset($caller['class'])) { |
|
101 | + $caller = explode('\\', $caller['class']); |
|
102 | + } else { |
|
103 | + $caller = ''; |
|
104 | + } |
|
104 | 105 | |
105 | 106 | //check if this function is called by email sender |
106 | - if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) |
|
107 | - return $this->email; |
|
107 | + if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) { |
|
108 | + return $this->email; |
|
109 | + } |
|
108 | 110 | //return unique identify for token repository |
109 | 111 | return $this->email . $this->company->id; |
110 | 112 | } |
@@ -45,8 +45,9 @@ |
||
45 | 45 | |
46 | 46 | public function getPlannerNameAttribute() |
47 | 47 | { |
48 | - if (is_object($this->planner) && $this->planner->exists) |
|
49 | - return $this->planner->name; |
|
48 | + if (is_object($this->planner) && $this->planner->exists) { |
|
49 | + return $this->planner->name; |
|
50 | + } |
|
50 | 51 | return null; |
51 | 52 | } |
52 | 53 |
@@ -50,8 +50,9 @@ discard block |
||
50 | 50 | // |
51 | 51 | $company = \Auth::user(); |
52 | 52 | $input = $request->all(); |
53 | - if (isset($input['password'])) |
|
54 | - $input['password'] = bcrypt($input['password']); |
|
53 | + if (isset($input['password'])) { |
|
54 | + $input['password'] = bcrypt($input['password']); |
|
55 | + } |
|
55 | 56 | $employee = $company->employees()->create($input); |
56 | 57 | return $employee; |
57 | 58 | } |
@@ -83,8 +84,9 @@ discard block |
||
83 | 84 | $employee = Employee::findOrFail($id); |
84 | 85 | $this->authorize($employee); |
85 | 86 | $input = $request->all(); |
86 | - if (isset($input['password'])) |
|
87 | - $input['password'] = bcrypt($input['password']); |
|
87 | + if (isset($input['password'])) { |
|
88 | + $input['password'] = bcrypt($input['password']); |
|
89 | + } |
|
88 | 90 | $employee->update($input); |
89 | 91 | return $employee; |
90 | 92 | } |