academico-sis / academico

app/Http/Controllers/RoomController.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
             ->where('end', '<', Carbon::now()->addDays(90))
             ->orderBy('id', 'desc')
             ->get()
-            ->map(fn ($event) => [
+            ->map(fn($event) => [
                 'title' => $event->name,
                 'resourceId' => $event->room_id,
                 'start' => $event->start,
@@ -37,7 +37,7 @@ 
 
         $rooms = Room::all()->toArray();
 
-        $rooms = array_map(fn ($room) => [
+        $rooms = array_map(fn($room) => [
             'id' => $room['id'],
             'title' => $room['name'],
         ], $rooms);
@@ -47,7 +47,7 @@ 
         $unassigned_events = Event::with('course')
             ->whereNull('room_id')
             ->get()
-            ->map(fn ($event) => [
+            ->map(fn($event) => [
                 'title' => $event->name,
                 'resourceId' => 'tbd',
                 'start' => $event->start,
@@ -70,7 +70,7 @@ 
     public function show(Room $room)
     {
         $events = $room->events->toArray();
-        $events = array_map(fn ($event) => [
+        $events = array_map(fn($event) => [
             'title' => $event['name'],
             'start' => $event['start'],
             'end' => $event['end'],

app/Models/Student.php

Spacing +16 added lines, -16 removed lines

@@ -42,8 +42,8 @@ 
 
     public function scopeEnrolled($query)
     {
-        return $query->whereHas('enrollments', function ($q) {
-            return $q->whereHas('course', function ($q) {
+        return $query->whereHas('enrollments', function($q) {
+            return $q->whereHas('course', function($q) {
                 return $q->where('period_id', Period::get_default_period()->id);
             });
         });
@@ -51,8 +51,8 @@ 
 
     public function scopeComputedLeadType($query, $leadTypeId)
     {
-        return match ($leadTypeId) {
-            1 => $query->whereHas('enrollments', fn ($query) => $query->whereHas('course', function ($q) {
+        return match($leadTypeId) {
+            1 => $query->whereHas('enrollments', fn($query) => $query->whereHas('course', function($q) {
                 $q->where('period_id', Period::get_default_period()->id);
             })),
 
@@ -60,15 +60,15 @@ 
 
             4 => $query
                 ->where('lead_type_id', $leadTypeId)
-                ->orWhere(function ($query) {
+                ->orWhere(function($query) {
                     $query
                         ->whereNull('lead_type_id')
-                        ->whereHas('enrollments', fn ($query) => $query
-                            ->whereHas('course', function ($q) {
+                        ->whereHas('enrollments', fn($query) => $query
+                            ->whereHas('course', function($q) {
                                 $q->where('period_id', '!=', Period::get_default_period()->id);
                             }))
-                        ->whereDoesntHave('enrollments', fn ($query) => $query
-                            ->whereHas('course', function ($q) {
+                        ->whereDoesntHave('enrollments', fn($query) => $query
+                            ->whereHas('course', function($q) {
                                 $q->where('period_id', Period::get_default_period()->id);
                             }));
                 }
@@ -109,7 +109,7 @@ 
 
         return $this->hasMany(Attendance::class)
         ->where('attendance_type_id', 4) // absence
-        ->whereHas('event', fn ($q) => $q->whereHas('course', fn ($c) => $c->where('period_id', $period->id)));
+        ->whereHas('event', fn($q) => $q->whereHas('course', fn($c) => $c->where('period_id', $period->id)));
     }
 
     public function periodAttendance(Period $period = null)
@@ -119,7 +119,7 @@ 
         }
 
         return $this->hasMany(Attendance::class)
-        ->whereHas('event', fn ($q) => $q->whereHas('course', fn ($c) => $c->where('period_id', $period->id)));
+        ->whereHas('event', fn($q) => $q->whereHas('course', fn($c) => $c->where('period_id', $period->id)));
     }
 
     public function contacts()
@@ -180,7 +180,7 @@ 
 
     public function getEmailAttribute(): ?string
     {
-        return $this?->user?->email;
+        return $this ? ->user ? ->email;
     }
 
     public function getNameAttribute(): string
@@ -190,7 +190,7 @@ 
 
     public function getStudentAgeAttribute()
     {
-        return $this->birthdate ? Carbon::parse($this->birthdate)->age . ' ' . __('years old') : '';
+        return $this->birthdate ? Carbon::parse($this->birthdate)->age.' '.__('years old') : '';
     }
 
     public function getStudentBirthdateAttribute()
@@ -201,7 +201,7 @@ 
     public function getIsEnrolledAttribute()
     {
         // if the student is currently enrolled
-        if ($this->enrollments()->whereHas('course', fn ($q) => $q->where('period_id', Period::get_default_period()->id))->count() > 0) {
+        if ($this->enrollments()->whereHas('course', fn($q) => $q->where('period_id', Period::get_default_period()->id))->count() > 0) {
             return 1;
         }
 
@@ -296,13 +296,13 @@ 
 
     public function getImageAttribute(): ?string
     {
-        return $this->getMedia('profile-picture')->last()?->getUrl('thumb');
+        return $this->getMedia('profile-picture')->last() ? ->getUrl('thumb');
     }
 
     public function setImageAttribute($value)
     {
         // if the image was erased
-        if ($value==null) {
+        if ($value == null) {
             $this->clearMediaCollection('profile-picture');
         }
 

app/Http/Controllers/Admin/EnrollmentCrudController.php

Spacing +19 added lines, -19 removed lines

@@ -106,7 +106,7 @@ 
                 'name' => 'id',
                 'label' => 'ID',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
@@ -117,7 +117,7 @@ 
                 'type' => 'text',
                 'name' => 'student.idnumber',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
@@ -130,13 +130,13 @@ 
                 'label' => __('Last Name'),
                 'type' => 'relationship',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
+                        $q->whereHas('user', function($q) use ($searchTerm) {
                             $q->where('lastname', 'like', '%'.$searchTerm.'%');
                         });
                     });
@@ -150,13 +150,13 @@ 
                 'label' => __('First Name'),
                 'type' => 'relationship',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
+                        $q->whereHas('user', function($q) use ($searchTerm) {
                             $q->where('firstname', 'like', '%'.$searchTerm.'%');
                         });
                     });
@@ -202,7 +202,7 @@ 
                 'model' => EnrollmentStatusType::class,
                 'wrapper' => [
                     'element' => 'span',
-                    'class' => function ($crud, $column, $entry) {
+                    'class' => function($crud, $column, $entry) {
                         return 'badge badge-pill badge-'.$entry->enrollmentStatus->styling();
                     },
                 ],
@@ -255,8 +255,8 @@ 
                 'name' => 'status_id',
                 'type' => 'select2_multiple',
                 'label'=> __('Status'),
-            ], fn () => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(),
-            function ($values) {
+            ], fn() => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(),
+            function($values) {
                 foreach (json_decode($values, null, 512, JSON_THROW_ON_ERROR) as $value) {
                     CRUD::addClause('orWhere', 'status_id', $value);
                 }
@@ -266,7 +266,7 @@ 
                 'name' => 'period_id',
                 'type' => 'select2',
                 'label'=> __('Period'),
-            ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($value) {
+            ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($value) {
                 CRUD::addClause('period', $value);
             });
 
@@ -276,12 +276,12 @@ 
                     'type' => 'select2',
                     'label'=> __('Scholarship'),
                 ],
-                fn () => Scholarship::all()->pluck('name', 'id')->toArray(),
-                function ($value) { // if the filter is active
+                fn() => Scholarship::all()->pluck('name', 'id')->toArray(),
+                function($value) { // if the filter is active
                     if ($value == 'all') {
                         CRUD::addClause('whereHas', 'scholarships');
                     } else {
-                        CRUD::addClause('whereHas', 'scholarships', function ($q) use ($value) {
+                        CRUD::addClause('whereHas', 'scholarships', function($q) use ($value) {
                             $q->where('scholarships.id', $value);
                         });
                     }
@@ -301,7 +301,7 @@ 
             ->get();
 
         // get related comments
-        $comments = $enrollment->invoices->map(fn (Invoice $invoice) => $invoice->comments)->flatten()->concat($enrollment->comments);
+        $comments = $enrollment->invoices->map(fn(Invoice $invoice) => $invoice->comments)->flatten()->concat($enrollment->comments);
 
         $scholarships = Scholarship::all();
 
@@ -332,7 +332,7 @@ 
             'model'     => \App\Models\Course::class,
             'attribute' => 'name',
 
-            'options'   => (fn ($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()),
+            'options'   => (fn($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()),
         ]);
 
         CRUD::addField(array_merge([

app/Http/Controllers/Admin/UserCrudController.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
                 'label' => trans('backpack::permissionmanager.email'),
                 'type'  => 'email',
             ],
-            [ // n-n relationship (with pivot table)
+            [// n-n relationship (with pivot table)
                 'label'     => trans('backpack::permissionmanager.roles'),
                 'type'      => 'select_multiple',
                 'name'      => 'roles',
@@ -67,9 +67,9 @@ 
                 'label' => trans('backpack::permissionmanager.role'),
             ],
             config('permission.models.role')::all()->pluck(['name', 'id'])->toArray(),
-            function ($value) {
+            function($value) {
                 // if the filter is active
-                $this->crud->addClause('whereHas', 'roles', function ($query) use ($value) {
+                $this->crud->addClause('whereHas', 'roles', function($query) use ($value) {
                     $query->where('role_id', '=', $value);
                 });
             }
@@ -120,12 +120,12 @@ 
     protected function addFields()
     {
         $this->crud->addFields([
-            [  // Select2
+            [// Select2
                 'label' => trans('firstname'),
                 'type' => 'text',
                 'name' => 'firstname',
             ],
-            [  // Select2
+            [// Select2
                 'label' => trans('lastname'),
                 'type' => 'text',
                 'name' => 'lastname',

app/Http/Controllers/Admin/SkillCrudController.php

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
     protected function setupListOperation()
     {
         CRUD::setColumns([
-            [ // skill type
+            [// skill type
                 'label'     => 'Type',
                 'type'      => 'select',
                 'name'      => 'skill_type',
@@ -44,7 +44,7 @@ 
                 'type' => 'text',
                 'name' => 'name',
             ],
-            [ // skill level
+            [// skill level
                 'label'     => 'Level',
                 'type'      => 'select',
                 'name'      => 'level',
@@ -56,19 +56,19 @@ 
 
         CRUD::enableExportButtons();
 
-        CRUD::addFilter([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'level_id',
             'type' => 'select2',
             'label'=> 'Level',
-        ], fn () => Level::all()->pluck('name', 'id')->toArray(), function ($value) { // if the filter is active
+        ], fn() => Level::all()->pluck('name', 'id')->toArray(), function($value) { // if the filter is active
             CRUD::addClause('where', 'level_id', $value);
         });
 
-        CRUD::addFilter([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'skill_type_id',
             'type' => 'select2',
             'label'=> 'Type',
-        ], fn () => SkillType::all()->pluck('name', 'id')->toArray(), function ($value) { // if the filter is active
+        ], fn() => SkillType::all()->pluck('name', 'id')->toArray(), function($value) { // if the filter is active
             CRUD::addClause('where', 'skill_type_id', $value);
         });
     }
@@ -77,7 +77,7 @@ 
     {
         CRUD::setValidation(StoreRequest::class);
         CRUD::addFields([
-            [ // skill type
+            [// skill type
                 'label'     => 'Type',
                 'type' => 'select',
                 'name' => 'skill_type_id', // the db column for the foreign key
@@ -90,7 +90,7 @@ 
                 'type' => 'text',
                 'name' => 'name',
             ],
-            [ // skill level
+            [// skill level
                 'label'     => 'Level',
                 'type' => 'select',
                 'name' => 'level_id', // the db column for the foreign key
@@ -103,7 +103,7 @@ 
                 'type' => 'relationship',
                 'name' => 'skill_type', // the method on your model that defines the relationship
                 'ajax' => true,
-                'inline_create' => [ // specify the entity in singular
+                'inline_create' => [// specify the entity in singular
                     'entity' => 'skilltype', // the entity in singular
                     // OPTIONALS
                     'force_select' => true, // should the inline-created entry be immediately selected?

app/Http/Controllers/Admin/TeacherCrudController.php

Spacing +11 added lines, -11 removed lines

@@ -46,10 +46,10 @@ 
                 'attribute' => 'lastname',
                 'model'     => \App\Models\User::class,
                 'orderable' => true,
-                'orderLogic' => fn ($query, $column, $columnDirection) => $query->leftJoin('users', 'users.id', '=', 'students.id')
+                'orderLogic' => fn($query, $column, $columnDirection) => $query->leftJoin('users', 'users.id', '=', 'students.id')
                     ->orderBy('users.lastname', $columnDirection)->select('students.*'),
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('user', function($q) use ($searchTerm) {
                         $q->where('lastname', 'like', '%'.$searchTerm.'%');
                     });
                 },
@@ -64,10 +64,10 @@ 
                 'attribute' => 'firstname',
                 'model'     => \App\Models\User::class,
                 'orderable' => true,
-                'orderLogic' => fn ($query, $column, $columnDirection) => $query->leftJoin('users', 'users.id', '=', 'teachers.id')
+                'orderLogic' => fn($query, $column, $columnDirection) => $query->leftJoin('users', 'users.id', '=', 'teachers.id')
                     ->orderBy('users.firstname', $columnDirection)->select('teachers.*'),
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('user', function($q) use ($searchTerm) {
                         $q->where('firstname', 'like', '%'.$searchTerm.'%');
                     });
                 },
@@ -81,10 +81,10 @@ 
                 'attribute' => 'email',
                 'model'     => \App\Models\User::class,
                 'orderable' => true,
-                'orderLogic' => fn ($query, $column, $columnDirection) => $query->leftJoin('users', 'users.id', '=', 'teachers.id')
+                'orderLogic' => fn($query, $column, $columnDirection) => $query->leftJoin('users', 'users.id', '=', 'teachers.id')
                     ->orderBy('users.email', $columnDirection)->select('teachers.*'),
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('user', function($q) use ($searchTerm) {
                         $q->where('email', 'like', '%'.$searchTerm.'%');
                     });
                 },
@@ -181,8 +181,8 @@ 
         $username_parts = array_filter(explode(' ', strtolower($fullName)));
         $username_parts = array_slice($username_parts, -2);
 
-        $part1 = (! empty($username_parts[0])) ? substr($username_parts[0], 0, 3) : '';
-        $part2 = (! empty($username_parts[1])) ? substr($username_parts[1], 0, 8) : '';
+        $part1 = (!empty($username_parts[0])) ? substr($username_parts[0], 0, 3) : '';
+        $part2 = (!empty($username_parts[1])) ? substr($username_parts[1], 0, 8) : '';
         $part3 = random_int(999, 9999);
 
         $username = $part1.$part2.$part3; //str_shuffle to randomly shuffle all characters

app/Http/Controllers/Admin/EvaluationTypeCrudController.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
     {
         CRUD::addField(['name' => 'name', 'label' => 'Name', 'type' => 'text']);
 
-        CRUD::addField([    // Select2Multiple = n-n relationship (with pivot table)
+        CRUD::addField([// Select2Multiple = n-n relationship (with pivot table)
             'label'     => __('Grade Types'),
             'type'      => 'select2_multiple',
             'name'      => 'gradeTypes',
@@ -47,7 +47,7 @@ 
             'select_all' => true, // show Select All and Clear buttons?
         ]);
 
-        CRUD::addField([    // Select2Multiple = n-n relationship (with pivot table)
+        CRUD::addField([// Select2Multiple = n-n relationship (with pivot table)
             'label'     => __('Skills'),
             'type'      => 'select2_multiple',
             'name'      => 'skills',

app/Models/Course.php

Spacing +7 added lines, -7 removed lines

@@ -200,7 +200,7 @@ 
      */
     public function skills()
     {
-        return $this->evaluationType?->skills()->orderBy('order');
+        return $this->evaluationType ? ->skills()->orderBy('order');
     }
 
     public function books()
@@ -225,7 +225,7 @@ 
      */
     public function getPendingAttendanceAttribute()
     {
-        $events = Event::where(function ($query) {
+        $events = Event::where(function($query) {
             $query->where('course_id', $this->id);
             $query->where('exempt_attendance', '!=', true);
             $query->where('exempt_attendance', '!=', 1);
@@ -358,7 +358,7 @@ 
             foreach ($courseTimes as $courseTime) {
                 $initial = $daysInitials[$courseTime->day];
 
-                if (! isset($parsedCourseTimes[$initial])) {
+                if (!isset($parsedCourseTimes[$initial])) {
                     $parsedCourseTimes[$initial] = [];
                 }
 
@@ -405,7 +405,7 @@ 
     public function getCourseTeacherNameAttribute()
     {
         if ($this->teacher_id) {
-            return $this->teacher?->name;
+            return $this->teacher ? ->name;
         } else {
             return '-';
         }
@@ -438,11 +438,11 @@ 
 
     public function getAcceptsNewStudentsAttribute(): bool
     {
-        if (! $this->spots || $this->spots == 0) {
+        if (!$this->spots || $this->spots == 0) {
             return true;
         }
 
-        return $this->spots - $this->enrollments()->whereIn('status_id', [1,2])->count() > 0;
+        return $this->spots - $this->enrollments()->whereIn('status_id', [1, 2])->count() > 0;
     }
 
     public function getTakesAttendanceAttribute(): bool
@@ -461,7 +461,7 @@ 
 
     public function eventsWithExpectedAttendance()
     {
-        return $this->events()->where(function ($query) {
+        return $this->events()->where(function($query) {
             $query->where('exempt_attendance', '!=', true);
             $query->where('exempt_attendance', '!=', 1);
             $query->orWhereNull('exempt_attendance');