academico-sis / academico

app/Http/Controllers/Admin/StudentCrudController.php

Spacing +24 added lines, -24 removed lines

@@ -92,10 +92,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.'%');
                     });
                 },
@@ -110,10 +110,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.'%');
                     });
                 },
@@ -127,10 +127,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.'%');
                     });
                 },
@@ -177,28 +177,28 @@ 
         ]);
 
         CRUD::addFilter(
-            [ // select2 filter
+            [// select2 filter
                 'name' => 'enrolled',
                 'type' => 'select2',
                 'label' => __('Is Enrolled in'),
             ],
-            fn () => Period::all()->pluck('name', 'id')->toArray(),
-            function ($value) {
-                $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) {
+                $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) {
+        ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($values) {
             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);
                 }));
             }
@@ -210,8 +210,8 @@ 
                 'type' => 'select2',
                 'label' => __('New In'),
             ],
-            fn () => Period::all()->pluck('name', 'id')->toArray(),
-            function ($value) {
+            fn() => Period::all()->pluck('name', 'id')->toArray(),
+            function($value) {
                 CRUD::addClause('newInPeriod', $value);
             }
         );
@@ -221,7 +221,7 @@ 
             'name' => 'institution_id',
             'type' => 'select2',
             'label' => __('Institution'),
-        ], fn () => Institution::all()->pluck('name', 'id')->toArray(), function ($value) {
+        ], fn() => Institution::all()->pluck('name', 'id')->toArray(), function($value) {
             $this->crud->addClause('where', 'institution_id', $value);
         });
 
@@ -229,7 +229,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 {
@@ -350,8 +350,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
@@ -439,7 +439,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/EvaluationTypeCrudController.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
             'label' => 'Name',
             'type' => 'text', ]);
 
