Merge remote-tracking branch 'origin/oss' into oss

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Http/Controllers/Admin/EnrollmentCrudController.php
#	composer.lock
#	yarn.lock

Author: thdebay

.all-contributorsrc

@@ -120,6 +120,16 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "MizouziE",
+      "name": "Sam",
+      "avatar_url": "https://avatars.githubusercontent.com/u/90829439?v=4",
+      "profile": "https://github.com/MizouziE",
+      "contributions": [
+        "code",
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1,6 +1,6 @@
 # About this project
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/academico-sis/academico/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/academico-sis/academico/?branch=master)
@@ -38,6 +38,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://bit.ly/doode-website"><img src="https://avatars.githubusercontent.com/u/1921806?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitor Micillo</b></sub></a><br /><a href="#maintenance-vitormicillo" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/Dummdevka"><img src="https://avatars.githubusercontent.com/u/87282400?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tatiana Goloviznina</b></sub></a><br /><a href="https://github.com/academico-sis/academico/commits?author=Dummdevka" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/rm-yakovenko"><img src="https://avatars.githubusercontent.com/u/2056667?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rm Yakovenko</b></sub></a><br /><a href="https://github.com/academico-sis/academico/commits?author=rm-yakovenko" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/MizouziE"><img src="https://avatars.githubusercontent.com/u/90829439?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam</b></sub></a><br /><a href="https://github.com/academico-sis/academico/commits?author=MizouziE" title="Code">💻</a> <a href="https://github.com/academico-sis/academico/commits?author=MizouziE" title="Documentation">📖</a></td>
   </tr>
 </table>
 

app/Http/Controllers/Admin/EnrollmentCrudController.php

@@ -245,39 +245,6 @@ public function setupListOperation()
                 'model' => PhoneNumber::class,
             ],
         ]);
-
-        if ($this->mode === 'global') {
-            CRUD::addFilter([
-                'name' => 'status_id',
-                'type' => 'select2_multiple',
-                'label' => __('Status'),
-            ],
-            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);
-                    }
-                }
-            );
-
-            CRUD::addFilter(['name' => 'period_id',
-                'type' => 'select2',
-                'label' => __('Period'), ], fn () => Period::all()->pluck('name', 'id')->toArray(), function ($value) {
-                    CRUD::addClause('period', $value);
-                });
-
-            CRUD::addFilter(['name' => 'scholarship',
-                'type' => 'select2',
-                'label' => __('Scholarship'), ], fn () => Scholarship::all()->pluck('name', 'id')->toArray(), function ($value) {
-                    if ($value == 'all') {
-                        CRUD::addClause('whereHas', 'scholarships');
-                    } else {
-                        CRUD::addClause('whereHas', 'scholarships', function ($q) use ($value) {
-                            $q->where('scholarships.id', $value);
-                        });
-                    }
-                });
-        }
     }
 
     public function show($enrollment)