"resources/views/git@sites.upe.br:walter.felipe/submeta.git" did not exist on "645a89ca654759f1c803290dbcc600d040fea51c"
Unverified Commit a8eb019e authored by Gabriel Antônio da Silva's avatar Gabriel Antônio da Silva Committed by GitHub
Browse files

Merge pull request #126 from lmts-ufape/modificacoes_perfil_avaliador

Modificacoes perfil avaliador
parents c70a7e66 42a99a5e
public/img/icons/icon_editais.png

4.73 KB | W: | H:

public/img/icons/icon_editais.png

5.27 KB | W: | H:

public/img/icons/icon_editais.png
public/img/icons/icon_editais.png
public/img/icons/icon_editais.png
public/img/icons/icon_editais.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -2,22 +2,52 @@ ...@@ -2,22 +2,52 @@
@section('content') @section('content')
<div class="container" style="margin-top: 100px;"> <div class="container">
@if(isset($mensagem))
<div class="container" > <div class="col-sm-12">
<div class="row" > <br>
<div class="alert alert-success">
<p>{{ $mensagem }}</p>
</div>
</div>
@endif
@if(session('mensagem'))
<div class="col-sm-12"> <div class="col-sm-12">
<h3>Meus Editais</h3> <br>
<div class="alert alert-success">
<p>{{session('mensagem')}}</p>
</div>
</div>
@endif
<div class="row justify-content-center" style="margin-top: 3rem;">
<div class="col-md-11" style="margin-bottom: -3rem">
<div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
<div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
<div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:-1rem">
<div class="bottomVoltar" style="margin-top: -20px">
<a href="{{ route('home') }}" class="btn btn-secondary" style=""><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
</div>
<div class="form-group">
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Meus editais</h5>
</div>
<div style="margin-top: -2rem">
<div class="form-group">
<div style="margin-top:30px;">
{{-- Pesquisar--}}
</div> </div>
</div> </div>
</div> </div>
<hr> </div>
<table class="table table-bordered"> </div>
<div class="card-body" >
<table class="table table-bordered table-hover" style="display: block; overflow-x: auto; white-space: nowrap; border-radius:10px; margin-bottom:0px">
<thead> <thead>
<tr> <tr>
<th scope="col">Nome do Edital</th> <th scope="col" style="width:100%">Nome do Edital</th>
<th scope="col">Data de Inicio da Revisão</th> <th scope="col">Data de Inicio da Revisão</th>
<th scope="col">Data de Fim da Revisão</th> <th scope="col" style="text-align: center">Data de Fim da Revisão</th>
<th scope="col">Opção</th> <th scope="col">Opção</th>
</tr> </tr>
</thead> </thead>
...@@ -28,11 +58,11 @@ ...@@ -28,11 +58,11 @@
<td> <td>
{{ $evento->nome }} {{ $evento->nome }}
</td> </td>
<td>{{ date('d/m/Y', strtotime($evento->inicioRevisao)) }}</td> <td style="text-align:center">{{ date('d/m/Y', strtotime($evento->inicioRevisao)) }}</td>
<td>{{ date('d/m/Y', strtotime($evento->fimRevisao)) }}</td> <td style="text-align:center">{{ date('d/m/Y', strtotime($evento->fimRevisao)) }}</td>
<td> <td>
<div class="btn-group dropright dropdown-options"> <div class="btn-group dropright dropdown-options" style="width: 100%; text-align:center; float:none">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a id="options" class="dropdown-toggle btn btn-light" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px"> <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
...@@ -67,8 +97,13 @@ ...@@ -67,8 +97,13 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div>
</div>
</div>
</div>
</div> </div>
@endsection @endsection
@section('javascript') @section('javascript')
......
...@@ -4,6 +4,24 @@ ...@@ -4,6 +4,24 @@
<div class="container"> <div class="container">
<div class="container" style="margin-bottom:8rem">
<div class="row justify-content-center" style="margin-top: 2rem;">
<div class="col-md-12 form-group" style="text-align: center">
<h5 style="color: #1492E6; margin-top:0.5rem; font-size:25px">Página inicial</h5>
<h5 style="color: #909090; margin-top:0.7rem; font-size:22px; font-weight:normal">Avaliador</h5>
</div>
<div class="" style="text-align: center">
<div class="form-group imagem_shadow" style="border-radius: 12px; padding:14px; height:200px; width:190px; margin:15px">
<a href="{{ route('avaliador.editais') }}" style="text-decoration:none; color: inherit;">
<img src="{{asset('img/icons/icon_meus_editais.png')}}" alt="" width="120px">
<h5 style="color: #073763; margin-top:0.5rem; font-size:25px;">Meus editais</h5>
</a>
</div>
</div>
</div>
</div>
{{--
<div class="row justify-content-center titulo-menu"> <div class="row justify-content-center titulo-menu">
<h4>Página Principal - Avaliador</h4> <h4>Página Principal - Avaliador</h4>
</div> </div>
...@@ -59,7 +77,7 @@ ...@@ -59,7 +77,7 @@
</div> </div>
</div> </div>
--}}
</div> </div>
......
...@@ -2,20 +2,51 @@ ...@@ -2,20 +2,51 @@
@section('content') @section('content')
<div class="container" style="margin-top: 100px;">
<div class="container" > <div class="container">
<div class="row" > @if(isset($mensagem))
<div class="col-sm-10"> <div class="col-sm-12">
<h3>Planos do Edital: {{ $evento->nome }}</h3> <br>
<div class="alert alert-success">
<p>{{ $mensagem }}</p>
</div>
</div>
@endif
@if(session('mensagem'))
<div class="col-sm-12">
<br>
<div class="alert alert-success">
<p>{{session('mensagem')}}</p>
</div>
</div>
@endif
<div class="row justify-content-center" style="margin-top: 3rem;">
<div class="col-md-11" style="margin-bottom: -3rem">
<div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
<div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
<div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:-1rem">
<div class="bottomVoltar" style="margin-top: -20px">
<a href="javascript:history.back()" class="btn btn-secondary" style=""><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
</div>
<div class="form-group">
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Planos do edital: {{ $evento->nome }}</h5>
</div>
<div style="margin-top: -2rem">
<div class="form-group">
<div style="margin-top:30px;">
{{-- Pesquisar--}}
</div> </div>
</div> </div>
</div> </div>
<hr> </div>
<table class="table table-bordered"> </div>
<div class="card-body" >
<table class="table table-bordered table-hover" style="display: block; overflow-x: auto; white-space: nowrap; border-radius:10px; margin-bottom:0px">
<thead> <thead>
<tr> <tr>
<th scope="col">Nome do Projeto</th> <th scope="col" style="width:100%">Nome do Projeto</th>
<th scope="col">Data de Criação</th> <th scope="col">Data de Criação</th>
<th scope="col">Parecer</th> <th scope="col">Parecer</th>
</tr> </tr>
...@@ -24,7 +55,7 @@ ...@@ -24,7 +55,7 @@
@foreach ($planos as $plano) @foreach ($planos as $plano)
<tr> <tr>
<td>{{ $plano->titulo }}</td> <td>{{ $plano->titulo }}</td>
<td>{{ $plano->created_at }}</td> <td style="text-align: center">{{ $plano->created_at->format('d/m/Y') }}</td>
{{-- <td> {{-- <td>
<a href="{{route('download', ['file' => $trabalho->anexoProjeto])}}" target="_new" style="font-size: 20px; color: #114048ff;" > <a href="{{route('download', ['file' => $trabalho->anexoProjeto])}}" target="_new" style="font-size: 20px; color: #114048ff;" >
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px"> <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
...@@ -64,6 +95,10 @@ ...@@ -64,6 +95,10 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div>
</div>
</div>
</div>
</div> </div>
@endsection @endsection
......
...@@ -2,20 +2,50 @@ ...@@ -2,20 +2,50 @@
@section('content') @section('content')
<div class="container" style="margin-top: 100px;"> <div class="container">
@if(isset($mensagem))
<div class="container" > <div class="col-sm-12">
<div class="row" > <br>
<div class="col-sm-10"> <div class="alert alert-success">
<h3>Trabalhos do Edital: {{ $evento->nome }}</h3> <p>{{ $mensagem }}</p>
</div>
</div>
@endif
@if(session('mensagem'))
<div class="col-sm-12">
<br>
<div class="alert alert-success">
<p>{{session('mensagem')}}</p>
</div>
</div>
@endif
<div class="row justify-content-center" style="margin-top: 3rem;">
<div class="col-md-11" style="margin-bottom: -3rem">
<div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
<div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
<div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:-1rem">
<div class="bottomVoltar" style="margin-top: -20px">
<a href="javascript:history.back()" class="btn btn-secondary" style=""><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
</div>
<div class="form-group">
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Trabalhos do Edital: {{ $evento->nome }}</h5>
</div>
<div style="margin-top: -2rem">
<div class="form-group">
<div style="margin-top:30px;">
{{-- Pesquisar--}}
</div>
</div> </div>
</div> </div>
</div> </div>
<hr> </div>
<table class="table table-bordered">
<div class="card-body" >
<table class="table table-bordered table-hover" style="display: block; overflow-x: auto; white-space: nowrap; border-radius:10px; margin-bottom:0px">
<thead> <thead>
<tr> <tr>
<th scope="col">Nome do Projeto</th> <th scope="col" style="width:100%">Nome do Projeto</th>
<th scope="col">Data de Criação</th> <th scope="col">Data de Criação</th>
<th scope="col">Projeto</th> <th scope="col">Projeto</th>
<th scope="col">Plano de Trabalho</th> <th scope="col">Plano de Trabalho</th>
...@@ -26,14 +56,14 @@ ...@@ -26,14 +56,14 @@
@foreach ($trabalhos as $trabalho) @foreach ($trabalhos as $trabalho)
<tr> <tr>
<td>{{ $trabalho->titulo }}</td> <td>{{ $trabalho->titulo }}</td>
<td>{{ $trabalho->created_at }}</td> <td style="text-align: center">{{ $trabalho->created_at->format('d/m/Y') }}</td>
<td> <td style="text-align: center">
{{-- --}} {{-- --}}
<a href="{{route('download', ['file' => $trabalho->anexoProjeto])}}" target="_new" style="font-size: 20px; color: #114048ff;" > <a href="{{route('download', ['file' => $trabalho->anexoProjeto])}}" target="_new" style="font-size: 20px; color: #114048ff;" class="btn btn-light">
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px"> <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:15px">
</a> </a>
</td> </td>
<td> <td style="text-align: center">
@foreach( $trabalho->participantes as $participante) @foreach( $trabalho->participantes as $participante)
@php @php
if( App\Arquivo::where('participanteId', $participante->id)->first() != null){ if( App\Arquivo::where('participanteId', $participante->id)->first() != null){
...@@ -43,8 +73,8 @@ ...@@ -43,8 +73,8 @@
} }
@endphp @endphp
@if ($planoTrabalho != null) @if ($planoTrabalho != null)
<a href="{{route('download', ['file' => $planoTrabalho])}}" target="_new" style="font-size: 20px; color: #114048ff;" > <a href="{{route('download', ['file' => $planoTrabalho])}}" target="_new" style="font-size: 20px; color: #114048ff;" class="btn btn-light">
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px"> <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:15px">
</a> </a>
@else @else
Não planos de trabalho. Não planos de trabalho.
...@@ -67,6 +97,10 @@ ...@@ -67,6 +97,10 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</div>
</div>
</div>
</div>
</div> </div>
@endsection @endsection
......
@extends('layouts.app') @extends('layouts.app')
@section('content') @section('content')
<div class="container content">
<div class="row justify-content-center"> <div class="container">
<div class="col-sm-12">
<div class="card" style="margin-top:50px"> <div class="row justify-content-center" style="margin-top: 3rem;">
<div class="card-body"> <div class="col-md-11" style="margin-bottom: -3rem">
<h5 class="card-title">Meu Parecer</h5> <div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
<h6 class="card-title">Trabalho: {{ $trabalho->titulo }}</h6> <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
<p class="card-text"> <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:-1rem">
<div class="bottomVoltar" style="margin-top: -20px">
<a href="javascript:history.back()" class="btn btn-secondary" style=""><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
</div>
<div class="form-group">
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Meu parecer</h5>
<h5 class="card-title mb-0" style="font-size:19px; font-family:Arial, Helvetica, sans-serif; color:#909090">Trabalho: {{ $trabalho->titulo }}</h5>
</div>
<div style="margin-top: -2rem">
<div class="form-group">
<div style="margin-top:30px;">
{{-- Pesquisar--}}
</div>
</div>
</div>
</div>
</div>
<div class="card-body" >
<form method="POST" action="{{route('avaliador.enviarParecer')}}" enctype="multipart/form-data"> <form method="POST" action="{{route('avaliador.enviarParecer')}}" enctype="multipart/form-data">
@csrf @csrf
<input type="hidden" name="trabalho_id" value="{{ $trabalho->id }}" > <input type="hidden" name="trabalho_id" value="{{ $trabalho->id }}" >
<input type="hidden" name="evento_id" value="{{ $evento->id }}" > <input type="hidden" name="evento_id" value="{{ $evento->id }}" >
<div class="form-group"> <div class="form-group">
<label for="exampleFormControlTextarea1">Parecer:</label> <label for="exampleFormControlTextarea1">Parecer:</label>
<textarea class="form-control" id="exampleFormControlTextarea1" rows="3" name="textParecer">{{ $trabalho->pivot->parecer }}</textarea> <textarea class="form-control" id="exampleFormControlTextarea1" rows="3" name="textParecer" placeholder="Digite aqui o seu parecer">{{ $trabalho->pivot->parecer }}</textarea>
</div> </div>
<select class="custom-select" name="recomendacao" > <select class="custom-select" name="recomendacao" >
@foreach($recomendacaos as $recomendacao) @foreach($recomendacaos as $recomendacao)
...@@ -33,26 +51,43 @@ ...@@ -33,26 +51,43 @@
<input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer"> <input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer">
@else @else
<label for="exampleFormControlFile1"> existe um arquivo, quer atualizar?</label> <div class="form-row">
<br> <label for="exampleFormControlFile1"> Arquivo atual:</label> <div class="col-md-12">
<a href="{{route('download', ['file' => $trabalho->pivot->AnexoParecer])}}" target="_new" style="font-size: 20px; color: #114048ff;" > <h6>Arquivo atual</h6>
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px"> </div>
</a><br> <div class="col-md-12 form-group">
<div>
<a href="{{route('download', ['file' => $trabalho->pivot->AnexoParecer])}}" target="_new" style="font-size: 18px;;" class="btn btn-light">
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px; margin:5px">
Baixar arquivo atual
</a>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-12">
<h6>Alterar arquivo atual</h6>
</div>
<div class="col-md-12 form-group">
<div>
<input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer"> <input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer">
</div>
</div>
</div>
@endif @endif
</div> </div>
<button type="submit" class="btn btn-primary">Enviar</button> <div><hr></div>
<a href="{{ route('avaliador.visualizarTrabalho', ['evento_id' => $evento->id])}}" class="btn btn-danger" >Cancelar</a> <div class="d-flex justify-content-end">
<div style="margin-right: 15px"><a href="{{ route('avaliador.visualizarTrabalho', ['evento_id' => $evento->id])}}" class="btn btn-light" style="color: red;">Cancelar</a></div>
<div><button type="submit" class="btn btn-success">Enviar meu parecer</button></div>
</div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
@endsection @endsection
@section('javascript') @section('javascript')
......
@extends('layouts.app') @extends('layouts.app')
@section('content') @section('content')
<div class="container content">
<div class="row justify-content-center"> <div class="container">
<div class="col-sm-12">
<div class="card" style="margin-top:50px"> <div class="row justify-content-center" style="margin-top: 3rem;">
<div class="card-body"> <div class="col-md-11" style="margin-bottom: -3rem">
<h5 class="card-title">Meu Parecer</h5> <div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
<h6 class="card-title">Plano: {{ $plano->titulo }}</h6> <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
<p class="card-text"> <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:-1rem">
<div class="bottomVoltar" style="margin-top: -20px">
<a href="javascript:history.back()" class="btn btn-secondary" style=""><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
</div>
<div class="form-group">
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Meu parecer</h5>
<h5 class="card-title mb-0" style="font-size:19px; font-family:Arial, Helvetica, sans-serif; color:#909090">Plano: {{ $plano->titulo }}</h5>
</div>
<div style="margin-top: -2rem">
<div class="form-group">
<div style="margin-top:30px;">
{{-- Pesquisar--}}
</div>
</div>
</div>
</div>
</div>
<div class="card-body" >
<form method="POST" action="{{route('avaliador.enviarParecerPlano')}}" enctype="multipart/form-data"> <form method="POST" action="{{route('avaliador.enviarParecerPlano')}}" enctype="multipart/form-data">
@csrf @csrf
<input type="hidden" name="plano_id" value="{{ $plano->id }}" > <input type="hidden" name="plano_id" value="{{ $plano->id }}" >
<input type="hidden" name="evento_id" value="{{ $evento->id }}" > <input type="hidden" name="evento_id" value="{{ $evento->id }}" >
<div class="form-group"> <div class="form-group">
<label for="exampleFormControlTextarea1">Parecer:</label> <label for="exampleFormControlTextarea1">Parecer:</label>
<textarea class="form-control" id="exampleFormControlTextarea1" rows="3" name="textParecer">{{ $plano->pivot->parecer }}</textarea> <textarea class="form-control" id="exampleFormControlTextarea1" rows="3" name="textParecer" placeholder="Digite aqui o seu parecer">{{ $plano->pivot->parecer }}</textarea>
</div> </div>
<select class="custom-select" name="recomendacao" > <select class="custom-select" name="recomendacao" >
@foreach($recomendacaos as $recomendacao) @foreach($recomendacaos as $recomendacao)
...@@ -33,26 +51,43 @@ ...@@ -33,26 +51,43 @@
<input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer"> <input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer">
@else @else
<label for="exampleFormControlFile1"> existe um arquivo, quer atualizar?</label> <div class="form-row">
<br> <label for="exampleFormControlFile1"> Arquivo atual:</label> <div class="col-md-12">
<a href="{{route('download', ['file' => $plano->pivot->AnexoParecer])}}" target="_new" style="font-size: 20px; color: #114048ff;" > <h6>Arquivo atual</h6>
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px"> </div>
</a><br> <div class="col-md-12 form-group">
<div>
<a href="{{route('download', ['file' => $plano->pivot->AnexoParecer])}}" target="_new" style="font-size: 18px;;" class="btn btn-light">
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px; margin:5px">
Baixar arquivo atual
</a>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-12">
<h6>Alterar arquivo atual</h6>
</div>
<div class="col-md-12 form-group">
<div>
<input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer"> <input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer">
</div>
</div>
</div>
@endif @endif
</div> </div>
<button type="submit" class="btn btn-primary">Enviar</button> <div><hr></div>
<a href="{{ route('avaliador.visualizarTrabalho', ['evento_id' => $evento->id])}}" class="btn btn-danger" >Cancelar</a> <div class="d-flex justify-content-end">
<div style="margin-right: 15px"><a href="{{ route('avaliador.visualizarTrabalho', ['evento_id' => $evento->id])}}" class="btn btn-light" style="color: red;">Cancelar</a></div>
<div><button type="submit" class="btn btn-success">Enviar meu parecer</button></div>
</div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
@endsection @endsection
@section('javascript') @section('javascript')
......
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