Commit 6951d09f authored by José Fernando Mendes da Costa's avatar José Fernando Mendes da Costa
Browse files

corrige para quando o usuario informa outro curso

parent 43433ea8
...@@ -1173,11 +1173,12 @@ class TrabalhoController extends Controller ...@@ -1173,11 +1173,12 @@ class TrabalhoController extends Controller
public function buscarUsuario(Request $request) { public function buscarUsuario(Request $request) {
$usuario = User::where('cpf', $request->cpf_consulta)->first(); $usuario = User::where('cpf', $request->cpf_consulta)->first();
$funcao = FuncaoParticipantes::where('id', $request->funcao)->first(); $funcao = FuncaoParticipantes::where('id', $request->funcao)->first();
$cursos = Curso::pluck('nome', 'id')->all();
if($usuario){ if($usuario){
$participante = $usuario->participantes()->first(); $participante = $usuario->participantes()->first();
return json_encode([$usuario, $funcao, $participante, $usuario->endereco()->first(), $cursos]); if ($participante->curso == null && $participante->curso_id != null)
$participante->curso = Curso::find($participante->curso_id)->nome;
return json_encode([$usuario, $funcao, $participante, $usuario->endereco()->first()]);
} }
return json_encode('inexistente'); return json_encode('inexistente');
......
...@@ -265,8 +265,7 @@ ...@@ -265,8 +265,7 @@
document.getElementById(`instituicao[${modal_id}]`).value = data[0]['instituicao']; document.getElementById(`instituicao[${modal_id}]`).value = data[0]['instituicao'];
document.getElementById(`instituicao[${modal_id}]`).setAttribute("readonly", ""); document.getElementById(`instituicao[${modal_id}]`).setAttribute("readonly", "");
document.getElementById(`curso[${modal_id}]`).value = data[4][data[2]['curso_id']]; document.getElementById(`curso[${modal_id}]`).value = data[2]['curso'];
console.log(data[2]['curso_id'], data[4], data[4][data[2]['curso_id']]);
document.getElementById(`curso[${modal_id}]`).setAttribute("readonly", ""); document.getElementById(`curso[${modal_id}]`).setAttribute("readonly", "");
console.log(document.getElementById(`funcaoParticipante${modal_id}`)); console.log(document.getElementById(`funcaoParticipante${modal_id}`));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment