academico-sis / academico

app/Http/Middleware/SetLocale.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     private function setLocale(string $locale)
     {
         // Check if is allowed and set default locale if not
-        if (! language()->allowed($locale)) {
+        if (!language()->allowed($locale)) {
             $locale = config('app.locale');
         }
 

app/Http/Controllers/GradeController.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 
         $gradeType = GradeType::findOrFail($request->input('grade_type_id'));
 
-        if (! $course->grade_types->contains($gradeType->id)) {
+        if (!$course->grade_types->contains($gradeType->id)) {
             $course->grade_types()->attach($gradeType->id);
         }
 

app/Providers/AuthServiceProvider.php

Spacing +11 added lines, -11 removed lines

@@ -30,7 +30,7 @@ 
          * 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', function ($user, $course) {
+        Gate::define('edit-course-grades', function($user, $course) {
             return $user->isTeacher() && $user->teacher_id == $course->teacher_id || $user->can('evaluation.edit');
         });
 
@@ -38,7 +38,7 @@ 
          * 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', function ($user, $course) {
+        Gate::define('view-course-attendance', function($user, $course) {
             return $user->isTeacher() && $user->teacher_id == $course->teacher_id || $user->can('attendance.view');
         });
 
@@ -47,7 +47,7 @@ 
          * 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', function ($user, $event) {
+        Gate::define('view-event-attendance', function($user, $event) {
             return ($event->teacher_id == $user->teacher_id) || ($event->course->teacher_id == $user->teacher_id) || $user->can('attendance.view');
         });
 
@@ -56,7 +56,7 @@ 
          * if they are the teacher for the course,
          * or if they have explicit permission to edit any attendance sheets
          */
-        Gate::define('edit-attendance', function ($user, $event) {
+        Gate::define('edit-attendance', function($user, $event) {
             return ($event->teacher_id == $user->teacher_id) || ($event->course->teacher_id == $user->teacher_id) || $user->can('attendance.edit');
         });
 
@@ -64,7 +64,7 @@ 
          * teachers are allowed to view their own calendar,
          * and users with explicit permission can view all calendars
          */
-        Gate::define('view-teacher-calendar', function ($user, $teacher) {
+        Gate::define('view-teacher-calendar', function($user, $teacher) {
             return ($user->isTeacher() && $user->teacher_id == $teacher->id) || $user->can('calendars.view');
         });
 
@@ -72,7 +72,7 @@ 
          * teachers are allowed to view their own courses,
          * and users with explicit permission can view all courses
          */
-        Gate::define('view-course', function ($user, Course $course) {
+        Gate::define('view-course', function($user, Course $course) {
             return ($user->isTeacher() && $user->teacher_id == $course->teacher_id) || $user->can('courses.view');
         });
 
@@ -81,7 +81,7 @@ 
          * if they are a teacher
          * of if they have explicit permission to view any result
          */
-        Gate::define('view-enrollment', function ($user, $enrollment) {
+        Gate::define('view-enrollment', function($user, $enrollment) {
             return ($user->isStudent() && $user->student_id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view');
         });
 
@@ -89,7 +89,7 @@ 
          * if the user is the teacher of the course
          * of if they have explicit permission to enroll students
          */
-        Gate::define('enroll-in-course', function ($user, $course) {
+        Gate::define('enroll-in-course', function($user, $course) {
             return $course->teacher_id == $user->teacher_id || $user->can('enrollments.edit');
         });
 
@@ -97,7 +97,7 @@ 
          * if the user is a teacher
          * of if they have explicit permission to enroll students
          */
-        Gate::define('enroll-students', function ($user) {
+        Gate::define('enroll-students', function($user) {
             return $user->isTeacher() || $user->can('enrollments.edit');
         });
 
@@ -105,7 +105,7 @@ 
          * teachers are allowed to view their own hours,
          * and users with explicit permission can view all hours
          */
-        Gate::define('view-teacher-hours', function ($user, $teacher) {
+        Gate::define('view-teacher-hours', function($user, $teacher) {
             return ($user->isTeacher() && $user->teacher_id == $teacher->id) || $user->can('hr.view');
         });
 
@@ -113,7 +113,7 @@ 
          * 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', function ($user, $enrollment) {
+        Gate::define('edit-result', function($user, $enrollment) {
             return ($user->isTeacher() && $user->teacher_id == $enrollment->course->teacher_id) || $user->can('evaluation.edit');
         });
     }

app/Http/Controllers/Admin/TeacherCrudController.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
     {
         CRUD::setValidation(StoreRequest::class);
         CRUD::addFields([
-            [  // Select2
+            [// Select2
                 'label' => 'User',
                 'type' => 'select2',
                 'name' => 'id', // the db column for the foreign key
@@ -87,7 +87,7 @@ 
     protected function setupUpdateOperation()
     {
         CRUD::addFields([
-            [  // Select2
+            [// Select2
                 'label' => 'User',
                 'type' => 'select2',
                 'name' => 'id', // the db column for the foreign key

app/Http/Controllers/Admin/StudentCrudController.php

Spacing +25 added lines, -25 removed lines

@@ -82,12 +82,12 @@ 
                 'attribute' => 'lastname', // foreign key attribute that is shown to user
                 'model'     => 'App\Models\User', // foreign key model
                 'orderable' => true,
-                'orderLogic' => function ($query, $column, $columnDirection) {
+                'orderLogic' => function($query, $column, $columnDirection) {
                     return $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.'%');
                     });
                 },
@@ -102,12 +102,12 @@ 
                 'attribute' => 'firstname', // foreign key attribute that is shown to user
                 'model'     => 'App\Models\User', // foreign key model
                 'orderable' => true,
-                'orderLogic' => function ($query, $column, $columnDirection) {
+                'orderLogic' => function($query, $column, $columnDirection) {
                     return $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.'%');
                     });
                 },
@@ -122,12 +122,12 @@ 
                 'attribute' => 'email', // foreign key attribute that is shown to user
                 'model'     => 'App\Models\User', // foreign key model
                 'orderable' => true,
-                'orderLogic' => function ($query, $column, $columnDirection) {
+                'orderLogic' => function($query, $column, $columnDirection) {
                     return $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.'%');
                     });
                 },
@@ -145,32 +145,32 @@ 
 
         ]);
 
-        CRUD::addFilter([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'enrolled',
             'type' => 'select2',
             'label'=> __('Is Enrolled in'),
-        ], function () {
+        ], function() {
             return Period::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
-            $this->crud->query = $this->crud->query->whereHas('enrollments', function ($query) use ($value) {
-                return $query->whereHas('course', function ($q) use ($value) {
+        }, function($value) { // if the filter is active
+            $this->crud->query = $this->crud->query->whereHas('enrollments', function($query) use ($value) {
+                return $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'),
-        ], function () { // the options that show up in the select2
+        ], function() { // the options that show up in the select2
             return Period::all()->pluck('name', 'id')->toArray();
-        }, function ($values) { // if the filter is active
+        }, function($values) { // if the filter is active
             foreach (json_decode($values) as $key => $value) {
-                $this->crud->query = $this->crud->query->whereDoesntHave('enrollments', function ($query) use ($value) {
-                    return $query->whereHas('course', function ($q) use ($value) {
+                $this->crud->query = $this->crud->query->whereDoesntHave('enrollments', function($query) use ($value) {
+                    return $query->whereHas('course', function($q) use ($value) {
                         $q->where('period_id', $value);
                     });
                 });
@@ -182,9 +182,9 @@ 
             'name'  => 'institution_id',
             'type'  => 'select2',
             'label' => __('Institution'),
-        ], function () {
+        ], function() {
             return Institution::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             $this->crud->addClause('where', 'institution_id', $value);
         });
 
@@ -192,9 +192,9 @@ 
             'name'  => 'status_type_id',
             'type'  => 'select2',
             'label' => __('Lead Status'),
-        ], function () {
+        ], function() {
             return LeadType::all()->pluck('name', 'id')->toArray();
-        }, function ($value) {
+        }, function($value) {
             $this->crud->addClause('computedLeadType', $value);
         });
     }
@@ -203,7 +203,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/Event.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         parent::boot();
 
         // before adding an event, we check that the teacher is available
-        static::saving(function ($event) {
+        static::saving(function($event) {
             $teacher = Teacher::find($event->teacher_id);
             // if the teacher is on leave on the day of the event
             if ($event->teacher_id !== null && $teacher) {

app/Models/Student.php

Spacing +13 added lines, -13 removed lines

@@ -31,7 +31,7 @@ 
         parent::boot();
 
         // when deleting a student, also delete any enrollments, grades and attendance related to this student
-        static::deleting(function (self $student) {
+        static::deleting(function(self $student) {
             Attendance::where('student_id', $student->id)->delete();
             Enrollment::where('student_id', $student->id)->delete();
         });
@@ -41,8 +41,8 @@ 
     {
         switch ($leadTypeId) {
             case 1: // active / enrolled students
-                return $query->whereHas('enrollments', function ($query) use ($leadTypeId) {
-                    return $query->whereHas('course', function ($q) use ($leadTypeId) {
+                return $query->whereHas('enrollments', function($query) use ($leadTypeId) {
+                    return $query->whereHas('course', function($q) use ($leadTypeId) {
                         $q->where('period_id', Period::get_default_period()->id);
                     });
                 });
@@ -56,18 +56,18 @@ 
             case 4: // old students who have at least one enrollment
                 return $query
                     ->where('lead_type_id', $leadTypeId)
-                    ->orWhere(function ($query) use ($leadTypeId) {
+                    ->orWhere(function($query) use ($leadTypeId) {
                         $query
                             ->whereNull('lead_type_id')
-                            ->whereHas('enrollments', function ($query) use ($leadTypeId) {
+                            ->whereHas('enrollments', function($query) use ($leadTypeId) {
                                 return $query
-                                    ->whereHas('course', function ($q) use ($leadTypeId) {
+                                    ->whereHas('course', function($q) use ($leadTypeId) {
                                         $q->where('period_id', '!=', Period::get_default_period()->id);
                                     });
                             })
-                            ->whereDoesntHave('enrollments', function ($query) use ($leadTypeId) {
+                            ->whereDoesntHave('enrollments', function($query) use ($leadTypeId) {
                                 return $query
-                                    ->whereHas('course', function ($q) use ($leadTypeId) {
+                                    ->whereHas('course', function($q) use ($leadTypeId) {
                                         $q->where('period_id', Period::get_default_period()->id);
                                     });
                             });
@@ -104,8 +104,8 @@ 
 
         return $this->hasMany(Attendance::class)
         ->where('attendance_type_id', 4) // absence
-        ->whereHas('event', function ($q) use ($period) {
-            return $q->whereHas('course', function ($c) use ($period) {
+        ->whereHas('event', function($q) use ($period) {
+            return $q->whereHas('course', function($c) use ($period) {
                 return $c->where('period_id', $period->id);
             });
         });
@@ -118,8 +118,8 @@ 
         }
 
         return $this->hasMany(Attendance::class)
-        ->whereHas('event', function ($q) use ($period) {
-            return $q->whereHas('course', function ($c) use ($period) {
+        ->whereHas('event', function($q) use ($period) {
+            return $q->whereHas('course', function($c) use ($period) {
                 return $c->where('period_id', $period->id);
             });
         });
@@ -211,7 +211,7 @@ 
     public function getIsEnrolledAttribute()
     {
         // if the student is currently enrolled
-        if ($this->enrollments()->whereHas('course', function ($q) {
+        if ($this->enrollments()->whereHas('course', function($q) {
             return $q->where('period_id', Period::get_default_period()->id);
         })->count() > 0) {
             return 1;

app/Models/Attendance.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,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 ($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