Skip to content

GitLab

Unverified Commit 72241b3c authored by Gabriel Antônio da Silva's avatar Gabriel Antônio da Silva Committed by GitHub
Browse files

Merge pull request #28 from lmts-ufape/planoTrabalho 

Plano trabalho
parents beed2694 b8f2b424
Expand all Hide whitespace changes
Inline Side-by-side
resources/views/evento/visualizarEvento.blade.php
View file @ 72241b3c
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<div class="row margin"> <div class="row margin">
<div class="col-sm-12 info-evento"> <div class="col-sm-12 info-evento">
<h4>Revisão de Projetos</h4> <h4>Avaliação de Projetos</h4>
<p> <p>
<img class="" src="{{asset('img/icons/calendar-evento.svg')}}" alt=""> <img class="" src="{{asset('img/icons/calendar-evento.svg')}}" alt="">
{{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}} {{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}
......
resources/views/layouts/app.blade.php
View file @ 72241b3c
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</div> </div>
<a href="{{ route('register') }}" class="btn navbar-text btn-azul-destaque negrito" style="color: rgb(0, 140, 255);">{{ __('Cadastre-se') }}</a> <a href="{{ route('register') }}" class="btn navbar-text btn-azul-destaque negrito" style="color: rgb(0, 140, 255);">{{ __('Cadastre-se') }}</a>
@else @else
<a href="{{route('visualizarEvento')}}" class="btn navbar-text negrito " style="color: rgb(0, 140, 255);">Home</a> <a href="{{route('coord.home')}}" class="btn navbar-text negrito " style="color: rgb(0, 140, 255);">Home</a>
<a id="navbarDropdown" class="btn navbar-text negrito dropdown-toggle" style="color: rgb(0, 140, 255);" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre> <a id="navbarDropdown" class="btn navbar-text negrito dropdown-toggle" style="color: rgb(0, 140, 255);" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span> {{ Auth::user()->name }} <span class="caret"></span>
......
resources/views/naturezas/index.blade.php
View file @ 72241b3c
...@@ -111,24 +111,31 @@ ...@@ -111,24 +111,31 @@
{{ $natureza->nome }} {{ $natureza->nome }}
</td> </td>
<td> <td>
{{$natureza->creat_at}} {{ $natureza->creat_at }}
</td> </td>
<td> <td>
<div class="btn-group dropright dropdown-options"> @if (is_null($natureza->projetos->first()))
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <div class="btn-group dropright dropdown-options">
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px"> <a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
</a> <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
<div class="dropdown-menu"> </a>
<a class="dropdown-item" data-toggle="modal" data-target="#modalEditCenter{{$natureza->id}}" class="dropdown-item"> <div class="dropdown-menu">
<img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
{{__('Editar')}} <a class="dropdown-item" data-toggle="modal" data-target="#modalEditCenter{{$natureza->id}}" class="dropdown-item">
</a> <img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
<a class="dropdown-item" data-toggle="modal" data-target="#modalDelCenter{{$natureza->id}}" class="dropdown-item"> {{__('Editar')}}
<img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt=""> </a>
{{__('Deletar')}} <a class="dropdown-item" data-toggle="modal" data-target="#modalDelCenter{{$natureza->id}}" class="dropdown-item">
</a> <img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
</div> {{__('Deletar')}}
</div> </a>
</div>
</div>
@else
<div style="float: right;">
Fixada em um edital
</div>
@endif
</td> </td>
</tr> </tr>
@endforeach @endforeach
......
resources/views/participante/editais.blade.php 0 → 100644
View file @ 72241b3c
@extends('layouts.app')
@section('content')
<div class="container" style="margin-top: 100px;">
<div class="container" >
<div class="row" >
<div class="col-sm-12">
<h3>Editais</h3>
</div>
</div>
</div>
<hr>
<table class="table table-bordered">
<thead>
<tr>
<th scope="col">Nome do Edital</th>
<th scope="col">Status</th>
<th scope="col">Data de Criação</th>
<th scope="col">Baixar edital</th>
<th scope="col">Opção</th>
</tr>
</thead>
<tbody>
@foreach ($eventos as $evento)
<tr>
<td>
<a href="{{ route('evento.visualizar',['id'=>$evento->id]) }}" class="visualizarEvento">
{{ $evento->nome }}
</a>
</td>
<td></td>
<td>{{ $evento->created_at }}</td>
<td style="text-align: center">
<a href="{{ route('baixar.edital', ['id' => $evento->id]) }}">
<img src="{{asset('img/icons/file-download-solid.svg')}}" width="15px">
</a>
</td>
<td>
<div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
<a href="{{ route('participante.edital', ['id' => $evento->id]) }}" class="dropdown-item" style="text-align: center">
Meus projetos
</a>
<a href="" class="dropdown-item" style="text-align: center">
Visualizar resultado
</a>
{{--
<a href="" class="dropdown-item" style="text-align: center">
Resultado preeliminar
</a>
<a href="" class="dropdown-item" style="text-align: center">
Resultado final
</a> --}}
</div>
</div>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endsection
@section('javascript')
<script>
</script>
@endsection
resources/views/participante/index.blade.php
View file @ 72241b3c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="row justify-content-center d-flex align-items-center"> <div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-4 d-flex justify-content-center "> <div class="col-sm-4 d-flex justify-content-center ">
<a href="{{route('admin.editais')}}" style="text-decoration:none; color: inherit;"> <a href="{{route('participante.editais')}}" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 30px; width: 18rem;"> <div class="card text-center " style="border-radius: 30px; width: 18rem;">
<div class="card-body d-flex justify-content-center"> <div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Editais</h2> <h2 style="padding-top:15px">Editais</h2>
......
resources/views/projeto/index.blade.php
View file @ 72241b3c
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
<div class="col-sm-2"> <div class="col-sm-2">
<!-- Se usuário não é proponente, redirecionar para view de cadastro --> <!-- Se usuário não é proponente, redirecionar para view de cadastro -->
@if(Auth::user()->proponentes == null) @if(Auth::user()->proponentes == null)
<a href="{{ route('proponente.create' )}}" class="btn btn-primary">Criar projeto</a> <a href="{{ route('proponente.create' )}}" class="btn btn-primary">Submeter projeto</a>
@else @else
<a href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-primary">Criar projeto</a> <a href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-primary">Submeter projeto</a>
@endif @endif
</div> </div>
</div> </div>
......
resources/views/proponente/cadastro.blade.php
View file @ 72241b3c
...@@ -15,6 +15,14 @@ ...@@ -15,6 +15,14 @@
</div> </div>
</div> </div>
@endif @endif
@if(isset($mensagem))
<div class="col-sm-12">
<br>
<div class="alert alert-danger">
<p>{{ $mensagem }}</p>
</div>
</div>
@endif
</div> </div>
<br> <br>
<form method="POST" action="{{ route('proponente.store') }}"> <form method="POST" action="{{ route('proponente.store') }}">
......
resources/views/proponente/editais.blade.php 0 → 100644
View file @ 72241b3c
@extends('layouts.app')
@section('content')
<div class="container" style="margin-top: 100px;">
<div class="container" >
<div class="row" >
<div class="col-sm-12">
<h3>Editais</h3>
</div>
</div>
</div>
<hr>
<table class="table table-bordered">
<thead>
<tr>
<th scope="col">Nome do Edital</th>
<th scope="col">Inicio da Submissão</th>
<th scope="col">Fim da Submissão</th>
<th scope="col">Data do Resultado</th>
<th scope="col">Baixar edital</th>
<th scope="col">Opção</th>
</tr>
</thead>
<tbody>
@foreach ($eventos as $evento)
<tr>
<td>
<a href="{{ route('evento.visualizar',['id'=>$evento->id]) }}" class="visualizarEvento">
{{ $evento->nome }}
</a>
</td>
<td>{{ date('d/m/Y', strtotime($evento->inicioSubmissao)) }}</td>
<td>{{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</td>
<td>{{ date('d/m/Y', strtotime($evento->created_at)) }}</td>
<td style="text-align: center">
<a href="{{ route('baixar.edital', ['id' => $evento->id]) }}">
<img src="{{asset('img/icons/file-download-solid.svg')}}" width="15px">
</a>
</td>
<td>
<div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
<a href="{{ route('projetos.edital', ['id' => $evento->id]) }}" class="dropdown-item" style="text-align: center">
Projetos submetidos
</a>
<a href="" class="dropdown-item" style="text-align: center">
Visualizar resultado
</a>
{{-- <a href="" class="dropdown-item" style="text-align: center">
Recurso ao resultado
</a>
<a href="" class="dropdown-item" style="text-align: center">
Resultado preeliminar
</a>
<a href="" class="dropdown-item" style="text-align: center">
Resultado final
</a> --}}
</div>
</div>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endsection
@section('javascript')
<script>
</script>
@endsection
resources/views/proponente/index.blade.php
View file @ 72241b3c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="row justify-content-center d-flex align-items-center"> <div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-3 d-flex justify-content-center "> <div class="col-sm-3 d-flex justify-content-center ">
<a href="{{route('admin.editais')}}" style="text-decoration:none; color: inherit;"> <a href="{{route('proponente.editais')}}" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 30px; width: 13rem;height: 15rem;"> <div class="card text-center " style="border-radius: 30px; width: 13rem;height: 15rem;">
<div class="card-body d-flex justify-content-center"> <div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Editais</h2> <h2 style="padding-top:15px">Editais</h2>
......
resources/views/user/perfilUser.blade.php
View file @ 72241b3c
This diff is collapsed.
routes/web.php
View file @ 72241b3c
...@@ -21,34 +21,35 @@ Auth::routes(['verify' => true]); ...@@ -21,34 +21,35 @@ Auth::routes(['verify' => true]);
//######## Rotas Avaliador #################################### //######## Rotas Avaliador ####################################
Route::prefix('avaliador')->name('avaliador.')->group(function(){ Route::prefix('avaliador')->name('avaliador.')->group(function(){
Route::get('/index', 'AvaliadorController@index' )->name('index'); Route::get('/index', 'AvaliadorController@index' )->name('index')->middleware('auth');
Route::get('/trabalhos', 'AvaliadorController@visualizarTrabalhos' )->name('visualizarTrabalho'); Route::get('/trabalhos', 'AvaliadorController@visualizarTrabalhos' )->name('visualizarTrabalho')->middleware('auth');
Route::post('/parecer', 'AvaliadorController@parecer' )->name('parecer'); Route::post('/parecer', 'AvaliadorController@parecer' )->name('parecer')->middleware('auth');
Route::get('/editais', 'AvaliadorController@editais' )->name('editais'); Route::get('/editais', 'AvaliadorController@editais' )->name('editais')->middleware('auth');
Route::post('/Enviarparecer', 'AvaliadorController@enviarParecer' )->name('enviarParecer'); Route::post('/Enviarparecer', 'AvaliadorController@enviarParecer' )->name('enviarParecer')->middleware('auth');
}); });
//######### Proponente ######################################## //######### Proponente ########################################
Route::get('/proponente/index', 'ProponenteController@index' )->name('proponente.index'); Route::get('/proponente/index', 'ProponenteController@index' )->name('proponente.index');
Route::get('/proponente/cadastro', 'ProponenteController@create' )->name('proponente.create'); Route::get('/proponente/cadastro', 'ProponenteController@create' )->name('proponente.create');
Route::post('/proponente/cadastro', 'ProponenteController@store' )->name('proponente.store'); Route::post('/proponente/cadastro', 'ProponenteController@store' )->name('proponente.store');
Route::get( '/proponente/editais', 'ProponenteController@editais' )->name('proponente.editais');
//######### Participante ######################################## //######### Participante ########################################
Route::get('/participante/index', 'ParticipanteController@index' )->name('participante.index'); Route::get('/participante/index', 'ParticipanteController@index' )->name('participante.index');
Route::get('/participante/edital/{id}', 'ParticipanteController@edital' )->name('participante.edital'); Route::get('/participante/edital/{id}', 'ParticipanteController@edital' )->name('participante.edital');
//######### Rotas Administrador ################################# //######### Rotas Administrador #################################
Route::get('/perfil-usuario', 'UserController@minhaConta')->middleware('auth' )->name('user.perfil'); Route::get('/perfil-usuario', 'UserController@minhaConta')->middleware('auth' )->name('user.perfil')->middleware(['auth', 'verified']);
Route::get('/perfil','UserController@perfil' )->name('perfil')->middleware(['auth', 'verified']); Route::get('/perfil','UserController@perfil' )->name('perfil')->middleware(['auth', 'verified']);
Route::post('/perfil','UserController@editarPerfil' )->name('perfil')->middleware(['auth', 'verified']); Route::post('/perfil','UserController@editarPerfil' )->name('perfil')->middleware(['auth', 'verified']);
Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
Route::get('/home/evento', 'EventoController@index' )->name('visualizarEvento'); Route::get('/home/edital', 'EventoController@index' )->name('visualizarEvento');
// ######## rotas de teste ##################################### // ######## rotas de teste #####################################
Route::get('/coordenador/home', 'EventoController@index' )->name('coord.home'); Route::get('/editais/home', 'EventoController@index' )->name('coord.home');
Route::get('/coordenador/evento/detalhes', 'EventoController@detalhes' )->name('coord.detalhesEvento'); Route::get('/coordenador/evento/detalhes', 'EventoController@detalhes' )->name('coord.detalhesEvento');
//####### Visualizar trabalhos do usuário ###################### //####### Visualizar trabalhos do usuário ######################
...@@ -63,6 +64,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ ...@@ -63,6 +64,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
//######### Area do participante ############################### //######### Area do participante ###############################
Route::get( '/participante', 'EventoController@areaParticipante' )->name('area.participante'); Route::get( '/participante', 'EventoController@areaParticipante' )->name('area.participante');
Route::get( 'participante/editais', 'ParticipanteController@editais' )->name('participante.editais');
//########## Area da comissao ################################### //########## Area da comissao ###################################
Route::get( '/comissoes', 'EventoController@listComissao' )->name('comissoes'); Route::get( '/comissoes', 'EventoController@listComissao' )->name('comissoes');
...@@ -120,6 +122,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ ...@@ -120,6 +122,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
Route::get('/baixar/anexo-lattes/{id}', 'TrabalhoController@baixarAnexoLattes' )->name('baixar.anexo.lattes'); Route::get('/baixar/anexo-lattes/{id}', 'TrabalhoController@baixarAnexoLattes' )->name('baixar.anexo.lattes');
Route::get('/baixar/anexo-planilha/{id}','TrabalhoController@baixarAnexoPlanilha' )->name('baixar.anexo.planilha'); Route::get('/baixar/anexo-planilha/{id}','TrabalhoController@baixarAnexoPlanilha' )->name('baixar.anexo.planilha');
Route::get('/baixar/plano-de-trabalho/{id}', 'ArquivoController@baixarPlano' )->name('baixar.plano'); Route::get('/baixar/plano-de-trabalho/{id}', 'ArquivoController@baixarPlano' )->name('baixar.plano');
Route::get('/baixar/anexo-temp/{eventoId}/{nomeAnexo}', 'TrabalhoController@baixarAnexoTemp' )->name('baixar.anexo.temp');
}); });
Route::prefix('usuarios')->name('admin.')->group(function(){ Route::prefix('usuarios')->name('admin.')->group(function(){
...@@ -188,15 +191,15 @@ Route::prefix('naturezas')->group(function(){ ...@@ -188,15 +191,15 @@ Route::prefix('naturezas')->group(function(){
//############ Evento ############################################## //############ Evento ##############################################
Route::prefix('evento')->name('evento.')->group(function(){ Route::prefix('evento')->name('evento.')->group(function(){
Route::get( '/criar', 'EventoController@create' )->name('criar'); Route::get( '/criar', 'EventoController@create' )->name('criar')->middleware('checkAdministrador');
Route::post( '/criar', 'EventoController@store' )->name('criar'); Route::post( '/criar', 'EventoController@store' )->name('criar')->middleware('checkAdministrador');
Route::get( '/visualizar/{id}','EventoController@show' )->name('visualizar'); Route::get( '/visualizar/{id}','EventoController@show' )->name('visualizar')->middleware('auth');
Route::get( '/listar', 'EventoController@listar' )->name('listar'); Route::get( '/listar', 'EventoController@listar' )->name('listar')->middleware('auth');
Route::delete( '/excluir/{id}', 'EventoController@destroy' )->name('deletar'); Route::delete( '/excluir/{id}', 'EventoController@destroy' )->name('deletar')->middleware('checkAdministrador');
Route::get( '/editar/{id}', 'EventoController@edit' )->name('editar'); Route::get( '/editar/{id}', 'EventoController@edit' )->name('editar')->middleware('checkAdministrador');
Route::post( '/editar/{id}', 'EventoController@update' )->name('update'); Route::post( '/editar/{id}', 'EventoController@update' )->name('update')->middleware('checkAdministrador');
Route::post( '/setResumo', 'EventoController@setResumo' )->name('setResumo'); Route::post( '/setResumo', 'EventoController@setResumo' )->name('setResumo')->middleware('checkAdministrador');
Route::post( '/setFoto', 'EventoController@setFotoEvento' )->name('setFotoEvento'); Route::post( '/setFoto', 'EventoController@setFotoEvento' )->name('setFotoEvento')->middleware('checkAdministrador');
}); });
......
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