Completed
Push — master ( a15587...8b7bfc )
by claudio
06:18
created
app/Http/Controllers/Employees/Planners/MeetingsController.php 1 patch
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,9 +31,11 @@
 block discarded – undo
31 31
         $group = Group::findOrFail($groupId);
32 32
         $this->authorize($group);
33 33
         $meetings = $group->meetings();
34
-        if ($request->query('current'))
35
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
36
-                $query->where('start_time', '=', NULL);//to be planned
34
+        if ($request->query('current')) {
35
+                    $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
36
+                $query->where('start_time', '=', NULL);
37
+        }
38
+        //to be planned
37 39
                 //datetime to consider timezone, don't use mysql NOW()
38 40
                 $query->orWhere('start_time', '>=', new \DateTime());//planned
39 41
             });
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/GroupsController.php 1 patch
Braces   +8 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,16 +31,19 @@
 block discarded – undo
31 31
          */
32 32
         $planner = \Auth::user();
33 33
         $groups = $planner->groupsManaged();
34
-        if ($request->query('current'))
35
-            $groups->with(['meetings' => function ($query) {
34
+        if ($request->query('current')) {
35
+                    $groups->with(['meetings' => function ($query) {
36 36
                 $query->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
37
-                    $query->where('start_time', '=', NULL);//to be planned
37
+                    $query->where('start_time', '=', NULL);
38
+        }
39
+        //to be planned
38 40
                     //datetime to consider timezone, don't use mysql NOW()
39 41
                     $query->orWhere('start_time', '>=', new \DateTime());//planned
40 42
                 });
41 43
             }]);
42
-        else
43
-            $groups->with('meetings');
44
+        else {
45
+                    $groups->with('meetings');
46
+        }
44 47
         return $groups->get();//both planed and to be planned
45 48
     }
46 49
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Meetings/MeetingsController.php 1 patch
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,9 +31,11 @@
 block discarded – undo
31 31
         $group = Group::findOrFail($groupId);
32 32
         $this->authorize($group);
33 33
         $meetings = $group->meetings();
34
-        if ($request->query('current'))
35
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
36
-                $query->where('start_time', '=', NULL);//to be planned
34
+        if ($request->query('current')) {
35
+                    $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
36
+                $query->where('start_time', '=', NULL);
37
+        }
38
+        //to be planned
37 39
                 //datetime to consider timezone, don't use mysql NOW()
38 40
                 $query->orWhere('start_time', '>=', new \DateTime());//planned
39 41
             });
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Calendars/TimeslotsController.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,8 +36,9 @@
 block discarded – undo
36 36
         $calendar = Calendar::findOrFail($calendarId);
37 37
         $this->authorize($calendar);
38 38
         $timeslots = $calendar->timeslots();
39
-        if ($request->query('current'))
40
-            $timeslots->where('time_start', '>=', new \DateTime());
39
+        if ($request->query('current')) {
40
+                    $timeslots->where('time_start', '>=', new \DateTime());
41
+        }
41 42
         return $timeslots->get();
42 43
     }
43 44
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/MeetingTimeslotsController.php 1 patch
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,8 +33,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Employee/EmployeeController.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,8 +37,9 @@
 block discarded – undo
37 37
     {
38 38
         $employee = \Auth::user();
39 39
         $input = $request->only(['name', 'password']);
40
-        if (isset($input['password']))
41
-            $input['password'] = bcrypt($input['password']);
40
+        if (isset($input['password'])) {
41
+                    $input['password'] = bcrypt($input['password']);
42
+        }
42 43
         $employee->update($input);
43 44
         return $employee;
44 45
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Companies/Company/CompanyController.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,8 +37,9 @@
 block discarded – undo
37 37
     {
38 38
         $employee = \Auth::user();
39 39
         $input = $request->only(['name', 'password']);
40
-        if (isset($input['password']))
41
-            $input['password'] = bcrypt($input['password']);
40
+        if (isset($input['password'])) {
41
+                    $input['password'] = bcrypt($input['password']);
42
+        }
42 43
         $employee->update($input);
43 44
         return $employee;
44 45
     }
Please login to merge, or discard this patch.
app/Console/Commands/SyncCaldav/Sync.php 1 patch
Braces   +21 added lines, -16 removed lines patch added patch discarded remove patch
@@ -90,10 +90,11 @@  discard block
 block discarded – undo
90 90
 
91 91
         //insert new timeslots
92 92
         foreach ($events as $event) {
93
-            if (!($event = $this->parseEvent($event)))
94
-                \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
95
-            else
96
-                $calendarMain->timeslots()->create($event);
93
+            if (!($event = $this->parseEvent($event))) {
94
+                            \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
95
+            } else {
96
+                            $calendarMain->timeslots()->create($event);
97
+            }
97 98
         }
98 99
         \Event::fire(new OkEvent($this->calendar));
99 100
     }
