Merge branch 'lmtsufape:master' into master

app/Http/Controllers/AdministradorController.php

@@ -83,11 +83,8 @@ class AdministradorController extends Controller
             ->whereIn('status', $status)
             ->pluck('area_id');
 
-        $trabalhos = Trabalho::where('evento_id', $evento->id)
-            ->whereIn('status', $status)
-            ->orderBy('titulo')
-            ->paginate(10);
-
+        $trabalhos = $evento->trabalhos->whereNotIn('status', 'rascunho')->sortBy('titulo');
+                   
         $grandesAreas = GrandeArea::whereIn('id', $aux)->get();
         $areas = Area::whereIn('id', $idArea)->get();
 

resources/views/administrador/analisar.blade.php

@@ -113,18 +113,6 @@
                             @endforeach
                         </div>
 
-
-    <div class="row justify-content-center" >
-        <div class="col-md-11">
-            <br>
-            {{ $trabalhos->appends(['evento_id' => $evento->id])->links() }}
-           
-                </div>
-
-        </div>
-
-
-
 @endsection
 
 @section('javascript')

resources/views/administrador/usersAdmin.blade.php

@@ -65,7 +65,7 @@
                         <a href="{{route('admin.user.edit', $user->id)}}" class="dropdown-item text-center">
                             Editar
                         </a>
-                        <hr class="dropdown-hr">
+                        <!-- <hr class="dropdown-hr">
                         <form method="POST" action="{{route('admin.user.destroy', $user->id)}}">
                             {{ csrf_field() }}
                             <button type="submit" class="dropdown-item dropdown-item-delete text-center">
@@ -73,7 +73,7 @@
                                 Deletar
                             </button>
 
-                        </form>
+                        </form> -->
                     </div>
                 </div>
               </td>