diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 599a57bcee03f4c122d46ac057926df9847efdca..14f0d0e99f935a5ba7982b068ef11b9982be9e68 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -141,6 +141,7 @@ class RegisterController extends Controller $endereco->save(); $participante->data_de_nascimento = $data['data_de_nascimento']; + $participante->curso = Curso::find($data['cursoEstudante']); $participante->linkLattes = $data['linkLattes']; if ($data['outroCursoEstudante'] != null) { diff --git a/app/Http/Controllers/TrabalhoController.php b/app/Http/Controllers/TrabalhoController.php index 8a030177656951b7d024ab6373dc585a976ac3d8..ac39717542aa924838f8500a43d8a115fad77d9c 100755 --- a/app/Http/Controllers/TrabalhoController.php +++ b/app/Http/Controllers/TrabalhoController.php @@ -56,6 +56,7 @@ use Illuminate\Support\Facades\Notification; use App\Desligamento; use App\ObjetivoDeDesenvolvimentoSustentavel; use App\AvaliacaoRelatorio; +use App\Curso; class TrabalhoController extends Controller { @@ -1172,10 +1173,11 @@ class TrabalhoController extends Controller public function buscarUsuario(Request $request) { $usuario = User::where('cpf', $request->cpf_consulta)->first(); $funcao = FuncaoParticipantes::where('id', $request->funcao)->first(); + $cursos = Curso::pluck('nome', 'id')->all(); if($usuario){ $participante = $usuario->participantes()->first(); - return json_encode([$usuario, $funcao, $participante, $usuario->endereco()->first()]); + return json_encode([$usuario, $funcao, $participante, $usuario->endereco()->first(), $cursos]); } return json_encode('inexistente'); diff --git a/resources/views/evento/formulario/integrantes.blade.php b/resources/views/evento/formulario/integrantes.blade.php index c90f525285f702abaee7d405c85d856cf08e098b..0233e377812c88579a9737c75278e8283edac713 100644 --- a/resources/views/evento/formulario/integrantes.blade.php +++ b/resources/views/evento/formulario/integrantes.blade.php @@ -265,7 +265,8 @@ document.getElementById(`instituicao[${modal_id}]`).value = data[0]['instituicao']; document.getElementById(`instituicao[${modal_id}]`).setAttribute("readonly", ""); - document.getElementById(`curso[${modal_id}]`).value = data[2]['curso']; + document.getElementById(`curso[${modal_id}]`).value = data[4][data[2]['curso_id']]; + console.log(data[2]['curso_id'], data[4], data[4][data[2]['curso_id']]); document.getElementById(`curso[${modal_id}]`).setAttribute("readonly", ""); console.log(document.getElementById(`funcaoParticipante${modal_id}`)); diff --git a/resources/views/evento/formulario/projeto.blade.php b/resources/views/evento/formulario/projeto.blade.php index 4a3d451a64fc08c324b247d872a9e1ee8fa4b9dd..3b49c0f69fad715ef815bc5489e2d548a60b3951 100755 --- a/resources/views/evento/formulario/projeto.blade.php +++ b/resources/views/evento/formulario/projeto.blade.php @@ -91,8 +91,8 @@