@@ -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 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | public function getFormattedStartDateAttribute() |
26 | 26 | { |
27 | - if (! $this->started_on) { |
|
27 | + if (!$this->started_on) { |
|
28 | 28 | return '-'; |
29 | 29 | } |
30 | 30 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | |
34 | 34 | public function getFormattedEndDateAttribute() |
35 | 35 | { |
36 | - if (! $this->expired_on) { |
|
36 | + if (!$this->expired_on) { |
|
37 | 37 | return '-'; |
38 | 38 | } |
39 | 39 |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | public $lastname; |
22 | 22 | |
23 | - public function __construct(Student|Contact $user, public $listId) |
|
23 | + public function __construct(Student | Contact $user, public $listId) |
|
24 | 24 | { |
25 | 25 | $this->email = $user->email; |
26 | 26 | $this->name = $user->firstname; |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | } |
59 | 59 | |
60 | 60 | // if no match has been found |
61 | - if (! $matchFound) { |
|
61 | + if (!$matchFound) { |
|
62 | 62 | echo 'no match; creating new eval type'; |
63 | 63 | $evalType = EvaluationType::create(['name' => 'cours '.$entry->course_id]); |
64 | 64 | $evalType->gradeTypes()->sync($courseGradeTypes); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | } |
86 | 86 | |
87 | 87 | // if no match has been found |
88 | - if (! $matchFound) { |
|
88 | + if (!$matchFound) { |
|
89 | 89 | $levelName = isset($course->level) ? $course->level->name : $course->id; |
90 | 90 | $evalType = EvaluationType::create(['name' => 'Niveau '.$levelName]); |
91 | 91 | $evalType->skills()->sync($courseSkills); |
@@ -92,7 +92,7 @@ |
||
92 | 92 | 'priceB' => $enrollment->course->price_b, |
93 | 93 | 'priceC' => $enrollment->course->price_c, |
94 | 94 | ]), |
95 | - 'studentPriceCategory' => $enrollment->student?->price_category, |
|
95 | + 'studentPriceCategory' => $enrollment->student ? ->price_category, |
|
96 | 96 | ] |
97 | 97 | ); |
98 | 98 | } |
@@ -56,11 +56,11 @@ discard block |
||
56 | 56 | public function scopeWithoutChildren($query) |
57 | 57 | { |
58 | 58 | return $query |
59 | - ->where(function ($query) { |
|
59 | + ->where(function($query) { |
|
60 | 60 | $query->whereDoesntHave('childrenEnrollments') |
61 | 61 | ->where('parent_id', null); |
62 | 62 | }) |
63 | - ->orWhere(function ($query) { |
|
63 | + ->orWhere(function($query) { |
|
64 | 64 | $query->where('parent_id', null); |
65 | 65 | }) |
66 | 66 | ->get(); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | public function scopePeriod(Builder $query, int $periodId) |
84 | 84 | { |
85 | - return $query->whereHas('course', function ($q) use ($periodId) { |
|
85 | + return $query->whereHas('course', function($q) use ($periodId) { |
|
86 | 86 | $q->where('period_id', $periodId); |
87 | 87 | }); |
88 | 88 | } |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | } |
316 | 316 | |
317 | 317 | // if enabled, retrieve the default price category for the student |
318 | - if (config('invoicing.price_categories_enabled') && $this->student?->price_category) { |
|
318 | + if (config('invoicing.price_categories_enabled') && $this->student ? ->price_category) { |
|
319 | 319 | $price_category = $this->student->price_category; |
320 | 320 | |
321 | 321 | return $this->course->$price_category ?? 0; |
@@ -340,12 +340,12 @@ discard block |
||
340 | 340 | $paidAmount = 0; |
341 | 341 | |
342 | 342 | foreach ($this->invoices as $invoice) { |
343 | - $paidAmount += $invoice->payments?->sum('value') ?? 0; |
|
343 | + $paidAmount += $invoice->payments ? ->sum('value') ?? 0; |
|
344 | 344 | } |
345 | 345 | |
346 | 346 | $balance -= $paidAmount; |
347 | 347 | |
348 | - return number_format(- $balance, 2); |
|
348 | + return number_format(-$balance, 2); |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | public function cancel() |
@@ -359,11 +359,11 @@ discard block |
||
359 | 359 | |
360 | 360 | // delete attendance records related to the enrollment |
361 | 361 | $attendances = $this->course->attendance->where('student_id', $this->student->id); |
362 | - Attendance::destroy($attendances->map(fn ($item, $key) => $item->id)); |
|
362 | + Attendance::destroy($attendances->map(fn($item, $key) => $item->id)); |
|
363 | 363 | |
364 | 364 | foreach ($this->course->children as $child) { |
365 | 365 | $attendances = $child->attendance->where('student_id', $this->student->id); |
366 | - Attendance::destroy($attendances->map(fn ($item, $key) => $item->id)); |
|
366 | + Attendance::destroy($attendances->map(fn($item, $key) => $item->id)); |
|
367 | 367 | } |
368 | 368 | |
369 | 369 | $this->delete(); |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | } |
395 | 395 | |
396 | 396 | // if one book is expired |
397 | - if ($this->student && $this->student->books->where('id', $book->id)->filter(fn ($book) => $book->pivot->expiry_date == null || $book->pivot->expiry_date > Carbon::now())->count() == 0) { |
|
397 | + if ($this->student && $this->student->books->where('id', $book->id)->filter(fn($book) => $book->pivot->expiry_date == null || $book->pivot->expiry_date > Carbon::now())->count() == 0) { |
|
398 | 398 | return 'EXP'; |
399 | 399 | } |
400 | 400 | } |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | 'attribute' => 'lastname', |
119 | 119 | 'label' => __('Last Name'), |
120 | 120 | 'type' => 'relationship', |
121 | - 'searchLogic' => function ($query, $column, $searchTerm) { |
|
122 | - $query->orWhereHas('student', function ($q) use ($searchTerm) { |
|
123 | - $q->whereHas('user', function ($q) use ($searchTerm) { |
|
121 | + 'searchLogic' => function($query, $column, $searchTerm) { |
|
122 | + $query->orWhereHas('student', function($q) use ($searchTerm) { |
|
123 | + $q->whereHas('user', function($q) use ($searchTerm) { |
|
124 | 124 | $q->where('lastname', 'like', '%'.$searchTerm.'%'); |
125 | 125 | }); |
126 | 126 | }); |
@@ -133,9 +133,9 @@ discard block |
||
133 | 133 | 'attribute' => 'firstname', |
134 | 134 | 'label' => __('First Name'), |
135 | 135 | 'type' => 'relationship', |
136 | - 'searchLogic' => function ($query, $column, $searchTerm) { |
|
137 | - $query->orWhereHas('student', function ($q) use ($searchTerm) { |
|
138 | - $q->whereHas('user', function ($q) use ($searchTerm) { |
|
136 | + 'searchLogic' => function($query, $column, $searchTerm) { |
|
137 | + $query->orWhereHas('student', function($q) use ($searchTerm) { |
|
138 | + $q->whereHas('user', function($q) use ($searchTerm) { |
|
139 | 139 | $q->where('firstname', 'like', '%'.$searchTerm.'%'); |
140 | 140 | }); |
141 | 141 | }); |
@@ -227,8 +227,8 @@ discard block |
||
227 | 227 | 'name' => 'status_id', |
228 | 228 | 'type' => 'select2_multiple', |
229 | 229 | 'label'=> __('Status'), |
230 | - ], fn () => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(), |
|
231 | - function ($values) { |
|
230 | + ], fn() => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(), |
|
231 | + function($values) { |
|
232 | 232 | // if the filter is active |
233 | 233 | foreach (json_decode($values, null, 512, JSON_THROW_ON_ERROR) as $value) { |
234 | 234 | CRUD::addClause('orWhere', 'status_id', $value); |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | 'name' => 'period_id', |
240 | 240 | 'type' => 'select2', |
241 | 241 | 'label'=> __('Period'), |
242 | - ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($value) { |
|
242 | + ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($value) { |
|
243 | 243 | // if the filter is active |
244 | 244 | CRUD::addClause('period', $value); |
245 | 245 | }); |
@@ -250,12 +250,12 @@ discard block |
||
250 | 250 | 'type' => 'select2', |
251 | 251 | 'label'=> __('Scholarship'), |
252 | 252 | ], |
253 | - fn () => Scholarship::all()->pluck('name', 'id')->toArray(), |
|
254 | - function ($value) { // if the filter is active |
|
253 | + fn() => Scholarship::all()->pluck('name', 'id')->toArray(), |
|
254 | + function($value) { // if the filter is active |
|
255 | 255 | if ($value == 'all') { |
256 | 256 | CRUD::addClause('whereHas', 'scholarships'); |
257 | 257 | } else { |
258 | - CRUD::addClause('whereHas', 'scholarships', function ($q) use ($value) { |
|
258 | + CRUD::addClause('whereHas', 'scholarships', function($q) use ($value) { |
|
259 | 259 | $q->where('scholarships.id', $value); |
260 | 260 | }); |
261 | 261 | } |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | ->get(); |
276 | 276 | |
277 | 277 | // get related comments |
278 | - $comments = $enrollment->invoices->map(fn (Invoice $invoice) => $invoice->comments)->flatten()->concat($enrollment->comments); |
|
278 | + $comments = $enrollment->invoices->map(fn(Invoice $invoice) => $invoice->comments)->flatten()->concat($enrollment->comments); |
|
279 | 279 | |
280 | 280 | $scholarships = Scholarship::all(); |
281 | 281 | |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | 'model' => \App\Models\Course::class, // foreign key model |
307 | 307 | 'attribute' => 'name', // foreign key attribute that is shown to user |
308 | 308 | |
309 | - 'options' => (fn ($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()), |
|
309 | + 'options' => (fn($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()), |
|
310 | 310 | ]); |
311 | 311 | |
312 | 312 | CRUD::addField(array_merge([ |