@@ -86,52 +86,52 @@ |
||
| 86 | 86 | |
| 87 | 87 | ]); |
| 88 | 88 | |
| 89 | - CRUD::addFilter([ // select2 filter |
|
| 89 | + CRUD::addFilter([// select2 filter |
|
| 90 | 90 | 'name' => 'rhythm_id', |
| 91 | 91 | 'type' => 'select2', |
| 92 | 92 | 'label'=> __('Rhythm'), |
| 93 | - ], function () { |
|
| 93 | + ], function() { |
|
| 94 | 94 | return Rhythm::all()->pluck('name', 'id')->toArray(); |
| 95 | - }, function ($value) { // if the filter is active |
|
| 95 | + }, function($value) { // if the filter is active |
|
| 96 | 96 | CRUD::addClause('where', 'rhythm_id', $value); |
| 97 | 97 | }, |
| 98 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 98 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 99 | 99 | }); |
| 100 | 100 | |
| 101 | - CRUD::addFilter([ // select2 filter |
|
| 101 | + CRUD::addFilter([// select2 filter |
|
| 102 | 102 | 'name' => 'teacher_id', |
| 103 | 103 | 'type' => 'select2', |
| 104 | 104 | 'label'=> __('Teacher'), |
| 105 | - ], function () { |
|
| 105 | + ], function() { |
|
| 106 | 106 | return Teacher::all()->pluck('name', 'id')->toArray(); |
| 107 | - }, function ($value) { // if the filter is active |
|
| 107 | + }, function($value) { // if the filter is active |
|
| 108 | 108 | CRUD::addClause('where', 'teacher_id', $value); |
| 109 | 109 | }, |
| 110 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 110 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 111 | 111 | }); |
| 112 | 112 | |
| 113 | - CRUD::addFilter([ // select2 filter |
|
| 113 | + CRUD::addFilter([// select2 filter |
|
| 114 | 114 | 'name' => 'level_id', |
| 115 | 115 | 'type' => 'select2', |
| 116 | 116 | 'label'=> __('Level'), |
| 117 | - ], function () { |
|
| 117 | + ], function() { |
|
| 118 | 118 | return Level::all()->pluck('name', 'id')->toArray(); |
| 119 | - }, function ($value) { // if the filter is active |
|
| 119 | + }, function($value) { // if the filter is active |
|
| 120 | 120 | CRUD::addClause('where', 'level_id', $value); |
| 121 | 121 | }, |
| 122 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 122 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 123 | 123 | }); |
| 124 | 124 | |
| 125 | - CRUD::addFilter([ // select2 filter |
|
| 125 | + CRUD::addFilter([// select2 filter |
|
| 126 | 126 | 'name' => 'period_id', |
| 127 | 127 | 'type' => 'select2', |
| 128 | 128 | 'label'=> __('Period'), |
| 129 | - ], function () { |
|
| 129 | + ], function() { |
|
| 130 | 130 | return Period::all()->sortByDesc('id')->pluck('name', 'id')->toArray(); |
| 131 | - }, function ($value) { // if the filter is active |
|
| 131 | + }, function($value) { // if the filter is active |
|
| 132 | 132 | CRUD::addClause('where', 'period_id', $value); |
| 133 | 133 | }, |
| 134 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 134 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 135 | 135 | $period = Period::get_default_period()->id; |
| 136 | 136 | CRUD::addClause('where', 'period_id', $period); |
| 137 | 137 | $this->crud->getRequest()->request->add(['period_id' => $period]); // to make the filter look active |
@@ -181,8 +181,8 @@ discard block |
||
| 181 | 181 | }, function ($value) { // if the filter is active |
| 182 | 182 | CRUD::addClause('where', 'rhythm_id', $value); |
| 183 | 183 | }, |
| 184 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 185 | - }); |
|
| 184 | + function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 185 | + }); |
|
| 186 | 186 | |
| 187 | 187 | CRUD::addFilter([ // select2 filter |
| 188 | 188 | 'name' => 'teacher_id', |
@@ -193,8 +193,8 @@ discard block |
||
| 193 | 193 | }, function ($value) { // if the filter is active |
| 194 | 194 | CRUD::addClause('where', 'teacher_id', $value); |
| 195 | 195 | }, |
| 196 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 197 | - }); |
|
| 196 | + function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 197 | + }); |
|
| 198 | 198 | |
| 199 | 199 | CRUD::addFilter([ // select2 filter |
| 200 | 200 | 'name' => 'level_id', |
@@ -205,8 +205,8 @@ discard block |
||
| 205 | 205 | }, function ($value) { // if the filter is active |
| 206 | 206 | CRUD::addClause('where', 'level_id', $value); |
| 207 | 207 | }, |
| 208 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 209 | - }); |
|
| 208 | + function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 209 | + }); |
|
| 210 | 210 | |
| 211 | 211 | CRUD::addFilter([ // select2 filter |
| 212 | 212 | 'name' => 'period_id', |
@@ -217,11 +217,11 @@ discard block |
||
| 217 | 217 | }, function ($value) { // if the filter is active |
| 218 | 218 | CRUD::addClause('where', 'period_id', $value); |
| 219 | 219 | }, |
| 220 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 221 | - $period = Period::get_default_period()->id; |
|
| 222 | - CRUD::addClause('where', 'period_id', $period); |
|
| 223 | - $this->crud->getRequest()->request->add(['period_id' => $period]); // to make the filter look active |
|
| 224 | - }); |
|
| 220 | + function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 221 | + $period = Period::get_default_period()->id; |
|
| 222 | + CRUD::addClause('where', 'period_id', $period); |
|
| 223 | + $this->crud->getRequest()->request->add(['period_id' => $period]); // to make the filter look active |
|
| 224 | + }); |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | protected function setupCreateOperation() |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | public function teacher(Request $request) |
| 50 | 50 | { |
| 51 | - if (! backpack_user()->isTeacher()) { |
|
| 51 | + if (!backpack_user()->isTeacher()) { |
|
| 52 | 52 | abort(403); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | public function student() |
| 69 | 69 | { |
| 70 | - if (! backpack_user()->isStudent()) { |
|
| 70 | + if (!backpack_user()->isStudent()) { |
|
| 71 | 71 | abort(403); |
| 72 | 72 | } |
| 73 | 73 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | $currentPeriod = Period::get_default_period(); |
| 86 | 86 | $enrollmentsPeriod = Period::get_enrollments_period(); |
| 87 | 87 | |
| 88 | - if (! backpack_user()->hasRole(['admin', 'secretary'])) { |
|
| 88 | + if (!backpack_user()->hasRole(['admin', 'secretary'])) { |
|
| 89 | 89 | abort(403); |
| 90 | 90 | } |
| 91 | 91 | |
@@ -96,14 +96,14 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | $teachers = Teacher::with('user')->get()->toArray(); |
| 98 | 98 | |
| 99 | - $teachers = array_map(function ($teacher) { |
|
| 99 | + $teachers = array_map(function($teacher) { |
|
| 100 | 100 | return [ |
| 101 | 101 | 'id' => $teacher['id'], |
| 102 | 102 | 'title' => $teacher['user']['firstname'], |
| 103 | 103 | ]; |
| 104 | 104 | }, $teachers); |
| 105 | 105 | |
| 106 | - $events = array_map(function ($event) { |
|
| 106 | + $events = array_map(function($event) { |
|
| 107 | 107 | return [ |
| 108 | 108 | 'title' => $event['name'], |
| 109 | 109 | 'resourceId' => $event['teacher_id'], |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | 'currentPeriod' => $currentPeriod, |
| 122 | 122 | 'enrollmentsPeriod' => $enrollmentsPeriod, |
| 123 | 123 | 'total_enrollment_count' => $currentPeriod->internal_enrollments_count, |
| 124 | - 'pending_attendance' => $currentPeriod->courses_with_pending_attendance, // optimize |
|
| 124 | + 'pending_attendance' => $currentPeriod->courses_with_pending_attendance, // optimize |
|
| 125 | 125 | 'unassigned_events' => (new Event())->unassigned_teacher->count(), |
| 126 | 126 | 'upcoming_leaves' => Leave::upcoming_leaves(), |
| 127 | 127 | 'resources' => $teachers, |
@@ -29,12 +29,12 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | protected function schedule(Schedule $schedule) |
| 31 | 31 | { |
| 32 | - $schedule->call(function () { |
|
| 32 | + $schedule->call(function() { |
|
| 33 | 33 | Log::info('Sending attendance reminders'); |
| 34 | 34 | (new Attendance())->remindPendingAttendance(); |
| 35 | 35 | })->dailyAt('08:15'); |
| 36 | 36 | |
| 37 | - $schedule->call(function () { |
|
| 37 | + $schedule->call(function() { |
|
| 38 | 38 | Log::info('Checking default periods'); |
| 39 | 39 | |
| 40 | 40 | // when we finish the current period; remove the manual override to automatically fallbackto the next one |
@@ -18,7 +18,7 @@ |
||
| 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->leaves->contains('date', Carbon::parse($event->start)->toDateString())) { |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | parent::boot(); |
| 28 | 28 | |
| 29 | 29 | // when creating a new enrollment, also add past attendance |
| 30 | - static::created(function (self $enrollment) { |
|
| 30 | + static::created(function(self $enrollment) { |
|
| 31 | 31 | $events = $enrollment->course->events->where('start', '<', (new Carbon())->toDateString()); |
| 32 | 32 | foreach ($events as $event) { |
| 33 | 33 | $event->attendance()->create([ |
@@ -58,11 +58,11 @@ discard block |
||
| 58 | 58 | public function scopeWithoutChildren($query) |
| 59 | 59 | { |
| 60 | 60 | return $query |
| 61 | - ->where(function ($query) { |
|
| 61 | + ->where(function($query) { |
|
| 62 | 62 | $query->whereDoesntHave('childrenEnrollments') |
| 63 | 63 | ->where('parent_id', null); |
| 64 | 64 | }) |
| 65 | - ->orWhere(function ($query) { |
|
| 65 | + ->orWhere(function($query) { |
|
| 66 | 66 | $query->where('parent_id', null); |
| 67 | 67 | }) |
| 68 | 68 | ->get(); |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | public function scopePeriod(Builder $query, $period) |
| 86 | 86 | { |
| 87 | - return $query->whereHas('course', function ($q) use ($period) { |
|
| 87 | + return $query->whereHas('course', function($q) use ($period) { |
|
| 88 | 88 | $q->where('period_id', $period); |
| 89 | 89 | }); |
| 90 | 90 | } |
@@ -293,13 +293,13 @@ discard block |
||
| 293 | 293 | |
| 294 | 294 | // delete attendance records related to the enrollment |
| 295 | 295 | $attendances = $this->course->attendance->where('student_id', $this->student->id); |
| 296 | - Attendance::destroy($attendances->map(function ($item, $key) { |
|
| 296 | + Attendance::destroy($attendances->map(function($item, $key) { |
|
| 297 | 297 | return $item->id; |
| 298 | 298 | })); |
| 299 | 299 | |
| 300 | 300 | foreach ($this->course->children as $child) { |
| 301 | 301 | $attendances = $child->attendance->where('student_id', $this->student->id); |
| 302 | - Attendance::destroy($attendances->map(function ($item, $key) { |
|
| 302 | + Attendance::destroy($attendances->map(function($item, $key) { |
|
| 303 | 303 | return $item->id; |
| 304 | 304 | })); |
| 305 | 305 | } |
@@ -10,8 +10,8 @@ |
||
| 10 | 10 | public function __invoke(Builder $query, $value, string $property) |
| 11 | 11 | { |
| 12 | 12 | $value = collect($value)->toArray(); |
| 13 | - $query->where(function (Builder $query) use ($value) { |
|
| 14 | - $query->whereIn('level_id', $value)->orWhereHas('children', function (Builder $query) use ($value) { |
|
| 13 | + $query->where(function(Builder $query) use ($value) { |
|
| 14 | + $query->whereIn('level_id', $value)->orWhereHas('children', function(Builder $query) use ($value) { |
|
| 15 | 15 | $query->whereIn('level_id', $value); |
| 16 | 16 | }); |
| 17 | 17 | }); |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | |
| 70 | 70 | $student_skills = $enrollment->skill_evaluations; |
| 71 | 71 | |
| 72 | - $skills = $course->skills->map(function ($skill, $key) use ($student_skills) { |
|
| 72 | + $skills = $course->skills->map(function($skill, $key) use ($student_skills) { |
|
| 73 | 73 | $skill['status'] = $student_skills->where('skill_id', $skill->id)->first()->skill_scale_id ?? null; |
| 74 | 74 | |
| 75 | 75 | return $skill; |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | private function setLocale(string $locale) |
| 18 | 18 | { |
| 19 | 19 | // Check if is allowed and set default locale if not |
| 20 | - if (! language()->allowed($locale)) { |
|
| 20 | + if (!language()->allowed($locale)) { |
|
| 21 | 21 | $locale = config('app.locale'); |
| 22 | 22 | } |
| 23 | 23 | |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | |
| 53 | 53 | $gradeType = GradeType::findOrFail($request->input('grade_type_id')); |
| 54 | 54 | |
| 55 | - if (! $course->grade_types->contains($gradeType->id)) { |
|
| 55 | + if (!$course->grade_types->contains($gradeType->id)) { |
|
| 56 | 56 | $course->grade_types()->attach($gradeType->id); |
| 57 | 57 | } |
| 58 | 58 | |