academico-sis / academico

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');
     }
 }

app/Providers/AuthServiceProvider.php

Spacing +11 added lines, -11 removed lines

@@ -30,69 +30,69 @@
          * 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', fn ($user, $enrollment) => ($user->isTeacher() && $user->id == $enrollment->course->teacher_id) || $user->can('evaluation.edit'));
+        Gate::define('edit-result', fn($user, $enrollment) => ($user->isTeacher() && $user->id == $enrollment->course->teacher_id) || $user->can('evaluation.edit'));
     }
 }