Skip to content

GitLab

"vscode:/vscode.git/clone" did not exist on "bd3fa160806b0ef85066b3834a4dac78e7f97518"
Unverified Commit c6fe4274 authored by carlos1270's avatar carlos1270 Committed by GitHub
Browse files

Merge pull request #75 from carlos1270/master 

Design do adm e crud função participante
parents 6afb8fb7 3a3fbf80
Hide whitespace changes
Inline Side-by-side
app/Area.php
View file @ c6fe4274
......@@ -37,4 +37,7 @@ class Area extends Model
public function avaliador(){
return $this->hasMany('App\Area');
}
public function grandeArea() {
return $this->belongsTo('App\GrandeArea', 'grande_area_id');
}
}
app/FuncaoParticipantes.php
View file @ c6fe4274
......@@ -6,5 +6,7 @@ use Illuminate\Database\Eloquent\Model;
class FuncaoParticipantes extends Model
{
//
public function participantes() {
return $this->hasMany("\App\Participante", 'funcao_participante_id');
}
}
app/Http/Controllers/AdministradorController.php
View file @ c6fe4274
......@@ -29,7 +29,8 @@ class AdministradorController extends Controller
}
public function naturezas(){
$naturezas = Natureza::orderBy('nome')->get();
return view('naturezas.index')->with(['naturezas' => $naturezas]);
$funcoesParticipante = FuncaoParticipantes::orderBy('nome')->get();
return view('naturezas.index')->with(['naturezas' => $naturezas, 'funcoes' => $funcoesParticipante]);
}
public function usuarios(){
$users = User::orderBy('name')->get();
......
app/Http/Controllers/ParticipanteController.php
View file @ c6fe4274
......@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use App\Evento;
use App\Trabalho;
use App\Participante;
use App\FuncaoParticipantes;
use Auth;
class ParticipanteController extends Controller
......@@ -33,4 +34,45 @@ class ParticipanteController extends Controller
return view('participante.projetos')->with(['edital' => $edital, 'projetos' => $projetos]);
}
public function storeFuncao(Request $request) {
$validated = $request->validate([
'newFuncao' => 'required',
'nome_da_função' => 'required',
]);
$funcao = new FuncaoParticipantes();
$funcao->nome = $request->input('nome_da_função');
$funcao->save();
return redirect()->back()->with(['mensagem' => 'Função de participante cadastrada com sucesso!']);
}
public function updateFuncao(Request $request, $id) {
$validated = $request->validate([
'editFuncao' => 'required',
'nome_da_função'.$id => 'required',
]);
$funcao = FuncaoParticipantes::find($id);
if ($funcao->participantes->count() > 0) {
return redirect()->back()->with(['error' => 'Essa função não pode ser editada pois participantes estão vinculados a ela!']);
}
$funcao->nome = $request->input('nome_da_função'.$id);
$funcao->update();
return redirect()->back()->with(['mensagem' => 'Função de participante salva com sucesso!']);
}
public function destroyFuncao($id) {
$funcao = FuncaoParticipantes::find($id);
if ($funcao->participantes->count() > 0) {
return redirect()->back()->with(['error' => 'Essa função não pode ser excluída pois participantes estão vinculados a ela!']);
}
$funcao->delete();
return redirect()->back()->with(['mensagem' => 'Função de participante deletada com sucesso!']);
}
}
app/Http/Controllers/TrabalhoController.php
View file @ c6fe4274
......@@ -104,7 +104,7 @@ class TrabalhoController extends Controller
}
//--Salvando os dados da submissão temporariamente
$trabalho = $this->armazenarInfoTemp($request, $proponente);
// $trabalho = $this->armazenarInfoTemp($request, $proponente);
//O anexo de Decisão do CONSU dependo do tipo de edital
if( $evento->tipo == 'PIBIC' || $evento->tipo == 'PIBIC-EM'){
......@@ -134,9 +134,9 @@ class TrabalhoController extends Controller
'anexoPlanoTrabalho.*' => ['nullable', 'file', 'mimes:pdf', 'max:2048'],
]);
if(gettype($this->validarAnexosRascunho($request, $trabalho)) != 'integer'){
return $this->validarAnexosRascunho($request, $trabalho);
}
// if(gettype($this->validarAnexosRascunho($request, $trabalho)) != 'integer'){
// return $this->validarAnexosRascunho($request, $trabalho);
// }
//$trabalho = Trabalho::create([
$trabalho['titulo'] = $request->nomeProjeto;
......@@ -181,9 +181,9 @@ class TrabalhoController extends Controller
'anexoPlanoTrabalho.*' => ['nullable', 'file', 'mimes:pdf', 'max:2048'],
]);
if(gettype($this->validarAnexosRascunho($request, $trabalho)) != 'integer'){
return $this->validarAnexosRascunho($request, $trabalho);
}
// if(gettype($this->validarAnexosRascunho($request, $trabalho)) != 'integer'){
// return $this->validarAnexosRascunho($request, $trabalho);
// }
//$trabalho = Trabalho::create([
$trabalho['titulo'] = $request->nomeProjeto;
$trabalho['coordenador_id'] = $coordenador->id;
......
database/seeds/AvaliadorSeeder.php
View file @ c6fe4274
......@@ -47,7 +47,7 @@ class AvaliadorSeeder extends Seeder
// $aval->eventos()->attach($evento);
// $aval->save();
// $user_id = DB::table('users')->where('name','Avaliador3')->pluck('id');
$user_id = DB::table('users')->where('name','Avaliador3')->pluck('id');
DB::table('avaliadors')->insert([
'user_id' => $user_id[0],
......
public/css/layout.css
View file @ c6fe4274
......@@ -199,6 +199,7 @@ body{
background-color: rgb(0, 140, 255);
margin-top: 8px;
margin-bottom: 8px;
border-radius: 3px;
}
.li-editais {
......@@ -216,7 +217,8 @@ body{
.flexcroll{ width:500px;
height:400px;
overflow:scroll;
overflow-y:inherit;
overflow-x:hidden;
}
.flexcroll{
......@@ -237,14 +239,14 @@ body{
/* Track */
.flexcroll::-webkit-scrollbar-track {
box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-webkit-border-radius: 10px;
border-radius: 10px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* Handle */
.flexcroll::-webkit-scrollbar-thumb {
-webkit-border-radius: 10px;
border-radius: 10px;
-webkit-border-radius: 5px;
border-radius: 5px;
background: rgb(0, 140, 255);
box-shadow: currentColor 0 0 6px rgba(0,0,0,0.5);
}
......@@ -286,3 +288,176 @@ section {
position: relative;
margin: 10px;
}
.card-menu {
color: rgb(0, 140, 255);
border-radius: 15px;
width: 14rem;
height: 16rem;
border-color: rgb(0, 140, 255);
}
.titulo-menu {
color: rgb(0, 140, 255);;
margin-top: 50px;
margin-bottom: 50px;
}
.titulo-card-menu {
margin-bottom: 10px;
}
.info-card {
margin-top: 45px;
}
.quant-titulo-card {
font-size: 60px;
}
.btn-info {
border-radius: 5px;
background-color: rgb(55, 187, 55);
color: white;
font-weight: bolder;
border-color: rgb(55, 187, 55);
}
.btn-info:hover {
border-radius: 5px;
background-color: rgb(172, 172, 172);
color: black;
font-weight: bolder;
border-color: rgb(172, 172, 172);
}
.btn-primary {
border-radius: 5px;
font-weight: bolder;
}
.btn-secondary {
border-radius: 5px;
font-weight: bolder;
}
.btn-danger {
border-radius: 5px;
font-weight: bolder;
}
.btn-success {
border-radius: 5px;
font-weight: bolder;
}
.dropdown-item {
color: rgb(0, 140, 255);
}
.dropdown-item:hover {
color: rgb(0, 140, 255);
}
.dropdown-item-delete {
background-color: red;
width: 155px;
border-radius: 5px;
margin-left: 10px;
margin-right: 10px;
color: white;
}
.dropdown-item-delete:hover {
background-color: rgb(207, 0, 0);
color: white;
}
.dropdown-options a:hover {
text-decoration: none;
}
.dropdown-hr {
margin-top: 0px;
margin-bottom: 0px;
width: 80%;
}
.titulo-table {
color: rgb(0, 140, 255);
}
.table th {
color: rgb(0, 140, 255);
}
.form-control-edit {
border-top: none;
border-left: none;
border-right: none;
border-radius: 0px;
border-color: rgb(0, 140, 255);
}
.form-control-edit:focus {
border-color: none;
box-shadow: none;
border-top: none;
border-left: none;
border-right: none;
border-radius: 0px;
}
.form-control-edit:hover {
border-color: none;
box-shadow: none;
border-top: none;
border-left: none;
border-right: none;
border-radius: 0px;
border-color: rgb(0, 140, 255);
}
.modal-header-submeta {
border-bottom: 1px solid rgb(0, 140, 255);
padding-bottom: 5px;
margin-left: 20px;
margin-right: 20px;
}
.labels-blue label {
color: rgb(0, 140, 255);
font-weight: 500;
}
.modal-submeta {
border-radius: 20px;
border-color: rgba(204, 204, 204, 0.555);
}
.texto-info {
color: rgba(102, 102, 102, 0.555);
text-align: justify;
font-size: 12px;
padding-top: 0px;
margin-bottom: 40px;
border-top: 1px solid rgba(102, 102, 102, 0.555) ;
}
button.close {
padding: 0;
font-size: 35px;
background-color: transparent;
border: none;
-webkit-appearance: none;
}
.close:hover, .close:focus {
color: none;
text-decoration: none;
text-shadow: none;
box-shadow: none;
border: none;
}
resources/views/administrador/atribuirAvaliadores.blade.php
View file @ c6fe4274
......@@ -4,37 +4,69 @@
<div class="container">
<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2>
<div class="container" >
<div class="row justify-content-center d-flex align-items-center" >
<h3>Edital Selecionado: {{ $evento->nome }} </h3>
</div>
<div class="row justify-content-center titulo-menu">
<h4>Edital Selecionado: {{ $evento->nome }} </h4>
</div>
<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.selecionar', ['evento_id' => $evento->id])}}" 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">Selecionar Avaliadores</h2>
</div>
<div class="card text-center card-menu">
<div class="card-body d-flex justify-content-center">
<div class="container">
<div class="row titulo-card-menu">
<div class="col-md-12">
<h2 style="padding-top:15px">Selecionar avaliadores</h2>
</div>
</div>
@php
$avaliadores = \App\Avaliador::count();
@endphp
<div class="row">
<div class="col-md-12">
<h5>Nº total de avaliadores:</h5>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h1 class="quant-titulo-card">{{$avaliadores}}</h1>
</div>
</div>
</div>
</div>
</div>
</a>
</div>
<div class="col-sm-3 d-flex justify-content-center">
<a href="{{ route('admin.projetos', ['evento_id' => $evento->id]) }}" 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">Selecionar Projetos</h2>
</div>
<div class="card text-center card-menu">
<div class="card-body d-flex justify-content-center">
<div class="container">
<div class="row titulo-card-menu">
<div class="col-md-12">
<h2 style="padding-top:15px">Selecionar projetos</h2>
</div>
</div>
@php
$projetos = \App\Trabalho::count();
@endphp
<div class="row">
<div class="col-md-12">
<h5>Nº total de projetos:</h5>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h1 class="quant-titulo-card">{{$projetos}}</h1>
</div>
</div>
</div>
</div>
</div>
</a>
</div>
<div class="col-sm-3 d-flex justify-content-center">
{{-- <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">
......@@ -42,7 +74,7 @@
</div>
</div>
</a>
</div>
</div> --}}
</div>
......
resources/views/administrador/editais.blade.php
View file @ c6fe4274
......@@ -6,11 +6,25 @@
<div class="container" >
<div class="row" >
<div class="col-sm-10">
<h3>Meus Editais</h3>
<div class="col-sm-4">
<div class="row">
<div class="col-sm-2">
<button class="btn" onclick="buscarEdital(this.parentElement.parentElement.children[1].children[0])">
<img src="{{asset('img/icons/logo_lupa.png')}}" alt="">
</button>
</div>
<div class="col-sm-10">
<input type="text" class="form-control form-control-edit" placeholder="Digite o nome do edital" onkeyup="buscarEdital(this)">
</div>
</div>
</div>
<div class="col-sm-1">
</div>
<div class="col-sm-5" style="float: center;">
<h4 class="titulo-table">Editais</h4>
</div>
<div class="col-sm-2">
<a href="{{route('evento.criar')}}" class="btn btn-primary" style="float: right;">Criar Edital</a>
<a href="{{route('evento.criar')}}" class="btn btn-info" style="float: right;">Criar Edital</a>
</div>
</div>
<hr>
......@@ -22,7 +36,7 @@
<th scope="col">Opção</th>
</tr>
</thead>
<tbody>
<tbody id="eventos">
@foreach ($eventos as $evento)
<tr>
<td>
......@@ -35,29 +49,29 @@
@if(auth()->user()->id == $evento->criador_id)
<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">
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
<a href="{{ route('evento.editar', ['id' => $evento->id]) }}" class="dropdown-item text-center">
Editar Edital
Editar Edital
</a>
<hr class="dropdown-hr">
<a href="{{route('admin.atribuir', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Atribuir Avaliadores
</a>
<hr class="dropdown-hr">
<a href="{{route('admin.pareceres', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Visualizar Pareceres
</a>
<hr class="dropdown-hr">
<a href="{{route('admin.analisar', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Analisar projetos
</a>
<hr class="dropdown-hr">
<!-- Button trigger modal -->
<button type="button" class="dropdown-item text-center" data-toggle="modal" data-target="#exampleModal{{ $evento->id }}">
Deletar
</button>
<button type="button" class="dropdown-item dropdown-item-delete text-center" data-toggle="modal" data-target="#exampleModal{{ $evento->id }}">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
</button>
</div>
......@@ -104,6 +118,22 @@
@section('javascript')
<script>
function buscarEdital(input) {
var editais = document.getElementById('eventos').children;
if(input.value.length > 2) {
for(var i = 0; i < editais.length; i++) {
var nomeEvento = editais[i].children[0].children[0].textContent;
if(nomeEvento.substr(0).indexOf(input.value) >= 0) {
editais[i].style.display = "";
} else {
editais[i].style.display = "none";
}
}
} else {
for(var i = 0; i < editais.length; i++) {
editais[i].style.display = "";
}
}
}
</script>
@endsection
resources/views/administrador/index.blade.php
View file @ c6fe4274
......@@ -4,46 +4,137 @@
<div class="container">
<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Administrador</h2>
<div class="row justify-content-center titulo-menu">
<h4>Página Principal - Administrador</h4>
</div>
<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 class="card text-center card-menu">
<div class="card-body d-flex justify-content-center">
<div class="container">
<div class="row titulo-card-menu">
<div class="col-md-12">
<h2 style="padding-top:15px">Editais</h2>
</div>
</div>
@php
$eventos = \App\Evento::all();
$quantAberta = 0;
$quantEncerrada = 0;
$hoje = today();
foreach ($eventos as $evento) {
if ($evento->fimSubmissao >= $hoje) {
$quantAberta++;
} else {
$quantEncerrada++;
}
}
@endphp
<div class="info-card">
<div class="row" style="text-align: left;">
<div class="col-md-12">
Total: {{$quantAberta + $quantEncerrada}}
</div>
</div>
<div class="row" style="text-align: left;">
<div class="col-md-12">
Aberto: {{$quantAberta}}
</div>
</div>
<div class="row" style="text-align: left;">
<div class="col-md-12">
Encerrado: {{$quantEncerrada}}
</div>
</div>
</div>
</div>
</div>
</div>
</a>
</div>
<div class="col-sm-3 d-flex justify-content-center">
<a href="{{ route('admin.naturezas') }}" 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">Natureza</h2>
</div>
<div class="card text-center card-menu">
<div class="container">
<div class="row titulo-card-menu">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Natureza</h2>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h6>Nº total de naturezas:</h6>
</div>
</div>
@php
$naturezas = \App\Natureza::count();
@endphp
<div class="row">
<div class="col-md-12">
<h1 class="quant-titulo-card">{{$naturezas}}</h1>
</div>
</div>
</div>
</div>
</a>
</div>
<div class="col-sm-3 d-flex justify-content-center">
<a href="{{ route('grandearea.index') }}" 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">Áreas</h2>
</div>
<div class="card text-center card-menu">
<div class="container">
<div class="row titulo-card-menu">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Áreas</h2>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h6>Nº total de áreas:</h6>
</div>
</div>
@php
$grandeAreas = \App\GrandeArea::count();
$areas = \App\Area::count();
$grandeAreas = \App\SubArea::count();
@endphp
<div class="row">
<div class="col-md-12">
<h1 class="quant-titulo-card">{{$grandeAreas + $areas + $grandeAreas}}</h1>
</div>
</div>
</div>
</div>
</a>
</div>
<div class="col-sm-3 d-flex justify-content-center">
<a href="{{ route('admin.usuarios') }}" 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">Usuários</h2>
</div>
<div class="card text-center card-menu">
<div class="container">
<div class="row titulo-card-menu">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Usuários</h2>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h6>Nº total de usuários:</h6>
</div>
</div>
@php
$usuarios = \App\User::count();
@endphp
<div class="row">
<div class="col-md-12">
<h1 class="quant-titulo-card">{{$usuarios}}</h1>
</div>
</div>
</div>
</div>
</a>
</div>
......
resources/views/administrador/selecionarAvaliadores.blade.php
View file @ c6fe4274
......@@ -2,30 +2,41 @@
@section('content')
<div class="container" style="margin-top: 100px;">
<div class="container" style="margin-top: 30px;">
<div class="container" >
<div class="row justify-content-center d-flex align-items-center" >
<div class="col-md-9">
<h3>Avaliadores </h3>
</div>
<div class="row justify-content-center d-flex align-items-center" style="margin-bottom: 50px;">
<div class="col-md-1">
<a href="{{ route('admin.atribuir', ['evento_id' => $evento->id]) }}" class="btn btn-primary">
<a href="{{ route('admin.atribuir', ['evento_id' => $evento->id]) }}" class="btn btn-secondary">
Voltar
</a>
</div>
<div class="col-md-9" style="text-align: center;">
<h3 class="titulo-table">Avaliadores</h3>
</div>
<div class="col-md-2">
<!-- Button trigger modal -->
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalCenter">
<button type="button" class="btn btn-info" data-toggle="modal" data-target="#exampleModalCenter">
Enviar Convite
</button>
</div>
</div>
<div class="row">
<div class="col-md-8">
<div class="row">
<div class="col-sm-1">
<button class="btn" onclick="buscar(this.parentElement.parentElement.children[1].children[0])">
<img src="{{asset('img/icons/logo_lupa.png')}}" alt="">
</button>
</div>
<div class="col-sm-6">
<input type="text" class="form-control form-control-edit" placeholder="Digite o e-mail do avaliador" onkeyup="buscar(this)">
</div>
</div>
</div>
</div>
</div>
<hr>
<table class="table table-bordered">
<thead>
......@@ -36,7 +47,7 @@
<th scope="col" style="text-align:center">Ação</th>
</tr>
</thead>
<tbody>
<tbody id="avaliadores">
@foreach ($avaliadores as $avaliador)
<tr>
<td>{{ $avaliador->user->name }}</td>
......@@ -62,11 +73,9 @@
</tbody>
</table>
<div class="container" >
<div class="row justify-content-center d-flex align-items-center" >
<h4>Avaliadores Selecionados para o Edital: {{ $evento->nome }} </h4>
<div class="container" style="margin-top: 50px;">
<div class="row justify-content-center" >
<h4 class="titulo-table">Avaliadores Selecionados para o Edital: <span style="color: black;">{{ $evento->nome }}</span> </h4>
</div>
</div>
<hr>
......@@ -84,22 +93,21 @@
<tr>
<td>{{ $avaliador->user->name }}</td>
<td>{{ $avaliador->user->email }}</td>
<td>
@if($avaliador->eventos->where('id', $evento->id)->first()->pivot->convite == true)
Aceito
@elseif(is_null($avaliador->eventos->where('id', $evento->id)->first()->pivot->convite))
Pendente
@else
Recusado
@endif
</td>
@if($avaliador->eventos->where('id', $evento->id)->first()->pivot->convite == true)
<td style="color: rgb(3, 189, 3);">Aceito</td>
@elseif(is_null($avaliador->eventos->where('id', $evento->id)->first()->pivot->convite))
<td>A confirmar</td>
@else
<td style="color: red;">Recusado</td>
@endif
<td style="text-align:center">
<form action="{{ route('admin.remover') }}" method="POST">
@csrf
<input type="hidden" name="avaliador_id" value="{{ $avaliador->id }}" >
<input type="hidden" name="evento_id" value="{{ $evento->id }}" >
<button type="submit" class="btn btn-primary" @if($avaliador->trabalhos->where('evento_id', $evento->id)->count() != 0) disabled="disabled" @endif >Remover</button>
<button type="submit" class="btn btn-danger" @if($avaliador->trabalhos->where('evento_id', $evento->id)->count() != 0) disabled="disabled" @endif >Remover</button>
</form>
</td>
</tr>
......@@ -114,36 +122,39 @@
<!-- Modal -->
<div class="modal fade" id="exampleModalCenter" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">Enviar Convite</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<div class="modal-content modal-submeta">
<div class="modal-header modal-header-submeta">
<h5 class="modal-title titulo-table" id="exampleModalLongTitle" style="font-size: 20px;">Enviar Convite</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color: rgb(182, 182, 182)">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="modal-body" style="margin-left: 20px; margin-right: 20px;">
<form action="{{ route('admin.enviarConvite') }}" method="POST">
<form action="{{ route('admin.enviarConvite') }}" method="POST" class="labels-blue">
@csrf
<input type="hidden" name="evento_id" value="{{ $evento->id }}" >
<div class="form-group">
<label for="exampleInputEmail1">Nome Completo</label>
<label for="exampleInputEmail1">Nome Completo <span style="color: red;">*</span></label>
<input type="text" class="form-control" name="nomeAvaliador" id="exampleInputNome1">
</div>
<div class="form-group">
<label for="exampleInputEmail1">Email</label>
<label for="exampleInputEmail1">Email <span style="color: red;">*</span></label>
<input type="email" class="form-control" name="emailAvaliador" id="exampleInputEmail1">
</div>
<div class="form-group">
<label for="exampleFormControlSelect1">Tipo</label>
<select class="form-control" name="tipo" id="exampleFormControlSelect1">
<select class="form-control" name="tipo" id="exampleFormControlSelect1" disabled>
<option value="avaliador" >Avaliador</option>
</select>
</div>
<div class="mx-auto" >
<button type="submit" class="btn btn-success mx-auto">Enviar</button>
</div>
<div class="form-group" style="margin-top: 40px; margin-bottom: 40px;">
<button type="submit" class="btn btn-info" style="width: 100%">Enviar</button>
</div>
<div class="form-group texto-info">
O convite será enviador por e-mail e o preenchimento dos dados será de inteira responsabilidade do usuário convidado.
</div>
</form>
</div>
......@@ -157,6 +168,24 @@
<script>
$('#myModal').on('shown.bs.modal', function () {
$('#myInput').trigger('focus')
})
});
function buscar(input) {
var editais = document.getElementById('avaliadores').children;
if(input.value.length > 2) {
for(var i = 0; i < editais.length; i++) {
var nomeEvento = editais[i].children[1].textContent;
if(nomeEvento.substr(0).indexOf(input.value) >= 0) {
editais[i].style.display = "";
} else {
editais[i].style.display = "none";
}
}
} else {
for(var i = 0; i < editais.length; i++) {
editais[i].style.display = "";
}
}
}
</script>
@endsection
resources/views/administrador/selecionarProjetos.blade.php
View file @ c6fe4274
......@@ -2,27 +2,41 @@
@section('content')
<div class="container" style="margin-top: 100px;">
<div class="container" style="margin-top: 30px;">
<div class="container" >
<div class="row justify-content-center d-flex align-items-center" >
{{-- <div class="col-md-12"> --}}
<h3>Lista de Projetos do Edital: {{ $evento->nome }} </h3>
{{-- </div> --}}
<div class="row justify-content-center" style="margin-bottom: 50px;">
<div class="col-md-1">
<a href="{{ route('admin.atribuir', ['evento_id' => $evento->id]) }}" class="btn btn-secondary">
Voltar
</a>
</div>
<div class="col-md-10" style="text-align: center;">
<h3 class="titulo-table">Lista de Projetos do Edital: <span style="color: black;">{{ $evento->nome }}</span> </h3>
</div>
<div class="col-md-1">
<!-- Button trigger modal -->
{{-- <button type="button" class="btn btn-info" data-toggle="modal" data-target="#exampleModalCenter">
Enviar Convite
</button> --}}
</div>
</div>
<div class="row justify-content-center d-flex align-items-center" >
{{-- <div class="col-md-12"> --}}
<h5>Total: </h5>
{{-- </div> --}}
<div class="row">
<div class="col-md-8">
<div class="row">
<div class="col-sm-1">
<button class="btn" onclick="buscar(this.parentElement.parentElement.children[1].children[0])">
<img src="{{asset('img/icons/logo_lupa.png')}}" alt="">
</button>
</div>
<div class="col-sm-6">
<input type="text" class="form-control form-control-edit" placeholder="Digite o nome do projeto" onkeyup="buscar(this)">
</div>
</div>
</div>
</div>
</div>
<a href="{{ route('admin.atribuir', ['evento_id' => $evento->id]) }}" class="btn btn-primary">
Voltar
</a>
<hr>
<table class="table table-bordered">
<thead>
......@@ -33,7 +47,7 @@
<th scope="col" style="text-align:center">Ação</th>
</tr>
</thead>
<tbody>
<tbody id="projetos">
@foreach ($trabalhos as $trabalho)
<tr>
<td>{{ $trabalho->titulo}}</td>
......@@ -85,10 +99,10 @@
</tbody>
</table>
<div class="container" >
<div class="container" style="margin-top: 50px;">
<div class="row justify-content-center d-flex align-items-center" >
<h3>Status dos Projetos em Avaliação: {{ $evento->nome }} </h3>
<h3 class="titulo-table">Status dos Projetos em Avaliação do edital: <span style="color: black;">{{ $evento->nome }}</span> </h3>
</div>
</div>
......@@ -134,7 +148,24 @@
<script>
$('#myModal').on('shown.bs.modal', function () {
$('#myInput').trigger('focus')
})
});
function buscar(input) {
var editais = document.getElementById('projetos').children;
if(input.value.length > 2) {
for(var i = 0; i < editais.length; i++) {
var nomeEvento = editais[i].children[0].textContent;
if(nomeEvento.substr(0).indexOf(input.value) >= 0) {
editais[i].style.display = "";
} else {
editais[i].style.display = "none";
}
}
} else {
for(var i = 0; i < editais.length; i++) {
editais[i].style.display = "";
}
}
}
</script>
@endsection
resources/views/administrador/usersAdmin.blade.php
View file @ c6fe4274
......@@ -2,26 +2,31 @@
@section('content')
<div class="container" style="margin-top: 100px;">
<div class="container" style="margin-top: 30px;">
<div class="container" >
<div class="row" >
<div class="col-sm-10">
<h3>Usuários</h3>
</div>
<div class="col-sm-2">
<a href="{{route('admin.user.create')}}" class="btn btn-primary" style="float: right;">{{ __('Criar usuário') }}</a>
</div>
</div>
<div class="row">
@if(session('mensagem'))
<div class="col-md-12" style="margin-top: 100px;">
<div class="col-md-12" style="margin-top: 30px;">
<div class="alert alert-success">
<p>{{session('mensagem')}}</p>
</div>
</div>
@endif
</div>
<div class="row" >
<div class="col-sm-1">
<a href="{{ route('admin.index') }}" class="btn btn-secondary">
Voltar
</a>
</div>
<div class="col-sm-9" style="text-align: center;">
<h3 class="titulo-table">Usuários</h3>
</div>
<div class="col-sm-2">
<a href="{{route('admin.user.create')}}" class="btn btn-info" style="float: right;">{{ __('Criar usuário') }}</a>
</div>
</div>
</div>
<hr>
<table class="table table-bordered">
......@@ -49,14 +54,14 @@
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
<a href="{{route('admin.user.edit', $user->id)}}" class="dropdown-item">
<img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
<a href="{{route('admin.user.edit', $user->id)}}" class="dropdown-item text-center">
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{route('admin.user.destroy', $user->id)}}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item">
<img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
<button type="submit" class="dropdown-item dropdown-item-delete text-center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
Deletar
</button>
......@@ -79,14 +84,14 @@
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
<a href="{{route('admin.user.edit', $user->id)}}" class="dropdown-item">
<img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
<a href="{{route('admin.user.edit', $user->id)}}" class="dropdown-item text-center">
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{route('admin.user.destroy', $user->id)}}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item">
<img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
<button type="submit" class="dropdown-item dropdown-item-delete text-center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
Deletar
</button>
......
resources/views/administradorResponsavel/editais.blade.php
View file @ c6fe4274
......@@ -10,7 +10,7 @@
<h3>Meus Editais</h3>
</div>
<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-info">Criar Edital</a>
</div>
</div>
</div>
......
resources/views/avaliador/editais.blade.php
View file @ c6fe4274
......@@ -23,45 +23,43 @@
</thead>
<tbody>
@foreach ($eventos as $evento)
<tr>
<td>
{{ $evento->nome }}
</td>
<td>{{ date('d/m/Y', strtotime($evento->inicioRevisao)) }}</td>
<td>{{ date('d/m/Y', strtotime($evento->fimRevisao)) }}</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">
@if(!is_null(Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite) && Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite == true )
<a href="{{ route('avaliador.visualizarTrabalho', ['evento_id' => $evento->id]) }}" class="dropdown-item">
<img src="{{asset('img/icons/eye-regular.svg')}}" class="icon-card" alt="">
Projetos para avaliar
</a>
@elseif(!is_null(Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite) && Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite == false)
<button disabled="disabled" class="dropdown-item">
Convite recusado
</button>
@elseif(is_null(Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite) )
<a href="{{ route('avaliador.conviteResposta', ['evento_id' => $evento->id, 'resposta'=>true]) }}" class="dropdown-item">
<img src="{{asset('img/icons/confirm.png')}}" class="icon-card" alt="" style="width: 20px; height: auto">
Aceitar Convite
</a>
<a href="{{ route('avaliador.conviteResposta', ['evento_id' => $evento->id, 'resposta'=>false]) }}" class="dropdown-item">
<img src="{{asset('img/icons/recuse.png')}}" class="icon-card" alt="" style="width: 20px; height: auto">
Recusar Convite
</a>
@endif
</div>
</div>
</td>
</tr>
@if($evento->pivot->convite !== false)
<tr>
<td>
{{ $evento->nome }}
</td>
<td>{{ date('d/m/Y', strtotime($evento->inicioRevisao)) }}</td>
<td>{{ date('d/m/Y', strtotime($evento->fimRevisao)) }}</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">
@if(!is_null(Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite) && Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite == true )
<a href="{{ route('avaliador.visualizarTrabalho', ['evento_id' => $evento->id]) }}" class="dropdown-item">
<img src="{{asset('img/icons/eye-regular.svg')}}" class="icon-card" alt="">
Projetos para avaliar
</a>
@elseif(!is_null(Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite) && Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite == false)
<button disabled="disabled" class="dropdown-item">
Convite recusado
</button>
@elseif(is_null(Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite) )
<a href="{{ route('avaliador.conviteResposta', ['evento_id' => $evento->id, 'resposta'=>true]) }}" class="dropdown-item">
<img src="{{asset('img/icons/confirm.png')}}" class="icon-card" alt="" style="width: 20px; height: auto">
Aceitar Convite
</a>
<a href="{{ route('avaliador.conviteResposta', ['evento_id' => $evento->id, 'resposta'=>false]) }}" class="dropdown-item">
<img src="{{asset('img/icons/recuse.png')}}" class="icon-card" alt="" style="width: 20px; height: auto">
Recusar Convite
</a>
@endif
</div>
</div>
</td>
</tr>
@endif
@endforeach
</tbody>
</table>
......
resources/views/avaliador/index.blade.php
View file @ c6fe4274
......@@ -4,16 +4,56 @@
<div class="container">
<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Avaliador</h2>
<div class="row justify-content-center titulo-menu">
<h4>Página Principal - Avaliador</h4>
</div>
<div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-4 d-flex justify-content-center ">
<a href="{{ route('avaliador.editais') }}" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 30px; width: 18rem;">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Editais</h2>
</div>
<div class="card text-center card-menu">
<div class="card-body d-flex justify-content-center">
<div class="container">
<div class="row titulo-card-menu">
<div class="col-md-12">
<h2 style="padding-top:15px">Editais</h2>
</div>
</div>
@php
$eventos = auth()->user()->avaliadors->eventos;
$quantAberta = 0;
$quantEncerrada = 0;
$hoje = today();
foreach ($eventos as $evento) {
if ($evento->pivot->convite === null || $evento->pivot->convite) {
if ($evento->fimSubmissao >= $hoje) {
$quantAberta++;
} else {
$quantEncerrada++;
}
}
}
@endphp
<div class="info-card">
<div class="row" style="text-align: left;">
<div class="col-md-12">
Total: {{$quantAberta + $quantEncerrada}}
</div>
</div>
<div class="row" style="text-align: left;">
<div class="col-md-12">
Aberto: {{$quantAberta}}
</div>
</div>
<div class="row" style="text-align: left;">
<div class="col-md-12">
Encerrado: {{$quantEncerrada}}
</div>
</div>
</div>
</div>
</div>
</div>
</a>
</div>
......
resources/views/evento/submeterTrabalho.blade.php
View file @ c6fe4274
......@@ -584,22 +584,28 @@
<hr>
</p>
<div class="row justify-content-center">
<div class="col-md-6">
{{-- <div class="col-md-6">
<button type="submit" formaction="{{route('trabalho.storeParcial')}}" class="btn btn-primary" style="width:100%;margin-bottom:10px">
{{ __('Salvar como Rascunho') }}
</button>
</div>
<div class="col-md-6">
</div> --}}
<div class="col-md-12">
<button type="submit" class="btn btn-success" style="width:100%">
{{ __('Enviar Projeto') }}
</button>
</div>
</div>
<br>
<div class="row justify-content-center">
<div class="col-sm-12">
@if (Auth()->user()->administradors != null)
<a href="{{ route('admin.editais') }}" class="btn btn-secondary" style="width:100%">Cancelar</a>
@else
<a href="{{ route('proponente.projetosEdital', ['id' => $edital->id]) }}" class="btn btn-secondary" style="width:100%">Cancelar</a>
@endif
</div>
</div>
@if (Auth()->user()->administradors != null)
<a href="{{ route('admin.editais') }}" class="btn btn-secondary" style="width:100%">Cancelar</a>
@else
<a href="{{ route('proponente.projetosEdital', ['id' => $edital->id]) }}" class="btn btn-secondary" style="width:100%">Cancelar</a>
@endif
</form>
</div>
</div>
......
resources/views/naturezas/area/detalhes.blade.php
View file @ c6fe4274
......@@ -5,59 +5,69 @@
<div class="container" >
<div class="row" >
@if(session('mensagem'))
<div class="col-md-12" style="margin-top: 100px;">
<div class="col-md-12" style="margin-top: 30px;">
<div class="alert alert-success">
<p>{{session('mensagem')}}</p>
</div>
</div>
@endif
<div class="col-sm-9">
<h2 style="margin-top: 100px; ">{{ __('Subáreas de ') . $area->nome }}</h2>
</div>
<div class="col-sm-3">
<a href="{{ route('subarea.criar', ['id' => $area->id]) }}" class="btn btn-primary" style="position:relative;top:100px; float: right;">{{ __('Criar subárea') }}</a>
</div>
</div>
<div class="row" style="margin-top: 30px;">
<div class="col-sm-1">
<a href="{{ route('grandearea.show', ['id' => $area->grandeArea->id]) }}" class="btn btn-secondary">
Voltar
</a>
</div>
<div class="col-sm-9" style="text-align: center;">
<h2 class="titulo-table">{{ __('Subáreas de ') . $area->nome }}</h2>
</div>
<div class="col-sm-2">
<a href="{{ route('subarea.criar', ['id' => $area->id]) }}" class="btn btn-info" style="float: right;">{{ __('Criar subárea') }}</a>
</div>
</div>
<hr>
<table class="table table-bordered">
<thead>
<tr>
<th scope="col">Nome</th>
<th scope="col">Opção</th>
</tr>
</thead>
<tbody>
@foreach ($subAreas as $subArea)
<tr>
<td>
{{ $subArea->nome }}
</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('subarea.editar', ['id' => $subArea->id]) }}" class="dropdown-item">
<img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
Editar
</a>
<form method="POST" action="{{ route('subarea.deletar', ['id' => $subArea->id]) }}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item">
<img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
Deletar
</button>
</form>
</div>
</div>
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="row" style="margin-bottom: 200px;">
<div class="col-md-12">
<table class="table table-bordered">
<thead>
<tr>
<th scope="col">Nome</th>
<th scope="col">Opção</th>
</tr>
</thead>
<tbody>
@foreach ($subAreas as $subArea)
<tr>
<td>
{{ $subArea->nome }}
</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('subarea.editar', ['id' => $subArea->id]) }}" class="dropdown-item text-center">
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{ route('subarea.deletar', ['id' => $subArea->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>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
@endsection
\ No newline at end of file
resources/views/naturezas/area/editar_area.blade.php
View file @ c6fe4274
......@@ -2,17 +2,17 @@
@section('content')
<div class="container" >
<div class="container" style="margin-top: 50px; ">
<div class="row" >
<div class="col-sm-12">
<h2 style="margin-top: 100px; ">{{ __('Editar uma área') }}</h2>
<h2 style="color: rgb(0, 140, 255);">{{ __('Editar uma área') }}</h2>
</div>
</div>
<div class="row">
<form method="POST" action="{{ route('area.atualizar', ['id' => $area->id])}}">
@csrf
<div class="col-sm-12">
<label for="nome" class="col-form-label">{{ __('Nome') }}</label>
<label for="nome" class="col-form-label" style="color: rgb(0, 140, 255);">{{ __('Nome') }}<span style="color: red;"> *</span></label>
<input id="nome" type="text" class="form-control @error('nome') is-invalid @enderror" name="nome" value="{{ $area->nome }}" required autocomplete="nome" autofocus>
@error('nome')
......@@ -21,7 +21,7 @@
</span>
@enderror
<button type="submit" class="btn btn-primary" style="position:relative;top:10px;">{{ __('Salvar') }}</button>
<button type="submit" class="btn btn-info" style="position:relative;top:10px;">{{ __('Salvar') }}</button>
</div>
</form>
</div>
......
resources/views/naturezas/area/index.blade.php
View file @ c6fe4274
......@@ -33,18 +33,20 @@
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
<a href="{{ route('area.show', ['id' => $area->id ]) }}" class="dropdown-item">
<a href="{{ route('area.show', ['id' => $area->id ]) }}" class="dropdown-item text-center">
<img src="{{asset('img/icons/eye-regular.svg')}}" class="icon-card" alt="">
Detalhes
</a>
<a href="{{ route('area.editar', ['id' => $area->id]) }}" class="dropdown-item">
<hr class="dropdown-hr">
<a href="{{ route('area.editar', ['id' => $area->id]) }}" class="dropdown-item text-center">
<img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{ route('area.deletar', ['id' => $area->id]) }}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item">
<img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
<button type="submit" class="dropdown-item dropdown-item-delete text-center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
Deletar
</button>
......
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