Skip to content

GitLab

Commit a21ee1c3 authored by S-Nathalia's avatar S-Nathalia
Browse files

resolvendo conflitos

parents 7242f654 58164163
Hide whitespace changes
Inline Side-by-side
resources/views/projeto/editaFormulario/participantes.blade.php
View file @ a21ee1c3
......@@ -321,7 +321,8 @@
<select name="ordem_prioridade[]" class="form-control" >
<option value="" selected>-- ORDEM --</option>
@for($j = 1; $j <= $edital->numParticipantes; $j++)
<option @if(old('total_periodos')[$i] ?? $participante->ordem_prioridade == $j ) selected @endif value="{{ $j }}">{{ $j }}</option>
<option @if(old('total_periodos')[$i] ?? ($participante->ordem_prioridade ?? '') == $j ) selected @endif value="{{ $j }}">{{ $j }}</option>
@endfor
</select>
......
resources/views/proponente/projetos.blade.php
View file @ a21ee1c3
......@@ -127,7 +127,7 @@
--}}
<!-- Button trigger modal -->
@if(($projeto->status == "rascunho") || ($projeto->evento->fimSubmissao > $hoje))
<div class="container">
<div class="row">
<div class="col text-center" style="margin-left: 20px">
......@@ -137,6 +137,7 @@
</div>
</div>
</div>
@endif
</div>
</div>
......
resources/views/proponente/projetosEdital.blade.php
View file @ a21ee1c3
......@@ -151,7 +151,7 @@
--}}
<!-- Button trigger modal -->
@if(($projeto->status == "rascunho") || ($projeto->evento->fimSubmissao > $hoje))
<div class="container">
<div class="row">
<div class="col text-center" style="margin-left: 20px">
......@@ -161,6 +161,7 @@
</div>
</div>
</div>
@endif
</div>
</div>
</td>
......
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