academico-sis / academico

app/Http/Controllers/CourseSkillController.php

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 
     public function import(Course $course, Request $request)
     {
-        if (! $request->hasFile('skillset')) {
+        if (!$request->hasFile('skillset')) {
             abort(422, 'No file has been uploaded');
         }
 

app/Http/Controllers/ContactController.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
     public function update(Contact $contact, Request $request)
     {
         // check if the user is allowed to edit the contact
-        if (! backpack_user()->can('update', $contact)) {
+        if (!backpack_user()->can('update', $contact)) {
             abort(403);
         }
 
@@ -95,7 +95,7 @@ 
     public function edit(Contact $contact)
     {
         // check if the user is allowed to edit the contact
-        if (! backpack_user()->can('update', $contact)) {
+        if (!backpack_user()->can('update', $contact)) {
             abort(403);
         }
 

app/Http/Controllers/Admin/StudentCrudController.php

Indentation +2 added lines, -2 removed lines

@@ -136,8 +136,8 @@
                 });
             });
         },
-          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
             'name' => 'notenrolled',

Spacing +29 added lines, -29 removed lines

@@ -88,12 +88,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.'%');
                     });
                 },
@@ -108,12 +108,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.'%');
                     });
                 },
@@ -127,12 +127,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.'%');
                     });
                 },
@@ -160,32 +160,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 $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);
                     });
                 });
@@ -197,9 +197,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);
         });
 
@@ -207,9 +207,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);
         });
     }
@@ -300,11 +300,11 @@ 
         $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 = rand(999, 9999);
 
-        $username = $part1. $part2. $part3; //str_shuffle to randomly shuffle all characters
+        $username = $part1.$part2.$part3; //str_shuffle to randomly shuffle all characters
 
         return $username;
     }
@@ -322,7 +322,7 @@ 
             $username = $request->email;
         }
         else {
-            $username = $this->generateUsername($request->firstname . ' ' . $request->lastname);
+            $username = $this->generateUsername($request->firstname.' '.$request->lastname);
         }
 
         // update the user info
@@ -391,7 +391,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);
         }
 

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
         if (User::where('email', $request->email)->count() === 0)
         {
             $username = $request->email;
-        }
-        else {
+        } else {
             $username = $this->generateUsername($request->firstname . ' ' . $request->lastname);
         }
 

app/Http/Controllers/Admin/LeaveCrudController.php

Indentation +8 added lines, -8 removed lines

@@ -75,20 +75,20 @@
         }, 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
             'type' => 'date_range',
             'name' => 'from_to',
             'label'=> __('Date range'),
         ],
-          false,
-          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');
-          });
+            false,
+            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');
+            });
     }
 
     protected function setupCreateOperation()

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/Providers/RouteServiceProvider.php

Indentation +5 added lines, -5 removed lines

