diff --git a/app/Http/Controllers/CategoriaController.php b/app/Http/Controllers/CategoriaController.php index 87b837e..547f481 100644 --- a/app/Http/Controllers/CategoriaController.php +++ b/app/Http/Controllers/CategoriaController.php @@ -13,7 +13,7 @@ class CategoriaController extends Controller { public function index(){ - $categorias = Categoria::all(); + $categorias = Categoria::orderBy('nome')->get(); \UspTheme::activeUrl('categorias'); return view('categoria.index', compact('categorias')); diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 0a08e9a..4a0d11c 100644 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -54,12 +54,12 @@ public function home(Request $request) \UspTheme::activeUrl('/'); return view('home', [ - 'categorias' => Categoria::all(), + 'categorias' => Categoria::orderBy('nome')->get(), 'filter' => ($request->filter) ?: [], 'reservas' => $reservas, 'finalidades' => Finalidade::all(), 'finalidades_filter' => $request->finalidades_filter ?? [], - 'salas' => Sala::all(), + 'salas' => Sala::orderBy('nome')->get(), 'salas_filter' => $request->salas_filter ?? [], 'categoria_id' => $request->categoria_id ?? [], 'data' => today(), diff --git a/app/Http/Controllers/ReservaController.php b/app/Http/Controllers/ReservaController.php index 0375e48..204ba0c 100644 --- a/app/Http/Controllers/ReservaController.php +++ b/app/Http/Controllers/ReservaController.php @@ -98,10 +98,13 @@ public function create(GeneralSettings $settings) $reserva = new Reserva(); $reserva->tipo_responsaveis = 'eu'; - foreach($categorias as $categoria) + foreach($categorias as $categoria) { foreach($categoria->salas as $salaKey => $sala) if(!is_null($sala->restricao) && $sala->restricao->bloqueada) $categoria->salas->forget($salaKey); + $categoria->setRelation('salas', $categoria->salas->sortBy('nome')); + } + \UspTheme::activeUrl('/reservas/create'); return view('reserva.create', [ 'irmaos' => false, diff --git a/app/Http/Controllers/SalaController.php b/app/Http/Controllers/SalaController.php index ab71a56..1724fd6 100644 --- a/app/Http/Controllers/SalaController.php +++ b/app/Http/Controllers/SalaController.php @@ -21,7 +21,9 @@ class SalaController extends Controller */ public function index() { - $categorias = Categoria::with(['salas'])->get(); + $categorias = Categoria::with(['salas' => function ($query) { + $query->orderBy('nome'); + }])->orderBy('nome')->get(); \UspTheme::activeUrl('/salas'); return view('sala.index', [ @@ -270,7 +272,9 @@ public function listar(Request $request) }) ->when($request->capacidade_filter, function ($query) use ($request) { $query->where('capacidade', '>=', $request->capacidade_filter); - });; + }) + ->orderBy(Categoria::select('nome')->whereColumn('categorias.id', 'salas.categoria_id')) + ->orderBy('nome'); \UspTheme::activeUrl(session('origem') === 'filtro_de_recursos' ? '/filtro_de_recursos' : 'salas/listar');