@@ -28,14 +28,14 @@ |
||
| 28 | 28 | protected function setupListOperation() |
| 29 | 29 | { |
| 30 | 30 | CRUD::addColumn(['name' => 'name', 'label' => 'Name']); |
| 31 | - CRUD::addColumn(['name' => 'lms_id', 'label' => 'LMS code', 'type' => 'text'], ); |
|
| 31 | + CRUD::addColumn(['name' => 'lms_id', 'label' => 'LMS code', 'type' => 'text'],); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | protected function setupCreateOperation() |
| 35 | 35 | { |
| 36 | 36 | CRUD::setValidation(StoreRequest::class); |
| 37 | 37 | CRUD::addField(['name' => 'name', 'label' => 'Name', 'type' => 'text']); |
| 38 | - CRUD::addField(['name' => 'lms_id', 'label' => 'LMS code', 'type' => 'text'], ); |
|
| 38 | + CRUD::addField(['name' => 'lms_id', 'label' => 'LMS code', 'type' => 'text'],); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | protected function setupUpdateOperation() |
@@ -97,7 +97,7 @@ |
||
| 97 | 97 | 'type' => 'date', |
| 98 | 98 | ]); |
| 99 | 99 | |
| 100 | - CRUD::addField([ // Checkbox |
|
| 100 | + CRUD::addField([// Checkbox |
|
| 101 | 101 | 'name' => 'auto_renewal', |
| 102 | 102 | 'label' => __('Tacit renewal'), |
| 103 | 103 | 'type' => 'checkbox', |
@@ -168,58 +168,58 @@ discard block |
||
| 168 | 168 | ]); |
| 169 | 169 | |
| 170 | 170 | CRUD::addFilter( |
| 171 | - [ // select2 filter |
|
| 171 | + [// select2 filter |
|
| 172 | 172 | 'name' => 'rhythm_id', |
| 173 | 173 | 'type' => 'select2', |
| 174 | 174 | 'label'=> __('Rhythm'), |
| 175 | 175 | ], |
| 176 | - fn () => Rhythm::all()->pluck('name', 'id')->toArray(), |
|
| 177 | - function ($value) { // if the filter is active |
|
| 176 | + fn() => Rhythm::all()->pluck('name', 'id')->toArray(), |
|
| 177 | + function($value) { // if the filter is active |
|
| 178 | 178 | CRUD::addClause('where', 'rhythm_id', $value); |
| 179 | 179 | }, |
| 180 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 180 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 181 | 181 | } |
| 182 | 182 | ); |
| 183 | 183 | |
| 184 | 184 | CRUD::addFilter( |
| 185 | - [ // select2 filter |
|
| 185 | + [// select2 filter |
|
| 186 | 186 | 'name' => 'teacher_id', |
| 187 | 187 | 'type' => 'select2', |
| 188 | 188 | 'label'=> __('Teacher'), |
| 189 | 189 | ], |
| 190 | - fn () => Teacher::all()->pluck('name', 'id')->toArray(), |
|
| 191 | - function ($value) { // if the filter is active |
|
| 190 | + fn() => Teacher::all()->pluck('name', 'id')->toArray(), |
|
| 191 | + function($value) { // if the filter is active |
|
| 192 | 192 | CRUD::addClause('where', 'teacher_id', $value); |
| 193 | 193 | }, |
| 194 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 194 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 195 | 195 | } |
| 196 | 196 | ); |
| 197 | 197 | |
| 198 | 198 | CRUD::addFilter( |
| 199 | - [ // select2 filter |
|
| 199 | + [// select2 filter |
|
| 200 | 200 | 'name' => 'level_id', |
| 201 | 201 | 'type' => 'select2', |
| 202 | 202 | 'label'=> __('Level'), |
| 203 | 203 | ], |
| 204 | - fn () => Level::all()->pluck('name', 'id')->toArray(), |
|
| 205 | - function ($value) { // if the filter is active |
|
| 204 | + fn() => Level::all()->pluck('name', 'id')->toArray(), |
|
| 205 | + function($value) { // if the filter is active |
|
| 206 | 206 | CRUD::addClause('where', 'level_id', $value); |
| 207 | 207 | }, |
| 208 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 208 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 209 | 209 | } |
| 210 | 210 | ); |
| 211 | 211 | |
| 212 | 212 | CRUD::addFilter( |
| 213 | - [ // select2 filter |
|
| 213 | + [// select2 filter |
|
| 214 | 214 | 'name' => 'period_id', |
| 215 | 215 | 'type' => 'select2', |
| 216 | 216 | 'label'=> __('Period'), |
| 217 | 217 | ], |
| 218 | - fn () => Period::all()->pluck('name', 'id')->toArray(), |
|
| 219 | - function ($value) { // if the filter is active |
|
| 218 | + fn() => Period::all()->pluck('name', 'id')->toArray(), |
|
| 219 | + function($value) { // if the filter is active |
|
| 220 | 220 | CRUD::addClause('where', 'period_id', $value); |
| 221 | 221 | }, |
| 222 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 222 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 223 | 223 | $period = Period::get_default_period()->id; |
| 224 | 224 | CRUD::addClause('where', 'period_id', $period); |
| 225 | 225 | $this->crud->getRequest()->request->add(['period_id' => $period]); // to make the filter look active |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | 'tab' => __('Course info'), |
| 366 | 366 | ], |
| 367 | 367 | |
| 368 | - [ // repeatable |
|
| 368 | + [// repeatable |
|
| 369 | 369 | 'name' => 'times', |
| 370 | 370 | 'label' => __('Course Schedule'), |
| 371 | 371 | 'type' => 'repeatable', |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | 'tab' => __('Schedule'), |
| 405 | 405 | ], |
| 406 | 406 | |
| 407 | - [ // view |
|
| 407 | + [// view |
|
| 408 | 408 | 'name' => 'custom-ajax-button', |
| 409 | 409 | 'type' => 'view', |
| 410 | 410 | 'view' => 'courses/schedule-preset-alert', |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | 'tab' => __('Course info'), |
| 559 | 559 | ], |
| 560 | 560 | |
| 561 | - [ // repeatable |
|
| 561 | + [// repeatable |
|
| 562 | 562 | 'name' => 'times', |
| 563 | 563 | 'label' => __('Course Schedule'), |
| 564 | 564 | 'type' => 'repeatable', |
@@ -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); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | public function search() |
| 40 | 40 | { |
| 41 | - return QueryBuilder::for(Course::class)->where('campus_id', 1) |
|
| 41 | + return QueryBuilder::for (Course::class)->where('campus_id', 1) |
|
| 42 | 42 | ->with('room')->withCount('events')->withCount('children')->withCount('enrollments') |
| 43 | 43 | ->allowedFilters([ |
| 44 | 44 | 'name', |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | public function redirectToUserPreferredView() |
| 54 | 54 | { |
| 55 | - return match (backpack_user()->preferred_course_view) { |
|
| 55 | + return match(backpack_user()->preferred_course_view) { |
|
| 56 | 56 | 'blocks' => redirect(route('get-courses-list')), |
| 57 | 57 | default => redirect(route('course.index')), |
| 58 | 58 | }; |
@@ -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 | /* |