Skip to content

GitLab

Unverified Commit d59b8495 authored by Yuri Resende's avatar Yuri Resende Committed by GitHub
Browse files

Merge pull request #805 from yuriresendematias/master 

Padronizando a adição de participantes
parents 4cd17bcb d06b4784
Hide whitespace changes
Inline Side-by-side
resources/views/evento/submeterTrabalho.blade.php
View file @ d59b8495
...@@ -217,10 +217,16 @@ ...@@ -217,10 +217,16 @@
if(nome.value != ""){ if(nome.value != ""){
if(planoTrabalho != null && planoTrabalho.value != ""){ if(planoTrabalho != null && planoTrabalho.value != ""){
nomePlano.innerText = `Nome: ${nome.value} \n Plano: ${planoTrabalho.value} \n E-mail: ${email.value} \n CPF: ${cpf.value}\nFunção: ${nome_funcao}`; nomePlano.innerHTML = ` <p style='font-weight: normal; line-height: normal;'><strong>Nome: </strong>${nome.value}<br>
<strong>E-mail: </strong>${email.value} <br>
<strong>Plano: </strong>${planoTrabalho.value}<br>
<strong>CPF: </strong>${cpf.value} <br>
<strong>Função: </strong>${funcaoParticipantes[funcao.value -1].nome}</p>`;
}else { }else {
nomePlano.innerText = `Nome: ${nome.value} \n E-mail: ${email.value} \n CPF: ${cpf.value}\nFunção: ${nome_funcao}`; nomePlano.innerHTML = ` <p style='font-weight: normal; line-height: normal;'><strong>Nome: </strong>${nome.value}<br>
<strong>E-mail: </strong>${email.value} <br>
<strong>CPF: </strong>${cpf.value} <br>
<strong>Função: </strong>${funcaoParticipantes[funcao.value -1].nome}</p>`;
} }
}else{ }else{
nomePlano.innerText = `Discente `+(id+1); nomePlano.innerText = `Discente `+(id+1);
......
resources/views/projeto/editaFormulario/participantes.blade.php
View file @ d59b8495
...@@ -52,43 +52,38 @@ ...@@ -52,43 +52,38 @@
<div class="col-sm-8" <div class="col-sm-8"
style="display: flex; align-items: center;"> style="display: flex; align-items: center;">
<div class="col-sm-12"> <div class="col-sm-12">
@if ($participante) @if ($participante)
<p>
@if (isset(old('name')[$i])) @if (isset(old('name')[$i]))
Nome: {{ old('name')[$i] }} <strong>Nome: </strong> {{ old('name')[$i] }}
@else @else
Nome: {{ $participante->user->name }} <strong>Nome: </strong>{{ $participante->user->name }}
@endif @endif
<br> <br>
@if($edital->tipo != "CONTINUO")
@if (isset(old('nomePlanoTrabalho')[$i]))
Plano: {{ old('nomePlanoTrabalho')[$i] }}
@else
Plano:
{{ $participante->planoTrabalho->titulo ?? 'Não informado' }}
@endif
@endif
@if (isset(old('email')[$i])) @if (isset(old('email')[$i]))
E-mail: {{ old('email')[$i] }} <strong>E-mail: </strong>{{ old('email')[$i] }}
@else @else
E-mail: {{ $participante->user->email }} <strong>E-mail: </strong>{{ $participante->user->email }}
@endif @endif
<br> <br>
@if (isset(old('cpf')[$i])) @if (isset(old('cpf')[$i]))
CPF:{{ old('cpf')[$i] }} <strong>CPF: </strong>{{ old('cpf')[$i] }}
@else @else
CPF: {{ $participante->user->cpf }} <strong>CPF: </strong>{{ $participante->user->cpf }}
@endif @endif
<br> <br>
@if (isset(old('funcao')[$i])) @if (isset(old('funcao')[$i]))
Função: {{ old('funcao')[$i] }} <strong>Função: </strong> {{ old('funcao')[$i] }}/
@else @else
Função: {{ $trabalhos_user[$i]->funcao->nome }} <strong>Função: </strong> {{ $trabalhos_user[$i]->funcao->nome }}
@endif @endif
</p>
@endif @endif
<h6> <h6>
<a id="nomePart{{ $i + 1 }}"></a> <a id="nomePart{{ $i + 1 }}"></a>
......
resources/views/projeto/editar.blade.php
View file @ d59b8495
...@@ -236,9 +236,16 @@ ...@@ -236,9 +236,16 @@
if(nome.value != ""){ if(nome.value != ""){
if(planoTrabalho != null && planoTrabalho.value != ""){ if(planoTrabalho != null && planoTrabalho.value != ""){
linkNome.innerText = `Nome: ${nome.value} \n Plano: ${planoTrabalho.value} \n E-mail: ${email.value} \n CPF: ${cpf.value}\nFunção: ${funcaoParticipantes[funcao.value -1].nome}`; linkNome.innerHTML = ` <p style='font-weight: normal; line-height: normal;'><strong>Nome: </strong>${nome.value}<br>
<strong>E-mail: </strong>${email.value} <br>
<strong>Plano: </strong>${planoTrabalho.value}<br>
<strong>CPF: </strong>${cpf.value} <br>
<strong>Função: </strong>${funcaoParticipantes[funcao.value -1].nome}</p>`;
}else { }else {
linkNome.innerText = `Nome: ${nome.value} \n E-mail: ${email.value} \n CPF: ${cpf.value}\nFunção: ${funcaoParticipantes[funcao.value -1].nome}`; linkNome.innerHTML = ` <p style='font-weight: normal; line-height: normal;'><strong>Nome: </strong>${nome.value}<br>
<strong>E-mail: </strong>${email.value} <br>
<strong>CPF: </strong>${cpf.value} <br>
<strong>Função: </strong>${funcaoParticipantes[funcao.value -1].nome}</p>`;
} }
} }
......
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