Skip to content

GitLab

"git@sites.upe.br:walter.felipe/submeta.git" did not exist on "bdb5d65437c8c0d5d239543a7dbac9301a8d0315"
Unverified Commit 7328ccbc authored by carlos1270's avatar carlos1270 Committed by GitHub
Browse files

Merge pull request #90 from lmts-ufape/modificacoes_layout_6 

Modificacoes layout 6
parents fe2905dd 45a10d53
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/ProponenteController.php
View file @ 7328ccbc
...@@ -82,15 +82,26 @@ class ProponenteController extends Controller ...@@ -82,15 +82,26 @@ class ProponenteController extends Controller
} }
public function projetosDoProponente() { public function projetosDoProponente(Request $request) {
if($request->buscar == null){
$proponente = Proponente::where('user_id', Auth()->user()->id)->first(); $proponente = Proponente::where('user_id', Auth()->user()->id)->first();
$projetos = Trabalho::where('proponente_id', $proponente->id)->get(); $projetos = Trabalho::where('proponente_id', $proponente->id)->get();
$hoje = Carbon::today('America/Recife'); $hoje = Carbon::today('America/Recife');
$hoje = $hoje->toDateString(); $hoje = $hoje->toDateString();
return view('proponente.projetos')->with(['projetos' => $projetos, 'hoje'=>$hoje, 'busca'=>$request->buscar, 'flag'=>'false']);
}else{
$proponente = Proponente::where('user_id', Auth()->user()->id)->first();
$projetos = Trabalho::where('proponente_id','=',$proponente->id)->where('titulo','ilike','%'.$request->buscar.'%')->get();
$hoje = Carbon::today('America/Recife');
$hoje = $hoje->toDateString();
return view('proponente.projetos')->with(['projetos' => $projetos, 'hoje'=>$hoje, 'busca'=>$request->buscar, 'flag'=>'true']);
}
return view('proponente.projetos')->with(['projetos' => $projetos, 'hoje'=>$hoje]);
} }
public function projetosEdital($id) { public function projetosEdital($id) {
$edital = Evento::find($id); $edital = Evento::find($id);
......
resources/views/proponente/projetos.blade.php
View file @ 7328ccbc
@extends('layouts.app') @extends('layouts.app')
@section('content') @section('content')
<div class="container" style="margin-top: 100px;">
{{-- @if(isset($mensagem)) <div class="container">
@if(isset($mensagem))
<div class="col-sm-12"> <div class="col-sm-12">
<br> <br>
<div class="alert alert-success"> <div class="alert alert-success">
<p>{{ $mensagem }}</p> <p>{{ $mensagem }}</p>
</div> </div>
</div> </div>
@endif --}} @endif
@if(session('mensagem'))
<div class="container" > <div class="col-sm-12">
<div class="row" > <br>
<div class="col-sm-1"> <div class="alert alert-success">
<a href="{{ route('proponente.index') }}" class="btn btn-secondary" style="position:relative; float: right;">Voltar</a> <p>{{session('mensagem')}}</p>
</div>
<div class="col-sm-7" style="text-align: center">
<div class="row">
<div class="col-md-4">
</div>
<div class="col-md-8">
<h4 class="titulo-table">Meus Projetos</h4>
</div>
</div>
</div> </div>
<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>
<div class="col-sm-10"> @endif
<input type="text" class="form-control form-control-edit" placeholder="Digite o nome do edital" onkeyup="buscarEdital(this)"> <div class="row justify-content-center" style="margin-top: 3rem;">
<div class="col-md-11" style="margin-bottom: -3rem">
<div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
<div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
<div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:-1rem">
<div class="bottomVoltar" style="margin-top: -20px">
<a href="{{ route('proponente.index') }}" class="btn btn-secondary" style=""><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
</div>
<div class="form-group">
@if($flag == 'false')
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Minhas propostas</h5>
@else
<div class="form-group" style="margin-bottom: 1px">
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Minhas propostas</h5>
<h5 class="card-title mb-0" style="font-size:15px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Resultado da busca por: <span style="font-style: italic; font-weight:bold">{{$busca}}</span></h5>
</div> </div>
@endif
</div> </div>
<div style="margin-top: -2rem">
<div class="form-group">
<div style="margin-top:30px;">
<form action="{{route('proponente.projetos')}}" method="get">
@csrf
<div class="btn-group">
<input type="text" class="form-control" name="buscar" placeholder="Digite o nome do edital" value="{{$busca}}" style="margin-right: 5px;border-radius:8px; border-color:#dcdcdc;">
<button type="submit" class="btn btn-light shadow-sm" style="border-radius: 8px; margin-right:3px"><img src="{{asset('img/icons/logo_lupa.png')}}" alt="" width="20px"></button>
</div> </div>
</form>
</div> </div>
</div> </div>
@if(session('mensagem'))
<div class="row">
<div class="col-sm-12">
<br>
<div class="alert alert-success">
<p>{{session('mensagem')}}</p>
</div> </div>
</div> </div>
</div> </div>
@endif
<hr> <div class="card-body" >
<div class="row"> @if(count($projetos)>0)
<div class="col-md-12"> <table class="table table-bordered table-hover" style="display: block; overflow-x: auto; white-space: nowrap; border-radius:10px; margin-bottom:0px">
<table class="table table-bordered">
<thead> <thead>
<tr> <tr>
<th scope="col">Projeto</th> <th scope="col">Edital</th>
<th scope="col">Status</th> <th scope="col" style="width:100%">Projeto</th>
<th scope="col">Data de Criação</th> <th scope="col" style="text-align: center">Data de Criação</th>
<th scope="col" style="text-align: center">Status</th>
<th scope="col">Opção</th> <th scope="col">Opção</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody id="projetos">
@foreach ($projetos as $projeto) @foreach ($projetos as $projeto)
@if ($projeto->proponente_id === Auth()->user()->proponentes->id)
<tr> <tr>
<td>
{{ $projeto->evento->nome }}
</td>
<td> <td>
{{ $projeto->titulo }} {{ $projeto->titulo }}
</td> </td>
<td style="text-align: center">{{ date('d-m-Y', strtotime($projeto->updated_at)) }}</td>
@if($projeto->status == 'Avaliado') @if($projeto->status == 'Avaliado')
<td style="color: rgb(6, 85, 6)">Avaliado</td> <td style="color: rgb(6, 85, 6); text-align: center">Avaliado</td>
@elseif($projeto->status == 'Submetido') @elseif($projeto->status == 'Submetido' || $projeto->status == 'submetido')
<td style="color: rgb(0, 0, 0)">Submetido</td> <td style="color: rgb(0, 0, 0); text-align: center">Submetido</td>
@elseif($projeto->status == 'Rascunho') @elseif($projeto->status == 'Rascunho')
<td style="color: rgb(0, 0, 0)">Rascunho</td> <td style="color: rgb(0, 0, 0); text-align: center">Rascunho</td>
@endif @endif
<td>{{ date('d/m/Y', strtotime($projeto->updated_at)) }}</td>
<td> <td>
<div class="btn-group dropright dropdown-options"> <div class="dropright dropdown-options" style="width: 100%; text-align:center; float:none">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a id="options" class="dropdown-toggle btn btn-light" 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> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
...@@ -93,31 +99,28 @@ ...@@ -93,31 +99,28 @@
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center"> <a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar Visualizar
</a> </a>
<hr class="dropdown-hr">
{{-- <a href="" class="dropdown-item" style="text-align: center"> {{-- <a href="" class="dropdown-item" style="text-align: center">
Recorrer Recorrer
</a> </a>
<a href="" class="dropdown-item" style="text-align: center"> <a href="" class="dropdown-item" style="text-align: center">
Resultado Resultado
</a> --}} </a> --}}
@if($projeto->status == 'Submetido')
<hr class="dropdown-hr">
<!-- Button trigger modal --> <!-- Button trigger modal -->
<button type="button" class="dropdown-item dropdown-item-delete" style="text-align: center" data-toggle="modal" data-target="#modal{{$projeto->id}}"> <button type="button" class="dropdown-item dropdown-item-delete" data-toggle="modal" data-target="#modal{{$projeto->id}}" style="text-align: center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar <img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
</button> </button>
@endif
</div> </div>
</div> </div>
</td> </td>
</tr> </tr>
@endif
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="modal{{$projeto->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="modal{{$projeto->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Deletar o projeto: {{ $projeto->titulo }}</h5> <h5 class="modal-title" id="exampleModalLabel">Deletar projeto</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
...@@ -127,7 +130,7 @@ ...@@ -127,7 +130,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<a href="{{ route('trabalho.destroy', ['id' => $projeto->id]) }}" class="btn btn-primary"> <a href="{{ route('trabalho.destroy', ['id' => $projeto->id]) }}" class="btn btn-primary" style="text-align: center">
Deletar Deletar
</a> </a>
</div> </div>
...@@ -137,6 +140,33 @@ ...@@ -137,6 +140,33 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
@else
@if($flag == "true")
<div class="form-row justify-content-center" style="margin-top: 5rem; margin-bottom:9rem;">
<div class="col-md-12" style="text-align: center; margin-bottom:20px">
<img src="{{asset('img/icons/logo_projeto.png')}}" style="width:200px">
</div>
<div class="col-md-12" style="text-align: center; color:#909090">
<h5>Nenhuma proposta encontrada!</h5>
</div>
<div class="col-md-12" style="text-align: center;">
</div>
</div>
@else
<div class="form-row justify-content-center" style="margin-top: 5rem; margin-bottom:9rem;">
<div class="col-md-12" style="text-align: center; margin-bottom:20px">
<img src="{{asset('img/icons/logo_projeto.png')}}" style="width:200px">
</div>
<div class="col-md-12" style="text-align: center; color:#909090">
<h5>Nenhuma proposta submetida!</h5>
</div>
<div class="col-md-12" style="text-align: center;">
</div>
</div>
@endif
@endif
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
resources/views/proponente/projetosEdital.blade.php
View file @ 7328ccbc
...@@ -19,36 +19,32 @@ ...@@ -19,36 +19,32 @@
</div> </div>
</div> </div>
@endif @endif
<div class="row justify-content-center" style="margin-top: 2rem;"> <div class="row justify-content-center" style="margin-top: 3rem;">
<div class="col-md-11"> <div class="col-md-11">
<div class="card" style="border-radius: 12px; padding:14px"> <div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
<div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
<div class="card-body" style="margin-bottom: -2rem"> <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:-1.5rem">
<div class="d-flex justify-content-between align-items-center">
<div class="bottomVoltar"> <div class="bottomVoltar">
<a href="{{ route('evento.visualizar',['id'=> $edital->id]) }}" class="btn btn-secondary" style="position:relative; float: right;"><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a> <a href="{{ route('evento.visualizar',['id'=> $edital->id]) }}" class="btn btn-secondary" style="position:relative; float: right;"><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
</div> </div>
<div> <div class="form-group">
<h5 style="color: #1492E6; margin-top:0.5rem">Propostas submetidas - {{ $edital->nome }}</h5> <h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Propostas submetidas - {{ $edital->nome }}</h5>
<h6 class="titulo-table" style="color: red;padding-left: 10px;">Submissão irá até o dia <span style="color: red">{{ date('d/m/Y', strtotime($edital->fimSubmissao)) }}</span></h6> <h6 class="titulo-table" style="color: red;">Submissão irá até o dia <span style="color: red">{{ date('d/m/Y', strtotime($edital->fimSubmissao)) }}</span></h6>
</div> </div>
<div> <div style="margin-top: -2rem">
<a @if($edital->inicioSubmissao <= $hoje && $hoje <= $edital->fimSubmissao) href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-info" @else href="#" data-toggle="tooltip" data-placement="top" title="O periodo de submissão foi encerrado." @endif style="position:relative; float: right;">Criar proposta</a> <a @if($edital->inicioSubmissao <= $hoje && $hoje <= $edital->fimSubmissao) href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-info" @else href="#" data-toggle="tooltip" data-placement="top" title="O periodo de submissão foi encerrado." @endif style="position:relative; float: right;">Criar proposta</a>
</div> </div>
</div> </div>
<div style="margin-top:-10px"><hr style="border-top: 1px solid#1492E6"></div>
</div> </div>
<div class="card-body" > <div class="card-body" >
@if(count($projetos)>0) @if(count($projetos)>0)
<table class="table table-bordered table-hover" style="display: block; <table class="table table-bordered table-hover" style="display: block; overflow-x: auto; white-space: nowrap; border-radius:10px; margin-bottom:0px">
overflow-x: auto;
white-space: nowrap; border-radius:10px">
<thead> <thead>
<tr> <tr>
<th scope="col" style="width:100%">Nome do projeto</th> <th scope="col" style="width:100%">Nome do projeto</th>
<th scope="col" style="text-align:center">Status</th>
<th scope="col">Data de Criação</th> <th scope="col">Data de Criação</th>
<th scope="col" style="text-align:center">Status</th>
<th scope="col">Opção</th> <th scope="col">Opção</th>
</tr> </tr>
</thead> </thead>
...@@ -59,17 +55,17 @@ ...@@ -59,17 +55,17 @@
<td> <td>
{{ $projeto->titulo }} {{ $projeto->titulo }}
</td> </td>
<td style="text-align: center">{{ date('d-m-Y', strtotime($projeto->updated_at)) }}</td>
@if($projeto->status == 'Avaliado') @if($projeto->status == 'Avaliado')
<td style="color: rgb(6, 85, 6); text-align: center">Avaliado</td> <td style="color: rgb(6, 85, 6); text-align: center">Avaliado</td>
@elseif($projeto->status == 'Submetido') @elseif($projeto->status == 'Submetido' || $projeto->status == 'submetido')
<td style="color: rgb(0, 0, 0); text-align: center">Submetido</td> <td style="color: rgb(0, 0, 0); text-align: center">Submetido</td>
@elseif($projeto->status == 'Rascunho') @elseif($projeto->status == 'Rascunho')
<td style="color: rgb(0, 0, 0); text-align: center">Rascunho</td> <td style="color: rgb(0, 0, 0); text-align: center">Rascunho</td>
@endif @endif
<td style="text-align: center">{{ date('d-m-Y', strtotime($projeto->updated_at)) }}</td>
<td> <td>
<div class="dropright dropdown-options" style="width: 100%; text-align:center; float:none"> <div class="dropright dropdown-options" style="width: 100%; text-align:center; float:none">
<a id="options" class="dropdown-toggle btn btn-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a id="options" class="dropdown-toggle btn btn-light" 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> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
......
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