@@ -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'], |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | 'label' => trans('backpack::permissionmanager.email'), |
| 49 | 49 | 'type' => 'email', |
| 50 | 50 | ], |
| 51 | - [ // n-n relationship (with pivot table) |
|
| 51 | + [// n-n relationship (with pivot table) |
|
| 52 | 52 | 'label' => trans('backpack::permissionmanager.roles'), |
| 53 | 53 | 'type' => 'select_multiple', |
| 54 | 54 | 'name' => 'roles', |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | 'label' => trans('backpack::permissionmanager.role'), |
| 68 | 68 | ], |
| 69 | 69 | config('permission.models.role')::all()->pluck(['name', 'id'])->toArray(), |
| 70 | - function ($value) { |
|
| 70 | + function($value) { |
|
| 71 | 71 | // if the filter is active |
| 72 | - $this->crud->addClause('whereHas', 'roles', function ($query) use ($value) { |
|
| 72 | + $this->crud->addClause('whereHas', 'roles', function($query) use ($value) { |
|
| 73 | 73 | $query->where('role_id', '=', $value); |
| 74 | 74 | }); |
| 75 | 75 | } |
@@ -120,12 +120,12 @@ discard block |
||
| 120 | 120 | protected function addFields() |
| 121 | 121 | { |
| 122 | 122 | $this->crud->addFields([ |
| 123 | - [ // Select2 |
|
| 123 | + [// Select2 |
|
| 124 | 124 | 'label' => trans('firstname'), |
| 125 | 125 | 'type' => 'text', |
| 126 | 126 | 'name' => 'firstname', |
| 127 | 127 | ], |
| 128 | - [ // Select2 |
|
| 128 | + [// Select2 |
|
| 129 | 129 | 'label' => trans('lastname'), |
| 130 | 130 | 'type' => 'text', |
| 131 | 131 | 'name' => 'lastname', |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | { |
| 35 | 35 | CRUD::addField(['name' => 'name', 'label' => 'Name', 'type' => 'text']); |
| 36 | 36 | |
| 37 | - CRUD::addField([ // Select2Multiple = n-n relationship (with pivot table) |
|
| 37 | + CRUD::addField([// Select2Multiple = n-n relationship (with pivot table) |
|
| 38 | 38 | 'label' => __('Grade Types'), |
| 39 | 39 | 'type' => 'select2_multiple', |
| 40 | 40 | 'name' => 'gradeTypes', |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | 'select_all' => true, // show Select All and Clear buttons? |
| 48 | 48 | ]); |
| 49 | 49 | |
| 50 | - CRUD::addField([ // Select2Multiple = n-n relationship (with pivot table) |
|
| 50 | + CRUD::addField([// Select2Multiple = n-n relationship (with pivot table) |
|
| 51 | 51 | 'label' => __('Skills'), |
| 52 | 52 | 'type' => 'select2_multiple', |
| 53 | 53 | 'name' => 'skills', |
@@ -196,15 +196,15 @@ |
||
| 196 | 196 | |
| 197 | 197 | public function handle() |
| 198 | 198 | { |
| 199 | - Student::whereNull('gender_id')->chunkById(10, function ($students) { |
|
| 200 | - $query = $students->map(fn ($student) => ['id' => $student->id, 'name' => $this->remove_accents(strtok($student->firstname, ' '))]); |
|
| 199 | + Student::whereNull('gender_id')->chunkById(10, function($students) { |
|
| 200 | + $query = $students->map(fn($student) => ['id' => $student->id, 'name' => $this->remove_accents(strtok($student->firstname, ' '))]); |
|
| 201 | 201 | |
| 202 | 202 | $response = Http::get('https://api.genderize.io/?name[]='.$query->pluck('name')->implode('&name[]=')); |
| 203 | 203 | foreach ($students as $student) { |
| 204 | 204 | $firstname = $query->firstWhere('id', $student->id)['name']; |
| 205 | 205 | |
| 206 | 206 | $student->update([ |
| 207 | - 'gender_id' => match ($response->collect()->where('name', $firstname)->where('probability', '>', 0.9)->where('count', '>', 10)->first()['gender'] ?? '-') { |
|
| 207 | + 'gender_id' => match($response->collect()->where('name', $firstname)->where('probability', '>', 0.9)->where('count', '>', 10)->first()['gender'] ?? '-') { |
|
| 208 | 208 | 'male' => 2, |
| 209 | 209 | 'female' => 1, |
| 210 | 210 | default => null, |
@@ -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', |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | { |
| 25 | 25 | parent::boot(); |
| 26 | 26 | |
| 27 | - static::addGlobalScope('order', function (Builder $builder) { |
|
| 27 | + static::addGlobalScope('order', function(Builder $builder) { |
|
| 28 | 28 | $builder->orderBy('year_id')->orderBy('order')->orderBy('id'); |
| 29 | 29 | }); |
| 30 | 30 | } |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | ->where('courses.period_id', $this->id) |
| 155 | 155 | ->where('enrollments.deleted_at', null) |
| 156 | 156 | ->where('enrollments.parent_id', null) |
| 157 | - ->where(function ($query) { |
|
| 157 | + ->where(function($query) { |
|
| 158 | 158 | return $query->where('students.gender_id', 0)->orWhereNull('students.gender_id'); |
| 159 | 159 | }) |
| 160 | 160 | ->whereIn('enrollments.status_id', ['1', '2']) // filter out cancelled enrollments, todo make this configurable. |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | { |
| 202 | 202 | $period = self::where('id', '<', $this->id)->orderBy('id', 'desc')->first(); |
| 203 | 203 | |
| 204 | - if (! $period == null) { |
|
| 204 | + if (!$period == null) { |
|
| 205 | 205 | return $period; |
| 206 | 206 | } else { |
| 207 | 207 | return self::first(); |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | public function getCoursesWithPendingAttendanceAttribute() |
| 282 | 282 | { |
| 283 | 283 | // get all courses for period and preload relations |
| 284 | - $courses = $this->courses()->where(function ($query) { |
|
| 284 | + $courses = $this->courses()->where(function($query) { |
|
| 285 | 285 | $query->where('exempt_attendance', '!=', true); |
| 286 | 286 | $query->where('exempt_attendance', '!=', 1); |
| 287 | 287 | $query->orWhereNull('exempt_attendance'); |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | public function scopeEnrolled($query) |
| 44 | 44 | { |
| 45 | - return $query->whereHas('enrollments', function ($q) { |
|
| 46 | - return $q->whereHas('course', function ($q) { |
|
| 45 | + return $query->whereHas('enrollments', function($q) { |
|
| 46 | + return $q->whereHas('course', function($q) { |
|
| 47 | 47 | return $q->where('period_id', Period::get_default_period()->id); |
| 48 | 48 | }); |
| 49 | 49 | }); |
@@ -51,8 +51,8 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | public function scopeComputedLeadType($query, $leadTypeId) |
| 53 | 53 | { |
| 54 | - return match ($leadTypeId) { |
|
| 55 | - 1 => $query->whereHas('enrollments', fn ($query) => $query->whereHas('course', function ($q) { |
|
| 54 | + return match($leadTypeId) { |
|
| 55 | + 1 => $query->whereHas('enrollments', fn($query) => $query->whereHas('course', function($q) { |
|
| 56 | 56 | $q->where('period_id', Period::get_default_period()->id); |
| 57 | 57 | })), |
| 58 | 58 | |
@@ -61,15 +61,15 @@ discard block |
||
| 61 | 61 | 4 => $query |
| 62 | 62 | ->where('lead_type_id', $leadTypeId) |
| 63 | 63 | ->orWhere( |
| 64 | - function ($query) { |
|
| 64 | + function($query) { |
|
| 65 | 65 | $query |
| 66 | 66 | ->whereNull('lead_type_id') |
| 67 | - ->whereHas('enrollments', fn ($query) => $query |
|
| 68 | - ->whereHas('course', function ($q) { |
|
| 67 | + ->whereHas('enrollments', fn($query) => $query |
|
| 68 | + ->whereHas('course', function($q) { |
|
| 69 | 69 | $q->where('period_id', '!=', Period::get_default_period()->id); |
| 70 | 70 | })) |
| 71 | - ->whereDoesntHave('enrollments', fn ($query) => $query |
|
| 72 | - ->whereHas('course', function ($q) { |
|
| 71 | + ->whereDoesntHave('enrollments', fn($query) => $query |
|
| 72 | + ->whereHas('course', function($q) { |
|
| 73 | 73 | $q->where('period_id', Period::get_default_period()->id); |
| 74 | 74 | })); |
| 75 | 75 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | return $this->hasMany(Attendance::class) |
| 112 | 112 | ->where('attendance_type_id', 4) // absence |
| 113 | - ->whereHas('event', fn ($q) => $q->whereHas('course', fn ($c) => $c->where('period_id', $period->id))); |
|
| 113 | + ->whereHas('event', fn($q) => $q->whereHas('course', fn($c) => $c->where('period_id', $period->id))); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | public function periodAttendance(Period $period = null) |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | return $this->hasMany(Attendance::class) |
| 123 | - ->whereHas('event', fn ($q) => $q->whereHas('course', fn ($c) => $c->where('period_id', $period->id))); |
|
| 123 | + ->whereHas('event', fn($q) => $q->whereHas('course', fn($c) => $c->where('period_id', $period->id))); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | public function contacts() |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | public function getEmailAttribute(): ?string |
| 183 | 183 | { |
| 184 | - return $this?->user?->email; |
|
| 184 | + return $this ? ->user ? ->email; |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | public function getNameAttribute(): string |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | public function getIsEnrolledAttribute() |
| 203 | 203 | { |
| 204 | 204 | // if the student is currently enrolled |
| 205 | - if ($this->enrollments()->whereHas('course', fn ($q) => $q->where('period_id', Period::get_default_period()->id))->count() > 0) { |
|
| 205 | + if ($this->enrollments()->whereHas('course', fn($q) => $q->where('period_id', Period::get_default_period()->id))->count() > 0) { |
|
| 206 | 206 | return 1; |
| 207 | 207 | } |
| 208 | 208 | |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | |
| 302 | 302 | public function getImageAttribute(): ?string |
| 303 | 303 | { |
| 304 | - return $this->getMedia('profile-picture')->last()?->getUrl('thumb'); |
|
| 304 | + return $this->getMedia('profile-picture')->last() ? ->getUrl('thumb'); |
|
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | public function setImageAttribute($value) |
@@ -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 | }); |