@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | protected function setupListOperation() |
| 32 | 32 | { |
| 33 | 33 | CRUD::setColumns([ |
| 34 | - [ // skill type |
|
| 34 | + [// skill type |
|
| 35 | 35 | 'label' => 'Type', // Table column heading |
| 36 | 36 | 'type' => 'select', |
| 37 | 37 | 'name' => 'skill_type', // the method that defines the relationship in your Model |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | 'type' => 'text', |
| 45 | 45 | 'name' => 'name', |
| 46 | 46 | ], |
| 47 | - [ // skill level |
|
| 47 | + [// skill level |
|
| 48 | 48 | 'label' => 'Level', // Table column heading |
| 49 | 49 | 'type' => 'select', |
| 50 | 50 | 'name' => 'level', // the method that defines the relationship in your Model |
@@ -56,19 +56,19 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | CRUD::enableExportButtons(); |
| 58 | 58 | |
| 59 | - CRUD::addFilter([ // select2 filter |
|
| 59 | + CRUD::addFilter([// select2 filter |
|
| 60 | 60 | 'name' => 'level_id', |
| 61 | 61 | 'type' => 'select2', |
| 62 | 62 | 'label'=> 'Level', |
| 63 | - ], fn () => Level::all()->pluck('name', 'id')->toArray(), function ($value) { // if the filter is active |
|
| 63 | + ], fn() => Level::all()->pluck('name', 'id')->toArray(), function($value) { // if the filter is active |
|
| 64 | 64 | CRUD::addClause('where', 'level_id', $value); |
| 65 | 65 | }); |
| 66 | 66 | |
| 67 | - CRUD::addFilter([ // select2 filter |
|
| 67 | + CRUD::addFilter([// select2 filter |
|
| 68 | 68 | 'name' => 'skill_type_id', |
| 69 | 69 | 'type' => 'select2', |
| 70 | 70 | 'label'=> 'Type', |
| 71 | - ], fn () => SkillType::all()->pluck('name', 'id')->toArray(), function ($value) { // if the filter is active |
|
| 71 | + ], fn() => SkillType::all()->pluck('name', 'id')->toArray(), function($value) { // if the filter is active |
|
| 72 | 72 | CRUD::addClause('where', 'skill_type_id', $value); |
| 73 | 73 | }); |
| 74 | 74 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | { |
| 78 | 78 | CRUD::setValidation(StoreRequest::class); |
| 79 | 79 | CRUD::addFields([ |
| 80 | - [ // skill type |
|
| 80 | + [// skill type |
|
| 81 | 81 | 'label' => 'Type', // Table column heading |
| 82 | 82 | 'type' => 'select', |
| 83 | 83 | 'name' => 'skill_type_id', // the db column for the foreign key |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | 'type' => 'text', |
| 91 | 91 | 'name' => 'name', |
| 92 | 92 | ], |
| 93 | - [ // skill level |
|
| 93 | + [// skill level |
|
| 94 | 94 | 'label' => 'Level', // Table column heading |
| 95 | 95 | 'type' => 'select', |
| 96 | 96 | 'name' => 'level_id', // the db column for the foreign key |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | 'type' => 'relationship', |
| 104 | 104 | 'name' => 'skill_type', // the method on your model that defines the relationship |
| 105 | 105 | 'ajax' => true, |
| 106 | - 'inline_create' => [ // specify the entity in singular |
|
| 106 | + 'inline_create' => [// specify the entity in singular |
|
| 107 | 107 | 'entity' => 'skilltype', // the entity in singular |
| 108 | 108 | // OPTIONALS |
| 109 | 109 | 'force_select' => true, // should the inline-created entry be immediately selected? |
@@ -166,9 +166,9 @@ |
||
| 166 | 166 | // add photo |
| 167 | 167 | if ($request->data['userPicture']) { |
| 168 | 168 | $student |
| 169 | - ->addMediaFromBase64($request->data['userPicture']) |
|
| 170 | - ->usingFileName('profilePicture.jpg') |
|
| 171 | - ->toMediaCollection('profile-picture'); |
|
| 169 | + ->addMediaFromBase64($request->data['userPicture']) |
|
| 170 | + ->usingFileName('profilePicture.jpg') |
|
| 171 | + ->toMediaCollection('profile-picture'); |
|
| 172 | 172 | |
| 173 | 173 | Log::info('Profile picture added to the student profile'); |
| 174 | 174 | } |
@@ -30,8 +30,8 @@ discard block |
||
| 30 | 30 | $username_parts = array_filter(explode(' ', strtolower($fullName))); |
| 31 | 31 | $username_parts = array_slice($username_parts, -2); |
| 32 | 32 | |
| 33 | - $part1 = (! empty($username_parts[0])) ? substr($username_parts[0], 0, 3) : ''; |
|
| 34 | - $part2 = (! empty($username_parts[1])) ? substr($username_parts[1], 0, 8) : ''; |
|
| 33 | + $part1 = (!empty($username_parts[0])) ? substr($username_parts[0], 0, 3) : ''; |
|
| 34 | + $part2 = (!empty($username_parts[1])) ? substr($username_parts[1], 0, 8) : ''; |
|
| 35 | 35 | $part3 = random_int(999, 9999); |
| 36 | 36 | |
| 37 | 37 | $username = $part1.$part2.$part3; //str_shuffle to randomly shuffle all characters |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | { |
| 122 | 122 | |
| 123 | 123 | // if registration is closed, deny access |
| 124 | - if (! config('backpack.base.registration_open')) { |
|
| 124 | + if (!config('backpack.base.registration_open')) { |
|
| 125 | 125 | abort(403, trans('backpack::base.registration_closed')); |
| 126 | 126 | } |
| 127 | 127 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $angle = 0; |
| 72 | 72 | $width = imagesx($image); |
| 73 | 73 | $centerX = $width / 2; |
| 74 | - [$left, , $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 74 | + [$left,, $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 75 | 75 | $left_offset = ($right - $left) / 2; |
| 76 | 76 | $x = $centerX - $left_offset; |
| 77 | 77 | imagettftext($image, $font_size, $angle, $x, 450, $black, $font, $text); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $angle = 0; |
| 82 | 82 | $width = imagesx($image); |
| 83 | 83 | $centerX = $width / 2; |
| 84 | - [$left, , $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 84 | + [$left,, $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 85 | 85 | $left_offset = ($right - $left) / 2; |
| 86 | 86 | $x = $centerX - $left_offset; |
| 87 | 87 | imagettftext($image, $font_size, $angle, $x, 525, $black, $font, $text); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $angle = 0; |
| 92 | 92 | $width = imagesx($image); |
| 93 | 93 | $centerX = $width / 2; |
| 94 | - [$left, , $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 94 | + [$left,, $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 95 | 95 | $left_offset = ($right - $left) / 2; |
| 96 | 96 | $x = $centerX - $left_offset; |
| 97 | 97 | imagettftext($image, $font_size, $angle, $x, 620, $black, $font, $text); |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $angle = 0; |
| 102 | 102 | $width = imagesx($image); |
| 103 | 103 | $centerX = $width / 2; |
| 104 | - [$left, , $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 104 | + [$left,, $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 105 | 105 | $left_offset = ($right - $left) / 2; |
| 106 | 106 | $x = $centerX - $left_offset; |
| 107 | 107 | imagettftext($image, $font_size, $angle, $x, 690, $black, $font, $text); |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $angle = 0; |
| 115 | 115 | $width = imagesx($image); |
| 116 | 116 | $centerX = $width / 2; |
| 117 | - [$left, , $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 117 | + [$left,, $right] = imageftbbox($font_size, $angle, $font, $text); |
|
| 118 | 118 | $left_offset = ($right - $left) / 2; |
| 119 | 119 | $x = $centerX - $left_offset; |
| 120 | 120 | imagettftext($image, $font_size, $angle, $x, 755, $black, $font, $text); |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | |
| 72 | 72 | // persist the products |
| 73 | 73 | foreach ($request->products as $f => $product) { |
| 74 | - $productType = match ($product['type']) { |
|
| 74 | + $productType = match($product['type']) { |
|
| 75 | 75 | 'enrollment' => Enrollment::class, |
| 76 | 76 | 'scheduledPayment' => Enrollment::class, |
| 77 | 77 | 'fee' => Fee::class, |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | public function teacher(Request $request) |
| 46 | 46 | { |
| 47 | - if (! backpack_user()->isTeacher()) { |
|
| 47 | + if (!backpack_user()->isTeacher()) { |
|
| 48 | 48 | abort(403); |
| 49 | 49 | } |
| 50 | 50 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | public function student() |
| 71 | 71 | { |
| 72 | - if (! backpack_user()->isStudent()) { |
|
| 72 | + if (!backpack_user()->isStudent()) { |
|
| 73 | 73 | abort(403); |
| 74 | 74 | } |
| 75 | 75 | |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $currentPeriod = Period::get_default_period(); |
| 88 | 88 | $enrollmentsPeriod = Period::get_enrollments_period(); |
| 89 | 89 | |
| 90 | - if (! backpack_user()->hasRole(['admin', 'secretary'])) { |
|
| 90 | + if (!backpack_user()->hasRole(['admin', 'secretary'])) { |
|
| 91 | 91 | abort(403); |
| 92 | 92 | } |
| 93 | 93 | |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | // todo optimize this !! |
| 97 | 97 | $events = Event::where('start', '>', Carbon::now()->subDays(15))->where('end', '<', Carbon::now()->addDays(15))->orderBy('id', 'desc') |
| 98 | 98 | ->get() |
| 99 | - ->map(fn ($event) => [ |
|
| 99 | + ->map(fn($event) => [ |
|
| 100 | 100 | 'title' => $event['name'], |
| 101 | 101 | 'resourceId' => $event['teacher_id'], |
| 102 | 102 | 'start' => $event['start'], |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | $teachers = Teacher::with('user')->get()->toArray(); |
| 110 | 110 | |
| 111 | - $teachers = array_map(fn ($teacher) => [ |
|
| 111 | + $teachers = array_map(fn($teacher) => [ |
|
| 112 | 112 | 'id' => $teacher['id'], |
| 113 | 113 | 'title' => $teacher['user']['firstname'], |
| 114 | 114 | ], $teachers); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | 'total_enrollment_count' => $currentPeriod->internal_enrollments_count, |
| 123 | 123 | 'resources' => $teachers, |
| 124 | 124 | 'events' => $events, |
| 125 | - 'pending_attendance' => $currentPeriod->courses_with_pending_attendance, // todo: optimize |
|
| 125 | + 'pending_attendance' => $currentPeriod->courses_with_pending_attendance, // todo: optimize |
|
| 126 | 126 | 'unassigned_events' => Event::unassigned()->count(), |
| 127 | 127 | 'pending_leads' => LeadType::find(4)->students()->count(), |
| 128 | 128 | ]); |
@@ -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 | }; |