academico-sis / academico

app/Http/Controllers/Admin/EnrollmentCrudController.php

Spacing +19 added lines, -19 removed lines

@@ -98,7 +98,7 @@ 
                 'name' => 'id',
                 'label' => 'ID',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
@@ -109,7 +109,7 @@ 
                 'type' => 'text',
                 'name' => 'student.idnumber',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
@@ -122,13 +122,13 @@ 
                 'label' => __('Last Name'),
                 'type' => 'relationship',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
+                        $q->whereHas('user', function($q) use ($searchTerm) {
                             $q->where('lastname', 'like', '%'.$searchTerm.'%');
                         });
                     });
@@ -142,13 +142,13 @@ 
                 'label' => __('First Name'),
                 'type' => 'relationship',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
+                        $q->whereHas('user', function($q) use ($searchTerm) {
                             $q->where('firstname', 'like', '%'.$searchTerm.'%');
                         });
                     });
@@ -194,7 +194,7 @@ 
                 'model' => EnrollmentStatusType::class,
                 'wrapper' => [
                     'element' => 'span',
-                    'class' => function ($crud, $column, $entry) {
+                    'class' => function($crud, $column, $entry) {
                         return 'badge badge-pill badge-'.$entry->enrollmentStatus->styling();
                     },
                 ],
@@ -217,7 +217,7 @@ 
 
 
         if (config('invoicing.invoices_contain_enrollments_only')) {
-            CRUD::addColumn(array_merge(['name' => 'balance', 'label' => __('Balance'), 'type' => 'number',], $currency));
+            CRUD::addColumn(array_merge(['name' => 'balance', 'label' => __('Balance'), 'type' => 'number', ], $currency));
         }
 
         CRUD::addColumns([
@@ -253,8 +253,8 @@ 
                     'type' => 'select2_multiple',
                     'label'=> __('Status'),
                 ],
-                fn () => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(),
-                function ($values) {
+                fn() => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(),
+                function($values) {
                 foreach (json_decode($values, null, 512, JSON_THROW_ON_ERROR) as $value) {
                     CRUD::addClause('orWhere', 'status_id', $value);
                 }
@@ -265,7 +265,7 @@ 
                 'name' => 'period_id',
                 'type' => 'select2',
                 'label'=> __('Period'),
-            ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($value) {
+            ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($value) {
                 CRUD::addClause('period', $value);
             });
 
@@ -275,12 +275,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);
                         });
                     }
@@ -325,7 +325,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/StudentCrudController.php

Spacing +24 added lines, -24 removed lines

@@ -91,10 +91,10 @@ 
                 'attribute' => 'lastname',
                 'model'     => 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'     => 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'     => 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/TeacherCrudController.php

Spacing +11 added lines, -11 removed lines

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

app/Http/Controllers/Admin/SkillCrudController.php

Spacing +9 added lines, -9 removed lines

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

app/Http/Controllers/EnrollmentController.php

Spacing +2 added lines, -2 removed lines

@@ -183,7 +183,7 @@ 
                         'price_b' => $enrollment->course->price_b,
                         'price_c' => $enrollment->course->price_c,
                     ]),
-                    'studentPriceCategory' => $enrollment->student?->price_category,
+                    'studentPriceCategory' => $enrollment->student ? ->price_category,
                 ]
             );
         }
@@ -221,7 +221,7 @@ 
 
     public function getBalance(Request $request)
     {
-        if (! config('invoicing.invoices_contain_enrollments_only')) {
+        if (!config('invoicing.invoices_contain_enrollments_only')) {
             abort(422, 'Configuration options forbid to access this value');
         }
 

Braces +1 added lines, -2 removed lines

@@ -228,8 +228,7 @@
         $periodId = $request->get('periodId');
         if ($periodId) {
             $pendingBalance = Enrollment::period($periodId)->pending()->sum('balance');
-        }
-        else {
+        } else {
             $pendingBalance = Enrollment::pending()->sum('balance');
         }
 

app/Models/Enrollment.php

Spacing +9 added lines, -9 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);
         });
     }
@@ -180,7 +180,7 @@ 
     // 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);
     }
@@ -332,7 +332,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;
@@ -362,11 +362,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();
@@ -397,7 +397,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';
                 }
             }
@@ -408,7 +408,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');
         }