Skip to content

GitLab

Unverified Commit a1491dc6 authored by GuilhermeGz's avatar GuilhermeGz Committed by GitHub
Browse files

Merge pull request #202 from antonioDurval/master 

Alterações
parents 5d615c19 bd3fa160
master carl-branch dependabot/composer/dompdf/dompdf-1.2.2 dependabot/composer/guzzlehttp/guzzle-6.5.8 dependabot/composer/symfony/http-kernel-4.4.50 dependabot/npm_and_yarn/decode-uri-component-0.2.2 dependabot/npm_and_yarn/express-4.18.2 dependabot/npm_and_yarn/json5-and-json5-2.2.3 dependabot/npm_and_yarn/loader-utils-and-webpack-cli-1.4.2 dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8 dependabot/npm_and_yarn/qs-and-express-6.11.0 excluir_projeto_submetido updates_mar
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 102 additions and 98 deletions
+102 -98
resources/views/administrador/analisarProposta.blade.php
View file @ a1491dc6
......@@ -145,7 +145,7 @@
</div>
<div class="modal-body" style="padding-right: 32px;padding-left: 32px;padding-top: 20px;padding-bottom: 32px;">
@include('administrador.substituirParticipanteForm', ['visualizarOnly' => 1])
@include('administrador.substituirParticipanteForm', ['visualizarOnly' => 1, 'edital' => $evento])
</div>
</div>
</div>
......
resources/views/administrador/substituirParticipanteForm.blade.php
View file @ a1491dc6
......@@ -149,6 +149,8 @@
@endcomponent
</div>
</div>
@if($edital->tipo != "PIBEX")
<div class="row">
<div class="col-6">
@component('componentes.input', ['label' => 'Coeficiente de rendimento (média geral)'])
......@@ -156,6 +158,7 @@
@endcomponent
</div>
</div>
@endif
<div class="row">
<div class="col-md-12">
<h5>Plano de trabalho</h5>
......
resources/views/avaliador/parecer.blade.php
View file @ a1491dc6
......@@ -2,7 +2,6 @@
@section('content')
<div class="row justify-content-center">
<!--Proponente Dados-->
<div class="col-md-10" style="margin-top:4rem;padding: 0px">
......@@ -58,109 +57,96 @@
</div>
@endforeach
</div>
</div>
</div>
</div>
</div>
<div class="col-md-10" style="margin-bottom: -3rem;margin-top:20px">
<div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px; overflow:auto">
<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">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">
@csrf
<input type="hidden" name="trabalho_id" value="{{ $trabalho->id }}" >
<input type="hidden" name="evento_id" value="{{ $evento->id }}" >
<div class="form-group">
@component('componentes.input', ['label' => 'Parecer'])
<textarea class="form-control" id="exampleFormControlTextarea1" rows="3" name="textParecer" placeholder="Digite aqui o seu parecer" required>{{ $trabalho->pivot->parecer }}</textarea>
@endcomponent
</div>
<div class="form-group">
<div class="row justify-content-start">
<div class="col-sm-3">
@component('componentes.input', ['label' => 'Pontuação calculada'])
<input type="number" min="0" step="1" name="pontuacao" style="width: 70px"
@if($trabalho->pivot!=null && $trabalho->pivot->pontuacao !=null )
value="{{$trabalho->pivot->pontuacao}}"
@else value="0"
@endif required>
@endcomponent
<!-- TO AKI -->
<hr style="border-top: 1px solid#1492E6">
<div class="form-row mt-3">
<div class="col-md-12"><h5 style="color: #234B8B; font-weight: bold">Meu parecer</h5></div>
<div class="col-md-12"><h6 style="color: #234B8B; font-weight: bold">Trabalho: {{$trabalho->titulo}}</h6></div>
</div>
<form method="POST" action="{{route('avaliador.enviarParecer')}}" enctype="multipart/form-data">
@csrf
<input type="hidden" name="trabalho_id" value="{{ $trabalho->id }}" >
<input type="hidden" name="evento_id" value="{{ $evento->id }}" >
<div class="form-group">
@component('componentes.input', ['label' => 'Parecer'])
<textarea class="form-control" id="exampleFormControlTextarea1" rows="3" name="textParecer" placeholder="Digite aqui o seu parecer" required>{{ $trabalho->pivot->parecer }}</textarea>
@endcomponent
</div>
@if($evento->tipo == "PIBEX")
<div class="form-group">
<div class="row justify-content-start">
<div class="col-sm-3">
@component('componentes.input', ['label' => 'Pontuação calculada'])
<input type="number" min="0" step="1" name="pontuacao" style="width: 70px"
@if($trabalho->pivot!=null && $trabalho->pivot->pontuacao !=null )
value="{{$trabalho->pivot->pontuacao}}"
@else value="0"
@endif required>
@endcomponent
</div>
</div>
</div>
</div>
@endif
<select class="custom-select" name="recomendacao" >
<option @if($trabalho->pivot->recomendacao =='RECOMENDADO' ) selected @endif value="RECOMENDADO">RECOMENDADO</option>
<option @if($trabalho->pivot->recomendacao =='NAO-RECOMENDADO' ) selected @endif value="NAO-RECOMENDADO">NAO-RECOMENDADO</option>
</select>
<div class="form-group mt-3 md-3">
<label >Formulário do Parecer : </label>
<a href="{{route('download', ['file' => $trabalho->evento->formAvaliacaoExterno])}}" target="_new" style="font-size: 20px; color: #114048ff;" >
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
</a>
@if($trabalho->pivot->AnexoParecer == null)
@component('componentes.input', ['label' => 'Anexo do Parecer'])
<input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer" required>
@endcomponent
<select class="custom-select" name="recomendacao" >
<option @if($trabalho->pivot->recomendacao =='RECOMENDADO' ) selected @endif value="RECOMENDADO">RECOMENDADO</option>
<option @if($trabalho->pivot->recomendacao =='NAO-RECOMENDADO' ) selected @endif value="NAO-RECOMENDADO">NAO-RECOMENDADO</option>
</select>
<div class="form-group mt-3 md-3">
<label >Formulário do Parecer : </label>
<a href="{{route('download', ['file' => $trabalho->evento->formAvaliacaoExterno])}}" target="_new" style="font-size: 20px; color: #114048ff;" >
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
</a>
@if($trabalho->pivot->AnexoParecer == null)
@component('componentes.input', ['label' => 'Anexo do Parecer'])
<input type="file" class="form-control-file" id="exampleFormControlFile1" name="anexoParecer" required>
@endcomponent
@else
<div class="form-row">
<div class="col-md-12">
<h6>Arquivo atual</h6>
</div>
<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>
@else
<div class="form-row">
<div class="col-md-12">
<h6>Arquivo atual</h6>
</div>
<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>
<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">
<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">
</div>
</div>
</div>
@endif
</div>
@endif
</div>
<div><hr></div>
<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>
<hr style="border-top: 1px solid#1492E6">
<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>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
......@@ -170,3 +156,9 @@
</script>
@endsection
<style>
label {
font-weight: bold;
}
</style>
resources/views/evento/formulario/participantes.blade.php
View file @ a1491dc6
......@@ -355,7 +355,7 @@
<button data-dismiss="modal" type="button" id="cancelar{{$i}}" class=" btn btn-danger" style="font-size: 16px" onclick="desmarcar({{$i}})">Cancelar</button>
</div>
<div class="col-6">
<button data-dismiss="modal" type="button" id="guardar{{$i}}" class="btn btn-success float-right" style="font-size: 16px" onclick="marcar({{$i}})">Guardar</button>
<button data-dismiss="modal" type="button" id="adicionar{{$i}}" class="btn btn-success float-right" style="font-size: 16px" onclick="marcar({{$i}})">Adicionar</button>
</div>
</div>
</div>
......@@ -385,7 +385,6 @@
</div>
<script>
$("input.rg:text").mask('00.000.000-0');
function marcar(id){
document.getElementById("checkB"+id).checked = true;
document.getElementById("exampleModal"+id).modal('hide');
......@@ -395,4 +394,4 @@
document.getElementById("exampleModal"+id).modal('hide');
}
</script>
<!--X Participantes X-->
<!--X Participantes X-->
\ No newline at end of file
resources/views/planosTrabalho/listar.blade.php
View file @ a1491dc6
......@@ -29,7 +29,7 @@
<tbody>
<td style="text-align: center;" title="{{$arquivo->titulo}}">{{$arquivo->titulo}}</td>
<td style="text-align: center;" title="{{$arquivo->participante->user->name}}">{{$arquivo->participante->user->name}}</td>
<td style="text-align: center;" title="{{$arquivo->participante->user->name}}" id="td-nomeAluno">{{$arquivo->participante->user->name}}</td>
<td style="text-align: center;">
@if((Auth::user()->proponentes != null) && ($arquivo->relatorioParcial == null) &&
($arquivo->trabalho->evento->dt_inicioRelatorioParcial <= $hoje) && ($hoje <= $arquivo->trabalho->evento->dt_fimRelatorioParcial))
......@@ -195,7 +195,7 @@
</table>
<div style= "margin-top:10px">
<div id="btn-cancelar">
<a class="btn btn-primary" href="{{ url()->previous() }}">Cancelar</a>
</div>
</div>
......@@ -204,11 +204,21 @@
<style>
td {
max-width: 25ch;
max-width: 40ch;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
#td-nomeAluno {
max-width: 25ch;
}
#btn-cancelar {
margin-top: 10px;
text-align: right;
}
</style>
......
resources/views/projeto/visualizar.blade.php
View file @ a1491dc6
......@@ -27,7 +27,7 @@
@component('projeto.formularioVisualizar.anexos2', ['edital' => $edital,'projeto' => $projeto])
@endcomponent
@component('projeto.formularioVisualizar.participantes2', ['projeto' => $projeto])
@component('projeto.formularioVisualizar.participantes2', ['projeto' => $projeto, 'edital' => $edital])
@endcomponent
@component('projeto.formularioVisualizar.relatório',['edital' => $edital,'projeto' => $projeto])
......
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