Completed
Push — master ( 113f7a...a92f31 )
by claudio
08:47
created
app/Listeners/Optimise/OkListener.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     public function handle(OkEvent $event)
26 26
     {
27 27
         //
28
-        \Log::info('Meeting correctly optimised (company id = ' . $event->getCompany()->id . ')');
28
+        \Log::info('Meeting correctly optimised (company id = '.$event->getCompany()->id.')');
29 29
         $company = $event->getCompany()->fresh();
30 30
         //send email to company
31 31
         self::sendCompanyEmail($company->email);
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
      */
41 41
     static private function sendCompanyEmail($email)
42 42
     {
43
-        \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) {
43
+        \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) {
44 44
             $message->from(config('mail.from.address'), config('mail.from.name'));
45 45
             $message->to($email)->subject('Meetings optimised');
46 46
         });
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      */
53 53
     static private function sendEmployeeEmail($email, $meetings)
54 54
     {
55
-        \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) {
55
+        \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) {
56 56
             $message->from(config('mail.from.address'), config('mail.from.name'));
57 57
             $message->to($email)->subject('Meetings of next week');
58 58
         });
Please login to merge, or discard this patch.
app/Planner.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
      */
57 57
     public function verifyEmployee(Employee $employee)
58 58
     {
59
-        $group = $this->groupsManaged()->whereHas('employees', function ($query) use ($employee) {
59
+        $group = $this->groupsManaged()->whereHas('employees', function($query) use ($employee) {
60 60
             $query->where('employees.id', $employee->id);
61 61
         })->first();
62 62
 
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/MeetingsController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
13 13
 {
14 14
     public function __construct()
15 15
     {
16
-        config(['auth.model' => \plunner\Planner::class]);
17
-        config(['jwt.user' => \plunner\Planner::class]);
16
+        config([ 'auth.model' => \plunner\Planner::class ]);
17
+        config([ 'jwt.user' => \plunner\Planner::class ]);
18 18
         $this->middleware('jwt.authandrefresh:mode-en');
19 19
     }
20 20
 
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
         $this->authorize($group);
33 33
         $meetings = $group->meetings();
34 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
35
+            $meetings->where(function($query) { //parenthesis for conditions ...(C1 OR C2)...
36
+                $query->where('start_time', '=', NULL); //to be planned
37 37
                 //datetime to consider timezone, don't use mysql NOW()
38
-                $query->orWhere('start_time', '>=', new \DateTime());//planned
38
+                $query->orWhere('start_time', '>=', new \DateTime()); //planned
39 39
             });
40 40
 
41 41
         return $meetings->get();
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/GroupsController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function __construct()
14 14
     {
15
-        config(['auth.model' => Planner::class]);
16
-        config(['jwt.user' => Planner::class]);
15
+        config([ 'auth.model' => Planner::class ]);
16
+        config([ 'jwt.user' => Planner::class ]);
17 17
         $this->middleware('jwt.authandrefresh:mode-en');
18 18
     }
19 19
 
@@ -32,16 +32,16 @@  discard block
 block discarded – undo
32 32
         $planner = \Auth::user();
33 33
         $groups = $planner->groupsManaged();
34 34
         if ($request->query('current'))
35
-            $groups->with(['meetings' => function ($query) {
36
-                $query->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
37
-                    $query->where('start_time', '=', NULL);//to be planned
35
+            $groups->with([ 'meetings' => function($query) {
36
+                $query->where(function($query) { //parenthesis for conditions ...(C1 OR C2)...
37
+                    $query->where('start_time', '=', NULL); //to be planned
38 38
                     //datetime to consider timezone, don't use mysql NOW()
39
-                    $query->orWhere('start_time', '>=', new \DateTime());//planned
39
+                    $query->orWhere('start_time', '>=', new \DateTime()); //planned
40 40
                 });
41
-            }]);
41
+            } ]);
42 42
         else
43 43
             $groups->with('meetings');
44
-        return $groups->get();//both planed and to be planned
44
+        return $groups->get(); //both planed and to be planned
45 45
     }
46 46
 
47 47
     /**
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Meetings/MeetingsController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 {
12 12
     public function __construct()
13 13
     {
14
-        config(['auth.model' => \plunner\Employee::class]);
15
-        config(['jwt.user' => \plunner\Employee::class]);
14
+        config([ 'auth.model' => \plunner\Employee::class ]);
15
+        config([ 'jwt.user' => \plunner\Employee::class ]);
16 16
         $this->middleware('jwt.authandrefresh:mode-en');
17 17
     }
18 18
 
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
         $employee = \Auth::user();
28 28
         $meetings = $employee->meetings();
29 29
         if ($request->query('current'))
30
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
31
-                $query->where('start_time', '=', NULL);//to be planned
30
+            $meetings->where(function($query) { //parenthesis for conditions ...(C1 OR C2)...
31
+                $query->where('start_time', '=', NULL); //to be planned
32 32
                 //datetime to consider timezone, don't use mysql NOW()
33
-                $query->orWhere('start_time', '>=', new \DateTime());//planned
33
+                $query->orWhere('start_time', '>=', new \DateTime()); //planned
34 34
             });
35 35
         return $meetings->get();
36 36
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Employees/Planners/MeetingTimeslotsController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 {
17 17
     public function __construct()
18 18
     {
19
-        config(['auth.model' => \plunner\Planner::class]);
20
-        config(['jwt.user' => \plunner\Planner::class]);
19
+        config([ 'auth.model' => \plunner\Planner::class ]);
20
+        config([ 'jwt.user' => \plunner\Planner::class ]);
21 21
         $this->middleware('jwt.authandrefresh:mode-en');
22 22
     }
23 23
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
         if ($meeting->group_id == $groupId)
37 37
             return $meeting->timeslots;
38
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
38
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
39 39
     }
40 40
 
41 41
     /**
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
         if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId)
59 59
             return $timeslot;
60
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
60
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
61 61
     }
62 62
 
63 63
     /**
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
         $meeting = Meeting::findOrFail($meetingId);
74 74
         $this->authorize($meeting);
75 75
         if ($meeting->start_time != NULL)
76
-            return Response::json(['error' => 'the meeting is already planned'], 422);
76
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
77 77
 
78 78
         $input = $request->all();
79 79
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             $timeslot = $meeting->timeslots()->create($input);
82 82
             return $timeslot;
83 83
         }
84
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
84
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
85 85
     }
86 86
 
87 87
     /**
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
         $meeting = Meeting::findOrFail($meetingId);
98 98
         $this->authorize($meeting);
99 99
         if ($meeting->start_time != NULL)
100
-            return Response::json(['error' => 'the meeting is already planned'], 422);
100
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
101 101
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
102 102
         $this->authorize($timeslot);
103 103
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
             $timeslot->update($input);
108 108
             return $timeslot;
109 109
         }
110
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
110
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
111 111
     }
112 112
 
113 113
     /**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
         $meeting = Meeting::findOrFail($meetingId);
126 126
         $this->authorize($meeting);
127 127
         if ($meeting->start_time != NULL)
128
-            return Response::json(['error' => 'the meeting is already planned'], 422);
128
+            return Response::json([ 'error' => 'the meeting is already planned' ], 422);
129 129
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
130 130
         $this->authorize($timeslot);
131 131
 
@@ -133,6 +133,6 @@  discard block
 block discarded – undo
133 133
             $timeslot->delete();
134 134
             return $timeslot;
135 135
         }
136
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
136
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
137 137
     }
138 138
 }
Please login to merge, or discard this patch.