academico-sis / academico

app/Models/EnrollmentStatusType.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
     public function styling()
     {
-        return match ($this->id) {
+        return match($this->id) {
             1 => 'warning',
             2 => 'info',
             default => 'danger',

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);
             })),
 
@@ -61,15 +61,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);
                             }));
                 }
@@ -110,7 +110,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)
@@ -120,7 +120,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()
@@ -181,7 +181,7 @@ 
 
     public function getEmailAttribute(): ?string
     {
-        return $this?->user?->email;
+        return $this ? ->user ? ->email;
     }
 
     public function getNameAttribute(): string
@@ -202,7 +202,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;
         }
 
@@ -301,7 +301,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/Models/Year.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
                 ->where('periods.year_id', $this->id)
                 ->whereIn('enrollments.status_id', ['1', '2']) // filter out cancelled enrollments, todo make this configurable.
                 ->where('enrollments.parent_id', null)->where('enrollments.deleted_at', null)
-                ->where(function ($query) {
+                ->where(function($query) {
                     return $query->where('students.gender_id', 0)->orWhereNull('students.gender_id');
                 })
                 ->distinct('student_id')->count('enrollments.student_id');

app/Providers/AppServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -53,12 +53,12 @@
 
         View::composer(
             ['partials.create_new_contact', 'students.edit-contact'],
-            function ($view) {
+            function($view) {
                 $view->with('contact_types', ContactRelationship::all());
             }
         );
 
-        View::composer('partials.add_book_to_student', function ($view) {
+        View::composer('partials.add_book_to_student', function($view) {
             $view->with('books', Book::all());
             $view->with('statuses', EnrollmentStatusType::all());
         });

app/Http/Controllers/Admin/PaymentCrudController.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
                 'label' => __('Due Date'),
             ],
             false,
-            function ($value) { // if the filter is active, apply these constraints
+            function($value) { // if the filter is active, apply these constraints
                 $this->crud->addClause('where', 'date', '>=', Carbon::parse($value)->firstOfMonth());
                 $this->crud->addClause('where', 'date', '<=', Carbon::parse($value)->lastOfMonth());
             }
@@ -92,11 +92,11 @@ 
     {
         $payment = Payment::findOrFail($id);
 
-        if (! backpack_user()->can('enrollments.edit')) {
+        if (!backpack_user()->can('enrollments.edit')) {
             abort(403);
         }
 
-        if (! $payment->invoice) {
+        if (!$payment->invoice) {
             abort(404, 'No enrollment found for this payment');
         }
 

app/Http/Controllers/Admin/StudentCrudController.php

Indentation +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
             }));
         },
             function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit)
-          }
+            }
         );
 
         CRUD::addFilter([ // select2_multiple filter

Spacing +24 added lines, -24 removed lines

@@ -91,10 +91,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.'%');
                     });
                 },
@@ -109,10 +109,10 @@ 
                 'attribute' => 'firstname',
                 '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.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',
                 '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.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.'%');
                     });
                 },
@@ -176,28 +176,28 @@ 
         ]);
 
         CRUD::addFilter(
-            [ // select2 filter
+            [// 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);
                 }));
             }
@@ -209,8 +209,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);
             }
         );
@@ -220,7 +220,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);
         });
 
