diff --git a/app/Http/Controllers/AdministradorController.php b/app/Http/Controllers/AdministradorController.php index eb8bf6cf70130f7c5e41571333f11a410a4ff0a0..a5ab3e525ace767d4468c82ebe8db346ea31a8fb 100755 --- a/app/Http/Controllers/AdministradorController.php +++ b/app/Http/Controllers/AdministradorController.php @@ -393,7 +393,7 @@ class AdministradorController extends Controller $validated = $request->validate([ 'name' => ['required', 'string', 'max:255'], 'tipo' => ['required'], - 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], + 'email' => ['required', 'string', 'email', 'max:255'], 'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'], 'instituicaoSelect' => ['required_without:instituicao'], 'celular' => ($request['celular']!=null ? 'required|string|telefone' : 'nullable'), diff --git a/app/Http/Controllers/TrabalhoController.php b/app/Http/Controllers/TrabalhoController.php index 544c4e698ee855fba2a78ff18688b5981c51a7c3..e188625a2300947d40e8338339dbe1c26317c310 100755 --- a/app/Http/Controllers/TrabalhoController.php +++ b/app/Http/Controllers/TrabalhoController.php @@ -362,6 +362,7 @@ class TrabalhoController extends Controller $grandeAreas = GrandeArea::all(); $areas = Area::all(); $subareas = Subarea::all(); + $areasTematicas = AreaTematica::all(); $funcaoParticipantes = FuncaoParticipantes::all(); $participantes = $projeto->participantes; $participantesUsersIds = Participante::where('trabalho_id', $id)->select('user_id')->get(); @@ -379,6 +380,7 @@ class TrabalhoController extends Controller 'estados' => $this->estados, 'visualizar' => true, 'enum_turno' => Participante::ENUM_TURNO, + 'areasTematicas' => $areasTematicas, ]); } diff --git a/resources/views/administrador/editar_user.blade.php b/resources/views/administrador/editar_user.blade.php index 6df52bd05237641edcb7c974ad274013e382b2bd..ab4be32a0ec3714f9a882da58a12400ee0e1df02 100755 --- a/resources/views/administrador/editar_user.blade.php +++ b/resources/views/administrador/editar_user.blade.php @@ -282,7 +282,7 @@