Skip to content

GitLab

Commit 6d92b310 authored by Gabriel-31415's avatar Gabriel-31415
Browse files

conflito resolvido

parents 266c1ff1 028d7859
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/AdministradorController.php
View file @ 6d92b310
...@@ -37,7 +37,7 @@ class AdministradorController extends Controller ...@@ -37,7 +37,7 @@ class AdministradorController extends Controller
public function editais(){ public function editais(){
//$admin = Administrador::with('user')->where('user_id', Auth()->user()->id)->first(); //$admin = Administrador::with('user')->where('user_id', Auth()->user()->id)->first();
//$eventos = Evento::where('coordenadorId',$admin->id )->get(); //$eventos = Evento::where('coordenadorId',$admin->id )->get();
$eventos = Evento::where('criador_id',Auth()->user()->id )->get(); $eventos = Evento::all();
return view('administrador.editais', ['eventos'=> $eventos]); return view('administrador.editais', ['eventos'=> $eventos]);
} }
......
app/Http/Controllers/EventoController.php
View file @ 6d92b310
...@@ -463,5 +463,8 @@ class EventoController extends Controller ...@@ -463,5 +463,8 @@ class EventoController extends Controller
return view('user.areaComissao', ['trabalhos' => $trabalhos]); return view('user.areaComissao', ['trabalhos' => $trabalhos]);
} }
public function baixarEdital($id) {
$evento = Evento::find($id);
return Storage::download($evento->pdfEdital);
}
} }
app/Http/Controllers/TrabalhoController.php
View file @ 6d92b310
...@@ -437,5 +437,10 @@ class TrabalhoController extends Controller ...@@ -437,5 +437,10 @@ class TrabalhoController extends Controller
return view('coordenadorComissao.detalhesEdital', ['evento'=> $trabalho->evento ]); return view('coordenadorComissao.detalhesEdital', ['evento'=> $trabalho->evento ]);
} }
public function projetosDoEdital($id) {
$edital = Evento::find($id);
$projetos = Trabalho::where('evento_id', '=', $id)->get();
return view('projeto.index')->with(['edital' => $edital, 'projetos' => $projetos]);
}
} }
database/migrations/2020_05_23_054945_create_participantes_table.php
View file @ 6d92b310
...@@ -15,6 +15,7 @@ class CreateParticipantesTable extends Migration ...@@ -15,6 +15,7 @@ class CreateParticipantesTable extends Migration
{ {
Schema::create('participantes', function (Blueprint $table) { Schema::create('participantes', function (Blueprint $table) {
$table->bigIncrements('id'); $table->bigIncrements('id');
$table->boolean('confirmacao_convite')->nullable();
$table->timestamps(); $table->timestamps();
$table->unsignedBigInteger('user_id')->nullable(); $table->unsignedBigInteger('user_id')->nullable();
......
resources/views/administrador/editais.blade.php
View file @ 6d92b310
...@@ -7,14 +7,21 @@ ...@@ -7,14 +7,21 @@
<div class="container" > <div class="container" >
<div class="row" > <div class="row" >
<div class="col-sm-10"> <div class="col-sm-10">
@if(auth()->user()->tipo === "administrador")
<h3>Meus Editais</h3> <h3>Meus Editais</h3>
@else
<h3>Editais</h3>
@endif
</div> </div>
@if(auth()->user()->tipo === "administrador")
<div class="col-sm-2"> <div class="col-sm-2">
<a href="{{route('evento.criar')}}" class="btn btn-primary">Criar Edital</a> <a href="{{route('evento.criar')}}" class="btn btn-primary">Criar Edital</a>
</div> </div>
@endif
</div> </div>
</div> </div>
<hr> <hr>
@if(auth()->user()->tipo === "administrador")
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
...@@ -62,6 +69,60 @@ ...@@ -62,6 +69,60 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
@endif
@if(auth()->user()->tipo === "proponente")
<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">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>10/05/2020</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('baixar.edital', ['id' => $evento->id]) }}" class="dropdown-item" style="text-align: center;">
Baixar edital
</a>
<a href="{{ route('projetos.edital', ['id' => $evento->id]) }}" class="dropdown-item" style="text-align: center">
Submeter projeto
</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>
@endif
</div> </div>
@endsection @endsection
......
resources/views/projeto/index.blade.php 0 → 100644
View file @ 6d92b310
@extends('layouts.app')
@section('content')
<div class="container" style="margin-top: 100px;">
<div class="container" >
<div class="row" >
<div class="col-sm-10">
<h3>Projetos do edital {{ $edital->nome }}</h3>
<h6 style="color: rgb(4, 78, 4);">Submissão irá até o dia {{ date('d-m-Y', strtotime($edital->fimSubmissao)) }}</h6>
</div>
<div class="col-sm-2">
<a href="{{route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-primary">Criar projeto</a>
</div>
</div>
</div>
<hr>
<table class="table table-bordered">
<thead>
<tr>
<th scope="col">Nome do projeto</th>
<th scope="col">Status</th>
<th scope="col">Data de Criação</th>
<th scope="col">Opção</th>
</tr>
</thead>
<tbody>
@foreach ($projetos as $projeto)
<tr>
<td>
{{ $projeto->titulo }}
</td>
@if($projeto->avaliado)
<td style="color: rgb(6, 85, 6)">Avaliado</td>
@else
<td style="color: rgb(0, 0, 0)">Submetido</td>
@endif
<td>{{$projeto->update}}</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="" class="dropdown-item" style="text-align: center;">
Editar projeto
</a>
<a href="" class="dropdown-item" style="text-align: center">
Adicionar participantes
</a>
<a href="" class="dropdown-item" style="text-align: center">
Recorrer
</a>
<a href="" class="dropdown-item" style="text-align: center">
Resultado
</a>
</div>
</div>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endsection
@section('javascript')
<script>
</script>
@endsection
\ No newline at end of file
resources/views/proponente/index.blade.php
View file @ 6d92b310
...@@ -4,8 +4,39 @@ ...@@ -4,8 +4,39 @@
<div class="container"> <div class="container">
<h2 style="margin-top: 100px;">Proponente</h2> <h2 style="margin-top: 100px;">{{ Auth()->user()->name }}</h2>
<div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-3 d-flex justify-content-center ">
<a href="{{route('admin.editais')}}" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 30px; width: 13rem;height: 15rem;">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Editais</h2>
</div>
</div>
</a>
</div>
<div class="col-sm-3 d-flex justify-content-center">
<a href="" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 30px; width: 13rem;height: 15rem;">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Projetos</h2>
</div>
</div>
</a>
</div>
<div class="col-sm-3 d-flex justify-content-center">
<a href="" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 30px; width: 13rem;height: 15rem;">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Mensagens</h2>
</div>
</div>
</a>
</div>
</div>
</div> </div>
@endsection @endsection
routes/web.php
View file @ 6d92b310
...@@ -83,6 +83,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ ...@@ -83,6 +83,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
Route::get( '/trabalho/submeter/{id}','TrabalhoController@index' )->name('trabalho.index'); Route::get( '/trabalho/submeter/{id}','TrabalhoController@index' )->name('trabalho.index');
Route::post( '/trabalho/novaVersao', 'TrabalhoController@novaVersao' )->name('trabalho.novaVersao'); Route::post( '/trabalho/novaVersao', 'TrabalhoController@novaVersao' )->name('trabalho.novaVersao');
Route::post( '/trabalho/criar', 'TrabalhoController@store' )->name('trabalho.store'); Route::post( '/trabalho/criar', 'TrabalhoController@store' )->name('trabalho.store');
Route::get( '/edital/{id}/projetos', 'TrabalhoController@projetosDoEdital' )->name('projetos.edital');
//######### Atribuição ####################################### //######### Atribuição #######################################
Route::get( '/atribuir', 'AtribuicaoController@distribuicaoAutomatica' )->name('distribuicao'); Route::get( '/atribuir', 'AtribuicaoController@distribuicaoAutomatica' )->name('distribuicao');
...@@ -101,13 +102,13 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ ...@@ -101,13 +102,13 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
Route::prefix('usuarios')->name('admin.')->group(function(){ Route::prefix('usuarios')->name('admin.')->group(function(){
//######### Rotas da administração dos usuários #################### //######### Rotas da administração dos usuários ####################
Route::get('/home-admin', 'AdministradorController@index' )->name('index'); Route::get('/home-admin', 'AdministradorController@index' )->name('index')->middleware('checkAdministrador');
Route::get('/usuarios', 'AdministradorController@usuarios' )->name('usuarios'); Route::get('/usuarios', 'AdministradorController@usuarios' )->name('usuarios')->middleware('checkAdministrador');
Route::get('/novo', 'AdministradorController@create' )->name('user.create'); Route::get('/novo', 'AdministradorController@create' )->name('user.create')->middleware('checkAdministrador');
Route::post('/salvar-novo', 'AdministradorController@salvar' )->name('user.store'); Route::post('/salvar-novo', 'AdministradorController@salvar' )->name('user.store')->middleware('checkAdministrador');
Route::get('/editar/{id}', 'AdministradorController@edit' )->name('user.edit'); Route::get('/editar/{id}', 'AdministradorController@edit' )->name('user.edit')->middleware('checkAdministrador');
Route::post('/editar/atualizar/{id}', 'AdministradorController@update' )->name('user.update'); Route::post('/editar/atualizar/{id}', 'AdministradorController@update' )->name('user.update')->middleware('checkAdministrador');
Route::post('/editar/deletar/{id}', 'AdministradorController@destroy' )->name('user.destroy'); Route::post('/editar/deletar/{id}', 'AdministradorController@destroy' )->name('user.destroy')->middleware('checkAdministrador');
Route::get('/editais', 'AdministradorController@editais' )->name('editais'); Route::get('/editais', 'AdministradorController@editais' )->name('editais');
Route::get('/atribuir', 'AdministradorController@atribuir' )->name('atribuir'); Route::get('/atribuir', 'AdministradorController@atribuir' )->name('atribuir');
Route::get('/selecionarAvaliador', 'AdministradorController@selecionar' )->name('selecionar'); Route::get('/selecionarAvaliador', 'AdministradorController@selecionar' )->name('selecionar');
...@@ -117,46 +118,47 @@ Route::prefix('usuarios')->name('admin.')->group(function(){ ...@@ -117,46 +118,47 @@ Route::prefix('usuarios')->name('admin.')->group(function(){
Route::post('/atribuirAvaliadorProjeto', 'AdministradorController@atribuicao' )->name('atribuicao'); Route::post('/atribuirAvaliadorProjeto', 'AdministradorController@atribuicao' )->name('atribuicao');
Route::post('/enviarConviteAvaliador', 'AdministradorController@enviarConvite')->name('enviarConvite'); Route::post('/enviarConviteAvaliador', 'AdministradorController@enviarConvite')->name('enviarConvite');
}); });
Route::prefix('naturezas')->group(function(){ Route::prefix('naturezas')->group(function(){
//########### Rotas das naturezas ############################### //########### Rotas das naturezas ###############################
Route::get('/', 'AdministradorController@naturezas' )->name('admin.naturezas'); Route::get('/', 'AdministradorController@naturezas' )->name('admin.naturezas')->middleware('checkAdministrador');
Route::get('/index', 'NaturezaController@index' )->name('natureza.index'); Route::get('/index', 'NaturezaController@index' )->name('natureza.index')->middleware('checkAdministrador');
Route::get('/nova', 'NaturezaController@create' )->name('natureza.criar'); Route::get('/nova', 'NaturezaController@create' )->name('natureza.criar')->middleware('checkAdministrador');
Route::post('/salvar', 'NaturezaController@store' )->name('natureza.salvar'); Route::post('/salvar', 'NaturezaController@store' )->name('natureza.salvar')->middleware('checkAdministrador');
Route::get('/detalhes/{id}', 'NaturezaController@show' )->name('natureza.show'); Route::get('/detalhes/{id}', 'NaturezaController@show' )->name('natureza.show')->middleware('checkAdministrador');
Route::get('/editar/{id}', 'NaturezaController@edit' )->name('natureza.editar'); Route::get('/editar/{id}', 'NaturezaController@edit' )->name('natureza.editar')->middleware('checkAdministrador');
Route::get('/atualizar/{id}', 'NaturezaController@update' )->name('natureza.atualizar'); Route::get('/atualizar/{id}', 'NaturezaController@update' )->name('natureza.atualizar')->middleware('checkAdministrador');
Route::get('/excluir/{id}', 'NaturezaController@destroy' )->name('natureza.deletar'); Route::get('/excluir/{id}', 'NaturezaController@destroy' )->name('natureza.deletar')->middleware('checkAdministrador');
//########### Rotas das grandes areas ############################## //########### Rotas das grandes areas ##############################
Route::get('/grande-area', 'GrandeAreaController@index' )->name('grandearea.index'); Route::get('/grande-area', 'GrandeAreaController@index' )->name('grandearea.index')->middleware('checkAdministrador');
Route::get('/grande-area/nova', 'GrandeAreaController@create' )->name('grandearea.criar'); Route::get('/grande-area/nova', 'GrandeAreaController@create' )->name('grandearea.criar')->middleware('checkAdministrador');
Route::post('/grande-area/salvar', 'GrandeAreaController@store' )->name('grandearea.salvar'); Route::post('/grande-area/salvar', 'GrandeAreaController@store' )->name('grandearea.salvar')->middleware('checkAdministrador');
Route::get('/grande-area/detalhes/{id}', 'GrandeAreaController@show' )->name('grandearea.show'); Route::get('/grande-area/detalhes/{id}', 'GrandeAreaController@show' )->name('grandearea.show')->middleware('checkAdministrador');
Route::get('/grande-area/editar/{id}', 'GrandeAreaController@edit' )->name('grandearea.editar'); Route::get('/grande-area/editar/{id}', 'GrandeAreaController@edit' )->name('grandearea.editar')->middleware('checkAdministrador');
Route::post('/grande-area/atualizar/{id}','GrandeAreaController@update' )->name('grandearea.atualizar'); Route::post('/grande-area/atualizar/{id}','GrandeAreaController@update' )->name('grandearea.atualizar')->middleware('checkAdministrador');
Route::post('/grande-area/excluir/{id}', 'GrandeAreaController@destroy' )->name('grandearea.deletar'); Route::post('/grande-area/excluir/{id}', 'GrandeAreaController@destroy' )->name('grandearea.deletar')->middleware('checkAdministrador');
//#### Rotas das areas, id's de nova e salvar são os ids da grande área a qual a nova área pertence #### //#### Rotas das areas, id's de nova e salvar são os ids da grande área a qual a nova área pertence ####
Route::get('/areas', 'AreaController@index' )->name('area.index'); Route::get('/areas', 'AreaController@index' )->name('area.index')->middleware('checkAdministrador');
Route::get('/{id}/area/nova', 'AreaController@create' )->name('area.criar'); Route::get('/{id}/area/nova', 'AreaController@create' )->name('area.criar')->middleware('checkAdministrador');
Route::post('/{id}/area/salvar', 'AreaController@store' )->name('area.salvar'); Route::post('/{id}/area/salvar', 'AreaController@store' )->name('area.salvar')->middleware('checkAdministrador');
Route::get('/area/detalhes/{id}', 'AreaController@show' )->name('area.show'); Route::get('/area/detalhes/{id}', 'AreaController@show' )->name('area.show')->middleware('checkAdministrador');
Route::get('/area/editar/{id}', 'AreaController@edit' )->name('area.editar'); Route::get('/area/editar/{id}', 'AreaController@edit' )->name('area.editar')->middleware('checkAdministrador');
Route::post('/area/atualizar/{id}', 'AreaController@update' )->name('area.atualizar'); Route::post('/area/atualizar/{id}', 'AreaController@update' )->name('area.atualizar')->middleware('checkAdministrador');
Route::post('/area/excluir/{id}', 'AreaController@destroy' )->name('area.deletar'); Route::post('/area/excluir/{id}', 'AreaController@destroy' )->name('area.deletar')->middleware('checkAdministrador');
//### Rotas das subareas, id's de nova e salvar são os ids da área a qual a nova subárea pertence ##### //### Rotas das subareas, id's de nova e salvar são os ids da área a qual a nova subárea pertence #####
Route::get('/subareas', 'SubAreaController@index' )->name('subarea.index'); Route::get('/subareas', 'SubAreaController@index' )->name('subarea.index')->middleware('checkAdministrador');
Route::get('/{id}/subarea/nova', 'SubAreaController@create' )->name('subarea.criar'); Route::get('/{id}/subarea/nova', 'SubAreaController@create' )->name('subarea.criar')->middleware('checkAdministrador');
Route::post('/{id}/subarea/salvar', 'SubAreaController@store' )->name('subarea.salvar'); Route::post('/{id}/subarea/salvar', 'SubAreaController@store' )->name('subarea.salvar')->middleware('checkAdministrador');
Route::get('/subarea/detalhes/{id}', 'SubAreaController@show' )->name('subarea.show'); Route::get('/subarea/detalhes/{id}', 'SubAreaController@show' )->name('subarea.show')->middleware('checkAdministrador');
Route::get('/subarea/editar/{id}', 'SubAreaController@edit' )->name('subarea.editar'); Route::get('/subarea/editar/{id}', 'SubAreaController@edit' )->name('subarea.editar')->middleware('checkAdministrador');
Route::post('/subarea/atualizar/{id}', 'SubAreaController@update' )->name('subarea.atualizar'); Route::post('/subarea/atualizar/{id}', 'SubAreaController@update' )->name('subarea.atualizar')->middleware('checkAdministrador');
Route::post('/subarea/excluir/{id}', 'SubAreaController@destroy' )->name('subarea.deletar'); Route::post('/subarea/excluir/{id}', 'SubAreaController@destroy' )->name('subarea.deletar')->middleware('checkAdministrador');
}); });
...@@ -171,8 +173,11 @@ Route::prefix('evento')->name('evento.')->group(function(){ ...@@ -171,8 +173,11 @@ Route::prefix('evento')->name('evento.')->group(function(){
Route::post( '/editar/{id}', 'EventoController@update' )->name('update'); Route::post( '/editar/{id}', 'EventoController@update' )->name('update');
Route::post( '/setResumo', 'EventoController@setResumo' )->name('setResumo'); Route::post( '/setResumo', 'EventoController@setResumo' )->name('setResumo');
Route::post( '/setFoto', 'EventoController@setFotoEvento' )->name('setFotoEvento'); Route::post( '/setFoto', 'EventoController@setFotoEvento' )->name('setFotoEvento');
}); });
Route::get('/baixar/edital/{id}', 'EventoController@baixarEdital' )->name('baixar.edital');
//########## Rotas de administrador responsavel (Reitor ou pro-reitor)######## //########## Rotas de administrador responsavel (Reitor ou pro-reitor)########
Route::prefix('adminResp')->name('adminResp.')->group(function(){ Route::prefix('adminResp')->name('adminResp.')->group(function(){
......
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