diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index dd52a0ba256f2aaf4e764feadc5ef4882b212a6b..a2b6c6f8269711bceaf0b92938b0f472c0d8f236 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -20,6 +20,7 @@ use Illuminate\Validation\Rule; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Log; use App\Curso; +use App\AreaTematica; class UserController extends Controller { @@ -107,7 +108,6 @@ class UserController extends Controller $avaliador = Avaliador::where('user_id', '=', $id)->first(); $avaliador->user_id = $user->id; //$avaliador->area_id = $request->area; - $avaliador->naturezas()->sync($request->natureza); $avaliador->update(); @@ -122,7 +122,8 @@ class UserController extends Controller case "avaliador": $avaliador = Avaliador::where('user_id', '=', $id)->first(); $avaliador->user_id = $user->id; - $avaliador->area_id = $request->area; + //$avaliador->area_id = $request->area; + $avaliador->areaTematicas()->sync($request->area); if ($user->usuarioTemp == true) { $user->usuarioTemp = false; } @@ -216,6 +217,8 @@ class UserController extends Controller $naturezas = Natureza::orderBy('nome')->get(); $cursos = Curso::orderBy('nome')->get(); + $areaTematica = AreaTematica::orderBy('nome')->get(); + return view('user.perfilUser')->with(['user' => $user, 'adminResp' => $adminResp, @@ -223,6 +226,7 @@ class UserController extends Controller 'proponente' => $proponente, 'participante' => $participante, 'cursos' => $cursos, - 'naturezas' => $naturezas]); + 'naturezas' => $naturezas, + 'areaTematica' => $areaTematica]); } } diff --git a/resources/views/user/perfilUser.blade.php b/resources/views/user/perfilUser.blade.php index 8e456577384af847f2ee1cd9b3a7b91a0f374a52..edd2fa9f44b9b680bc67ab4257b9f7e5c645f92e 100644 --- a/resources/views/user/perfilUser.blade.php +++ b/resources/views/user/perfilUser.blade.php @@ -1,5 +1,9 @@ @extends('layouts.app') +@section('styles') + +@endsection + @section('content')
@@ -122,29 +126,12 @@
@if(Auth()->user()->tipo == 'avaliador')
- - + @foreach ($areaTematica as $area) + @endforeach - @else - @foreach (App\Area::all() as $area) - @if(Auth()->user()->avaliadors->area_id == $area->id) - - @else - - @endif - @endforeach - @endif - - @error('area') {{ $message }} @@ -804,6 +791,14 @@ @endsection @section('javascript') + + +