academico-sis / academico

app/Models/Teacher.php

Spacing +7 added lines, -7 removed lines

@@ -39,22 +39,22 @@ 
     /** attributes */
     public function getFirstnameAttribute(): ?string
     {
-        return $this?->user?->firstname;
+        return $this ? ->user ? ->firstname;
     }
 
     public function getLastnameAttribute(): ?string
     {
-        return $this?->user?->lastname;
+        return $this ? ->user ? ->lastname;
     }
 
     public function getEmailAttribute(): ?string
     {
-        return $this?->user?->email;
+        return $this ? ->user ? ->email;
     }
 
     public function getNameAttribute(): ?string
     {
-        return $this?->user?->firstname.' '.$this?->user?->lastname;
+        return $this ? ->user ? ->firstname.' '.$this ? ->user ? ->lastname;
     }
 
     public function period_courses(Period $period)
@@ -178,14 +178,14 @@ 
         $eventsWithMissingAttendance = [];
 
         $eventsWithExpectedAttendance = $this->events()
-        ->where(function ($query) {
+        ->where(function($query) {
             $query->where('exempt_attendance', '!=', true);
             $query->where('exempt_attendance', '!=', 1);
             $query->orWhereNull('exempt_attendance');
         })
         ->where('course_id', '!=', null)
-        ->whereHas('course', fn (Builder $query) => $query->where('period_id', $period->id)
-            ->where(function ($query) {
+        ->whereHas('course', fn(Builder $query) => $query->where('period_id', $period->id)
+            ->where(function($query) {
                 $query->where('exempt_attendance', '!=', true);
                 $query->where('exempt_attendance', '!=', 1);
                 $query->orWhereNull('exempt_attendance');

app/Models/ScheduledPayment.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 
     public function scopeStatus(Builder $query, $status)
     {
-        return match ($status) {
+        return match($status) {
             '2' => $query->where('status', 2),
             '1' => $query->where('status', 1),
             default => $query,
@@ -67,7 +67,7 @@ 
 
     public function invoices()
     {
-        return $this->invoiceDetails->map(fn (InvoiceDetail $invoiceDetail) => $invoiceDetail->invoice)->filter();
+        return $this->invoiceDetails->map(fn(InvoiceDetail $invoiceDetail) => $invoiceDetail->invoice)->filter();
     }
     /*
     |--------------------------------------------------------------------------
@@ -123,7 +123,7 @@ 
 
     public function getStatusTypeNameAttribute()
     {
-        return match ($this->status) {
+        return match($this->status) {
             2 => __('Paid'),
             1 => __('Pending'),
             default => '-',

app/Models/Enrollment.php

Spacing +10 added lines, -10 removed lines

@@ -60,11 +60,11 @@ 
     public function scopeWithoutChildren($query)
     {
         return $query
-            ->where(function ($query) {
+            ->where(function($query) {
                 $query->whereDoesntHave('childrenEnrollments')
                 ->where('parent_id', null);
             })
-            ->orWhere(function ($query) {
+            ->orWhere(function($query) {
                 $query->where('parent_id', null);
             })
             ->get();
@@ -86,7 +86,7 @@ 
 
     public function scopePeriod(Builder $query, int $periodId)
     {
-        return $query->whereHas('course', function ($q) use ($periodId) {
+        return $query->whereHas('course', function($q) use ($periodId) {
             $q->where('period_id', $periodId);
         });
     }
@@ -174,13 +174,13 @@ 
 
     public function invoices()
     {
-        return $this->invoiceDetails->map(fn (InvoiceDetail $invoiceDetail) => $invoiceDetail->invoice)->filter();
+        return $this->invoiceDetails->map(fn(InvoiceDetail $invoiceDetail) => $invoiceDetail->invoice)->filter();
     }
 
     // also includes invoices for this enrollment's scheduled payments.
     public function relatedInvoices()
     {
-        $scheduledPaymentsInvoices = $this->scheduledPayments->map(fn (ScheduledPayment $scheduledPayment) => $scheduledPayment->invoices());
+        $scheduledPaymentsInvoices = $this->scheduledPayments->map(fn(ScheduledPayment $scheduledPayment) => $scheduledPayment->invoices());
 
         return $this->invoices()->concat($scheduledPaymentsInvoices)->flatten(1);
     }
@@ -336,7 +336,7 @@ 
         }
 
         // if enabled, retrieve the default price category for the student
-        if (config('invoicing.price_categories_enabled') && $this->student?->price_category) {
+        if (config('invoicing.price_categories_enabled') && $this->student ? ->price_category) {
             $price_category = $this->student->price_category;
 
             return $this->course->$price_category ?? 0;
@@ -366,11 +366,11 @@ 
 
         // delete attendance records related to the enrollment
         $attendances = $this->course->attendance->where('student_id', $this->student->id);
-        Attendance::destroy($attendances->map(fn ($item, $key) => $item->id));
+        Attendance::destroy($attendances->map(fn($item, $key) => $item->id));
 
         foreach ($this->course->children as $child) {
             $attendances = $child->attendance->where('student_id', $this->student->id);
-            Attendance::destroy($attendances->map(fn ($item, $key) => $item->id));
+            Attendance::destroy($attendances->map(fn($item, $key) => $item->id));
         }
 
         $this->delete();
@@ -401,7 +401,7 @@ 
                 }
 
                 // if one book is expired
-                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) {
+                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) {
                     return 'EXP';
                 }
             }
@@ -412,7 +412,7 @@ 
 
     public function getBalanceAttribute()
     {
-        if (! config('invoicing.invoices_contain_enrollments_only')) {
+        if (!config('invoicing.invoices_contain_enrollments_only')) {
             abort(422, 'Configuration options forbid to access this value');
         }
 

app/Models/Student.php

Spacing +14 added lines, -14 removed lines

@@ -45,8 +45,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);
             });
         });
@@ -54,8 +54,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);
             })),
 
@@ -64,15 +64,15 @@ 
             4 => $query
                 ->where('lead_type_id', $leadTypeId)
                 ->orWhere(
-                    function ($query) {
+                    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);
                             }));
                     }
@@ -113,7 +113,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)
@@ -123,7 +123,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()
@@ -184,7 +184,7 @@ 
 
     public function getEmailAttribute(): ?string
     {
-        return $this?->user?->email;
+        return $this ? ->user ? ->email;
     }
 
     public function getNameAttribute(): string
@@ -205,7 +205,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;
         }
 
@@ -304,7 +304,7 @@ 
 
     public function getImageAttribute(): ?string
     {
-        return $this->getMedia('profile-picture')->last()?->getUrl('thumb');
+        return $this->getMedia('profile-picture')->last() ? ->getUrl('thumb');
     }
 
     public function setImageAttribute($value)

app/Console/Commands/genderizeStudents.php

Spacing +3 added lines, -3 removed lines

@@ -349,8 +349,8 @@ 
 
     public function handle()
     {
-        Student::whereNull('gender_id')->chunkById(10, function ($students) {
-            $query = $students->map(fn ($student) => ['id' => $student->id,
+        Student::whereNull('gender_id')->chunkById(10, function($students) {
+            $query = $students->map(fn($student) => ['id' => $student->id,
                 'name' => $this->remove_accents(strtok($student->firstname, ' ')), ]);
 
             $response = Http::get('https://api.genderize.io/?name[]='.$query->pluck('name')->implode('&name[]='));
@@ -358,7 +358,7 @@ 
                 $firstname = $query->firstWhere('id', $student->id)['name'];
 
                 $student->update([
-                    'gender_id' => match ($response->collect()->where('name', $firstname)->where('probability', '>', 0.9)->where('count', '>', 10)->first()['gender'] ?? '-') {
+                    'gender_id' => match($response->collect()->where('name', $firstname)->where('probability', '>', 0.9)->where('count', '>', 10)->first()['gender'] ?? '-') {
                         'male' => 2,
                         'female' => 1,
                         default => null,

app/Providers/AuthServiceProvider.php

Spacing +11 added lines, -11 removed lines

@@ -30,70 +30,70 @@
          * a user is allowed to edit the course grades if they are the teacher for this course,
          * or if they have explicit permission to do so
          */
-        Gate::define('edit-course-grades', fn ($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('evaluation.edit'));
+        Gate::define('edit-course-grades', fn($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('evaluation.edit'));
 
         /*
          * a user is allowed to view the course attendance sheet if they are the teacher for this course,
          * or if they have explicit permission to view all course attendance sheets
          */
-        Gate::define('view-course-attendance', fn ($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('attendance.view'));
+        Gate::define('view-course-attendance', fn($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('attendance.view'));
 
         /*
          * a user is allowed to view the event attendance sheet if they are the teacher for this event,
          * if they are the teacher for this course,
          * or if they have explicit permission to view all event attendance sheets
          */
-        Gate::define('view-event-attendance', fn ($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.view'));
+        Gate::define('view-event-attendance', fn($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.view'));
 
         /*
          * a user is allowed to edit an attendance sheet if they are the teacher for the event,
          * if they are the teacher for the course,
          * or if they have explicit permission to edit any attendance sheets
          */
-        Gate::define('edit-attendance', fn ($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.edit'));
+        Gate::define('edit-attendance', fn($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.edit'));
 
         /*
          * teachers are allowed to view their own calendar,
          * and users with explicit permission can view all calendars
          */
-        Gate::define('view-teacher-calendar', fn ($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('calendars.view'));
+        Gate::define('view-teacher-calendar', fn($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('calendars.view'));
 
         /*
          * teachers are allowed to view their own courses,
          * and users with explicit permission can view all courses
          */
-        Gate::define('view-course', fn ($user, Course $course) => ($user->isTeacher() && $user->id == $course->teacher_id) || $user->can('courses.view'));
+        Gate::define('view-course', fn($user, Course $course) => ($user->isTeacher() && $user->id == $course->teacher_id) || $user->can('courses.view'));
 
         /*
          * the user is allowed to view the result if they are the student,
          * if they are a teacher
          * of if they have explicit permission to view any result
          */
-        Gate::define('view-enrollment', fn ($user, $enrollment) => ($user->isStudent() && $user->id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view'));
+        Gate::define('view-enrollment', fn($user, $enrollment) => ($user->isStudent() && $user->id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view'));
 
         /*
          * if the user is the teacher of the course
          * of if they have explicit permission to enroll students
          */
-        Gate::define('enroll-in-course', fn ($user, $course) => $course->teacher_id == $user->id || $user->can('enrollments.edit'));
+        Gate::define('enroll-in-course', fn($user, $course) => $course->teacher_id == $user->id || $user->can('enrollments.edit'));
 
         /*
          * if the user is a teacher
          * of if they have explicit permission to enroll students
          */
-        Gate::define('enroll-students', fn ($user) => $user->isTeacher() || $user->can('enrollments.edit'));
+        Gate::define('enroll-students', fn($user) => $user->isTeacher() || $user->can('enrollments.edit'));
 
         /*
          * teachers are allowed to view their own hours,
          * and users with explicit permission can view all hours
          */
-        Gate::define('view-teacher-hours', fn ($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('hr.view'));
+        Gate::define('view-teacher-hours', fn($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('hr.view'));
 
         /*
          * teachers are allowed to edit results for their own students
          * as well as users with explicit permission to edit any result
          */
-        Gate::define('edit-result', function ($user, $enrollment) {
+        Gate::define('edit-result', function($user, $enrollment) {
             if ($user->can('evaluation.edit')) {
                 return true;
             }

app/Http/Controllers/Admin/EnrollmentCrudController.php

Spacing +22 added lines, -22 removed lines

@@ -97,14 +97,14 @@ 
 
         CRUD::addColumns([['name' => 'id',
             'label' => 'ID',
-            'wrapper' => ['element' => function ($crud, $column, $entry) {
+            'wrapper' => ['element' => function($crud, $column, $entry) {
                 return $entry->status_id > 2 ? 'del' : 'span';
             }], ],
 
             ['label' => __('ID number'),
                 'type' => 'text',
                 'name' => 'student.idnumber',
-                'wrapper' => ['element' => function ($crud, $column, $entry) {
+                'wrapper' => ['element' => function($crud, $column, $entry) {
                     return $entry->status_id > 2 ? 'del' : 'span';
                 }], ],
 
@@ -113,17 +113,17 @@ 
                 'attribute' => 'lastname',
                 'label' => __('Last Name'),
                 'type' => 'relationship',
-                'wrapper' => ['element' => function ($crud, $column, $entry) {
+                'wrapper' => ['element' => function($crud, $column, $entry) {
                     return $entry->status_id > 2 ? 'del' : 'span';
                 }],
                 'orderable' => true,
-                'orderLogic' => function ($query, $column, $columnDirection) {
+                'orderLogic' => function($query, $column, $columnDirection) {
                     return $query->leftJoin('users', 'enrollments.student_id', '=', 'users.id')
                         ->orderBy('users.lastname', $columnDirection)->select('enrollments.*');
                 },
-                '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.'%');
                         });
                     });
@@ -135,17 +135,17 @@ 
                 'attribute' => 'firstname',
                 'label' => __('First Name'),
                 'type' => 'relationship',
-                'wrapper' => ['element' => function ($crud, $column, $entry) {
+                'wrapper' => ['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.'%');
                         });
                     });
                 },
-                'orderLogic' => function ($query, $column, $columnDirection) {
+                'orderLogic' => function($query, $column, $columnDirection) {
                     return $query->leftJoin('users', 'enrollments.student_id', '=', 'users.id')
                         ->orderBy('users.firstname', $columnDirection)->select('enrollments.*');
                 },
@@ -169,7 +169,7 @@ 
                     'name' => 'course.period',
                     'label' => __('Period'),
                     'attribute' => 'name',
-                    'orderLogic' => function ($query, $column, $columnDirection) {
+                    'orderLogic' => function($query, $column, $columnDirection) {
                         return $query->leftJoin('courses', 'enrollments.course_id', '=', 'courses.id')
                             ->orderBy('courses.period_id', $columnDirection)->select('enrollments.*');
                     },
@@ -184,9 +184,9 @@ 
             'attribute' => 'name',
             'model' => EnrollmentStatusType::class,
             'wrapper' => ['element' => 'span',
-                'class' => function ($crud, $column, $entry) {
+                'class' => function($crud, $column, $entry) {
                     return 'badge badge-pill badge-'.$entry->enrollmentStatus->styling();
-                }, ], ]]);
+                },], ]]);
 
         if (config('invoicing.allow_scheduled_payments')) {
             CRUD::addColumn(['name' => 'scheduledPayments',
@@ -232,7 +232,7 @@ 
         if ($this->mode === 'global') {
             CRUD::addFilter(['name' => 'status_id',
                 'type' => 'select2_multiple',
-                'label' => __('Status'), ], fn () => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(), function ($values) {
+                'label' => __('Status'), ], 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);
                     }
@@ -240,17 +240,17 @@ 
 
             CRUD::addFilter(['name' => 'period_id',
                 'type' => 'select2',
-                'label' => __('Period'), ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($value) {
+                'label' => __('Period'), ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($value) {
                     CRUD::addClause('period', $value);
                 });
 
             CRUD::addFilter(['name' => 'scholarship',
                 'type' => 'select2',
-                'label' => __('Scholarship'), ], fn () => Scholarship::all()->pluck('name', 'id')->toArray(), function ($value) {
+                'label' => __('Scholarship'), ], fn() => Scholarship::all()->pluck('name', 'id')->toArray(), function($value) {
                     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);
                         });
                     }
@@ -271,8 +271,8 @@ 
         // then load the page
         $commentsIncludingInvoices = $enrollment->comments
             ->concat($enrollment->invoices()
-                ->map(fn($invoice) => $invoice->comments->map(function ($comment) use ($invoice) {
-                    $comment->prefix = '(' . __('Invoice') . " " . ($invoice->invoice_reference ?? $invoice->id) . ")";
+                ->map(fn($invoice) => $invoice->comments->map(function($comment) use ($invoice) {
+                    $comment->prefix = '('.__('Invoice')." ".($invoice->invoice_reference ?? $invoice->id).")";
                     return $comment;
                 }))
                 ->flatten()
@@ -304,7 +304,7 @@ 
             'model' => 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/InvoiceCrudController.php

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
         CRUD::setModel(Invoice::class);
         CRUD::setRoute(config('backpack.base.route_prefix').'/invoice');
         CRUD::setEntityNameStrings(__('invoice'), __('invoices'));
-        if (! config('invoicing.price_categories_enabled')) {
+        if (!config('invoicing.price_categories_enabled')) {
             $this->crud->addButtonFromView('top', 'createInvoice', 'createInvoice', 'start');
         }
     }
@@ -104,7 +104,7 @@ 
                 'label' => __('Date range'),
             ],
             false,
-            function ($value) { // if the filter is active, apply these constraints
+            function($value) { // if the filter is active, apply these constraints
                 $dates = json_decode($value, null, 512, JSON_THROW_ON_ERROR);
 
                 if ($dates->from) {
@@ -147,7 +147,7 @@ 
     {
         $invoice = Invoice::findOrFail($id)->load('payments');
 
-        if (! backpack_user()->can('enrollments.edit')) {
+        if (!backpack_user()->can('enrollments.edit')) {
             abort(403);
         }
 
@@ -155,7 +155,7 @@ 
             'invoice' => $invoice,
             'availablePaymentMethods' => Paymentmethod::all(),
             'editable' => true,
-            'enrollment' => $invoice->enrollments->first()?->product,
+            'enrollment' => $invoice->enrollments->first() ? ->product,
             'comments' => $invoice->comments,
             'afterSuccessUrl' => $invoice->enrollments->count() > 0 ? "/enrollment/{$invoice->enrollments->first()->product_id}/show" : '/invoice', // TODO fix this, an invoice can theoretically contain several enrollments
         ]);