Skip to content

GitLab

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

Merge pull request #210 from GuilhermeGz/master 

Atualizações do sistema
parents 63c67f68 0abe3d8e
Hide whitespace changes
Inline Side-by-side
Showing
with 376 additions and 4 deletions
+376 -4
resources/views/avaliacaoRelatorio/listar.blade.php 0 → 100644
View file @ 311314ac
@extends('layouts.app')
@section('content')
<div class="row justify-content-center">
<!--Proponente Dados-->
<div class="col-md-10" style="margin-top:4rem;padding: 0px">
@component('projeto.formularioVisualizar.proponente2', ['projeto' => $trabalho])
@endcomponent
</div>
<!--Anexos do Projeto-->
<div class="col-md-10" style="margin-top:20px">
<div class="card" style="border-radius: 5px">
<div class="card-body" style="padding-top: 0.2rem;">
<div class="container">
<div class="form-row mt-3">
<div class="col-md-12"><h5 style="color: #234B8B; font-weight: bold">Anexos</h5></div>
</div>
<hr style="border-top: 1px solid#1492E6">
{{-- Anexo do Projeto --}}
<div class="row justify-content-left">
{{-- Arquivo --}}
<div class="col-sm-12">
<label for="anexoProjeto" class="col-form-label font-tam"
style="font-weight: bold">{{ __('Projeto: ') }}</label>
<a href="{{ route('baixar.anexo.projeto', ['id' => $trabalho->id])}}"><img class=""
src="{{asset('img/icons/pdf.ico')}}"
style="width:40px"
alt=""></a>
</div>
<br>
{{-- Autorização Especial --}}
<div class="col-sm-12">
<label for="nomeTrabalho" class="col-form-label font-tam"
style="font-weight: bold">{{ __('Autorização Especial: ') }}</label>
@if($trabalho->anexoAutorizacaoComiteEtica != null)
<a href="{{ route('baixar.anexo.comite', ['id' => $trabalho->id]) }}"> <img class=""
src="{{asset('img/icons/pdf.ico')}}"
style="width:40px"
alt=""></a>
@else
-
@endif
</div>
</div>
<div class="form-row mt-3">
<div class="col-md-12"><h5 style="color: #234B8B; font-weight: bold">Planos</h5></div>
</div>
<hr style="border-top: 1px solid#1492E6">
{{-- Anexo(s) do Plano(s) de Trabalho --}}
@foreach( $trabalho->participantes as $participante)
@php
$planoTrabalhoTemp = App\Arquivo::where('participanteId', $participante->id)->first();
$relatorio= \App\AvaliacaoRelatorio::where('user_id',auth()->user()->id)->where('arquivo_id',$planoTrabalhoTemp->id)->where('tipo',$tipoRelatorio)->first();
@endphp
@if(isset($relatorio))
<div class="row" style="margin-left: 5px">
<label for="anexoProjeto" class="col-form-label font-tam" style="font-weight: bold"
title="{{$participante->planoTrabalho->titulo}}">{{ __('Plano: ') }}{{$participante->planoTrabalho->titulo}}</label>
@if($planoTrabalhoTemp != null)
<a href="{{route('download', ['file' => $planoTrabalhoTemp])}}"><img
src="{{asset('img/icons/pdf.ico')}}" style="width:40px" alt=""></a>
@endif
@if($tipoRelatorio == "Parcial")
<div style="margin-left: 25px">
<label for="anexoProjeto" class="col-form-label font-tam"
style="font-weight: bold"
>{{ __('Relatório Parcial: ') }}</label>
@if($participante->planoTrabalho->relatorioParcial)
<a href="{{ route('baixar.documentosParticipante', ['pathDocumento' => $participante->planoTrabalho->relatorioParcial]) }}"><i
class="fas fa-file-pdf fa-2x"></i></a>
@else
<a><i class="fas fa-times-circle fa-2x"></i></a>
@endif
</div>
<div class="col-sm-12">
<form id="formRelatFinal" method="post"
action="{{route('planos.avaliacoesUser.criar')}}"
enctype="multipart/form-data">
@csrf
<input type="hidden" name="tipo" value="Parcial">
<input type="hidden" name="trabalho_id" value="{{$trabalho->id}}">
<input type="hidden" name="avaliacao_id" value="{{$relatorio->id}}">
<input type="hidden" name="plano_id"
value="{{$participante->planoTrabalho->id}}">
<input type="hidden" name="user_id" value="{{Auth::user()->id}}">
<div class="col-12" style="padding-left: 0px">
<div class="row">
@php
$relatParcial = App\AvaliacaoRelatorio::where('user_id',Auth::user()->id)->where('tipo','Parcial')->where('arquivo_id',$participante->planoTrabalho->id)->first();
@endphp
<div class="col-sm-6 row">
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;padding-right: 10px">{{ __('Nota: ') }}</label>
<input class="form-control" name="nota" type="number"
style="width: 60px;"
@if(isset($relatParcial)) value="{{$relatParcial->nota}}" @endif>
</div>
</div>
<div class="row" style="margin-top: 10px">
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;margin-right: 5px;">{{ __('Arquivo: ') }}</label>
@if(isset($relatParcial))
@if($relatParcial->arquivoAvaliacao != null)
<a href="{{route('download', ['file' => $relatParcial->arquivoAvaliacao])}}" target="_new" >
<img class="" src="{{asset('img/icons/pdf.ico')}}" style="width:40px">
</a>
@endif
@endif
<input type="file" class="input-group-text" value="" name="arquivo" accept=".pdf" id="arquivo" required/>
@error('arquivo')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
<div class="row">
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold">{{ __('Comentário: ') }}</label>
</div>
<div class="row">
<textarea class="col-md-11" minlength="20" id="comentario"
name="comentario"
style="border-radius:5px 5px 0 0;height: 71px;"
required>@if(isset($relatParcial)){{$relatParcial->comentario}}</textarea>@else</textarea>@endif
<div class="col-md-1" style="flex: 1;align-self: flex-end;">
<button type="submit" id="id{{$participante->user->id}}"
name="id{{$participante->user->id}}"
class="btn btn-success"
style="height: 40px">Salvar
</button>
</div>
</div>
</div>
<br>
</form>
</div>
@else
<div style="margin-left: 25px">
<label for="anexoProjeto" class="col-form-label font-tam"
style="font-weight: bold"
>{{ __('Relatório Final: ') }}</label>
@if($participante->planoTrabalho->relatorioFinal)
<a href="{{ route('baixar.documentosParticipante', ['pathDocumento' => $participante->planoTrabalho->relatorioFinal]) }}"><i
class="fas fa-file-pdf fa-2x"></i></a>
@else
<a><i class="fas fa-times-circle fa-2x"></i></a>
@endif
</div>
<div class="col-sm-12">
<form id="formRelatFinal" method="post"
action="{{route('planos.avaliacoesUser.criar')}}"
enctype="multipart/form-data">
@csrf
<input type="hidden" name="tipo" value="Final">
<input type="hidden" name="trabalho_id" value="{{$trabalho->id}}">
<input type="hidden" name="avaliacao_id" value="{{$relatorio->id}}">
<input type="hidden" name="plano_id"
value="{{$participante->planoTrabalho->id}}">
<input type="hidden" name="user_id" value="{{Auth::user()->id}}">
<div class="col-12" style="padding-left: 0px">
<div class="row">
@php
$relatFinal = App\AvaliacaoRelatorio::where('user_id',Auth::user()->id)->where('tipo','Final')->where('arquivo_id',$participante->planoTrabalho->id)->first();
@endphp
<div class="col-sm-6 row">
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;padding-right: 10px">{{ __('Nota: ') }}</label>
<input class="form-control" name="nota" type="number"
style="width: 60px;"
@if(isset($relatFinal)) value="{{$relatFinal->nota}}" @endif>
</div>
</div>
<div class="row" style="margin-top: 10px">
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;margin-right: 5px;">{{ __('Arquivo: ') }}</label>
@if(isset($relatFinal))
@if($relatFinal->arquivoAvaliacao != null)
<a href="{{route('download', ['file' => $relatFinal->arquivoAvaliacao])}}" target="_new" >
<img class="" src="{{asset('img/icons/pdf.ico')}}" style="width:40px">
</a>
@endif
@endif
<input type="file" class="input-group-text" value="" name="avaliacaoArq" accept=".pdf" id="avaliacaoArq" required/>
@error('avaliacaoArq')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
<div class="row">
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold">{{ __('Comentário: ') }}</label>
</div>
<div class="row">
<textarea class="col-md-11" minlength="20" id="comentario"
name="comentario"
style="border-radius:5px 5px 0 0;height: 71px;"
required>@if(isset($relatFinal)){{$relatFinal->comentario}}</textarea>@else</textarea>@endif
<div class="col-md-1" style="flex: 1;align-self: flex-end;">
<button type="submit" id="id{{$participante->user->id}}"
name="id{{$participante->user->id}}"
class="btn btn-success"
style="height: 40px">Salvar
</button>
</div>
</div>
</div>
<br>
</form>
</div>
@endif
</div>
@endif
<div class="row" style="margin-left: 0px">
</div>
@endforeach
</div>
</div>
</div>
</div>
</div>
@endsection
@section('javascript')
<script type="text/javascript">
</script>
@endsection
<style>
label {
font-weight: bold;
}
</style>
resources/views/avaliador/index.blade.php
View file @ 311314ac
......@@ -18,7 +18,17 @@
</a>
</div>
</div>
@if(\App\AvaliacaoRelatorio::where('user_id',Auth::user()->id )->get()->count()!=0)
<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('planos.avaliacoes.index') }}" 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;">Avaliações de Relatórios</h5>
</a>
</div>
</div>
@endif
</div>
</div>
{{--
......
resources/views/evento/formulario/projeto.blade.php
View file @ 311314ac
......@@ -66,6 +66,23 @@
</span>
@enderror
</div>
@if($edital->natureza_id ==3 )
<div class="form-group col-md-4">
<label for="areaTematica" class="col-form-label" style="font-weight: bold">{{ __('Área Temática') }} <span style="color: red; font-weight:bold">*</span></label>
<select class="form-control @error('area_tematica_id') is-invalid @enderror" id="areaTematica" name="area_tematica_id">
<option value="" disabled selected hidden>-- Área Tematica--</option>
@foreach($areaTematicas as $areaTematica)
<option @if(old('area_tematica_id') !== null ? old('area_tematica_id') : (isset($rascunho) ? $rascunho->area_tematica_id : '')
== $areaTematica->id ) selected @endif value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option>
@endforeach
</select>
@error('area_tematica_id')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
@endif
</div>
</div>
......
resources/views/naturezas/grandeArea/collapse-grande-area.blade.php
View file @ 311314ac
......@@ -57,4 +57,56 @@
</div>
</div>
@endforeach
</div>
<div id="accordion2">
<div class="card">
<div class="row">
<div class="col-11 ">
<h2 class="m-2">Áreas Temáticas</h2>
</div>
<div class="col-1 text-center">
<a href="{{route('areaTematica.criar')}}" >
<i class="fas fa-plus-circle fa-2x m-2" style="color: green"></i>
</a>
</div>
</div>
</div>
@foreach ($areasTematicas as $areasTematica)
<div class="card">
<h5 class="mb-0">
<div class="row">
<div class="col-11">
<button class="btn btn-link font-size-naturezas" aria-expanded="true" >
{{ $areasTematica->nome }}
</button>
</div>
<div class="col-1 text-center">
<div class=" dropright mt-2 text-center">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{-- <i class="fas fa-cogs"></i> --}}
<i class="fas fa-cog fa-1x"></i>
</a>
<div class="dropdown-menu">
<a href="{{ route('areaTematica.edit', ['id' => $areasTematica->id]) }}" class="dropdown-item text-center">
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{ route('areaTematica.deletar', ['id' => $areasTematica->id]) }}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item dropdown-item-delete text-center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
Deletar
</button>
</form>
</div>
</div>
</div>
</div>
</h5>
</div>
@endforeach
</div>
\ No newline at end of file
resources/views/projeto/editaFormulario/projeto.blade.php
View file @ 311314ac
......@@ -68,6 +68,23 @@
</span>
@enderror
</div>
@if($edital->natureza_id ==3 )
<div class="form-group col-md-4">
<label for="areaTematica" class="col-form-label" style="font-weight: bold">{{ __('Área Temática') }} <span style="color: red; font-weight:bold">*</span></label>
<select class="form-control @error('area_tematica_id') is-invalid @enderror" id="areaTematica" name="area_tematica_id">
<option value="" disabled selected hidden>-- Área Tematica--</option>
@foreach($areaTematicas as $areaTematica)
<option @if(old('area_tematica_id') !== null ? old('area_tematica_id') : (isset($rascunho) ? $rascunho->area_tematica_id : '')
== $areaTematica->id ) selected @endif @if($projeto->area_tematica_id == $areaTematica->id ) selected @endif value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option>
@endforeach
</select>
@error('area_tematica_id')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
@endif
</div>
</div>
......
routes/web.php
View file @ 311314ac
......@@ -47,9 +47,26 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
Route::get( '/projetos-edital/{id}', 'ProponenteController@projetosEdital' )->name('proponente.projetosEdital')->middleware('auth');
Route::post('/proponente/edital/{edital_id}/projeto/{projeto_id}/solicitar_desligamento/{participante_id}', 'ProponenteController@solicitarDesligamento')->name('proponente.solicitar.desligamento');
//######### Rotas Administrador #################################
//######## Rotas Avaliador ####################################
Route::prefix('avaliacaoRelatorio')->name('avaliacaoRelatorio.')->group(function(){
Route::post('/atribuirAvaliadorPlano', 'AvaliacaoRelatorioController@atribuicaoAvaliador')->name('atribuicao.avaliador');
});
Route::post('/trabalho/planos/avaliacoes', 'AvaliacaoRelatorioController@listarUser')->name('planos.avaliacoesUser');
Route::get('/trabalho/planos/avaliacoes/index', 'AvaliacaoRelatorioController@index')->name('planos.avaliacoes.index');
Route::post('/trabalho/planos/avaliacoes/criar', 'AvaliacaoRelatorioController@criar')->name('planos.avaliacoesUser.criar');
Route::prefix('areaTematica')->name('areaTematica.')->group(function() {
Route::get('/editar/{id}', 'AreaTematicaController@edit' )->name('edit')->middleware('checkAdministrador');
Route::post('/atualizar/{id}','AreaTematicaController@update' )->name('atualizar')->middleware('checkAdministrador');
Route::post('/excluir/{id}', 'AreaTematicaController@destroy' )->name('deletar')->middleware('checkAdministrador');
Route::post('/salvar', 'AreaTematicaController@store' )->name('salvar')->middleware('checkAdministrador');
Route::get('/nova', 'AreaTematicaController@create' )->name('criar')->middleware('checkAdministrador');
});
//######### Rotas Administrador #################################
Route::get('/perfil-usuario', 'UserController@minhaConta' )->name('user.perfil')->middleware(['auth', 'verified']);
//######## Rotas Avaliador ####################################
......
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