@@ -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 | } |
@@ -41,7 +41,7 @@ |
||
41 | 41 | |
42 | 42 | public function search() |
43 | 43 | { |
44 | - return QueryBuilder::for(Course::class)->where('campus_id', 1) |
|
44 | + return QueryBuilder::for (Course::class)->where('campus_id', 1) |
|
45 | 45 | ->with('room')->withCount('events')->withCount('children')->withCount('enrollments') |
46 | 46 | ->allowedFilters([ |
47 | 47 | 'name', |
@@ -52,7 +52,7 @@ |
||
52 | 52 | |
53 | 53 | $grade_type = GradeType::findOrFail($request->input('grade_type_id')); |
54 | 54 | |
55 | - if (! $course->grade_types->contains($grade_type->id)) { |
|
55 | + if (!$course->grade_types->contains($grade_type->id)) { |
|
56 | 56 | $course->grade_types()->attach($grade_type->id); |
57 | 57 | } |
58 | 58 |
@@ -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 | }); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * a user is allowed to edit the course grades if they are the teacher for this course, |
30 | 30 | * or if they have explicit permission to do so |
31 | 31 | */ |
32 | - Gate::define('edit-course-grades', function ($user, $course) { |
|
32 | + Gate::define('edit-course-grades', function($user, $course) { |
|
33 | 33 | return $user->isTeacher() && $user->teacher_id == $course->teacher_id || $user->can('evaluation.edit'); |
34 | 34 | }); |
35 | 35 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * a user is allowed to view the course attendance sheet if they are the teacher for this course, |
38 | 38 | * or if they have explicit permission to view all course attendance sheets |
39 | 39 | */ |
40 | - Gate::define('view-course-attendance', function ($user, $course) { |
|
40 | + Gate::define('view-course-attendance', function($user, $course) { |
|
41 | 41 | return $user->isTeacher() && $user->teacher_id == $course->teacher_id || $user->can('attendance.view'); |
42 | 42 | }); |
43 | 43 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | * if they are the teacher for this course, |
47 | 47 | * or if they have explicit permission to view all event attendance sheets |
48 | 48 | */ |
49 | - Gate::define('view-event-attendance', function ($user, $event) { |
|
49 | + Gate::define('view-event-attendance', function($user, $event) { |
|
50 | 50 | return ($event->teacher_id == $user->teacher_id) || ($event->course->teacher_id == $user->teacher_id) || $user->can('attendance.view'); |
51 | 51 | }); |
52 | 52 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * if they are the teacher for the course, |
56 | 56 | * or if they have explicit permission to edit any attendance sheets |
57 | 57 | */ |
58 | - Gate::define('edit-attendance', function ($user, $event) { |
|
58 | + Gate::define('edit-attendance', function($user, $event) { |
|
59 | 59 | return ($event->teacher_id == $user->teacher_id) || ($event->course->teacher_id == $user->teacher_id) || $user->can('attendance.edit'); |
60 | 60 | }); |
61 | 61 | |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * teachers are allowed to view their own calendar, |
64 | 64 | * and users with explicit permission can view all calendars |
65 | 65 | */ |
66 | - Gate::define('view-teacher-calendar', function ($user, $teacher) { |
|
66 | + Gate::define('view-teacher-calendar', function($user, $teacher) { |
|
67 | 67 | return ($user->isTeacher() && $user->teacher_id == $teacher->id) || $user->can('calendars.view'); |
68 | 68 | }); |
69 | 69 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * teachers are allowed to view their own courses, |
72 | 72 | * and users with explicit permission can view all courses |
73 | 73 | */ |
74 | - Gate::define('view-course', function ($user, $course) { |
|
74 | + Gate::define('view-course', function($user, $course) { |
|
75 | 75 | return ($user->isTeacher() && $user->teacher_id == $course->teacher_id) || $user->can('courses.view'); |
76 | 76 | }); |
77 | 77 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * if they are a teacher |
81 | 81 | * of if they have explicit permission to view any result |
82 | 82 | */ |
83 | - Gate::define('view-enrollment', function ($user, $enrollment) { |
|
83 | + Gate::define('view-enrollment', function($user, $enrollment) { |
|
84 | 84 | return ($user->isStudent() && $user->student_id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view'); |
85 | 85 | }); |
86 | 86 | |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | * if the user is the teacher of the course |
89 | 89 | * of if they have explicit permission to enroll students |
90 | 90 | */ |
91 | - Gate::define('enroll-in-course', function ($user, $course) { |
|
91 | + Gate::define('enroll-in-course', function($user, $course) { |
|
92 | 92 | return $course->teacher_id == $user->teacher_id || $user->can('enrollments.edit'); |
93 | 93 | }); |
94 | 94 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * if the user is a teacher |
97 | 97 | * of if they have explicit permission to enroll students |
98 | 98 | */ |
99 | - Gate::define('enroll-students', function ($user) { |
|
99 | + Gate::define('enroll-students', function($user) { |
|
100 | 100 | return $user->isTeacher() || $user->can('enrollments.edit'); |
101 | 101 | }); |
102 | 102 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * teachers are allowed to view their own hours, |
105 | 105 | * and users with explicit permission can view all hours |
106 | 106 | */ |
107 | - Gate::define('view-teacher-hours', function ($user, $teacher) { |
|
107 | + Gate::define('view-teacher-hours', function($user, $teacher) { |
|
108 | 108 | return ($user->isTeacher() && $user->teacher_id == $teacher->id) || $user->can('hr.view'); |
109 | 109 | }); |
110 | 110 | |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * teachers are allowed to edit results for their own students |
113 | 113 | * as well as users with explicit permission to edit any result |
114 | 114 | */ |
115 | - Gate::define('edit-result', function ($user, $enrollment) { |
|
115 | + Gate::define('edit-result', function($user, $enrollment) { |
|
116 | 116 | return ($user->isTeacher() && $user->teacher_id == $enrollment->course->teacher_id) || $user->can('evaluation.edit'); |
117 | 117 | }); |
118 | 118 | } |
@@ -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; |