academico-sis / academico

app/Models/Student.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,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();
         });
@@ -66,8 +66,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);
             });
         });
@@ -80,8 +80,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);
             });
         });
@@ -173,7 +173,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/Providers/AuthServiceProvider.php

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,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->teacher_id == $course->teacher_id || $user->can('attendance.view');
         });
 
@@ -38,7 +38,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');
         });
 
@@ -47,7 +47,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');
         });
 
@@ -55,7 +55,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->teacher_id == $teacher->id) || $user->can('calendars.view');
         });
 
@@ -63,7 +63,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) {
+        Gate::define('view-course', function($user, $course) {
             return ($user->teacher_id == $course->teacher_id) || $user->can('courses.view');
         });
 
@@ -72,7 +72,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->student_id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view');
         });
 
@@ -80,7 +80,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');
         });
 
@@ -88,7 +88,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');
         });
 
@@ -96,7 +96,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->teacher_id == $teacher->id) || $user->can('hr.view');
         });
 
@@ -104,7 +104,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->teacher_id == $enrollment->course->teacher_id) || $user->can('evaluation.edit');
         });
     }

app/Http/Controllers/Admin/CommentCrudController.php

Spacing +5 added lines, -5 removed lines

@@ -87,17 +87,17 @@ 
             ],
         ]);
 
-        CRUD::addFilter([ // simple filter
+        CRUD::addFilter([// 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
+        CRUD::addFilter([// dropdown filter
             'name' => 'type',
             'type' => 'dropdown',
             'label'=> 'Type',
@@ -106,10 +106,10 @@ 
             Enrollment::class => 'Enrollments',
             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
               });

app/Http/Controllers/Admin/CourseCrudController.php

Spacing +19 added lines, -19 removed lines

@@ -57,11 +57,11 @@ 
 
         $permissions = backpack_user()->getAllPermissions();
 
-        if (! $permissions->contains('name', 'courses.edit')) {
+        if (!$permissions->contains('name', 'courses.edit')) {
             CRUD::denyAccess('update');
         }
 
-        if (! $permissions->contains('name', 'courses.edit')) {
+        if (!$permissions->contains('name', 'courses.edit')) {
             CRUD::denyAccess('create');
         }
 
@@ -75,7 +75,7 @@ 
 
         CRUD::addButtonFromView('line', 'children_badge', 'children_badge', 'beginning');
 
-        if (! $permissions->contains('name', 'courses.delete')) {
+        if (!$permissions->contains('name', 'courses.delete')) {
             CRUD::denyAccess('delete');
         }
 
@@ -172,52 +172,52 @@ 
 
         ]);
 
-        CRUD::addFilter([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'rhythm_id',
             'type' => 'select2',
             'label'=> __('Rhythm'),
-        ], function () {
+        ], function() {
             return Rhythm::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             CRUD::addClause('where', 'rhythm_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 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'teacher_id',
             'type' => 'select2',
             'label'=> __('Teacher'),
-        ], function () {
+        ], function() {
             return Teacher::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             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([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'level_id',
             'type' => 'select2',
             'label'=> __('Level'),
-        ], function () {
+        ], function() {
             return Level::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             CRUD::addClause('where', 'level_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 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'period_id',
             'type' => 'select2',
             'label'=> __('Period'),
-        ], function () {
+        ], function() {
             return Period::all()->sortByDesc('id')->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, 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 = 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

app/Http/Controllers/Admin/SkillCrudController.php

Spacing +10 added lines, -10 removed lines

@@ -35,7 +35,7 @@ 
     protected function setupListOperation()
     {
         CRUD::setColumns([
-            [ // skill type
+            [// skill type
                 'label'     => 'Type', // Table column heading
                 'type'      => 'select',
                 'name'      => 'skill_type', // the method that defines the relationship in your Model
@@ -48,7 +48,7 @@ 
                 'type' => 'text',
                 'name' => 'name',
             ],
-            [ // skill level
+            [// skill level
                 'label'     => 'Level', // Table column heading
                 'type'      => 'select',
                 'name'      => 'level', // the method that defines the relationship in your Model
@@ -60,23 +60,23 @@ 
 
         CRUD::enableBulkActions();
 
-        CRUD::addFilter([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'level_id',
             'type' => 'select2',
             'label'=> 'Level',
-        ], function () {
+        ], function() {
             return Level::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, 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',
-        ], function () {
+        ], function() {
             return SkillType::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             CRUD::addClause('where', 'skill_type_id', $value);
         });
     }
@@ -85,7 +85,7 @@ 
     {
         CRUD::setValidation(StoreRequest::class);
         CRUD::addFields([
-            [ // skill type
+            [// skill type
                 'label'     => 'Type', // Table column heading
                 'type' => 'select',
                 'name' => 'skill_type_id', // the db column for the foreign key
@@ -98,7 +98,7 @@ 
                 'type' => 'text',
                 'name' => 'name',
             ],
-            [ // skill level
+            [// skill level
                 'label'     => 'Level', // Table column heading
                 'type' => 'select',
                 'name' => 'level_id', // the db column for the foreign key

app/Http/Controllers/Admin/StudentCrudController.php

Spacing +23 added lines, -23 removed lines

@@ -62,12 +62,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.user_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.'%');
                     });
                 },
@@ -82,12 +82,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.user_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.'%');
                     });
                 },
@@ -102,12 +102,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.user_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.'%');
                     });
                 },
@@ -125,32 +125,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);
                     });
                 });
@@ -162,9 +162,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);
         });
     }
@@ -173,7 +173,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/CourseEvaluationCrudController.php

Spacing +16 added lines, -16 removed lines

@@ -86,52 +86,52 @@
 
         ]);
 
