Skip to content

GitLab

"app/vscode:/vscode.git/clone" did not exist on "e119449ac5f16c73afe570e9bd7ca98e55d45401"
Unverified Commit 9efc2f1c authored by Gabriel Antônio da Silva's avatar Gabriel Antônio da Silva Committed by GitHub
Browse files

Merge pull request #178 from GuilhermeGz/master 

Alterações no Sistema
parents 8779fb28 8c91b6e2
Show whitespace changes
Inline Side-by-side
resources/views/planosTrabalho/listar.blade.php 0 → 100644
View file @ 9efc2f1c
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-center titulo-menu mb-0">
<h4>Planos de Trabalho </h4>
</div>
<div class="card-body" >
<table class="table table-bordered table-hover" style="display: block; overflow-x: visible; white-space: nowrap; border-radius:10px; margin-bottom:0px">
<thead>
<tr>
<th scope="col" style="width:200px;">Plano de Trabalho</th>
<th scope="col" style="width:200px;">Projeto</th>
<th scope="col" style="width:200px;">Discente</th>
<th scope="col" style="width:200px;">Data</th>
<th scope="col" style="width:200px;">Relatório Parcial</th>
<th scope="col" style="width:200px;">Relatório Final</th>
</tr>
</thead>
@foreach($arquivos as $arquivo)
<tbody>
<td>{{$arquivo->trabalho->titulo}}</td>
<td>{{$arquivo->titulo}}</td>
<td>{{$arquivo->participante->user->name}}</td>
<td>{{$arquivo->data}}</td>
<td>
<!-- Button trigger modal -->
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioParcial{{ $arquivo->id }}">
Visualizar
</button>
</td>
<td>
<!-- Button trigger modal -->
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioFinal{{ $arquivo->id }}">
Visualizar
</button>
</td>
<!-- Modal Relatorio Parcial-->
<div class="modal fade" id="modalRelatorioParcial{{ $arquivo->id }}" tabindex="-1" role="dialog" aria-labelledby="modalRelatorioParcialLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Relatório Parcial (.pdf)</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form id="formRelatParcial" method="post" action="{{route('planos.anexar.relatorio')}}" enctype="multipart/form-data">
@csrf
<input type="hidden" value="{{ $arquivo->id }}" name="arqId">
<input type="hidden" value="{{ $arquivo->trabalhoId }}" name="projId">
<div class="col-12">
<div class="row">
@if($arquivo->relatorioParcial)
<div class="col-sm-2">Arquivo: </div>
<div class="col-sm-1">
<a href="{{ route('baixar.documentosParticipante', ['pathDocumento' => $arquivo->relatorioParcial]) }}"><i class="fas fa-file-pdf fa-2x"></i></a>
</div>
@else
<label class="control-label col-6">Nenhum arquivo carregado</label>
@endif
</div>
<br>
@if(Auth::user()->proponentes != null)
<input type="file" class="input-group-text" value="" name="relatorioParcial" accept=".pdf" placeholder="Relatorio Parcial" id="relatorioParcial{{$arquivo->id}}" required/>
@error('relatorioParcial')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
@endif
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
@if(Auth::user()->proponentes != null)
<button type="submit" class="btn btn-success">Salvar</button>
@endif
</div>
</form>
</div>
</div>
</div>
<!-- Modal Relatorio Final-->
<div class="modal fade" id="modalRelatorioFinal{{ $arquivo->id }}" tabindex="-1" role="dialog" aria-labelledby="modalRelatorioFinalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Relatório Final (.pdf)</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form id="formRelatFinal" method="post" action="{{route('planos.anexar.relatorio')}}" enctype="multipart/form-data">
@csrf
<input type="hidden" value="{{ $arquivo->id }}" name="arqId">
<input type="hidden" value="{{ $arquivo->trabalhoId }}" name="projId">
<div class="col-12">
<div class="row">
@if($arquivo->relatorioFinal)
<div class="col-sm-2">Arquivo: </div>
<div class="col-sm-1">
<a href="{{ route('baixar.documentosParticipante', ['pathDocumento' => $arquivo->relatorioFinal]) }}"><i class="fas fa-file-pdf fa-2x"></i></a>
</div>
@else
<label class="control-label col-6">Nenhum arquivo carregado</label>
@endif
</div>
<br>
@if(Auth::user()->proponentes != null)
<input type="file" class="input-group-text" value="" name="relatorioFinal" accept=".pdf" placeholder="Relatorio Final" id="relatorioFinal{{$arquivo->id}}" required/>
@error('relatorioFinal')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
@endif
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
@if(Auth::user()->proponentes != null)
<button type="submit" class="btn btn-success">Salvar</button>
@endif
</div>
</form>
</div>
</div>
</div>
</tbody>
@endforeach
</table>
</div>
</div>
@endsection
resources/views/proponente/projetosEdital.blade.php
View file @ 9efc2f1c
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<div class="card-body" > <div class="card-body" >
@if(count($projetos)>0) @if(count($projetos)>0)
<table class="table table-bordered table-hover" style="display: block; overflow-x: auto; white-space: nowrap; border-radius:10px; margin-bottom:0px"> <table class="table table-bordered table-hover" style="display: block; overflow-x: visible; white-space: nowrap; border-radius:10px; margin-bottom:0px">
<thead> <thead>
<tr> <tr>
<th scope="col" style="width:100%">Nome do projeto</th> <th scope="col" style="width:100%">Nome do projeto</th>
...@@ -111,10 +111,19 @@ ...@@ -111,10 +111,19 @@
<a href="{{route('trabalho.trocaParticipante', ['evento_id' => $projeto->evento->id, 'projeto_id' => $projeto->id])}}" class="dropdown-item" style="text-align: center;"> <a href="{{route('trabalho.trocaParticipante', ['evento_id' => $projeto->evento->id, 'projeto_id' => $projeto->id])}}" class="dropdown-item" style="text-align: center;">
Substituir participante Substituir participante
</a> </a>
<hr class="dropdown-hr">
@endif @endif
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center"> <a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar Visualizar
</a> </a>
@if(($edital->dt_inicioRelatorio != null && $edital->dt_fimRelatorio !=null) &&
($edital->dt_inicioRelatorio <= $hoje && $hoje <= $edital->dt_fimRelatorio))
<hr class="dropdown-hr">
<a href="{{route('planos.listar', ['id' => $projeto->id])}}" class="dropdown-item" style="text-align: center">
Relatórios
</a>
@endif
<hr class="dropdown-hr"> <hr class="dropdown-hr">
{{-- <a href="" class="dropdown-item" style="text-align: center"> {{-- <a href="" class="dropdown-item" style="text-align: center">
Recorrer Recorrer
......
resources/views/user/perfilUser.blade.php
View file @ 9efc2f1c
...@@ -777,6 +777,11 @@ ...@@ -777,6 +777,11 @@
//var emailInput = document.getElementById('email'); //var emailInput = document.getElementById('email');
//emailInput.disabled = true; //emailInput.disabled = true;
$(document).ready(function() {
$('#cpf').mask('000.000.000-00');
$('#celular').mask('(00) 00000-0000');
});
function limpa_formulário_cep() { function limpa_formulário_cep() {
//Limpa valores do formulário de cep. //Limpa valores do formulário de cep.
document.getElementById('rua').value=(""); document.getElementById('rua').value=("");
......
routes/web.php
View file @ 9efc2f1c
...@@ -133,6 +133,10 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ ...@@ -133,6 +133,10 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
Route::get( '/showSubstituicoes', 'TrabalhoController@telaShowSubst' )->name('trabalho.telaAnaliseSubstituicoes')->middleware('checkRoles:coordenador,administrador'); Route::get( '/showSubstituicoes', 'TrabalhoController@telaShowSubst' )->name('trabalho.telaAnaliseSubstituicoes')->middleware('checkRoles:coordenador,administrador');
Route::post( '/aprovarSubstituicao', 'TrabalhoController@aprovarSubstituicao' )->name('trabalho.aprovarSubstituicao'); Route::post( '/aprovarSubstituicao', 'TrabalhoController@aprovarSubstituicao' )->name('trabalho.aprovarSubstituicao');
//########## Relatórios
Route::get( '/projeto/planosTrabalho/{id}', 'ArquivoController@listar' )->name('planos.listar');
Route::post( '/projeto/planosTrabalho/anexarRelatorio', 'ArquivoController@anexarRelatorio' )->name('planos.anexar.relatorio');
//######### Atribuição ####################################### //######### Atribuição #######################################
Route::get( '/atribuir', 'AtribuicaoController@distribuicaoAutomatica' )->name('distribuicao'); Route::get( '/atribuir', 'AtribuicaoController@distribuicaoAutomatica' )->name('distribuicao');
Route::get( '/atribuirPorArea', 'AtribuicaoController@distribuicaoPorArea' )->name('distribuicaoAutomaticaPorArea'); Route::get( '/atribuirPorArea', 'AtribuicaoController@distribuicaoPorArea' )->name('distribuicaoAutomaticaPorArea');
......
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