Skip to content

GitLab

Unverified Commit f564a7e8 authored by carlos1270's avatar carlos1270 Committed by GitHub
Browse files

Merge pull request #84 from carlos1270/master 

View inicio
parents 7c3e7461 940b007c
Expand all Show whitespace changes
Inline Side-by-side
app/Http/Controllers/TrabalhoController.php
View file @ f564a7e8
......@@ -507,25 +507,25 @@ class TrabalhoController extends Controller
//
$projeto = Trabalho::find($id);
$edital = Evento::find($projeto->evento_id);
$grandeArea = GrandeArea::where('id', $projeto->grande_area_id)->select('nome')->first();
$area = Area::where('id', $projeto->area_id)->select('nome')->first();
$subarea = Subarea::where('id', $projeto->sub_area_id)->select('nome')->first();
$proponente = Proponente::find($projeto->proponente_id);
$grandeAreas = GrandeArea::all();
$areas = Area::all();
$subareas = Subarea::all();
$funcaoParticipantes = FuncaoParticipantes::all();
$participantes = Participante::where('trabalho_id', $id)->get();
$participantesUsersIds = Participante::where('trabalho_id', $id)->select('user_id')->get();
$users = User::whereIn('id', $participantesUsersIds)->get();
$arquivos = Arquivo::where('trabalhoId', $id)->get();
return view('projeto.visualizar')->with(['projeto' => $projeto,
'grandeArea' => $grandeArea,
'area' => $area,
'subArea' => $subarea,
'proponente' => $proponente,
'grandeAreas' => $grandeAreas,
'areas' => $areas,
'subAreas' => $subareas,
'edital' => $edital,
'users' => $users,
'funcaoParticipantes' => $funcaoParticipantes,
'participantes' => $participantes,
'arquivos' => $arquivos,]);
'arquivos' => $arquivos,
'enum_turno' => Participante::ENUM_TURNO,
]);
}
/**
......
public/css/layout.css
View file @ f564a7e8
......@@ -220,7 +220,8 @@ body{
border-radius: 5px;
}
.flexcroll{ width:500px;
.flexcroll{
width:99%;
height:400px;
overflow-y:inherit;
overflow-x:hidden;
......
resources/views/index.blade.php
View file @ f564a7e8
......@@ -54,8 +54,28 @@
</div>
</div>
</li>
@elseif($fimSub < $today && $fimRev >= $today || $i == 1)
<li class="col-sm-12 li-editais avaliacao" style="display: none;">
@elseif($fimSub < $today)
<li class="col-sm-12 li-editais encerrado" style="display: none;">
<div class="container">
<div class="row">
<div class="col-sm-1">
<img class="img-arquivo" src="{{ asset('img/icons/logo_arquivo.png') }}" alt="">
</div>
<div class="col-sm-8">
<div>{{$evento->nome}}</div>
<div class="color-subtitle-edital">Submissão até o dia {{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</div>
</div>
<div class="col-sm-3">
<a href="{{ route('evento.visualizarNaoLogado', ['id' => $evento->id]) }}">
<button class="btn btn-opcoes-edital background-red" style="float: right;">
Encerrado
</button>
</a>
</div>
</div>
</div>
</li>
{{-- <li class="col-sm-12 li-editais avaliacao" style="display: none;">
<div class="container">
<div class="row">
<div class="col-sm-1">
......@@ -74,8 +94,8 @@
</div>
</div>
</div>
</li>
@elseif($fimRev <= $today)
</li> --}}
{{-- @elseif($fimRev <= $today)
<li class="col-sm-12 li-editais encerrado" style="display: none;">
<div class="container">
<div class="row">
......@@ -95,7 +115,7 @@
</div>
</div>
</div>
</li>
</li> --}}
@endif
@endforeach
</ul>
......@@ -107,7 +127,7 @@
<div class="col-md-4" style="float: right;">
<select id="" class="form-control select-submeta" onchange="exibirEditais(this)">
<option value="aberto" selected>Aberto</option>
<option value="avaliacao">Em Avaliação</option>
{{-- <option value="avaliacao">Em Avaliação</option> --}}
<option value="encerrado">Encerrado</option>
<option value="todos">Todos</option>
</select>
......
resources/views/layouts/app.blade.php
View file @ f564a7e8
......@@ -108,6 +108,7 @@
<div style="color: rgb(0, 140, 255); margin: 5px; text-align: center; font-size: 20px;">
Entrar
</div>
<input type="hidden" name="login" value="0">
<div style="margin-top: 30px;">
<label for="email" class="col-form-label negrito" style="color: rgb(0, 140, 255);">{{ __('Endereço de E-mail') }}</label>
......@@ -333,7 +334,7 @@
event.stopPropagation();
});
});
@if(old('email') != null)
@if(old('login') != null)
$(document).ready(function() {
$('#dropdownMenuLink').click();
});
......
resources/views/projeto/editar.blade.php
View file @ f564a7e8
This diff is collapsed.
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