-        CRUD::addFilter([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'rhythm_id',
             'type' => 'select2',
             'label'=> __('Rhythm'),
-        ], function () {
+        ], function() {
             return Rhythm::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             CRUD::addClause('where', 'rhythm_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 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'teacher_id',
             'type' => 'select2',
             'label'=> __('Teacher'),
-        ], function () {
+        ], function() {
             return Teacher::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             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([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'level_id',
             'type' => 'select2',
             'label'=> __('Level'),
-        ], function () {
+        ], function() {
             return Level::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             CRUD::addClause('where', 'level_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 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'period_id',
             'type' => 'select2',
             'label'=> __('Period'),
-        ], function () {
+        ], function() {
             return Period::all()->sortByDesc('id')->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, 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 = 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

app/Http/Controllers/Admin/LeaveCrudController.php

Spacing +8 added lines, -8 removed lines

@@ -72,25 +72,25 @@ 
             ],
         ]);
 
-        CRUD::addFilter([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'teacher_id',
             'type' => 'select2',
             'label'=> __('Teacher'),
-        ], function () {
+        ], function() {
             return Teacher::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             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
+        CRUD::addFilter([// 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);
               CRUD::addClause('where', 'date', '>=', $dates->from);
               CRUD::addClause('where', 'date', '<=', $dates->to.' 23:59:59');
@@ -122,7 +122,7 @@ 
                 'model' => LeaveType::class, // foreign key model
             ],
 
-            [   // date_range
+            [// date_range
                 'name' => ['start_date', 'end_date'], // db columns for start_date & end_date
                 'label' => 'Event Date Range',
                 'type' => 'date_range',
@@ -166,7 +166,7 @@ 
                 'model' => LeaveType::class, // foreign key model
             ],
 
-            [   // datepicker
+            [// datepicker
                 'name' => 'date',
                 'label' => 'Event Date',
                 'type' => 'date',

app/Http/Controllers/Admin/EventCrudController.php

Spacing +9 added lines, -9 removed lines

@@ -112,13 +112,13 @@ 
 
         ]);
 
-        CRUD::addFilter([ // daterange filter
+        CRUD::addFilter([// 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);
 
               if ($dates->from) {
@@ -135,10 +135,10 @@ 
             'label'=> __('Events with no course'),
         ],
           false,
-          function ($value) { // if the filter is active, apply these constraints
+          function($value) { // if the filter is active, apply these constraints
               $this->crud->query->where('course_id', null);
           },
-          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([
@@ -147,20 +147,20 @@ 
             'label'=> __('Events with no teacher'),
         ],
           false,
-          function ($value) { // if the filter is active, apply these constraints
+          function($value) { // if the filter is active, apply these constraints
               $this->crud->query->where('teacher_id', null);
           });
 
-        CRUD::addFilter([ // select2 filter
+        CRUD::addFilter([// select2 filter
             'name' => 'teacher_id',
             'type' => 'select2',
             'label'=> __('Teacher'),
-        ], function () {
+        ], function() {
             return Teacher::all()->pluck('name', 'id')->toArray();
-        }, function ($value) { // if the filter is active
+        }, function($value) { // if the filter is active
             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)
           });
     }