Fixed filter bug

app/Http/Middleware/SetDept.php

@@ -15,6 +15,7 @@ class SetDept
      */
     public function handle($request, Closure $next)
     {
+        // dump($request);
         if ($request->has('f')) {
             $data = $request->validate(['f' => 'regex:/[df]/']);
             $request->session()->put('filter', $data['f']);
@@ -34,6 +35,7 @@ class SetDept
             $default_dept_id = \App\Department::where('name', '=', 'BIOL')->first()->id;
             $request->session()->put('department', $default_dept_id);
         }
+        // dump($request->session());
         return $next($request);
     }
 }

database/migrations/2019_07_07_183013_create_departments_table.php

@@ -15,8 +15,8 @@ class CreateDepartmentsTable extends Migration
     {
         Schema::create('departments', function (Blueprint $table) {
             $table->bigIncrements('id');
+            $table->string('code')->nullable();
             $table->string('name')->nullable();
-            $table->string('title')->nullable();
             $table->unsignedBigInteger('faculty_id');
 
             $table->foreign('faculty_id')->references('id')->on('faculties');

resources/views/dashboard/register.blade.php

@@ -102,7 +102,7 @@
                                                     </div>
                                                     <div class="mdc-checkbox__ripple"></div>
                                                 </div>
-                                                <label for="checkbox-d-{{ $loop->index }}">{{ $department->title ?: $department->name }}</label>
+                                                <label for="checkbox-d-{{ $loop->index }}">{{ $department->name ?: $department->code }}</label>
                                             </div>
                                         </div>
                                     @endforeach

resources/views/layouts/app.blade.php

@@ -44,21 +44,25 @@
                     </li>
                     <li class="nav-item dropdown">
                         @php
-                            $department = \App\Department::find(Request()->session()->get('department'));
+                            switch(Request()->session()->get('filter')) {
+                                case 'f': $division = App\Faculty::find(Request()->session()->get('faculty')); break;
+                                case 'd': $division = App\Department::find(Request()->session()->get('department')); break;
+                                default: break;
+                            }
                         @endphp
                         <a class="nav-link dropdown-toggle mdc-typography--body1" href="#" data-toggle="dropdown">
-                            {{ $department->title ?: $department->name ?? 'Departamento' }} <span class="caret"></span>
+                            {{ $division->name ?: $division->code ?? 'Departamento' }} <span class="caret"></span>
                         </a>
                         <ul class="dropdown-menu">
                             @foreach (App\Faculty::orderBy('name')->get() as $faculty)
-                                @if (!$faculty->departments->isEmpty())
+                                @if ($faculty->departments->isNotEmpty())
                                     <li class="dropdown-submenu">
                                         <a class="dropdown-item dropdown-toggle mdc-typography--body1" href="#" data-toggle="dropdown">{{ $faculty->name }}</a>
                                         <ul class="dropdown-menu">
                                             @foreach ($faculty->departments as $dept)
                                                 <li class="mdc-typography--body2">
                                                     <a class="dropdown-item" href="{{ url()->current() }}?f=d&dept={{ $dept->id }}">
-                                                        {{ $dept->title ?: $dept->name }}
+                                                        {{ $dept->name ?: $dept->code }}
                                                     </a>
                                                 </li>
                                             @endforeach