academico-sis / academico

app/Events/LeadStatusUpdatedEvent.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     public $lastname;
 
-    public function __construct(Student|Contact $user, public $listId)
+    public function __construct(Student | Contact $user, public $listId)
     {
         $this->email = $user->email;
         $this->name = $user->firstname;

app/Http/Controllers/Admin/StudentCrudController.php

Spacing +23 added lines, -23 removed lines

@@ -91,10 +91,10 @@ 
                 'attribute' => 'lastname', // foreign key attribute that is shown to user
                 'model'     => \App\Models\User::class, // foreign key model
                 '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.'%');
                     });
                 },
@@ -109,10 +109,10 @@ 
                 'attribute' => 'firstname', // foreign key attribute that is shown to user
                 'model'     => \App\Models\User::class, // foreign key model
                 '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.firstname', $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('firstname', 'like', '%'.$searchTerm.'%');
                     });
                 },
@@ -126,10 +126,10 @@ 
                 'attribute' => 'email', // foreign key attribute that is shown to user
                 'model'     => \App\Models\User::class, // foreign key model
                 '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.email', $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('email', 'like', '%'.$searchTerm.'%');
                     });
                 },
@@ -175,25 +175,25 @@ 
 
         ]);
 
-        CRUD::addFilter([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'enrolled',
             'type' => 'select2',
             'label'=> __('Is Enrolled in'),
-        ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($value) { // if the filter is active
-            $this->crud->query = $this->crud->query->whereHas('enrollments', fn ($query) => $query->whereHas('course', function ($q) use ($value) {
+        ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($value) { // if the filter is active
+            $this->crud->query = $this->crud->query->whereHas('enrollments', fn($query) => $query->whereHas('course', function($q) use ($value) {
                 $q->where('period_id', $value);
             }));
         },
-          function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit)
+          function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit)
           });
 
-        CRUD::addFilter([ // select2_multiple filter
+        CRUD::addFilter([// select2_multiple filter
             'name' => 'notenrolled',
             'type' => 'select2_multiple',
             'label'=> __('Is Not Enrolled in'),
-        ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($values) { // if the filter is active
+        ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($values) { // if the filter is active
             foreach (json_decode($values, null, 512, JSON_THROW_ON_ERROR) as $value) {
-                $this->crud->query = $this->crud->query->whereDoesntHave('enrollments', fn ($query) => $query->whereHas('course', function ($q) use ($value) {
+                $this->crud->query = $this->crud->query->whereDoesntHave('enrollments', fn($query) => $query->whereHas('course', function($q) use ($value) {
                     $q->where('period_id', $value);
                 }));
             }
@@ -204,8 +204,8 @@ 
             'type' => 'select2',
             'label'=> __('New In'),
         ],
-            fn () => Period::all()->pluck('name', 'id')->toArray(),
-            function ($value) { // if the filter is active
+            fn() => Period::all()->pluck('name', 'id')->toArray(),
+            function($value) { // if the filter is active
                 CRUD::addClause('newInPeriod', $value);
             }
         );
@@ -215,7 +215,7 @@ 
             'name'  => 'institution_id',
             'type'  => 'select2',
             'label' => __('Institution'),
-        ], fn () => Institution::all()->pluck('name', 'id')->toArray(), function ($value) { // if the filter is active
+        ], fn() => Institution::all()->pluck('name', 'id')->toArray(), function($value) { // if the filter is active
             $this->crud->addClause('where', 'institution_id', $value);
         });
 
@@ -223,7 +223,7 @@ 
             'name'  => 'status_type_id',
             'type'  => 'select2',
             'label' => __('Lead Status'),
-        ], fn () => LeadType::all()->pluck('name', 'id')->toArray(), function ($value) {
+        ], fn() => LeadType::all()->pluck('name', 'id')->toArray(), function($value) {
             if ($value === '4') {
                 $this->crud->query = $this->crud->query->where('lead_type_id', $value)->orWhere('lead_type_id', null);
             } else {
@@ -318,8 +318,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
@@ -407,7 +407,7 @@ 
     {
         $student = Student::findOrFail($student);
 
-        if (! backpack_user()->isTeacher() && ! backpack_user()->can('enrollments.view')) {
+        if (!backpack_user()->isTeacher() && !backpack_user()->can('enrollments.view')) {
             abort(403);
         }
 

app/Models/Enrollment.php

Spacing +9 added lines, -9 removed lines

@@ -56,11 +56,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();
@@ -82,7 +82,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);
         });
     }
@@ -315,7 +315,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;
@@ -340,12 +340,12 @@ 
         $paidAmount = 0;
 
         foreach ($this->invoices as $invoice) {
-            $paidAmount += $invoice->payments?->sum('value') ?? 0;
+            $paidAmount += $invoice->payments ? ->sum('value') ?? 0;
         }
 
         $balance -= $paidAmount;
 
-        return number_format(- $balance, 2);
+        return number_format(-$balance, 2);
     }
 
     public function cancel()
@@ -359,11 +359,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();
@@ -394,7 +394,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';
                 }
             }

app/Http/Controllers/Admin/EnrollmentCrudController.php

Spacing +14 added lines, -14 removed lines

@@ -118,9 +118,9 @@ 
                 'attribute' => 'lastname',
                 'label' => __('Last Name'),
                 'type' => 'relationship',
-                '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.'%');
                         });
                     });
@@ -133,9 +133,9 @@ 
                 'attribute' => 'firstname',
                 'label' => __('First Name'),
                 'type' => 'relationship',
-                '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.'%');
                         });
                     });
@@ -227,8 +227,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) {
                 // if the filter is active
                 foreach (json_decode($values, null, 512, JSON_THROW_ON_ERROR) as $value) {
                     CRUD::addClause('orWhere', 'status_id', $value);
@@ -239,7 +239,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) {
                 // if the filter is active
                 CRUD::addClause('period', $value);
             });
@@ -250,12 +250,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);
                         });
                     }
@@ -275,7 +275,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();
 
@@ -306,7 +306,7 @@ 
             'model'     => \App\Models\Course::class, // foreign key model
             'attribute' => 'name', // foreign key attribute that is shown to user
 
-            '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/Models/Result.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
         if (config('app.send_emails_for_results')) {
             // when a result is added, send a notification
-            static::saved(function (self $result) {
+            static::saved(function(self $result) {
                 Mail::to($result->enrollment->student->user->email)->locale($result->enrollment->student->user->locale)->queue(new ResultNotification($result->enrollment->course, $result->enrollment->student->user));
             });
         }

app/Models/Attendance.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         parent::boot();
 
         // when an attendance record is added, we check if this is an absence
-        static::saved(function (self $attendance) {
+        static::saved(function(self $attendance) {
             if (config('app.send_emails_for_absences') && $attendance->attendance_type_id == 4) { // todo move to configurable settings
                 // Log::info('Absence marked for student '.$attendance->student->name);
                 // will check the record again and send a notification if it hasn't changed

app/Models/Student.php

Spacing +14 added lines, -14 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;
         }
 

app/Models/Teacher.php

Spacing +7 added lines, -7 removed lines

@@ -36,22 +36,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)
@@ -175,14 +175,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/Policies/CommentPolicy.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
      */
     public function store_student_comment(User $user, Student $student)
     {
-        return ($student->enrollments()->whereHas('course', fn ($q) => $q->where('teacher_id', $user->id))->count() > 0) || $user->can('comments.edit');
+        return ($student->enrollments()->whereHas('course', fn($q) => $q->where('teacher_id', $user->id))->count() > 0) || $user->can('comments.edit');
     }
 }