@@ -228,7 +228,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 {
@@ -344,8 +344,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
@@ -433,7 +433,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/Http/Controllers/Admin/ScheduledPaymentCrudController.php

Spacing +11 added lines, -11 removed lines

@@ -43,9 +43,9 @@ 
             'attribute' => 'lastname',
             'label' => __('Last Name'),
             'type' => 'relationship',
-            'searchLogic' => function ($query, $column, $searchTerm) {
-                $query->orWhereHas('enrollment', function ($q) use ($searchTerm) {
-                    $q->whereHas('user', function ($q) use ($searchTerm) {
+            'searchLogic' => function($query, $column, $searchTerm) {
+                $query->orWhereHas('enrollment', function($q) use ($searchTerm) {
+                    $q->whereHas('user', function($q) use ($searchTerm) {
                         $q->where('lastname', 'like', '%'.$searchTerm.'%');
                     });
                 });
@@ -58,9 +58,9 @@ 
             'attribute' => 'firstname',
             'label' => __('First Name'),
             'type' => 'relationship',
-            'searchLogic' => function ($query, $column, $searchTerm) {
-                $query->orWhereHas('enrollment', function ($q) use ($searchTerm) {
-                    $q->whereHas('user', function ($q) use ($searchTerm) {
+            'searchLogic' => function($query, $column, $searchTerm) {
+                $query->orWhereHas('enrollment', function($q) use ($searchTerm) {
+                    $q->whereHas('user', function($q) use ($searchTerm) {
                         $q->where('firstname', 'like', '%'.$searchTerm.'%');
                     });
                 });
@@ -73,9 +73,9 @@ 
             'attribute' => 'email',
             'label' => __('Email'),
             'type' => 'relationship',
-            'searchLogic' => function ($query, $column, $searchTerm) {
-                $query->orWhereHas('enrollment', function ($q) use ($searchTerm) {
-                    $q->whereHas('user', function ($q) use ($searchTerm) {
+            'searchLogic' => function($query, $column, $searchTerm) {
+                $query->orWhereHas('enrollment', function($q) use ($searchTerm) {
+                    $q->whereHas('user', function($q) use ($searchTerm) {
                         $q->where('email', 'like', '%'.$searchTerm.'%');
                     });
                 });
@@ -107,11 +107,11 @@ 
                 'type' => 'select2',
                 'label'=> __('Status'),
             ],
-            fn () => [
+            fn() => [
                 1 => __('Pending'),
                 2 => __('Paid'),
             ],
-            function ($value) { // if the filter is active
+            function($value) { // if the filter is active
                 CRUD::addClause('status', $value);
             }
         );

app/Http/Controllers/Admin/CourseCrudController.php

Spacing +24 added lines, -24 removed lines

@@ -54,7 +54,7 @@ 
         CRUD::addClause('internal');
         $permissions = backpack_user()->getAllPermissions();
 
-        if (! $permissions->contains('name', 'courses.edit')) {
+        if (!$permissions->contains('name', 'courses.edit')) {
             CRUD::denyAccess(['update', 'create']);
         }
 
@@ -64,7 +64,7 @@ 
 
         CRUD::addButtonFromView('line', 'children_badge', 'children_badge', 'beginning');
 
-        if (! $permissions->contains('name', 'courses.delete')) {
+        if (!$permissions->contains('name', 'courses.delete')) {
             CRUD::denyAccess(['delete']);
         }
 
@@ -188,12 +188,12 @@ 
                 'type' => 'select2',
                 'label'=> __('Rhythm'),
             ],
-            fn () => Rhythm::all()->pluck('name', 'id')->toArray(),
-            function ($value) {
+            fn() => Rhythm::all()->pluck('name', 'id')->toArray(),
+            function($value) {
             // if the filter is active
             CRUD::addClause('where', 'rhythm_id', $value);
         },
-            function () {
+            function() {
             // if the filter is NOT active (the GET parameter "checkbox" does not exit)
         }
         );
@@ -204,12 +204,12 @@ 
                 'type' => 'select2',
                 'label'=> __('Teacher'),
             ],
-            fn () => Teacher::all()->pluck('name', 'id')->toArray(),
-            function ($value) {
+            fn() => Teacher::all()->pluck('name', 'id')->toArray(),
+            function($value) {
             // if the filter is active
             CRUD::addClause('where', 'teacher_id', $value);
         },
-            function () {
+            function() {
             // if the filter is NOT active (the GET parameter "checkbox" does not exit)
         }
         );
@@ -220,12 +220,12 @@ 
                 'type' => 'select2',
                 'label'=> __('Level'),
             ],
-            fn () => Level::all()->pluck('name', 'id')->toArray(),
-            function ($value) {
+            fn() => Level::all()->pluck('name', 'id')->toArray(),
+            function($value) {
             // if the filter is active
             CRUD::addClause('where', 'level_id', $value);
         },
-            function () {
+            function() {
             // if the filter is NOT active (the GET parameter "checkbox" does not exit)
         }
         );
@@ -236,11 +236,11 @@ 
                 'type' => 'select2',
                 'label'=> __('Period'),
             ],
-            fn () => \App\Models\Period::all()->sortByDesc('id')->pluck('name', 'id')->toArray(),
-            function ($value) { // if the filter is active
+            fn() => \App\Models\Period::all()->sortByDesc('id')->pluck('name', 'id')->toArray(),
+            function($value) { // if the filter is active
                 CRUD::addClause('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)
                 $period = \App\Models\Period::get_default_period()->id;
                 CRUD::addClause('where', 'period_id', $period);
                 $this->crud->getRequest()->request->add(['period_id' => $period]); // to make the filter look active
@@ -248,13 +248,13 @@ 
         );
 
         CRUD::addFilter(
-            [ // add a "simple" filter called Draft
+            [// add a "simple" filter called Draft
                 'type' => 'simple',
                 'name' => 'parent',
                 'label'=> __('Hide Children Courses'),
             ],
             false,
-            function () {
+            function() {
                 CRUD::addClause('parent');
             }
         );
@@ -266,7 +266,7 @@ 
                 'label' => __('Start'),
             ],
             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);
                 $this->crud->addClause('where', 'start_date', '>=', $dates->from);
                 $this->crud->addClause('where', 'start_date', '<=', $dates->to.' 23:59:59');
@@ -280,7 +280,7 @@ 
                 'label' => __('End'),
             ],
             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);
                 $this->crud->addClause('where', 'end_date', '>=', $dates->from);
                 $this->crud->addClause('where', 'end_date', '<=', $dates->to.' 23:59:59');
@@ -377,7 +377,7 @@ 
                 'tab' => __('Course info'),
             ],
 
-            [   // repeatable
+            [// repeatable
                 'name'  => 'sublevels',
                 'label' => __('Course sublevels'),
                 'type'  => 'repeatable',
@@ -534,7 +534,7 @@ 
                 'default' => Period::get_enrollments_period()->end,
             ],
 
-            [   // repeatable
+            [// repeatable
                 'name'  => 'times',
                 'label' => __('Course Schedule'),
                 'type'  => 'repeatable',
@@ -597,14 +597,14 @@ 
                 'init_rows' => 0, // number of empty rows to be initialized, by default 1
             ],
 
-            [   // view
+            [// view
                 'name' => 'custom-ajax-button',
                 'type' => 'view',
                 'view' => 'courses/schedule-preset-alert',
                 'tab' => __('Schedule'),
             ],
 
-            [   // select_from_array
+            [// select_from_array
                 'name'        => 'schedulepreset',
                 'label'       => __('Schedule Preset'),
                 'type'        => 'select_from_array',
@@ -628,7 +628,7 @@ 
         }
 
         if ($this->crud->getCurrentEntry()->children->count() > 0) {
-            CRUD::addField([   // view
+            CRUD::addField([// view
                 'name' => 'custom-ajax-button',
                 'type' => 'view',
                 'view' => 'courses/parent-course-alert',
@@ -636,7 +636,7 @@ 
         }
 
         if ($this->crud->getCurrentEntry()->parent_course_id !== null) {
-            CRUD::addField([   // view
+            CRUD::addField([// view
                 'name' => 'custom-ajax-button',
                 'type' => 'view',
                 'view' => 'courses/child-course-alert',

app/Http/Controllers/Admin/CommentCrudController.php

Indentation +5 added lines, -5 removed lines

@@ -93,8 +93,8 @@ 
             ],
             false,
             function () { // if the filter is active
-                  CRUD::addClause('where', 'action', true);
-              }
+                    CRUD::addClause('where', 'action', true);
+                }
         );
 
         CRUD::addFilter(
@@ -114,9 +114,9 @@ 
                 CRUD::addClause('where', 'commentable_type', '=', $value);
             },
             function () { // if the filter is not active
-                  CRUD::addClause('where', 'commentable_type', '=', Student::class);
-                  $this->crud->getRequest()->request->add(['commentable_type' => Student::class]); // to make the filter look active
-              }
+                    CRUD::addClause('where', 'commentable_type', '=', Student::class);
+                    $this->crud->getRequest()->request->add(['commentable_type' => Student::class]); // to make the filter look active
+                }
         );
     }
 

Spacing +5 added lines, -5 removed lines

@@ -86,19 +86,19 @@ 
         ]);
 
         CRUD::addFilter(
-            [ // simple filter
+            [// simple filter
                 'type' => 'simple',
                 'name' => 'action',
                 'label'=> 'Action',
             ],
             false,
-            function () { // if the filter is active
+            function() { // if the filter is active
                   CRUD::addClause('where', 'action', true);
               }
         );
 
         CRUD::addFilter(
-            [ // dropdown filter
+            [// dropdown filter
                 'name' => 'type',
                 'type' => 'dropdown',
                 'label'=> 'Type',
@@ -110,10 +110,10 @@ 
                 Result::class => 'Result',
 
             ],
-            function ($value) { // if the filter is active
+            function($value) { // if the filter is active
                 CRUD::addClause('where', 'commentable_type', '=', $value);
             },
-            function () { // if the filter is not active
+            function() { // if the filter is not active
                   CRUD::addClause('where', 'commentable_type', '=', Student::class);
                   $this->crud->getRequest()->request->add(['commentable_type' => Student::class]); // to make the filter look active
               }