@@ -68,7 +68,7 @@ |
||
68 | 68 | |
69 | 69 | $course = Course::with('evaluationType')->find($enrollment->course_id); |
70 | 70 | |
71 | - $skills = $course->skills->map(function ($skill, $key) use ($student_skills) { |
|
71 | + $skills = $course->skills->map(function($skill, $key) use ($student_skills) { |
|
72 | 72 | $skill['status'] = $student_skills->where('skill_id', $skill->id)->first()->skill_scale_id ?? null; |
73 | 73 | |
74 | 74 | return $skill; |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | parent::boot(); |
22 | 22 | |
23 | 23 | // before adding an event, we check that the teacher is available |
24 | - static::saving(function ($event) { |
|
24 | + static::saving(function($event) { |
|
25 | 25 | $teacher = Teacher::find($event->teacher_id); |
26 | 26 | // if the teacher is on leave on the day of the event |
27 | 27 | if ($event->teacher_id !== null && $teacher) { |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | |
149 | 149 | public function getColorAttribute() |
150 | 150 | { |
151 | - return $this?->course->color ?? ('#'.substr(md5($this->course_id ?? '0'), 0, 6)); |
|
151 | + return $this ? ->course->color ?? ('#'.substr(md5($this->course_id ?? '0'), 0, 6)); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | /* |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | */ |
204 | 204 | public function skills() |
205 | 205 | { |
206 | - return $this->evaluationType?->skills()->orderBy('order'); |
|
206 | + return $this->evaluationType ? ->skills()->orderBy('order'); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | public function books() |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | */ |
229 | 229 | public function getPendingAttendanceAttribute() |
230 | 230 | { |
231 | - $events = Event::where(function ($query) { |
|
231 | + $events = Event::where(function($query) { |
|
232 | 232 | $query->where('course_id', $this->id); |
233 | 233 | $query->where('exempt_attendance', '!=', true); |
234 | 234 | $query->where('exempt_attendance', '!=', 1); |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | foreach ($courseTimes as $courseTime) { |
362 | 362 | $initial = $daysInitials[$courseTime->day]; |
363 | 363 | |
364 | - if (! isset($parsedCourseTimes[$initial])) { |
|
364 | + if (!isset($parsedCourseTimes[$initial])) { |
|
365 | 365 | $parsedCourseTimes[$initial] = []; |
366 | 366 | } |
367 | 367 | |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | public function getCourseTeacherNameAttribute() |
409 | 409 | { |
410 | 410 | if ($this->teacher_id) { |
411 | - return $this->teacher?->name; |
|
411 | + return $this->teacher ? ->name; |
|
412 | 412 | } else { |
413 | 413 | return '-'; |
414 | 414 | } |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | |
442 | 442 | public function getAcceptsNewStudentsAttribute(): bool |
443 | 443 | { |
444 | - if (! $this->spots || $this->spots == 0) { |
|
444 | + if (!$this->spots || $this->spots == 0) { |
|
445 | 445 | return true; |
446 | 446 | } |
447 | 447 | |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | |
465 | 465 | public function eventsWithExpectedAttendance() |
466 | 466 | { |
467 | - return $this->events()->where(function ($query) { |
|
467 | + return $this->events()->where(function($query) { |
|
468 | 468 | $query->where('exempt_attendance', '!=', true); |
469 | 469 | $query->where('exempt_attendance', '!=', 1); |
470 | 470 | $query->orWhereNull('exempt_attendance'); |
@@ -104,7 +104,7 @@ |
||
104 | 104 | |
105 | 105 | public function getDisplayStatusAttribute() |
106 | 106 | { |
107 | - return match ($this->status) { |
|
107 | + return match($this->status) { |
|
108 | 108 | null, 1 => __('Pending'), |
109 | 109 | 2 => __('Paid'), |
110 | 110 | }; |
@@ -39,22 +39,22 @@ discard block |
||
39 | 39 | /** attributes */ |
40 | 40 | public function getFirstnameAttribute() : ?string |
41 | 41 | { |
42 | - return $this?->user?->firstname; |
|
42 | + return $this ? ->user ? ->firstname; |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | public function getLastnameAttribute() : ?string |
46 | 46 | { |
47 | - return $this?->user?->lastname; |
|
47 | + return $this ? ->user ? ->lastname; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | public function getEmailAttribute() : ?string |
51 | 51 | { |
52 | - return $this?->user?->email ?? ''; |
|
52 | + return $this ? ->user ? ->email ?? ''; |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | public function getNameAttribute() : ?string |
56 | 56 | { |
57 | - return $this?->user?->firstname.' '.$this?->user?->lastname; |
|
57 | + return $this ? ->user ? ->firstname.' '.$this ? ->user ? ->lastname; |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | public function period_courses(Period $period) |
@@ -178,14 +178,14 @@ discard block |
||
178 | 178 | $eventsWithMissingAttendance = []; |
179 | 179 | |
180 | 180 | $eventsWithExpectedAttendance = $this->events() |
181 | - ->where(function ($query) { |
|
181 | + ->where(function($query) { |
|
182 | 182 | $query->where('exempt_attendance', '!=', true); |
183 | 183 | $query->where('exempt_attendance', '!=', 1); |
184 | 184 | $query->orWhereNull('exempt_attendance'); |
185 | 185 | }) |
186 | 186 | ->where('course_id', '!=', null) |
187 | - ->whereHas('course', fn (Builder $query) => $query->where('period_id', $period->id) |
|
188 | - ->where(function ($query) { |
|
187 | + ->whereHas('course', fn(Builder $query) => $query->where('period_id', $period->id) |
|
188 | + ->where(function($query) { |
|
189 | 189 | $query->where('exempt_attendance', '!=', true); |
190 | 190 | $query->where('exempt_attendance', '!=', 1); |
191 | 191 | $query->orWhereNull('exempt_attendance'); |
@@ -27,6 +27,6 @@ |
||
27 | 27 | { |
28 | 28 | // if the student is enrolled in any class by the user |
29 | 29 | |
30 | - return $student->enrollments()->whereHas('course', fn ($q) => $q->where('teacher_id', $user->id))->count() > 0; |
|
30 | + return $student->enrollments()->whereHas('course', fn($q) => $q->where('teacher_id', $user->id))->count() > 0; |
|
31 | 31 | } |
32 | 32 | } |
@@ -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->teacher_id))->count() > 0) || $user->can('comments.edit'); |
|
29 | + return ($student->enrollments()->whereHas('course', fn($q) => $q->where('teacher_id', $user->teacher_id))->count() > 0) || $user->can('comments.edit'); |
|
30 | 30 | } |
31 | 31 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | public function scopeStatus(Builder $query, $status) |
31 | 31 | { |
32 | - return match ($status) { |
|
32 | + return match($status) { |
|
33 | 33 | '2' => $query->where('status', 2)->orWhereHas('invoices'), |
34 | 34 | '1' => $query->where('status', 1)->orWhereDoesntHave('invoices'), |
35 | 35 | default => $query, |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | |
111 | 111 | public function getStatusTypeNameAttribute() |
112 | 112 | { |
113 | - return match ($this->computed_status) { |
|
113 | + return match($this->computed_status) { |
|
114 | 114 | 2 => __('Paid'), |
115 | 115 | 1 => __('Pending'), |
116 | 116 | default => '-', |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | |
47 | 47 | public function scopeEnrolled($query) |
48 | 48 | { |
49 | - return $query->whereHas('enrollments', function ($q) { |
|
50 | - return $q->whereHas('course', function ($q) { |
|
49 | + return $query->whereHas('enrollments', function($q) { |
|
50 | + return $q->whereHas('course', function($q) { |
|
51 | 51 | return $q->where('period_id', Period::get_default_period()->id); |
52 | 52 | }); |
53 | 53 | }); |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | |
56 | 56 | public function scopeComputedLeadType($query, $leadTypeId) |
57 | 57 | { |
58 | - return match ($leadTypeId) { |
|
59 | - 1 => $query->whereHas('enrollments', fn ($query) => $query->whereHas('course', function ($q) { |
|
58 | + return match($leadTypeId) { |
|
59 | + 1 => $query->whereHas('enrollments', fn($query) => $query->whereHas('course', function($q) { |
|
60 | 60 | $q->where('period_id', Period::get_default_period()->id); |
61 | 61 | })), |
62 | 62 | |
@@ -64,15 +64,15 @@ discard block |
||
64 | 64 | |
65 | 65 | 4 => $query |
66 | 66 | ->where('lead_type_id', $leadTypeId) |
67 | - ->orWhere(function ($query) { |
|
67 | + ->orWhere(function($query) { |
|
68 | 68 | $query |
69 | 69 | ->whereNull('lead_type_id') |
70 | - ->whereHas('enrollments', fn ($query) => $query |
|
71 | - ->whereHas('course', function ($q) { |
|
70 | + ->whereHas('enrollments', fn($query) => $query |
|
71 | + ->whereHas('course', function($q) { |
|
72 | 72 | $q->where('period_id', '!=', Period::get_default_period()->id); |
73 | 73 | })) |
74 | - ->whereDoesntHave('enrollments', fn ($query) => $query |
|
75 | - ->whereHas('course', function ($q) { |
|
74 | + ->whereDoesntHave('enrollments', fn($query) => $query |
|
75 | + ->whereHas('course', function($q) { |
|
76 | 76 | $q->where('period_id', Period::get_default_period()->id); |
77 | 77 | })); |
78 | 78 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | return $this->hasMany(Attendance::class) |
115 | 115 | ->where('attendance_type_id', 4) // absence |
116 | - ->whereHas('event', fn ($q) => $q->whereHas('course', fn ($c) => $c->where('period_id', $period->id))); |
|
116 | + ->whereHas('event', fn($q) => $q->whereHas('course', fn($c) => $c->where('period_id', $period->id))); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | public function periodAttendance(Period $period = null) |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | return $this->hasMany(Attendance::class) |
126 | - ->whereHas('event', fn ($q) => $q->whereHas('course', fn ($c) => $c->where('period_id', $period->id))); |
|
126 | + ->whereHas('event', fn($q) => $q->whereHas('course', fn($c) => $c->where('period_id', $period->id))); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | public function contacts() |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | |
202 | 202 | public function getEmailAttribute(): ?string |
203 | 203 | { |
204 | - return $this?->user?->email; |
|
204 | + return $this ? ->user ? ->email; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | public function getNameAttribute(): string |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | public function getIsEnrolledAttribute() |
235 | 235 | { |
236 | 236 | // if the student is currently enrolled |
237 | - if ($this->enrollments()->whereHas('course', fn ($q) => $q->where('period_id', Period::get_default_period()->id))->count() > 0) { |
|
237 | + if ($this->enrollments()->whereHas('course', fn($q) => $q->where('period_id', Period::get_default_period()->id))->count() > 0) { |
|
238 | 238 | return 1; |
239 | 239 | } |
240 | 240 | } |