academico-sis / academico

app/Console/Commands/genderizeStudents.php

Spacing +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
     protected $description = 'Guess gender for existing students, based on their firstname';
 
     // wordpress implementation, from https://github.com/WordPress/WordPress/blob/a2693fd8602e3263b5925b9d799ddd577202167d/wp-includes/formatting.php#L1528
-    private function remove_accents( $string ) {
+    private function remove_accents($string) {
 
 		$chars = array(
 		// Decompositions for Latin-1 Supplement
@@ -21,7 +21,7 @@ 
 		'À' => 'A', 'Á' => 'A',
 		'Â' => 'A', 'Ã' => 'A',
 		'Ä' => 'A', 'Å' => 'A',
-		'Æ' => 'AE','Ç' => 'C',
+		'Æ' => 'AE', 'Ç' => 'C',
 		'È' => 'E', 'É' => 'E',
 		'Ê' => 'E', 'Ë' => 'E',
 		'Ì' => 'I', 'Í' => 'I',
@@ -32,11 +32,11 @@ 
 		'Ö' => 'O', 'Ù' => 'U',
 		'Ú' => 'U', 'Û' => 'U',
 		'Ü' => 'U', 'Ý' => 'Y',
-		'Þ' => 'TH','ß' => 's',
+		'Þ' => 'TH', 'ß' => 's',
 		'à' => 'a', 'á' => 'a',
 		'â' => 'a', 'ã' => 'a',
 		'ä' => 'a', 'å' => 'a',
-		'æ' => 'ae','ç' => 'c',
+		'æ' => 'ae', 'ç' => 'c',
 		'è' => 'e', 'é' => 'e',
 		'ê' => 'e', 'ë' => 'e',
 		'ì' => 'i', 'í' => 'i',
@@ -75,7 +75,7 @@ 
 		'Ĭ' => 'I', 'ĭ' => 'i',
 		'Į' => 'I', 'į' => 'i',
 		'İ' => 'I', 'ı' => 'i',
-		'IJ' => 'IJ','ij' => 'ij',
+		'IJ' => 'IJ', 'ij' => 'ij',
 		'Ĵ' => 'J', 'ĵ' => 'j',
 		'Ķ' => 'K', 'ķ' => 'k',
 		'ĸ' => 'k', 'Ĺ' => 'L',
@@ -91,13 +91,13 @@ 
 		'Ō' => 'O', 'ō' => 'o',
 		'Ŏ' => 'O', 'ŏ' => 'o',
 		'Ő' => 'O', 'ő' => 'o',
-		'Œ' => 'OE','œ' => 'oe',
-		'Ŕ' => 'R','ŕ' => 'r',
-		'Ŗ' => 'R','ŗ' => 'r',
-		'Ř' => 'R','ř' => 'r',
-		'Ś' => 'S','ś' => 's',
-		'Ŝ' => 'S','ŝ' => 's',
-		'Ş' => 'S','ş' => 's',
+		'Œ' => 'OE', 'œ' => 'oe',
+		'Ŕ' => 'R', 'ŕ' => 'r',
+		'Ŗ' => 'R', 'ŗ' => 'r',
+		'Ř' => 'R', 'ř' => 'r',
+		'Ś' => 'S', 'ś' => 's',
+		'Ŝ' => 'S', 'ŝ' => 's',
+		'Ş' => 'S', 'ş' => 's',
 		'Š' => 'S', 'š' => 's',
 		'Ţ' => 'T', 'ţ' => 't',
 		'Ť' => 'T', 'ť' => 't',
@@ -197,10 +197,10 @@ 
 
     public function handle()
     {
-        Student::whereNull('gender_id')->chunkById(10, function ($students) {
+        Student::whereNull('gender_id')->chunkById(10, function($students) {
             $query = $students->map(fn($student) => ['id' => $student->id, 'name' => $this->remove_accents(strtok($student->firstname, " "))]);
 
-            $response = Http::get('https://api.genderize.io/?name[]=' . $query->pluck('name')->implode('&name[]='));
+            $response = Http::get('https://api.genderize.io/?name[]='.$query->pluck('name')->implode('&name[]='));
             foreach ($students as $student) {
                 $firstname = $query->firstWhere('id', $student->id)['name'];
 

app/Models/Period.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
     {
         parent::boot();
 
-        static::addGlobalScope('order', function (Builder $builder) {
+        static::addGlobalScope('order', function(Builder $builder) {
             $builder->orderBy('year_id')->orderBy('order')->orderBy('id');
         });
     }
@@ -134,7 +134,7 @@ 
 
     public function studentCount($gender = null)
     {
-        if (in_array($gender, [1,2])) {
+        if (in_array($gender, [1, 2])) {
             return DB::table('enrollments')
                 ->join('courses', 'enrollments.course_id', 'courses.id')
                 ->join('students', 'enrollments.student_id', 'students.id')
@@ -201,7 +201,7 @@ 
     {
         $period = self::where('id', '<', $this->id)->orderBy('id', 'desc')->first();
 
-        if (! $period == null) {
+        if (!$period == null) {
             return $period;
         } else {
             return self::first();
@@ -281,7 +281,7 @@ 
     public function getCoursesWithPendingAttendanceAttribute()
     {
         // get all courses for period and preload relations
-        $courses = $this->courses()->where(function ($query) {
+        $courses = $this->courses()->where(function($query) {
             $query->where('exempt_attendance', '!=', true);
             $query->where('exempt_attendance', '!=', 1);
             $query->orWhereNull('exempt_attendance');

app/Models/Year.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
     public function studentCount($gender = null)
     {
-        if (in_array($gender, [1,2])) {
+        if (in_array($gender, [1, 2])) {
             return DB::table('enrollments')
                 ->join('courses', 'enrollments.course_id', 'courses.id')
                 ->join('periods', 'courses.period_id', 'periods.id')

app/Http/Controllers/ReportController.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         $year_data = [];
         $years = []; // New array
 
-        if (! isset($request->period)) {
+        if (!isset($request->period)) {
             $startperiod = Period::find(Config::where('name', 'first_external_period')->first()->value ?? Period::first()->id);
         } else {
             $startperiod = Period::find($request->period);

app/Http/Controllers/TeacherCalendarController.php

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
         $events = Event::with('course')
             ->where('start', '>', Carbon::now()->subDays(30))->where('end', '<', Carbon::now()->addDays(30))->orderBy('id', 'desc') // TODO optimize this.
             ->get()
-            ->map(fn ($event) => [
+            ->map(fn($event) => [
                 'title' => $event->name ?? '',
                 'resourceId' => $event->teacher_id,
                 'start' => $event->start,
@@ -37,14 +37,14 @@ 
 
         $teachers = Teacher::all()->toArray();
 
-        $teachers = array_map(fn ($teacher) => [
+        $teachers = array_map(fn($teacher) => [
             'id' => $teacher['id'],
             'title' => $teacher['name'] ?? '',
         ], $teachers);
 
         array_push($teachers, ['id' => 'tbd', 'title' => 'Unassigned']);
 
-        $unassigned_events = Event::unassigned()->get()->map(fn ($event) => [
+        $unassigned_events = Event::unassigned()->get()->map(fn($event) => [
             'title' => $event->name ?? '',
             'resourceId' => 'tbd',
             'start' => $event->start,
@@ -54,7 +54,7 @@ 
             'borderColor' => $event->color,
         ]);
 
-        $leaves = Leave::orderBy('date', 'desc')->limit(10000)->get()->map(fn ($event) => [
+        $leaves = Leave::orderBy('date', 'desc')->limit(10000)->get()->map(fn($event) => [
             'title' => $event->leaveType->name ?? 'ABS', // todo fix
             'resourceId' => $event['teacher_id'],
             'start' => $event['date'],
@@ -80,7 +80,7 @@ 
             abort(403);
         }
 
-        $events = $teacher->events->map(fn ($event) => [
+        $events = $teacher->events->map(fn($event) => [
             'title' => $event['name'],
             'start' => $event['start'],
             'end' => $event['end'],
@@ -88,8 +88,8 @@ 
             'borderColor' => $event['color'],
         ]);
 
-        $leaves = $teacher->leaves->map(fn ($event) => [
-            'title' => $event->leaveType->name ?? 'vacances',  // todo fix
+        $leaves = $teacher->leaves->map(fn($event) => [
+            'title' => $event->leaveType->name ?? 'vacances', // todo fix
             'start' => $event['date'],
             'allDay' => true,
         ]);

app/Http/Controllers/RoomController.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
             ->where('end', '<', Carbon::now()->addDays(90))
             ->orderBy('id', 'desc')
             ->get()
-            ->map(fn ($event) => [
+            ->map(fn($event) => [
                 'title' => $event->name,
                 'resourceId' => $event->room_id,
                 'start' => $event->start,
@@ -37,7 +37,7 @@ 
 
         $rooms = Room::all()->toArray();
 
-        $rooms = array_map(fn ($room) => [
+        $rooms = array_map(fn($room) => [
             'id' => $room['id'],
             'title' => $room['name'],
         ], $rooms);
@@ -47,7 +47,7 @@ 
         $unassigned_events = Event::with('course')
             ->whereNull('room_id')
             ->get()
-            ->map(fn ($event) => [
+            ->map(fn($event) => [
                 'title' => $event->name,
                 'resourceId' => 'tbd',
                 'start' => $event->start,
@@ -70,7 +70,7 @@ 
     public function show(Room $room)
     {
         $events = $room->events->toArray();
-        $events = array_map(fn ($event) => [
+        $events = array_map(fn($event) => [
             'title' => $event['name'],
             'start' => $event['start'],
             'end' => $event['end'],

app/Models/Student.php

Spacing +16 added lines, -16 removed lines

@@ -42,8 +42,8 @@ 
 
     public function scopeEnrolled($query)
     {
-        return $query->whereHas('enrollments', function ($q) {
-            return $q->whereHas('course', function ($q) {
+        return $query->whereHas('enrollments', function($q) {
+            return $q->whereHas('course', function($q) {
                 return $q->where('period_id', Period::get_default_period()->id);
             });
         });
@@ -51,8 +51,8 @@ 
 
     public function scopeComputedLeadType($query, $leadTypeId)
     {
-        return match ($leadTypeId) {
-            1 => $query->whereHas('enrollments', fn ($query) => $query->whereHas('course', function ($q) {
+        return match($leadTypeId) {
+            1 => $query->whereHas('enrollments', fn($query) => $query->whereHas('course', function($q) {
                 $q->where('period_id', Period::get_default_period()->id);
             })),
 
@@ -60,15 +60,15 @@ 
 
             4 => $query
                 ->where('lead_type_id', $leadTypeId)
-                ->orWhere(function ($query) {
+                ->orWhere(function($query) {
                     $query
                         ->whereNull('lead_type_id')
-                        ->whereHas('enrollments', fn ($query) => $query
-                            ->whereHas('course', function ($q) {
+                        ->whereHas('enrollments', fn($query) => $query
+                            ->whereHas('course', function($q) {
                                 $q->where('period_id', '!=', Period::get_default_period()->id);
                             }))
-                        ->whereDoesntHave('enrollments', fn ($query) => $query
-                            ->whereHas('course', function ($q) {
+                        ->whereDoesntHave('enrollments', fn($query) => $query
+                            ->whereHas('course', function($q) {
                                 $q->where('period_id', Period::get_default_period()->id);
                             }));
                 }
@@ -109,7 +109,7 @@ 
 
         return $this->hasMany(Attendance::class)
         ->where('attendance_type_id', 4) // absence
-        ->whereHas('event', fn ($q) => $q->whereHas('course', fn ($c) => $c->where('period_id', $period->id)));
+        ->whereHas('event', fn($q) => $q->whereHas('course', fn($c) => $c->where('period_id', $period->id)));
     }
 
     public function periodAttendance(Period $period = null)
@@ -119,7 +119,7 @@ 
         }
 
         return $this->hasMany(Attendance::class)
-        ->whereHas('event', fn ($q) => $q->whereHas('course', fn ($c) => $c->where('period_id', $period->id)));
+        ->whereHas('event', fn($q) => $q->whereHas('course', fn($c) => $c->where('period_id', $period->id)));
     }
 
     public function contacts()
@@ -180,7 +180,7 @@ 
 
     public function getEmailAttribute(): ?string
     {
-        return $this?->user?->email;
+        return $this ? ->user ? ->email;
     }
 
     public function getNameAttribute(): string
@@ -190,7 +190,7 @@ 
 
     public function getStudentAgeAttribute()
     {
-        return $this->birthdate ? Carbon::parse($this->birthdate)->age . ' ' . __('years old') : '';
+        return $this->birthdate ? Carbon::parse($this->birthdate)->age.' '.__('years old') : '';
     }
 
     public function getStudentBirthdateAttribute()
@@ -201,7 +201,7 @@ 
     public function getIsEnrolledAttribute()
     {
         // if the student is currently enrolled
-        if ($this->enrollments()->whereHas('course', fn ($q) => $q->where('period_id', Period::get_default_period()->id))->count() > 0) {
+        if ($this->enrollments()->whereHas('course', fn($q) => $q->where('period_id', Period::get_default_period()->id))->count() > 0) {
             return 1;
         }
 
@@ -296,13 +296,13 @@ 
 
     public function getImageAttribute(): ?string
     {
-        return $this->getMedia('profile-picture')->last()?->getUrl('thumb');
+        return $this->getMedia('profile-picture')->last() ? ->getUrl('thumb');
     }
 
     public function setImageAttribute($value)
     {
         // if the image was erased
-        if ($value==null) {
+        if ($value == null) {
             $this->clearMediaCollection('profile-picture');
         }
 

app/Http/Controllers/Admin/EnrollmentCrudController.php

Spacing +19 added lines, -19 removed lines

@@ -106,7 +106,7 @@ 
                 'name' => 'id',
                 'label' => 'ID',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
@@ -117,7 +117,7 @@ 
                 'type' => 'text',
                 'name' => 'student.idnumber',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
@@ -130,13 +130,13 @@ 
                 'label' => __('Last Name'),
                 'type' => 'relationship',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
+                        $q->whereHas('user', function($q) use ($searchTerm) {
                             $q->where('lastname', 'like', '%'.$searchTerm.'%');
                         });
                     });
@@ -150,13 +150,13 @@ 
                 'label' => __('First Name'),
                 'type' => 'relationship',
                 'wrapper' => [
-                    'element' => function ($crud, $column, $entry) {
+                    'element' => function($crud, $column, $entry) {
                         return $entry->status_id > 2 ? 'del' : 'span';
                     },
                 ],
-                'searchLogic' => function ($query, $column, $searchTerm) {
-                    $query->orWhereHas('student', function ($q) use ($searchTerm) {
-                        $q->whereHas('user', function ($q) use ($searchTerm) {
+                'searchLogic' => function($query, $column, $searchTerm) {
+                    $query->orWhereHas('student', function($q) use ($searchTerm) {
+                        $q->whereHas('user', function($q) use ($searchTerm) {
                             $q->where('firstname', 'like', '%'.$searchTerm.'%');
                         });
                     });
@@ -202,7 +202,7 @@ 
                 'model' => EnrollmentStatusType::class,
                 'wrapper' => [
                     'element' => 'span',
-                    'class' => function ($crud, $column, $entry) {
+                    'class' => function($crud, $column, $entry) {
                         return 'badge badge-pill badge-'.$entry->enrollmentStatus->styling();
                     },
                 ],
@@ -255,8 +255,8 @@ 
                 'name' => 'status_id',
                 'type' => 'select2_multiple',
                 'label'=> __('Status'),
-            ], fn () => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(),
-            function ($values) {
+            ], fn() => EnrollmentStatusType::all()->pluck('name', 'id')->toArray(),
+            function($values) {
                 foreach (json_decode($values, null, 512, JSON_THROW_ON_ERROR) as $value) {
                     CRUD::addClause('orWhere', 'status_id', $value);
                 }
@@ -266,7 +266,7 @@ 
                 'name' => 'period_id',
                 'type' => 'select2',
                 'label'=> __('Period'),
-            ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($value) {
+            ], fn() => Period::all()->pluck('name', 'id')->toArray(), function($value) {
                 CRUD::addClause('period', $value);
             });
 
@@ -276,12 +276,12 @@ 
                     'type' => 'select2',
                     'label'=> __('Scholarship'),
                 ],
-                fn () => Scholarship::all()->pluck('name', 'id')->toArray(),
-                function ($value) { // if the filter is active
+                fn() => Scholarship::all()->pluck('name', 'id')->toArray(),
+                function($value) { // if the filter is active
                     if ($value == 'all') {
                         CRUD::addClause('whereHas', 'scholarships');
                     } else {
-                        CRUD::addClause('whereHas', 'scholarships', function ($q) use ($value) {
+                        CRUD::addClause('whereHas', 'scholarships', function($q) use ($value) {
                             $q->where('scholarships.id', $value);
                         });
                     }
@@ -301,7 +301,7 @@ 
             ->get();
 
         // get related comments
-        $comments = $enrollment->invoices->map(fn (Invoice $invoice) => $invoice->comments)->flatten()->concat($enrollment->comments);
+        $comments = $enrollment->invoices->map(fn(Invoice $invoice) => $invoice->comments)->flatten()->concat($enrollment->comments);
 
         $scholarships = Scholarship::all();
 
@@ -332,7 +332,7 @@ 
             'model'     => \App\Models\Course::class,
             'attribute' => 'name',
 
-            'options'   => (fn ($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()),
+            'options'   => (fn($query) => $query->orderBy('level_id', 'ASC')->where('period_id', $this->crud->getCurrentEntry()->course->period_id)->get()),
         ]);
 
         CRUD::addField(array_merge([

app/Http/Controllers/Admin/UserCrudController.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
                 'label' => trans('backpack::permissionmanager.email'),
                 'type'  => 'email',
             ],
-            [ // n-n relationship (with pivot table)
+            [// n-n relationship (with pivot table)
                 'label'     => trans('backpack::permissionmanager.roles'),
                 'type'      => 'select_multiple',
                 'name'      => 'roles',
@@ -67,9 +67,9 @@ 
                 'label' => trans('backpack::permissionmanager.role'),
             ],
             config('permission.models.role')::all()->pluck(['name', 'id'])->toArray(),
-            function ($value) {
+            function($value) {
                 // if the filter is active
-                $this->crud->addClause('whereHas', 'roles', function ($query) use ($value) {
+                $this->crud->addClause('whereHas', 'roles', function($query) use ($value) {
                     $query->where('role_id', '=', $value);
                 });
             }
@@ -120,12 +120,12 @@ 
     protected function addFields()
     {
         $this->crud->addFields([
-            [  // Select2
+            [// Select2
                 'label' => trans('firstname'),
                 'type' => 'text',
                 'name' => 'firstname',
             ],
-            [  // Select2
+            [// Select2
                 'label' => trans('lastname'),
                 'type' => 'text',
                 'name' => 'lastname',