Skip to content

GitLab

"app/Http/vscode:/vscode.git/clone" did not exist on "22127580cbfe1922a71ae1c7c01783d0f7b13c88"
Unverified Commit 23deecef authored by José Rômulo's avatar José Rômulo Committed by GitHub
Browse files

Merge pull request #173 from J-Romulo/master 

Correções analise de propostas/minhas propostas
parents 6c9ecb69 0336f9cd
Show whitespace changes
Inline Side-by-side
resources/views/administrador/analisar.blade.php
View file @ 23deecef
......@@ -58,7 +58,7 @@
</div>
<div class="col-sm-4">
<label for="subArea" class="col-form-label">{{ __('Sub Área:') }}</label>
<span class="form-control" id="subArea" name="subArea">{{App\SubArea::where('id', $trabalho->sub_area_id)->first()->nome}}</span>
<span class="form-control" id="subArea" name="subArea">@if(App\SubArea::where('id', $trabalho->sub_area_id)->first() != null){{App\SubArea::where('id', $trabalho->sub_area_id)->first()->nome}}@endif</span>
</div>
</div>
......
resources/views/proponente/projetos.blade.php
View file @ 23deecef
......@@ -95,7 +95,8 @@
</a>
<hr class="dropdown-hr">
@elseif($projeto->evento->fimSubmissao <= $hoje)
<a href="{{route('trabalho.trocaParticipante', ['evento_id' => $projeto->evento->id, 'projeto_id' => $projeto->id])}}" class="dropdown-item" style="text-align: center;">Substituir participante</a>
<a href="{{route('trabalho.trocaParticipante', ['evento_id' => $projeto->evento->id, 'projeto_id' => $projeto->id])}}" class="dropdown-item" style="text-align: center;">
Substituir participante</a>
@endif
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar
......@@ -104,11 +105,6 @@
{{-- <a href="" class="dropdown-item" style="text-align: center">
Recorrer
</a>
@if($projeto->evento->resultado_preliminar <= $hoje)
<a href="" class="dropdown-item" style="text-align: center" data-toggle="modal" data-target="#modalResult{{$projeto->id}}">
Resultado
</a>
@endif
--}}
<!-- Button trigger modal deletar -->
......@@ -144,81 +140,6 @@
</div>
</div>
<!-- Modal Resultado -->
<div class="modal fade" id="modalResult{{$projeto->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header" style="overflow-x:auto">
<h5 class="modal-title" id="exampleModalLabel" style= "color:#1492E6">Resultado Do Projeto: {{$projeto->titulo}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="padding-top: 8px; color:#1492E6">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="container-fluid">
<div class="row">
<div class="col-4">
<label class="control-label">Área</label>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" value="{{$projeto->area->nome}}" disabled>
</div>
</div>
<div class="row mt-2" >
<div class="col-6">
<label class="control-label">N. Planos</label>
</div>
<div class="col-6">
<label class="control-label">Avaliador Externo</label>
</div>
</div>
<div class="row">
<div class="col-6">
<input type="text" class="form-control" value="{{$projeto->participantes->count()}}" disabled>
</div>
<div class="col-6">
@if($projeto->avaliadors->count() > 0)
<input type="text" class="form-control" value="{{$projeto->avaliadors->first()->user->name}}" disabled>
@else
<input type="text" class="form-control" value="" disabled>
@endif
</div>
</div>
<div class="row">
<div class="col-4">
<label class="control-label mt-2">Status</label>
</div>
</div>
<div class="row">
<div class="col-12">
@if($projeto->avaliadors->count() > 0)
@if($projeto->avaliadors->first()->pivot->recomendacao == 'RECOMENDADO')
<input type="text" class="form-control" value="RECOMENDADO" disabled style="color:rgb(6, 85, 6)">
@elseif($projeto->avaliadors->first()->pivot->recomendacao == 'NAO-RECOMENDADO')
<input type="text" class="form-control" value="NAO-RECOMENDADO" disabled style="color: darkred">
@else
<input type="text" class="form-control" value="" disabled>
@endif
@endif
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endforeach
</tbody>
</table>
......
resources/views/proponente/projetosEdital.blade.php
View file @ 23deecef
......@@ -122,12 +122,6 @@
{{-- <a href="" class="dropdown-item" style="text-align: center">
Recorrer
</a>
@if($projeto->evento->resultado_preliminar <= $hoje)
<a href="" class="dropdown-item" style="text-align: center" data-toggle="modal" data-target="#modalResult{{$projeto->id}}">
Resultado
</a>
@endif
--}}
<!-- Button trigger modal -->
......@@ -162,80 +156,6 @@
</div>
</div>
<!-- Modal Resultado -->
<div class="modal fade" id="modalResult{{$projeto->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header" style="overflow-x:auto">
<h5 class="modal-title" id="exampleModalLabel" style= "color:#1492E6">Resultado Do Projeto: {{$projeto->titulo}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="padding-top: 8px; color:#1492E6">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="container-fluid">
<div class="row">
<div class="col-4">
<label class="control-label">Área</label>
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" value="{{$projeto->area->nome}}" disabled>
</div>
</div>
<div class="row mt-2" >
<div class="col-6">
<label class="control-label">N. Planos</label>
</div>
<div class="col-6">
<label class="control-label">Avaliador Externo</label>
</div>
</div>
<div class="row">
<div class="col-6">
<input type="text" class="form-control" value="{{$projeto->participantes->count()}}" disabled>
</div>
<div class="col-6">
@if($projeto->avaliadors->count() > 0)
<input type="text" class="form-control" value="{{$projeto->avaliadors->first()->user->name}}" disabled>
@else
<input type="text" class="form-control" value="" disabled>
@endif
</div>
</div>
<div class="row">
<div class="col-4">
<label class="control-label mt-2">Status</label>
</div>
</div>
<div class="row">
<div class="col-12">
@if($projeto->avaliadors->count() > 0)
@if($projeto->avaliadors->first()->pivot->recomendacao == 'RECOMENDADO')
<input type="text" class="form-control" value="RECOMENDADO" disabled style="color:rgb(6, 85, 6)">
@elseif($projeto->avaliadors->first()->pivot->recomendacao == 'NAO-RECOMENDADO')
<input type="text" class="form-control" value="NAO-RECOMENDADO" disabled style="color: darkred">
@else
<input type="text" class="form-control" value="" disabled>
@endif
@endif
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endforeach
</tbody>
</table>
......
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