Passed
Push — master ( 9bf1ea...1a4135 )
by Thomas
08:04
created
app/Http/Controllers/Admin/TeacherCrudController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     {
63 63
         CRUD::setValidation(StoreRequest::class);
64 64
         CRUD::addFields([
65
-            [  // Select2
65
+            [// Select2
66 66
                 'label' => 'User',
67 67
                 'type' => 'select2',
68 68
                 'name' => 'id', // the db column for the foreign key
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     protected function setupUpdateOperation()
88 88
     {
89 89
         CRUD::addFields([
90
-            [  // Select2
90
+            [// Select2
91 91
                 'label' => 'User',
92 92
                 'type' => 'select2',
93 93
                 'name' => 'id', // the db column for the foreign key
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/StudentCrudController.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -82,12 +82,12 @@  discard block
 block discarded – undo
82 82
                 'attribute' => 'lastname', // foreign key attribute that is shown to user
83 83
                 'model'     => 'App\Models\User', // foreign key model
84 84
                 'orderable' => true,
85
-                'orderLogic' => function ($query, $column, $columnDirection) {
85
+                'orderLogic' => function($query, $column, $columnDirection) {
86 86
                     return $query->leftJoin('users', 'users.id', '=', 'students.id')
87 87
                         ->orderBy('users.lastname', $columnDirection)->select('students.*');
88 88
                 },
89
-                'searchLogic' => function ($query, $column, $searchTerm) {
90
-                    $query->orWhereHas('user', function ($q) use ($searchTerm) {
89
+                'searchLogic' => function($query, $column, $searchTerm) {
90
+                    $query->orWhereHas('user', function($q) use ($searchTerm) {
91 91
                         $q->where('lastname', 'like', '%'.$searchTerm.'%');
92 92
                     });
93 93
                 },
@@ -102,12 +102,12 @@  discard block
 block discarded – undo
102 102
                 'attribute' => 'firstname', // foreign key attribute that is shown to user
103 103
                 'model'     => 'App\Models\User', // foreign key model
104 104
                 'orderable' => true,
105
-                'orderLogic' => function ($query, $column, $columnDirection) {
105
+                'orderLogic' => function($query, $column, $columnDirection) {
106 106
                     return $query->leftJoin('users', 'users.id', '=', 'students.id')
107 107
                         ->orderBy('users.firstname', $columnDirection)->select('students.*');
108 108
                 },
109
-                'searchLogic' => function ($query, $column, $searchTerm) {
110
-                    $query->orWhereHas('user', function ($q) use ($searchTerm) {
109
+                'searchLogic' => function($query, $column, $searchTerm) {
110
+                    $query->orWhereHas('user', function($q) use ($searchTerm) {
111 111
                         $q->where('firstname', 'like', '%'.$searchTerm.'%');
112 112
                     });
113 113
                 },
@@ -122,12 +122,12 @@  discard block
 block discarded – undo
122 122
                 'attribute' => 'email', // foreign key attribute that is shown to user
123 123
                 'model'     => 'App\Models\User', // foreign key model
124 124
                 'orderable' => true,
125
-                'orderLogic' => function ($query, $column, $columnDirection) {
125
+                'orderLogic' => function($query, $column, $columnDirection) {
126 126
                     return $query->leftJoin('users', 'users.id', '=', 'students.id')
127 127
                         ->orderBy('users.email', $columnDirection)->select('students.*');
128 128
                 },
129
-                'searchLogic' => function ($query, $column, $searchTerm) {
130
-                    $query->orWhereHas('user', function ($q) use ($searchTerm) {
129
+                'searchLogic' => function($query, $column, $searchTerm) {
130
+                    $query->orWhereHas('user', function($q) use ($searchTerm) {
131 131
                         $q->where('email', 'like', '%'.$searchTerm.'%');
132 132
                     });
133 133
                 },
@@ -145,32 +145,32 @@  discard block
 block discarded – undo
145 145
 
146 146
         ]);
147 147
 
148
-        CRUD::addFilter([ // select2 filter
148
+        CRUD::addFilter([// select2 filter
149 149
             'name' => 'enrolled',
150 150
             'type' => 'select2',
151 151
             'label'=> __('Is Enrolled in'),
152
-        ], function () {
152
+        ], function() {
153 153
             return Period::all()->pluck('name', 'id')->toArray();
154
-        }, function ($value) { // if the filter is active
155
-            $this->crud->query = $this->crud->query->whereHas('enrollments', function ($query) use ($value) {
156
-                return $query->whereHas('course', function ($q) use ($value) {
154
+        }, function($value) { // if the filter is active
155
+            $this->crud->query = $this->crud->query->whereHas('enrollments', function($query) use ($value) {
156
+                return $query->whereHas('course', function($q) use ($value) {
157 157
                     $q->where('period_id', $value);
158 158
                 });
159 159
             });
160 160
         },
161
-          function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit)
161
+          function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit)
162 162
           });
163 163
 
164
-        CRUD::addFilter([ // select2_multiple filter
164
+        CRUD::addFilter([// select2_multiple filter
165 165
             'name' => 'notenrolled',
166 166
             'type' => 'select2_multiple',
167 167
             'label'=> __('Is Not Enrolled in'),
168
-        ], function () { // the options that show up in the select2
168
+        ], function() { // the options that show up in the select2
169 169
             return Period::all()->pluck('name', 'id')->toArray();
170
-        }, function ($values) { // if the filter is active
170
+        }, function($values) { // if the filter is active
171 171
             foreach (json_decode($values) as $key => $value) {
172
-                $this->crud->query = $this->crud->query->whereDoesntHave('enrollments', function ($query) use ($value) {
173
-                    return $query->whereHas('course', function ($q) use ($value) {
172
+                $this->crud->query = $this->crud->query->whereDoesntHave('enrollments', function($query) use ($value) {
173
+                    return $query->whereHas('course', function($q) use ($value) {
174 174
                         $q->where('period_id', $value);
175 175
                     });
176 176
                 });
@@ -182,9 +182,9 @@  discard block
 block discarded – undo
182 182
             'name'  => 'institution_id',
183 183
             'type'  => 'select2',
184 184
             'label' => __('Institution'),
185
-        ], function () {
185
+        ], function() {
186 186
             return Institution::all()->pluck('name', 'id')->toArray();
187
-        }, function ($value) { // if the filter is active
187
+        }, function($value) { // if the filter is active
188 188
             $this->crud->addClause('where', 'institution_id', $value);
189 189
         });
190 190
 
@@ -192,9 +192,9 @@  discard block
 block discarded – undo
192 192
             'name'  => 'status_type_id',
193 193
             'type'  => 'select2',
194 194
             'label' => __('Lead Status'),
195
-        ], function () {
195
+        ], function() {
196 196
             return LeadType::all()->pluck('name', 'id')->toArray();
197
-        }, function ($value) {
197
+        }, function($value) {
198 198
             $this->crud->addClause('computedLeadType', $value);
199 199
         });
200 200
     }
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
     {
204 204
         $student = Student::findOrFail($student);
205 205
 
206
-        if (! backpack_user()->isTeacher() && ! backpack_user()->can('enrollments.view')) {
206
+        if (!backpack_user()->isTeacher() && !backpack_user()->can('enrollments.view')) {
207 207
             abort(403);
208 208
         }
209 209
 
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/MyAccountController.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -228,8 +228,8 @@
 block discarded – undo
228 228
             $user = Student::where('id', $this->guard()->user()->id)->first();
229 229
 
230 230
             $user
231
-               ->addMedia($request->fileToUpload)
232
-               ->toMediaCollection('profile-picture');
231
+                ->addMedia($request->fileToUpload)
232
+                ->toMediaCollection('profile-picture');
233 233
         }
234 234
 
235 235
         // if the user has been selected for a forced update, move to the next step
Please login to merge, or discard this patch.
app/Models/Event.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
         parent::boot();
19 19
 
20 20
         // before adding an event, we check that the teacher is available
21
-        static::saving(function ($event) {
21
+        static::saving(function($event) {
22 22
             $teacher = Teacher::find($event->teacher_id);
23 23
             // if the teacher is on leave on the day of the event
24 24
             if ($event->teacher_id !== null && $teacher) {
Please login to merge, or discard this patch.
app/Models/Student.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         parent::boot();
32 32
 
33 33
         // when deleting a student, also delete any enrollments, grades and attendance related to this student
34
-        static::deleting(function (self $student) {
34
+        static::deleting(function(self $student) {
35 35
             Attendance::where('student_id', $student->id)->delete();
36 36
             Enrollment::where('student_id', $student->id)->delete();
37 37
         });
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
     {
42 42
         switch ($leadTypeId) {
43 43
             case 1: // active / enrolled students
44
-                return $query->whereHas('enrollments', function ($query) use ($leadTypeId) {
45
-                    return $query->whereHas('course', function ($q) use ($leadTypeId) {
44
+                return $query->whereHas('enrollments', function($query) use ($leadTypeId) {
45
+                    return $query->whereHas('course', function($q) use ($leadTypeId) {
46 46
                         $q->where('period_id', Period::get_default_period()->id);
47 47
                     });
48 48
                 });
@@ -56,18 +56,18 @@  discard block
 block discarded – undo
56 56
             case 4: // old students who have at least one enrollment
57 57
                 return $query
58 58
                     ->where('lead_type_id', $leadTypeId)
59
-                    ->orWhere(function ($query) use ($leadTypeId) {
59
+                    ->orWhere(function($query) use ($leadTypeId) {
60 60
                         $query
61 61
                             ->whereNull('lead_type_id')
62
-                            ->whereHas('enrollments', function ($query) use ($leadTypeId) {
62
+                            ->whereHas('enrollments', function($query) use ($leadTypeId) {
63 63
                                 return $query
64
-                                    ->whereHas('course', function ($q) use ($leadTypeId) {
64
+                                    ->whereHas('course', function($q) use ($leadTypeId) {
65 65
                                         $q->where('period_id', '!=', Period::get_default_period()->id);
66 66
                                     });
67 67
                             })
68
-                            ->whereDoesntHave('enrollments', function ($query) use ($leadTypeId) {
68
+                            ->whereDoesntHave('enrollments', function($query) use ($leadTypeId) {
69 69
                                 return $query
70
-                                    ->whereHas('course', function ($q) use ($leadTypeId) {
70
+                                    ->whereHas('course', function($q) use ($leadTypeId) {
71 71
                                         $q->where('period_id', Period::get_default_period()->id);
72 72
                                     });
73 73
                             });
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 
105 105
         return $this->hasMany(Attendance::class)
106 106
         ->where('attendance_type_id', 4) // absence
107
-        ->whereHas('event', function ($q) use ($period) {
108
-            return $q->whereHas('course', function ($c) use ($period) {
107
+        ->whereHas('event', function($q) use ($period) {
108
+            return $q->whereHas('course', function($c) use ($period) {
109 109
                 return $c->where('period_id', $period->id);
110 110
             });
111 111
         });
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
         }
119 119
 
120 120
         return $this->hasMany(Attendance::class)
121
-        ->whereHas('event', function ($q) use ($period) {
122
-            return $q->whereHas('course', function ($c) use ($period) {
121
+        ->whereHas('event', function($q) use ($period) {
122
+            return $q->whereHas('course', function($c) use ($period) {
123 123
                 return $c->where('period_id', $period->id);
124 124
             });
125 125
         });
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
     public function getIsEnrolledAttribute()
212 212
     {
213 213
         // if the student is currently enrolled
214
-        if ($this->enrollments()->whereHas('course', function ($q) {
214
+        if ($this->enrollments()->whereHas('course', function($q) {
215 215
             return $q->where('period_id', Period::get_default_period()->id);
216 216
         })->count() > 0) {
217 217
             return 1;
Please login to merge, or discard this patch.
app/Models/Attendance.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
         parent::boot();
24 24
 
25 25
         // when an attendance record is added, we check if this is an absence
26
-        static::saved(function (self $attendance) {
26
+        static::saved(function(self $attendance) {
27 27
             if ($attendance->attendance_type_id == 4) { // todo move to configurable settings
28 28
                 // Log::info('Absence marked for student '.$attendance->student->name);
29 29
                 // will check the record again and send a notification if it hasn't changed
Please login to merge, or discard this patch.