-        CRUD::addField([    // Select2Multiple = n-n relationship (with pivot table)
+        CRUD::addField([// Select2Multiple = n-n relationship (with pivot table)
             'label' => __('Grade Types'),
             'type' => 'select2_multiple',
             'name' => 'gradeTypes',
@@ -54,7 +54,7 @@ 
             // show Select All and Clear buttons?
         ]);
 
-        CRUD::addField([    // Select2Multiple = n-n relationship (with pivot table)
+        CRUD::addField([// Select2Multiple = n-n relationship (with pivot table)
             'label' => __('Skills'),
             'type' => 'select2_multiple',
             'name' => 'skills',

app/Http/Controllers/Admin/ResultCrudController.php

Spacing +9 added lines, -9 removed lines

@@ -52,9 +52,9 @@ 
                 'type' => 'select',
                 'name' => 'student',
                 'attribute' => 'name',
-                '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.'%')
                             ->orWhere('lastname', 'like', '%'.$searchTerm.'%')
                             ->orWhere('email', 'like', '%'.$searchTerm.'%')
@@ -94,7 +94,7 @@ 
                 'label' => __('No Result'),
             ],
             false,
-            function () {
+            function() {
                 CRUD::addClause('noResult');
             }
         );
@@ -106,7 +106,7 @@ 
                 'label' => __('Hide Parents'),
             ],
             false,
-            function () {
+            function() {
                 CRUD::addClause('real');
             }
         );
@@ -115,16 +115,16 @@ 
             '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);
         });
 
-        CRUD::addFilter([ // select2_multiple filter
+        CRUD::addFilter([// select2_multiple filter
             'name' => 'result',
             'type' => 'select2',
             'label' => __('Result'),
-        ], fn () => ResultType::all()->pluck('name', 'id')->toArray(), function ($value) {
-            $this->crud->query = $this->crud->query->whereHas('result', function ($query) use ($value) {
+        ], fn() => ResultType::all()->pluck('name', 'id')->toArray(), function($value) {
+            $this->crud->query = $this->crud->query->whereHas('result', function($query) use ($value) {
                 $query->where('result_type_id', $value);
             });
         });

app/Http/Controllers/Admin/LeaveCrudController.php

Spacing +8 added lines, -8 removed lines

@@ -69,27 +69,27 @@ 
         ]);
 
         CRUD::addFilter(
-            [ // select2 filter
+            [// select2 filter
                 'name' => 'teacher_id',
                 'type' => 'select2',
                 'label' => __('Teacher'),
             ],
-            fn () => Teacher::all()->pluck('name', 'id')->toArray(),
-            function ($value) {
+            fn() => Teacher::all()->pluck('name', 'id')->toArray(),
+            function($value) {
                 CRUD::addClause('where', 'teacher_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(
-            [ // daterange filter
+            [// daterange filter
                 'type' => 'date_range',
                 'name' => 'from_to',
                 '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);
                 CRUD::addClause('where', 'date', '>=', $dates->from);
                 CRUD::addClause('where', 'date', '<=', $dates->to.' 23:59:59');
@@ -122,7 +122,7 @@ 
                 'model' => LeaveType::class,
             ],
 
-            [   // date_range
+            [// date_range
                 'name' => ['start_date', 'end_date'],
                 // db columns for start_date & end_date
                 'label' => 'Event Date Range',
@@ -168,7 +168,7 @@ 
                 'model' => LeaveType::class,
             ],
 
-            [   // datepicker
+            [// datepicker
                 'name' => 'date',
                 'label' => 'Event Date',
                 'type' => 'date',

app/Http/Controllers/Admin/SkillCrudController.php

Spacing +9 added lines, -9 removed lines

@@ -32,7 +32,7 @@ 
     protected function setupListOperation()
     {
         CRUD::setColumns([
-            [ // skill type
+            [// skill type
                 'label' => 'Type',
                 'type' => 'select',
                 'name' => 'skill_type',
@@ -46,7 +46,7 @@ 
                 'type' => 'text',
                 'name' => 'name',
             ],
-            [ // skill level
+            [// skill level
                 'label' => 'Level',
                 'type' => 'select',
                 'name' => 'level',
@@ -58,19 +58,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) {
+        ], fn() => Level::all()->pluck('name', 'id')->toArray(), function($value) {
             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) {
+        ], fn() => SkillType::all()->pluck('name', 'id')->toArray(), function($value) {
             CRUD::addClause('where', 'skill_type_id', $value);
         });
     }
@@ -79,7 +79,7 @@ 
     {
         CRUD::setValidation(StoreRequest::class);
         CRUD::addFields([
-            [ // skill type
+            [// skill type
                 'label' => 'Type',
                 'type' => 'select',
                 'name' => 'skill_type_id',
@@ -93,7 +93,7 @@ 
                 'type' => 'text',
                 'name' => 'name',
             ],
-            [ // skill level
+            [// skill level
                 'label' => 'Level',
                 'type' => 'select',
                 'name' => 'level_id',
@@ -106,7 +106,7 @@ 
                 'type' => 'relationship',
                 'name' => 'skill_type',
                 'ajax' => true,
-                'inline_create' => [ // specify the entity in singular
+                'inline_create' => [// specify the entity in singular
                     'entity' => 'skilltype',
                     // the entity in singular
                     // OPTIONALS

app/Http/Controllers/HomeController.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 
     public function teacher(Request $request)
     {
-        if (! backpack_user()->isTeacher()) {
+        if (!backpack_user()->isTeacher()) {
             abort(403);
         }
 
@@ -69,7 +69,7 @@ 
 
     public function student()
     {
-        if (! backpack_user()->isStudent()) {
+        if (!backpack_user()->isStudent()) {
             abort(403);
         }
 
@@ -87,7 +87,7 @@ 
         $currentPeriod = Period::get_default_period();
         $enrollmentsPeriod = Period::get_enrollments_period();
 
-        if (! backpack_user()->hasRole(['admin', 'secretary'])) {
+        if (!backpack_user()->hasRole(['admin', 'secretary'])) {
             abort(403);
         }
 
@@ -96,7 +96,7 @@ 
         // todo optimize this !!
         $events = Event::where('start', '>', Carbon::now()->subDays(15))->where('end', '<', Carbon::now()->addDays(15))->orderBy('id', 'desc')
             ->get()
-            ->map(fn ($event) => [
+            ->map(fn($event) => [
                 'title' => $event['name'],
                 'resourceId' => $event['teacher_id'],
                 'start' => $event['start'],
@@ -108,7 +108,7 @@ 
 
         $teachers = Teacher::with('user')->get()->toArray();
 
-        $teachers = array_map(fn ($teacher) => [
+        $teachers = array_map(fn($teacher) => [
             'id' => $teacher['id'],
             'title' => $teacher['user']['firstname'],
         ], $teachers);

app/Services/ApolearnService.php

Spacing +6 added lines, -6 removed lines

@@ -133,7 +133,7 @@ 
 
     public function updateCourse(Course $course): void
     {
-        if (! $course->lms_id) {
+        if (!$course->lms_id) {
             $this->createCourse($course);
         }
 
@@ -162,7 +162,7 @@ 
             Log::info('found these teachers IDs on LMS:'.implode(', ', $teachers->pluck('id')->toArray()));
 
             // if the course has no teacher, stop
-            if (! $course->teacher) {
+            if (!$course->teacher) {
                 Log::alert('The course has no teacher on local system, removing all teachers from remote');
                 foreach ($teachers as $teacher) {
                     $this->removeTeacher($course->lms_id, $teacher['id']);
@@ -177,7 +177,7 @@ 
                     }
                 }
 
-                if (! $course->teacher->user->lms_id || ! $teachers->contains('id', $course->teacher->user->lms_id)) {
+                if (!$course->teacher->user->lms_id || !$teachers->contains('id', $course->teacher->user->lms_id)) {
                     Log::info('the course teacher has changed, need to update it');
                     $this->addTeacher($course);
                 }
@@ -187,14 +187,14 @@ 
 
     public function enrollStudent(Course $course, Student $student): void
     {
-        if (! $course->lms_id) {
+        if (!$course->lms_id) {
             abort(404, 'This course is not synced with external LMS');
         }
 
         $courseId = $course->lms_id;
 
         // if the student is not synced with the LMS, create them
-        if (! $student->user->lms_id) {
+        if (!$student->user->lms_id) {
             $this->createUser($student->user);
         }
 
@@ -217,7 +217,7 @@ 
         // only process if the course has a teacher
         if ($course->teacher_id) {
             // if the teacher doesn't exist on LMS, create them
-            if (! $course->teacher->user->lms_id) {
+            if (!$course->teacher->user->lms_id) {
                 Log::info('creating user now');
                 $this->createUser($course->teacher->user);
             }

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