@@ -52,8 +52,8 @@ 
     protected function mapWebRoutes()
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
+                ->namespace($this->namespace)
+                ->group(base_path('routes/web.php'));
     }
 
     /**
@@ -66,8 +66,8 @@ 
     protected function mapApiRoutes()
     {
         Route::prefix('api')
-             ->middleware('api')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/api.php'));
+                ->middleware('api')
+                ->namespace($this->namespace)
+                ->group(base_path('routes/api.php'));
     }
 }

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         }
 
         View::composer(
-            ['partials.create_new_contact', 'students.edit-contact'], function ($view) {
+            ['partials.create_new_contact', 'students.edit-contact'], function($view) {
                 $view->with('contact_types', ContactRelationship::all());
             });
     }

Braces +1 added lines, -2 removed lines

@@ -30,8 +30,7 @@
 
             if ($firstPeriod) {
                 $periods = Period::where('id', '>=', $firstPeriod->id)->get();
-            }
-            else {
+            } else {
                 $periods = Period::all();
             }
 

app/Http/Controllers/Admin/CommentCrudController.php

Indentation +8 added lines, -8 removed lines

@@ -92,10 +92,10 @@ 
             'name' => 'action',
             'label'=> 'Action',
         ],
-              false,
-              function () { // if the filter is active
-                  CRUD::addClause('where', 'action', true);
-              });
+                false,
+                function () { // if the filter is active
+                    CRUD::addClause('where', 'action', true);
+                });
 
         CRUD::addFilter([ // dropdown filter
             'name' => 'type',
@@ -109,10 +109,10 @@ 
         ], function ($value) { // if the filter is active
             CRUD::addClause('where', 'commentable_type', '=', $value);
         },
-              function () { // if the filter is not active
-                  CRUD::addClause('where', 'commentable_type', '=', Student::class);
-                  $this->crud->getRequest()->request->add(['commentable_type' => Student::class]); // to make the filter look active
-              });
+                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
+                });
     }
 
     public function setupUpdateOperation()

Spacing +5 added lines, -5 removed lines

@@ -86,17 +86,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',
@@ -107,10 +107,10 @@ 
             Invoice::class => 'Invoice',
             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/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)
           });
     }
 

Indentation +24 added lines, -24 removed lines

@@ -83,7 +83,7 @@ 
                 'entity' => 'teacher', // the method that defines the relationship in your Model
                 'attribute' => 'name', // foreign key attribute that is shown to user
                 'model' => Teacher::class, // foreign key model
-		'searchLogic' => false,
+        'searchLogic' => false,
             ],
 
             [
@@ -117,39 +117,39 @@ 
             'name' => 'from_to',
             'label'=> __('Date range'),
         ],
-          false,
-          function ($value) { // if the filter is active, apply these constraints
-              $dates = json_decode($value);
-
-              if ($dates->from) {
-                  CRUD::addClause('where', 'start', '>=', $dates->from);
-              }
-              if ($dates->to) {
-                  CRUD::addClause('where', 'start', '<=', $dates->to.' 23:59:59');
-              }
-          });
+            false,
+            function ($value) { // if the filter is active, apply these constraints
+                $dates = json_decode($value);
+
+                if ($dates->from) {
+                    CRUD::addClause('where', 'start', '>=', $dates->from);
+                }
+                if ($dates->to) {
+                    CRUD::addClause('where', 'start', '<=', $dates->to.' 23:59:59');
+                }
+            });
 
         CRUD::addFilter([
             'type' => 'simple',
             'name' => 'orphan',
             'label'=> __('Events with no course'),
         ],
-          false,
-          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)
-          });
+            false,
+            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)
+            });
 
         CRUD::addFilter([
             'type' => 'simple',
             'name' => 'unassigned',
             'label'=> __('Events with no teacher'),
         ],
-          false,
-          function ($value) { // if the filter is active, apply these constraints
-              $this->crud->query->where('teacher_id', null);
-          });
+            false,
+            function ($value) { // if the filter is active, apply these constraints
+                $this->crud->query->where('teacher_id', null);
+            });
 
         CRUD::addFilter([ // select2 filter
             'name' => 'teacher_id',
@@ -160,8 +160,8 @@ 
         }, 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)
+            });
     }
 
     public function store(Request $request)

app/Http/Controllers/CourseController.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     public function search()
     {
-        return QueryBuilder::for(Course::class)->where('campus_id', 1)
+        return QueryBuilder::for (Course::class)->where('campus_id', 1)
         ->with('room')->withCount('events')->withCount('children')->withCount('enrollments')
         ->allowedFilters([
             'name',

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,8 @@ 
 
     public function search()
     {
-        return QueryBuilder::for(Course::class)->where('campus_id', 1)
+        return QueryBuilder::for(Course::class) {
+            ->where('campus_id', 1)
         ->with('room')->withCount('events')->withCount('children')->withCount('enrollments')
         ->allowedFilters([
             'name',
@@ -49,6 +50,7 @@ 
             AllowedFilter::exact('teacher_id'),
         ])
         ->get();
+        }
     }
 
     public function redirectToUserPreferredView()