@@ -23,7 +23,7 @@ |
||
23 | 23 | |
24 | 24 | if (config('app.send_emails_for_results')) { |
25 | 25 | // when a result is added, send a notification |
26 | - static::saved(function (self $result) { |
|
26 | + static::saved(function(self $result) { |
|
27 | 27 | Mail::to($result->enrollment->student->user->email)->locale($result->enrollment->student->user->locale)->queue(new ResultNotification($result->enrollment->course, $result->enrollment->student->user)); |
28 | 28 | }); |
29 | 29 | } |
@@ -21,7 +21,7 @@ |
||
21 | 21 | parent::boot(); |
22 | 22 | |
23 | 23 | // when an attendance record is added, we check if this is an absence |
24 | - static::saved(function (self $attendance) { |
|
24 | + static::saved(function(self $attendance) { |
|
25 | 25 | if (config('app.send_emails_for_absences') && $attendance->attendance_type_id == 4) { // todo move to configurable settings |
26 | 26 | // Log::info('Absence marked for student '.$attendance->student->name); |
27 | 27 | // will check the record again and send a notification if it hasn't changed |
@@ -26,6 +26,6 @@ |
||
26 | 26 | */ |
27 | 27 | public function store_student_comment(User $user, Student $student) |
28 | 28 | { |
29 | - return ($student->enrollments()->whereHas('course', fn ($q) => $q->where('teacher_id', $user->id))->count() > 0) || $user->can('comments.edit'); |
|
29 | + return ($student->enrollments()->whereHas('course', fn($q) => $q->where('teacher_id', $user->id))->count() > 0) || $user->can('comments.edit'); |
|
30 | 30 | } |
31 | 31 | } |
@@ -30,69 +30,69 @@ |
||
30 | 30 | * a user is allowed to edit the course grades if they are the teacher for this course, |
31 | 31 | * or if they have explicit permission to do so |
32 | 32 | */ |
33 | - Gate::define('edit-course-grades', fn ($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('evaluation.edit')); |
|
33 | + Gate::define('edit-course-grades', fn($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('evaluation.edit')); |
|
34 | 34 | |
35 | 35 | /* |
36 | 36 | * a user is allowed to view the course attendance sheet if they are the teacher for this course, |
37 | 37 | * or if they have explicit permission to view all course attendance sheets |
38 | 38 | */ |
39 | - Gate::define('view-course-attendance', fn ($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('attendance.view')); |
|
39 | + Gate::define('view-course-attendance', fn($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('attendance.view')); |
|
40 | 40 | |
41 | 41 | /* |
42 | 42 | * a user is allowed to view the event attendance sheet if they are the teacher for this event, |
43 | 43 | * if they are the teacher for this course, |
44 | 44 | * or if they have explicit permission to view all event attendance sheets |
45 | 45 | */ |
46 | - Gate::define('view-event-attendance', fn ($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.view')); |
|
46 | + Gate::define('view-event-attendance', fn($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.view')); |
|
47 | 47 | |
48 | 48 | /* |
49 | 49 | * a user is allowed to edit an attendance sheet if they are the teacher for the event, |
50 | 50 | * if they are the teacher for the course, |
51 | 51 | * or if they have explicit permission to edit any attendance sheets |
52 | 52 | */ |
53 | - Gate::define('edit-attendance', fn ($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.edit')); |
|
53 | + Gate::define('edit-attendance', fn($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.edit')); |
|
54 | 54 | |
55 | 55 | /* |
56 | 56 | * teachers are allowed to view their own calendar, |
57 | 57 | * and users with explicit permission can view all calendars |
58 | 58 | */ |
59 | - Gate::define('view-teacher-calendar', fn ($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('calendars.view')); |
|
59 | + Gate::define('view-teacher-calendar', fn($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('calendars.view')); |
|
60 | 60 | |
61 | 61 | /* |
62 | 62 | * teachers are allowed to view their own courses, |
63 | 63 | * and users with explicit permission can view all courses |
64 | 64 | */ |
65 | - Gate::define('view-course', fn ($user, Course $course) => ($user->isTeacher() && $user->id == $course->teacher_id) || $user->can('courses.view')); |
|
65 | + Gate::define('view-course', fn($user, Course $course) => ($user->isTeacher() && $user->id == $course->teacher_id) || $user->can('courses.view')); |
|
66 | 66 | |
67 | 67 | /* |
68 | 68 | * the user is allowed to view the result if they are the student, |
69 | 69 | * if they are a teacher |
70 | 70 | * of if they have explicit permission to view any result |
71 | 71 | */ |
72 | - Gate::define('view-enrollment', fn ($user, $enrollment) => ($user->isStudent() && $user->id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view')); |
|
72 | + Gate::define('view-enrollment', fn($user, $enrollment) => ($user->isStudent() && $user->id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view')); |
|
73 | 73 | |
74 | 74 | /* |
75 | 75 | * if the user is the teacher of the course |
76 | 76 | * of if they have explicit permission to enroll students |
77 | 77 | */ |
78 | - Gate::define('enroll-in-course', fn ($user, $course) => $course->teacher_id == $user->id || $user->can('enrollments.edit')); |
|
78 | + Gate::define('enroll-in-course', fn($user, $course) => $course->teacher_id == $user->id || $user->can('enrollments.edit')); |
|
79 | 79 | |
80 | 80 | /* |
81 | 81 | * if the user is a teacher |
82 | 82 | * of if they have explicit permission to enroll students |
83 | 83 | */ |
84 | - Gate::define('enroll-students', fn ($user) => $user->isTeacher() || $user->can('enrollments.edit')); |
|
84 | + Gate::define('enroll-students', fn($user) => $user->isTeacher() || $user->can('enrollments.edit')); |
|
85 | 85 | |
86 | 86 | /* |
87 | 87 | * teachers are allowed to view their own hours, |
88 | 88 | * and users with explicit permission can view all hours |
89 | 89 | */ |
90 | - Gate::define('view-teacher-hours', fn ($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('hr.view')); |
|
90 | + Gate::define('view-teacher-hours', fn($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('hr.view')); |
|
91 | 91 | |
92 | 92 | /* |
93 | 93 | * teachers are allowed to edit results for their own students |
94 | 94 | * as well as users with explicit permission to edit any result |
95 | 95 | */ |
96 | - Gate::define('edit-result', fn ($user, $enrollment) => ($user->isTeacher() && $user->id == $enrollment->course->teacher_id) || $user->can('evaluation.edit')); |
|
96 | + Gate::define('edit-result', fn($user, $enrollment) => ($user->isTeacher() && $user->id == $enrollment->course->teacher_id) || $user->can('evaluation.edit')); |
|
97 | 97 | } |
98 | 98 | } |
@@ -172,7 +172,7 @@ |
||
172 | 172 | 'price_b' => $enrollment->course->price_b, |
173 | 173 | 'price_c' => $enrollment->course->price_c, |
174 | 174 | ]), |
175 | - 'studentPriceCategory' => $enrollment->student?->price_category, |
|
175 | + 'studentPriceCategory' => $enrollment->student ? ->price_category, |
|
176 | 176 | ] |
177 | 177 | ); |
178 | 178 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | ->where('end', '<', Carbon::now()->addDays(90)) |
26 | 26 | ->orderBy('id', 'desc') |
27 | 27 | ->get() |
28 | - ->map(fn ($event) => [ |
|
28 | + ->map(fn($event) => [ |
|
29 | 29 | 'title' => $event->name, |
30 | 30 | 'resourceId' => $event->room_id, |
31 | 31 | 'start' => $event->start, |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | $rooms = Room::all()->toArray(); |
39 | 39 | |
40 | - $rooms = array_map(fn ($room) => [ |
|
40 | + $rooms = array_map(fn($room) => [ |
|
41 | 41 | 'id' => $room['id'], |
42 | 42 | 'title' => $room['name'], |
43 | 43 | ], $rooms); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $unassigned_events = Event::with('course') |
48 | 48 | ->whereNull('room_id') |
49 | 49 | ->get() |
50 | - ->map(fn ($event) => [ |
|
50 | + ->map(fn($event) => [ |
|
51 | 51 | 'title' => $event->name, |
52 | 52 | 'resourceId' => 'tbd', |
53 | 53 | 'start' => $event->start, |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | public function show(Room $room) |
71 | 71 | { |
72 | 72 | $events = $room->events->toArray(); |
73 | - $events = array_map(fn ($event) => [ |
|
73 | + $events = array_map(fn($event) => [ |
|
74 | 74 | 'title' => $event['name'], |
75 | 75 | 'start' => $event['start'], |
76 | 76 | 'end' => $event['end'], |
@@ -15,7 +15,7 @@ |
||
15 | 15 | |
16 | 16 | public function styling() |
17 | 17 | { |
18 | - return match ($this->id) { |
|
18 | + return match($this->id) { |
|
19 | 19 | 1 => 'warning', |
20 | 20 | 2 => 'info', |
21 | 21 | default => 'danger', |
@@ -46,7 +46,7 @@ |
||
46 | 46 | ->where('periods.year_id', $this->id) |
47 | 47 | ->whereIn('enrollments.status_id', ['1', '2']) // filter out cancelled enrollments, todo make this configurable. |
48 | 48 | ->where('enrollments.parent_id', null)->where('enrollments.deleted_at', null) |
49 | - ->where(function ($query) { |
|
49 | + ->where(function($query) { |
|
50 | 50 | return $query->where('students.gender_id', 0)->orWhereNull('students.gender_id'); |
51 | 51 | }) |
52 | 52 | ->distinct('student_id')->count('enrollments.student_id'); |
@@ -53,12 +53,12 @@ |
||
53 | 53 | |
54 | 54 | View::composer( |
55 | 55 | ['partials.create_new_contact', 'students.edit-contact'], |
56 | - function ($view) { |
|
56 | + function($view) { |
|
57 | 57 | $view->with('contact_types', ContactRelationship::all()); |
58 | 58 | } |
59 | 59 | ); |
60 | 60 | |
61 | - View::composer('partials.add_book_to_student', function ($view) { |
|
61 | + View::composer('partials.add_book_to_student', function($view) { |
|
62 | 62 | $view->with('books', Book::all()); |
63 | 63 | $view->with('statuses', EnrollmentStatusType::all()); |
64 | 64 | }); |