@@ -110,8 +111,9 @@  discard block
 block discarded – undo
110 111
         $caldavClient = new SimpleCaldavAdapter();
111 112
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
112 113
         $calendars = $caldavClient->findCalendars();
113
-        if(!isset($calendars[$this->calendar->calendar_name]))
114
-            throw new CaldavException("calendar inserted doesn't exist");
114
+        if(!isset($calendars[$this->calendar->calendar_name])) {
115
+                    throw new CaldavException("calendar inserted doesn't exist");
116
+        }
115 117
         $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);//TODO error if the calendar name is wrong
116 118
         /**
117 119
          * 26 hours before to avoid tiemezone problems and dst problems
@@ -128,17 +130,20 @@  discard block
 block discarded – undo
128 130
     {
129 131
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
130 132
         if (preg_match_all($pattern, $event->getData(), $matches)) {
131
-            if (!isset($matches[4]) || count($matches[4]) != 2)
132
-                return null;
133
+            if (!isset($matches[4]) || count($matches[4]) != 2) {
134
+                            return null;
135
+            }
133 136
             $ret = [];
134
-            if ($tmp = $this->parseDate($matches[4][0]))
135
-                $ret['time_start'] = $tmp;
136
-            else
137
-                return null;
138
-            if ($tmp = $this->parseDate($matches[4][1]))
139
-                $ret['time_end'] = $tmp;
140
-            else
141
-                return null;
137
+            if ($tmp = $this->parseDate($matches[4][0])) {
138
+                            $ret['time_start'] = $tmp;
139
+            } else {
140
+                            return null;
141
+            }
142
+            if ($tmp = $this->parseDate($matches[4][1])) {
143
+                            $ret['time_end'] = $tmp;
144
+            } else {
145
+                            return null;
146
+            }
142 147
             return $ret;
143 148
         }
144 149
         return null;
Please login to merge, or discard this patch.
app/Console/Commands/Optimise/OptimiseCommand.php 1 patch
Braces   +15 added lines, -11 removed lines patch added patch discarded remove patch
@@ -58,10 +58,11 @@  discard block
 block discarded – undo
58 58
         //TODO insert a timeout
59 59
         //TODO try...catch with destruct
60 60
         $companyId = $this->argument('companyId');
61
-        if (is_numeric($companyId))
62
-            $this->makeForeground(Company::findOrFail($companyId));
63
-        else
64
-            $this->syncAll();
61
+        if (is_numeric($companyId)) {
62
+                    $this->makeForeground(Company::findOrFail($companyId));
63
+        } else {
64
+                    $this->syncAll();
65
+        }
65 66
     }
66 67
 
67 68
     /**
@@ -74,7 +75,7 @@  discard block
 block discarded – undo
74 75
         try {
75 76
             (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
76 77
             $this->info('Optimisation ' . $company->id . ' completed');
77
-        }catch(OptimiseException $e) {
78
+        } catch(OptimiseException $e) {
78 79
             if ($e->isEmpty()) {
79 80
                 $mex = 'Company ' . $company->id . ' doesn\'t have sufficient data';
80 81
                 $this->warn($mex);
@@ -94,13 +95,15 @@  discard block
 block discarded – undo
94 95
         if ($this->option('background')) {
95 96
             \Log::debug(self::BACKGROUND_MOD_MEX);
96 97
             $this->info(self::BACKGROUND_MOD_MEX);
97
-            foreach ($companies as $company)
98
-                $this->makeBackground($company);
98
+            foreach ($companies as $company) {
99
+                            $this->makeBackground($company);
100
+            }
99 101
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
100 102
             $this->info(self::BACKGROUND_COMPLETED_MEX);
101
-        } else
102
-            foreach ($companies as $company)
103
+        } else {
104
+                    foreach ($companies as $company)
103 105
                 $this->makeForeground($company);
106
+        }
104 107
     }
105 108
 
106 109
     /**
@@ -110,7 +113,8 @@  discard block
 block discarded – undo
110 113
     private function makeBackground(Company $company)
111 114
     {
112 115
         $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
113
-        if ($event->isDue($this->laravel))
114
-            $event->run($this->laravel);
116
+        if ($event->isDue($this->laravel)) {
117
+                    $event->run($this->laravel);
118
+        }
115 119
     }
116 120
 }
Please login to merge, or discard this patch.