diff --git a/app/Http/Controllers/AdministradorController.php b/app/Http/Controllers/AdministradorController.php index 9eb4af0e3d224d002d7a82900c9b8d01d7ff067b..a6492031dfa86f616449e5fc35331eba01eb0ea3 100755 --- a/app/Http/Controllers/AdministradorController.php +++ b/app/Http/Controllers/AdministradorController.php @@ -689,6 +689,7 @@ class AdministradorController extends Controller $evento = Evento::where('id', $request->evento_id)->first(); $trabalhos = $evento->trabalhos; $grandesAreas = GrandeArea::orderBy('nome')->get(); + $areasTematicas = AreaTematica::orderBy('nome')->get(); $avaliadores = $evento->avaliadors; foreach ($trabalhos as $key => $trabalho) { $avalSelecionadosId = $trabalho->avaliadors->pluck('id'); @@ -703,6 +704,7 @@ class AdministradorController extends Controller 'trabalhos' => $trabalhos, 'avaliadores' => $avaliadores, 'grandesAreas' => $grandesAreas, + 'areasTematicas' => $areasTematicas ]); } diff --git a/resources/views/administrador/selecionarProjetos.blade.php b/resources/views/administrador/selecionarProjetos.blade.php index ba47994d26969de695929812c685bae4702c260d..ac8c43dcb02f1bf9c5f8128f74eb46147b5e43e5 100755 --- a/resources/views/administrador/selecionarProjetos.blade.php +++ b/resources/views/administrador/selecionarProjetos.blade.php @@ -323,7 +323,7 @@
- +
@@ -334,6 +334,7 @@
+ @if($evento->natureza_id != 3)
- -
- - -
+ @else + + + @endif + + @if($evento->natureza_id != 3) +
+ + +
+ @endif
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index c24e3b82fb76c11100acf1a745304751daa9a1e1..9b7ee332529d590f6d86f37f01ec9d7cf0ae8bb9 100755 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -125,7 +125,7 @@