Skip to content

GitLab

Commit c73baf28 authored by Gabriel-31415's avatar Gabriel-31415
Browse files

conflict resolved

parents 77659f80 625e77a5
Expand all Show whitespace changes
Inline Side-by-side
resources/views/auth/register.blade.php
View file @ c73baf28
This diff is collapsed.
resources/views/auth/verify.blade.php
View file @ c73baf28
@extends('layouts.app')
@section('content')
<div class="container content">
<div class="container content" style="margin-top: 3rem">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">{{ __('Verifique o seu endereço de e-mail') }}</div>
<div class="col-md-7">
<div class="card shadow-sm 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:6px">
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Verifique o seu endereço de e-mail</h5>
</div>
</div>
<div class="card-body">
@if (session('resent'))
......@@ -18,7 +22,7 @@
{{ __('Se você não recebeu o e-mail') }},
<form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
@csrf
<button type="submit" class="btn btn-link p-0 m-0 align-baseline">{{ __('clique aqui para solicitar outro.') }}</button>.
<button type="submit" class="btn btn-link p-0 m-0 align-baseline">{{ __('clique aqui para solicitar outro.') }}</button>
</form>
</div>
</div>
......
resources/views/coordenador/home.blade.php
View file @ c73baf28
......@@ -5,27 +5,36 @@
<div class="container">
{{-- titulo da página --}}
<div class="row justify-content-center titulo">
<div class="col-sm-12">
<div class="row">
<h3>Editais</h3>
<div class="row justify-content-center" style="margin-top: 3rem; text-align:center">
<div class="col-md-12" style="margin-bottom: -0.5rem">
@if(count($eventos)>0)
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Editais</h5>
@else
<h5 class="card-title mb-0" style="font-size:25px; font-family:Arial, Helvetica, sans-serif; color:#1492E6">Edital</h5>
@endif
</div>
<div class="col-md-12">
<hr>
</div>
</div>
@php
$hoje = now();
@endphp
<div class="row">
<div class="row justify-content-center">
@if(count($eventos)>0)
@foreach ($eventos as $evento)
<div class="card" style="width: 18rem;">
@if (Auth::check())
<a href="{{ route('evento.visualizar',['id'=> $evento->id]) }}" style="text-decoration: none">
@else
<a href="{{ route('evento.visualizarNaoLogado', ['id'=>$evento->id]) }}" style="text-decoration: none">
@endif
<div class="card" style="width: 18rem; border-radius:12px; border-width:0px; margin:10px">
@if(isset($evento->fotoEvento))
<img src="{{asset('storage/eventos/'.$evento->id.'/logo.png')}}" class="card-img-top" alt="...">
@else
<img src="{{asset('img/colorscheme.png')}}" class="card-img-top" alt="...">
<img src="{{asset('img/img_fundo.png')}}" class="card-img-top" alt="..." style="border-radius: 12px;">
@endif
<div class="card-body">
<div class="row">
......@@ -33,7 +42,7 @@
<h4 class="card-title">
<div class="row justify-content-center">
<div class="col-sm-12">
{{$evento->nome}}
<h3 style="color: #01487E; font-family:Arial, Helvetica, sans-serif; font-size:30px; font-weight:bold">{{$evento->nome}}</h3>
{{-- @if(Auth::user()->tipo == "administrador" || Auth::user()->tipo == "administradorResponsavel") --}}
@can('isCoordenador', $evento)
<div class="btn-group dropright dropdown-options">
......@@ -70,15 +79,51 @@
</div>
</div>
<p class="card-text">
<div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px">
<div><img src="{{asset('img/icons/icon_submissao.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
<div class="form-group" style="text-align: left">
<div style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Submissão</div>
<div style="color: #909090">{{date('d/m/Y',strtotime($evento->inicioSubmissao))}} - {{date('d/m/Y',strtotime($evento->fimSubmissao))}}</div>
</div>
</div>
<div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px">
<div><img src="{{asset('img/icons/icon_revisao.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
<div class="form-group" style="text-align: left">
<div style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Revisão</div>
<div style="color: #909090">{{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}</div>
</div>
</div>
<div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px">
<div><img src="{{asset('img/icons/icon_resultado_preliminar.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
<div class="form-group" style="text-align: left">
<div style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Resultado preliminar</div>
<div style="color: #909090">{{date('d/m/Y',strtotime($evento->resultado_preliminar))}}</div>
</div>
</div>
<div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px">
<div><img src="{{asset('img/icons/icon_recurso.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
<div class="form-group" style="text-align: left">
<div style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Recurso</div>
<div style="color: #909090">{{date('d/m/Y',strtotime($evento->inicio_recurso))}} - {{date('d/m/Y',strtotime($evento->fim_recurso))}}</div>
</div>
</div>
<div class="row justify-content-lg-left" style="margin-left:1px; margin-right:1px; margin-bottom:-0.8rem">
<div><img src="{{asset('img/icons/icon_resultado_final.png')}}" class="card-img-top" alt="..." style="width:45px; margin-right:15px"></div>
<div class="form-group" style="text-align: left">
<div style="font-weight: normal;color:black; font-family:Arial, Helvetica, sans-serif; font-size:18px; margin-bottom:-5px">Resultado final</div>
<div style="color: #909090">{{date('d/m/Y',strtotime($evento->resultado_final))}}</div>
</div>
</div>
<!--<p class="card-text">
<strong>Submissão:</strong> {{date('d/m/Y',strtotime($evento->inicioSubmissao))}} - {{date('d/m/Y',strtotime($evento->fimSubmissao))}}<br>
<strong>Revisão:</strong> {{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}<br>
<strong>Resultado Preliminar:</strong> {{date('d/m/Y',strtotime($evento->resultado_preliminar))}}<br>
<strong>Recurso:</strong> {{date('d/m/Y',strtotime($evento->inicio_recurso))}} - {{date('d/m/Y',strtotime($evento->fim_recurso))}}<br>
<strong>Resultado Final:</strong> {{date('d/m/Y',strtotime($evento->resultado_final))}}<br>
</p>
</p>-->
<p>
<!--<p>
@if (Auth::check())
<a href="{{ route('evento.visualizar',['id'=> $evento->id]) }}" class="visualizarEvento">Visualizar edital</a>
@if($evento->inicioSubmissao <= $hoje && $hoje <= $evento->fimSubmissao)
......@@ -91,11 +136,20 @@
@else
<a href="{{ route('evento.visualizarNaoLogado', ['id'=>$evento->id]) }}" class="visualizarEvento">Visualizar edital</a>
@endif
</p>
</p> -->
</div>
</div>
</a>
@endforeach
@else
<div class="form-row justify-content-lg-center" style="width:100%; margin-top:4rem; text-align:center">
<div class="col-md-12">
<img src="{{asset('img/icons/logo_projeto.png')}}" alt="..." width="190px">
</div>
<div class="col-md-5" style="text-align: center;margin-top:1rem"><h5>Nenhum edital cadastrado!</h5></div>
</div>
@endif
</div>
</div>
......
resources/views/evento/submeterTrabalho.blade.php
View file @ c73baf28
......@@ -575,14 +575,14 @@
<label for="ordemDePrioridade1">{{ __('Ordem de prioridade') }} <span style="color: red; font-weight:bold">*</span></label>
<select name="ordem_prioridade[]" id="ordemDePrioridade1" class="form-control" >
<option value="" disabled selected>-- ORDEM --</option>
<option value="1">1º</option>
<option value="2">2º</option>
<option value="3">3º</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
</select>
</div>
<div class="form-group col-md-6">
<label for="coeficienteDeRendimento1">Coeficiente de rendimento <span style="color: red; font-weight:bold">*</span></label>
<input type="number" class="form-control media" id="coeficienteDeRendimento1" min="0" max="10" step="0.01" value="00.00" name="media_geral_curso[]" required>
<input type="number" class="form-control media" id="coeficienteDeRendimento1" min="0" max="10" step="0.01" name="media_geral_curso[]" required>
@error('coeficienteDeRendimento1')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
......@@ -827,14 +827,14 @@
<label for="ordemDePrioridade2">{{ __('Ordem de prioridade') }} <span style="color: red; font-weight:bold">*</span></label>
<select name="ordem_prioridade[]" id="ordemDePrioridade2" class="form-control" required>
<option value="" disabled selected>-- ORDEM --</option>
<option value="1">1º</option>
<option value="2">2º</option>
<option value="3">3º</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
</select>
</div>
<div class="form-group col-md-6">
<label for="coeficienteDeRendimento2">Coeficiente de rendimento <span style="color: red; font-weight:bold">*</span></label>
<input type="number" class="form-control media" id="coeficienteDeRendimento2" min="0" max="10" step="0.01" value="00.00" name="media_geral_curso[]" required>
<input type="number" class="form-control media" id="coeficienteDeRendimento2" min="0" max="10" step="0.01" name="media_geral_curso[]" required>
@error('coeficienteDeRendimento2')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
......@@ -1079,14 +1079,14 @@
<label for="ordemDePrioridade3">{{ __('Ordem de prioridade') }} <span style="color: red; font-weight:bold">*</span></label>
<select name="ordem_prioridade[]" id="ordemDePrioridade3" class="form-control" required>
<option value="" disabled selected>-- ORDEM --</option>
<option value="1">1º</option>
<option value="2">2º</option>
<option value="3">3º</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
</select>
</div>
<div class="form-group col-md-6">
<label for="coeficienteDeRendimento3">Coeficiente de rendimento <span style="color: red; font-weight:bold">*</span></label>
<input type="number" class="form-control media" id="coeficienteDeRendimento3" min="0" max="10" step="0.01" value="00.00" name="media_geral_curso[]" required>
<input type="number" class="form-control media" id="coeficienteDeRendimento3" min="0" max="10" step="0.01" name="media_geral_curso[]" required>
@error('coeficienteDeRendimento3')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
......
resources/views/layouts/app.blade.php
View file @ c73baf28
......@@ -23,6 +23,9 @@
<link href="{{ asset('css/layout.css') }}" rel="stylesheet">
<style>
body{
background-color: #f8fafc
}
.styleRodape {
background-color: rgb(0, 140, 255);;
text-align: center;
......
resources/views/projeto/editar.blade.php
View file @ c73baf28
......@@ -6,14 +6,14 @@
@csrf
<input type="hidden" name="editalId" value="{{$edital->id}}">
<div class="container">
<div class="container" style="margin-top: 3rem">
<div class="row justify-content-center">
<!-- projeto -->
{{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">1º Passo</h4></div>
<div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Preencha os campos com as informações do projeto</h5></div> --}}
<div class="col-md-10">
<div class="card" style="border-radius: 12px">
<div class="card" style="border-radius: 12px; margin-bottom:2rem">
<div class="card-body">
<div class="container">
......@@ -99,7 +99,7 @@
{{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">2º Passo</h4></div>
<div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Preencha os campos com as informações do proponente</h5></div> --}}
<div class="col-md-10">
<div class="card" style="border-radius: 12px">
<div class="card" style="border-radius: 12px; margin-bottom:2rem">
<div class="card-body">
<div class="container">
<div class="form-row mt-3">
......@@ -161,7 +161,7 @@
{{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">3º Passo</h4></div>
<div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Anexos</h5></div> --}}
<div class="col-md-10">
<div class="card" style="border-radius: 12px">
<div class="card" style="border-radius: 12px; margin-bottom:2rem">
<div class="card-body">
<div class="container">
<div class="form-row mt-3">
......@@ -338,7 +338,7 @@
{{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">4º Passo</h4></div>
<div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Área do(s) participante(s)</h5></div> --}}
<div class="col-md-10">
<div class="card" style="border-radius: 12px; padding:15px">
<div class="card" style="border-radius: 12px; padding:15px; margin-bottom:2rem">
<div class="card-body" style="margin-bottom: -2rem">
<div class="d-flex justify-content-between align-items-center">
<div><h5 style="color: #1492E6; margin-top:0.5rem">Participante(s)</h5></div>
......@@ -1015,7 +1015,7 @@
</div>
<div class="form-group col-md-6">
<label for="cidade3">Cidade <span style="color: red; font-weight:bold">*</span></label>
<input type="text" class="form-control @error('cidade3') is-invalid @enderror" id="cidade3" name="cidade[]" placeholder="Digite a cidade do participante" required value="@if($resultado_participante_tres){{$participantes[2]->user->endereco->cep}}@endif">
<input type="text" class="form-control @error('cidade3') is-invalid @enderror" id="cidade3" name="cidade[]" placeholder="Digite a cidade do participante" required value="@if($resultado_participante_tres){{$participantes[2]->user->endereco->cidade}}@endif">
@error('cidade3')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
......
resources/views/projeto/visualizar.blade.php
View file @ c73baf28
......@@ -6,14 +6,14 @@
@csrf --}}
<input type="hidden" name="editalId" value="{{$edital->id}}">
<div class="container">
<div class="container" style="margin-top: 3rem">
<div class="row justify-content-center">
<!-- projeto -->
{{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">1º Passo</h4></div>
<div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Preencha os campos com as informações do projeto</h5></div> --}}
<div class="col-md-10">
<div class="card" style="border-radius: 12px">
<div class="card" style="border-radius: 12px; margin-bottom:2rem;">
<div class="card-body">
<div class="container">
......@@ -99,7 +99,7 @@
{{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">2º Passo</h4></div>
<div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Preencha os campos com as informações do proponente</h5></div> --}}
<div class="col-md-10">
<div class="card" style="border-radius: 12px">
<div class="card" style="border-radius: 12px; margin-bottom:2rem">
<div class="card-body">
<div class="container">
<div class="form-row mt-3">
......@@ -161,7 +161,7 @@
{{-- <div class="col-md-10" style="text-align: center; margin-top:2rem"><h4 style="margin-top: 1rem;">3º Passo</h4></div>
<div class="col-md-10" style="text-align: center;"><h5 style="margin-bottom:1rem;color:#909090">Anexos</h5></div> --}}
<div class="col-md-10">
<div class="card" style="border-radius: 12px">
<div class="card" style="border-radius: 12px; margin-bottom:2rem">
<div class="card-body">
<div class="container">
<div class="form-row mt-3">
......
resources/views/proponente/editais.blade.php
View file @ c73baf28
......@@ -2,53 +2,50 @@
@section('content')
<div class="container" style="margin-top: 100px;">
<div class="container">
<div class="row justify-content-center" style="margin-top: 2rem;">
<div class="col-md-11">
<div class="card" style="border-radius: 12px; padding:14px">
<div class="container" >
<div class="row" >
<div class="col-sm-1" style="text-align: left; flaot:left;">
<a href="{{ route('proponente.index') }}" class="btn btn-secondary" style="position:relative; float: right;">Voltar</a>
<div class="card-body" style="margin-bottom: -2rem">
<div class="d-flex justify-content-between align-items-center">
<div class="bottomVoltar">
<a href="{{ route('proponente.index') }}" class="btn btn-secondary" style="position:relative; float: right;"><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
</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">Editais</h4>
</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="">
<div><h5 style="color: #1492E6; margin-top:0.5rem">Editais</h5></div>
<div>
<div class="row justify-content-end">
<div class="btn-group col">
<button class="btn" onclick="buscarEdital(this.parentElement.parentElement.children[1].children[0])" style="margin-right:5px; border-radius:12px">
<img src="{{asset('img/icons/logo_lupa2.png')}}" alt="" width="25px">
</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)">
<input type="text" class="form-control form-control-edit" placeholder="Digite o nome do edital" onkeyup="buscarEdital(this)" style="border-color: #d1d1d1">
</div>
</div>
</div>
</div>
<div style="margin-top:-10px"><hr style="border-top: 1px solid#1492E6"></div>
</div>
<hr>
<table class="table table-bordered">
<div class="card-body" >
<table class="table table-bordered table-hover" style="display: block;
overflow-x: auto;
white-space: nowrap; border-radius:10px">
<thead>
<tr>
<th scope="col">Edital</th>
<th scope="col" style="width: 100%;">Edital</th>
<th scope="col" style="text-align: center;">Inicio da Submissão</th>
<th scope="col" style="text-align: center;">Fim da Submissão</th>
<th scope="col" style="text-align: center;">Data do Resultado</th>
<th scope="col" style="text-align: center;">Baixar Edital</th>
<th scope="col">Opção</th>
<th scope="col" style="text-align: center;">Opção</th>
</tr>
</thead>
<tbody id="eventos">
@foreach ($eventos as $evento)
<tr>
<td>
<a href="{{ route('evento.visualizar',['id'=>$evento->id]) }}" class="visualizarEvento">
<td style="text-align: left;">
<a href="{{ route('evento.visualizar',['id'=>$evento->id]) }}" class="">
{{ $evento->nome }}
</a>
</td>
......@@ -56,13 +53,13 @@
<td style="text-align: center;">{{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</td>
<td style="text-align: center;">{{ date('d/m/Y', strtotime($evento->created_at)) }}</td>
<td style="text-align: center">
<a href="{{ route('baixar.edital', ['id' => $evento->id]) }}">
<a class="btn btn-light" href="{{ route('baixar.edital', ['id' => $evento->id]) }}" style="width: 100%">
<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">
<div class="dropright dropdown-options" style="width: 100%; text-align:center; float:none">
<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">
</a>
<div class="dropdown-menu">
......@@ -94,7 +91,10 @@
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
@endsection
......
resources/views/proponente/index.blade.php
View file @ c73baf28
......@@ -10,7 +10,7 @@
<div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-3 d-flex justify-content-center ">
<a href="{{route('proponente.editais')}}" style="text-decoration:none; color: inherit;">
<a href="{{route('coord.home')}}" style="text-decoration:none; color: inherit;">
<div class="card text-center card-menu">
<div class="card-body d-flex justify-content-center">
<div class="container">
......
resources/views/proponente/projetosEdital.blade.php
View file @ c73baf28
@extends('layouts.app')
@section('content')
<div class="container" style="margin-top: 100px;">
<div class="container">
@if(isset($mensagem))
<div class="col-sm-12">
<br>
......@@ -19,26 +19,35 @@
</div>
</div>
@endif
<div class="container" >
<div class="row" >
<div class="col-sm-1">
<a href="{{ route('proponente.editais') }}" class="btn btn-secondary" style="position:relative; float: right;">Voltar</a>
<div class="row justify-content-center" style="margin-top: 2rem;">
<div class="col-md-11">
<div class="card" style="border-radius: 12px; padding:14px">
<div class="card-body" style="margin-bottom: -2rem">
<div class="d-flex justify-content-between align-items-center">
<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>
</div>
<div class="col-sm-9" style="text-align: center">
<h4 class="titulo-table">Projetos do edital {{ $edital->nome }}</h4>
<h6 class="titulo-table">Submissão irá até o dia <span style="color: rgb(0, 0, 0);">{{ date('d/m/Y', strtotime($edital->fimSubmissao)) }}</span></h6>
<div>
<h5 style="color: #1492E6; margin-top:0.5rem">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>
</div>
<div class="col-sm-2">
<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 projeto</a>
<div>
<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 style="margin-top:-10px"><hr style="border-top: 1px solid#1492E6"></div>
</div>
<hr>
<table class="table table-bordered">
<div class="card-body" >
@if(count($projetos)>0)
<table class="table table-bordered table-hover" style="display: block;
overflow-x: auto;
white-space: nowrap; border-radius:10px">
<thead>
<tr>
<th scope="col">Nome do projeto</th>
<th scope="col">Status</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">Opção</th>
</tr>
......@@ -51,16 +60,16 @@
{{ $projeto->titulo }}
</td>
@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')
<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')
<td style="color: rgb(0, 0, 0)">Rascunho</td>
<td style="color: rgb(0, 0, 0); text-align: center">Rascunho</td>
@endif
<td>{{ date('d-m-Y', strtotime($projeto->updated_at)) }}</td>
<td style="text-align: center">{{ date('d-m-Y', strtotime($projeto->updated_at)) }}</td>
<td>
<div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<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">
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
......@@ -115,6 +124,23 @@
@endforeach
</tbody>
</table>
@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>Nenhum projeto submetido!</h5>
</div>
<div class="col-md-12" style="text-align: center;">
<a href="{{ route('trabalho.index', ['id' => $edital->id] )}}">Cliquei aqui para submeter um projeto.</a>
</div>
</div>
@endif
</div>
</div>
</div>
</div>
</div>
@endsection
......
routes/web.php
View file @ c73baf28
......@@ -29,7 +29,7 @@ Route::get( '/proponente/cadastro', 'ProponenteController@create'
Route::post('/proponente/cadastro', 'ProponenteController@store' )->name('proponente.store');
Route::get( '/proponente/editais', 'ProponenteController@editais' )->name('proponente.editais');
Route::get( '/projetos-submetidos', 'ProponenteController@projetosDoProponente' )->name('proponente.projetos');
Route::get( '/projetos-edital/{id}', 'ProponenteController@projetosEdital' )->name('proponente.projetosEdital');
Route::get( '/projetos-edital/{id}', 'ProponenteController@projetosEdital' )->name('proponente.projetosEdital')->middleware('auth');
//######### Rotas Administrador #################################
......@@ -40,7 +40,7 @@ Route::post('/perfil-usuario', 'UserController@editarPerfil'
Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
//######## Rotas Avaliador ####################################
Route::prefix('avaliador')->name('avaliador.')->group(function(){
Route::prefix('avaliador')->name('avaliador.')->group(function(){
Route::get('/index', 'AvaliadorController@index' )->name('index')->middleware('auth');
Route::get('/trabalhos', 'AvaliadorController@visualizarTrabalhos' )->name('visualizarTrabalho')->middleware('auth');
Route::get('/planos', 'AvaliadorController@listarPlanos' )->name('listarPlanos')->middleware('auth');
......@@ -50,7 +50,7 @@ Route::prefix('avaliador')->name('avaliador.')->group(function(){
Route::post('/Enviarparecer', 'AvaliadorController@enviarParecer' )->name('enviarParecer')->middleware('auth');
Route::post('/Enviarparecer', 'AvaliadorController@enviarParecerPlano' )->name('enviarParecerPlano')->middleware('auth');
Route::get('/Resposta', 'AvaliadorController@conviteResposta' )->name('conviteResposta')->middleware('auth');
});
});
Route::get('/home/edital', 'EventoController@index' )->name('visualizarEvento');
......@@ -131,8 +131,6 @@ Route::prefix('avaliador')->name('avaliador.')->group(function(){
Route::post( '/revisor/emailTodos', 'RevisorController@enviarEmailTodosRevisores' )->name('revisor.emailTodos');
//########## Rotas de download de documentos ###########################
Route::get('/baixar/edital/{id}', 'EventoController@baixarEdital' )->name('baixar.edital');
Route::get('/baixar/modelos/{id}', 'EventoController@baixarModelos' )->name('baixar.modelos');
Route::get('/baixar/anexo-projeto/{id}', 'TrabalhoController@baixarAnexoProjeto' )->name('baixar.anexo.projeto');
Route::get('/baixar/anexo-consu/{id}', 'TrabalhoController@baixarAnexoConsu' )->name('baixar.anexo.consu');
Route::get('/baixar/anexo-comite/{id}', 'TrabalhoController@baixarAnexoComite' )->name('baixar.anexo.comite');
......@@ -144,6 +142,9 @@ Route::prefix('avaliador')->name('avaliador.')->group(function(){
Route::get('/baixar/evento-temp/{nomeAnexo}', 'TrabalhoController@baixarEventoTemp' )->name('baixar.evento.temp');
});
Route::get('/baixar/edital/{id}', 'EventoController@baixarEdital' )->name('baixar.edital');
Route::get('/baixar/modelos/{id}', 'EventoController@baixarModelos' )->name('baixar.modelos');
Route::prefix('usuarios')->name('admin.')->group(function(){
//######### Rotas da administração dos usuários ####################
Route::get('/home-admin', 'AdministradorController@index' )->name('index')->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