Skip to content

GitLab

"resources/views/git@sites.upe.br:walter.felipe/submeta.git" did not exist on "b44f203c3563dee24b41621a847023c7706d98fd"
Unverified Commit 22a61341 authored by GuilhermeGz's avatar GuilhermeGz Committed by GitHub
Browse files

Merge pull request #206 from antonioDurval/master 

Atualizações visuais
parents 06286ddc 2946a070
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/AdministradorController.php
View file @ 22a61341
...@@ -35,6 +35,7 @@ use Illuminate\Support\Collection; ...@@ -35,6 +35,7 @@ use Illuminate\Support\Collection;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
use App\Notifications\AtribuicaoAvaliadorExternoNotification; use App\Notifications\AtribuicaoAvaliadorExternoNotification;
use Carbon\Carbon;
class AdministradorController extends Controller class AdministradorController extends Controller
{ {
...@@ -103,13 +104,17 @@ class AdministradorController extends Controller ...@@ -103,13 +104,17 @@ class AdministradorController extends Controller
$grandeAreas = GrandeArea::orderBy('nome')->get(); $grandeAreas = GrandeArea::orderBy('nome')->get();
$hoje = Carbon::today('America/Recife');
$hoje = $hoje->toDateString();
return view('administrador.analisarProposta')->with( return view('administrador.analisarProposta')->with(
[ 'trabalho' => $trabalho, [ 'trabalho' => $trabalho,
'funcaoParticipantes' => $funcaoParticipantes, 'funcaoParticipantes' => $funcaoParticipantes,
'evento' => $evento, 'evento' => $evento,
'substituicoesPendentes' => $substituicoesPendentes, 'substituicoesPendentes' => $substituicoesPendentes,
'substituicoesProjeto' => $substituicoesProjeto, 'substituicoesProjeto' => $substituicoesProjeto,
'grandeAreas' => $grandeAreas,]); 'grandeAreas' => $grandeAreas,
'hoje' => $hoje,]);
} }
public function showProjetos(Request $request){ public function showProjetos(Request $request){
......
resources/views/administrador/analisar.blade.php
View file @ 22a61341
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="row justify-content-center" style="margin-top: 100px;"> <div class="row justify-content-center" style="margin-top: 100px;">
<div class="col-md-11"> <div class="col-md-11">
<div class="row"> <div class="row">
<div class="col-sm-7"> <div class="col-sm-4">
<div class="card-body" style="padding-top: 0.2rem;"> <div class="card-body" style="padding-top: 0.2rem;">
<div class="container"> <div class="container">
<div class="form-row mt-3"> <div class="form-row mt-3">
...@@ -42,6 +42,11 @@ ...@@ -42,6 +42,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-3" style="display:flex; align-items: end;">
<input type="text" class="form-control form-control-edit" placeholder="Título do projeto ou nome do Proponente" onkeyup="buscar(this)"> <img src="{{asset('img/icons/logo_lupa.png')}}" alt="">
</div>
<div class="col-sm-5" style="top: 40px; text-align: end;"> <div class="col-sm-5" style="top: 40px; text-align: end;">
<h6 style="color: #234B8B; font-weight: bold;font-size: 13px; text-align: right;padding-bottom: 35px"> <h6 style="color: #234B8B; font-weight: bold;font-size: 13px; text-align: right;padding-bottom: 35px">
<img src="{{asset('img/icons/pendente.png')}}" style="width: 22px"/> <img src="{{asset('img/icons/pendente.png')}}" style="width: 22px"/>
...@@ -58,7 +63,7 @@ ...@@ -58,7 +63,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="projetos">
@foreach( $trabalhos as $trabalho ) @foreach( $trabalhos as $trabalho )
<!--Informações Proponente--> <!--Informações Proponente-->
...@@ -71,7 +76,7 @@ ...@@ -71,7 +76,7 @@
<div class="card-body" style="padding-top: 0.2rem; padding-left: 25px;padding-right: 25px;"> <div class="card-body" style="padding-top: 0.2rem; padding-left: 25px;padding-right: 25px;">
<div class="form-row mt-3"> <div class="form-row mt-3">
<div class="col-md-10"><h5 style="color: #234B8B; font-weight: bold">Título: {{ $trabalho->titulo }}</h5></div> <div class="col-md-10 tituloProj"><h5 style="color: #234B8B; font-weight: bold">Título: {{ $trabalho->titulo }}</h5></div>
<div class="col-md-2"> <div class="col-md-2">
@if($trabalho->status == "aprovado") @if($trabalho->status == "aprovado")
<img src="{{asset('img/icons/aprovado.png')}}" style="width: 23%;margin: auto;display: flex;margin-top: 0px;justify-content: center;align-items: center;" alt=""> <img src="{{asset('img/icons/aprovado.png')}}" style="width: 23%;margin: auto;display: flex;margin-top: 0px;justify-content: center;align-items: center;" alt="">
...@@ -87,7 +92,7 @@ ...@@ -87,7 +92,7 @@
<hr style="border-top: 1px solid#1492E6"> <hr style="border-top: 1px solid#1492E6">
<div class="form-row mt-3"> <div class="form-row mt-3">
<div class="col-md-12"> <div class="col-md-12">
<p style="color: #4D4D4D; padding: 0px"><b>Proponente:</b> {{ App\Proponente::find($trabalho->proponente_id)->user->name }}</p> <p class="proponenteProj" style="color: #4D4D4D; padding: 0px"><b>Proponente:</b> {{ App\Proponente::find($trabalho->proponente_id)->user->name }}</p>
</div> </div>
<div class="col-md-12"> <p style="color: #4D4D4D; padding: 0px"><b>Discentes:</b> <div class="col-md-12"> <p style="color: #4D4D4D; padding: 0px"><b>Discentes:</b>
...@@ -108,6 +113,7 @@ ...@@ -108,6 +113,7 @@
</div> </div>
</div> </div>
@endforeach @endforeach
</div>
<div class="row justify-content-center" > <div class="row justify-content-center" >
...@@ -128,6 +134,27 @@ ...@@ -128,6 +134,27 @@
function myFunc(i){ function myFunc(i){
document.getElementById("vizuProposta"+i).click(); document.getElementById("vizuProposta"+i).click();
} }
function buscar(input) {
let trabalhos = document.getElementById("projetos").children;
if(input.value.length > 2) {
for(let i = 0; i < trabalhos.length; i++){
let tituloProjeto = trabalhos[i].getElementsByClassName("tituloProj")[0].textContent
let nomeProponente = trabalhos[i].getElementsByClassName("proponenteProj")[0].textContent
if(tituloProjeto.toLowerCase().substr(0).indexOf(input.value.toLowerCase()) >= 0 || nomeProponente.toLowerCase().substr(0).indexOf(input.value.toLowerCase()) >= 0) {
trabalhos[i].style.display = "";
}else {
trabalhos[i].style.display = "none";
}
}
}else {
for(let i = 0; i < trabalhos.length; i++) {
trabalhos[i].style.display = "";
}
}
}
</script> </script>
@endsection @endsection
<style> <style>
......
resources/views/administrador/analisarProposta.blade.php
View file @ 22a61341
...@@ -417,11 +417,14 @@ ...@@ -417,11 +417,14 @@
<div class="container"> <div class="container">
<div class="form-row mt-3"> <div class="form-row mt-3">
<div class="col-md-11"><h5 style="color: #234B8B; font-weight: bold">Avaliadores</h5></div> <div class="col-md-11"><h5 style="color: #234B8B; font-weight: bold">Avaliadores</h5></div>
<!-- AKI MUDEI (06/05)-->
@if($hoje <= $evento->fimSubmissao)
<div class="col-md-1 text-sm-right"> <div class="col-md-1 text-sm-right">
<a type="button" value="{{ $trabalho->id }}" id="atribuir1" data-toggle="modal" data-target="#avaliadorModalCenter"> <a type="button" value="{{ $trabalho->id }}" id="atribuir1" data-toggle="modal" data-target="#avaliadorModalCenter">
<img class="" src="{{asset('img/icons/add.ico')}}" style="width:30px" alt=""> <img class="" src="{{asset('img/icons/add.ico')}}" style="width:30px" alt="">
</a> </a>
</div> </div>
@endif
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="avaliadorModalCenter" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true" style="overflow-y: hidden"> <div class="modal fade" id="avaliadorModalCenter" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true" style="overflow-y: hidden">
<div class="modal-dialog modal-dialog-centered modal-xl" role="document"> <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
......
resources/views/coordenador/home.blade.php
View file @ 22a61341
...@@ -9,7 +9,13 @@ ...@@ -9,7 +9,13 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-sm"></div> <div class="col-sm">
<select id="" class="form-control select-submeta" onchange="exibirEditais(this)" style="width: 140px;">
<option value="todos" selected>Todos</option>
<option value="aberto">Aberto(s)</option>
<option value="encerrado">Encerrado(s)</option>
</select>
</div>
<div class="col-sm" style="margin-bottom: 10px"> <div class="col-sm" style="margin-bottom: 10px">
@if($flag == 'false') @if($flag == 'false')
@if(count($eventos)>0) @if(count($eventos)>0)
...@@ -46,9 +52,17 @@ ...@@ -46,9 +52,17 @@
@foreach ($eventos as $evento) @foreach ($eventos as $evento)
@if (Auth::check()) @if (Auth::check())
<a href="{{ route('evento.visualizar',['id'=> $evento->id]) }}" style="text-decoration: none"> @if($evento->fimSubmissao >= $hoje)
<a href="{{ route('evento.visualizar',['id'=> $evento->id]) }}" style="text-decoration: none" class="aberto">
@else
<a href="{{ route('evento.visualizar',['id'=> $evento->id]) }}" style="text-decoration: none" class="encerrado">
@endif
@else @else
<a href="{{ route('evento.visualizarNaoLogado', ['id'=>$evento->id]) }}" style="text-decoration: none"> @if($evento->fimSubmissao >= $hoje)
<a href="{{ route('evento.visualizarNaoLogado', ['id'=>$evento->id]) }}" style="text-decoration: none" class="aberto">
@else
<a href="{{ route('evento.visualizarNaoLogado', ['id'=>$evento->id]) }}" style="text-decoration: none" class="encerrado">
@endif
@endif @endif
<div class="card" style="width: 18rem; border-radius:12px; border-width:0px; margin:10px"> <div class="card" style="width: 18rem; border-radius:12px; border-width:0px; margin:10px">
@if(isset($evento->fotoEvento)) @if(isset($evento->fotoEvento))
...@@ -64,7 +78,7 @@ ...@@ -64,7 +78,7 @@
<div class="col-sm-12"> <div class="col-sm-12">
<h3 style="color: #01487E; font-family:Arial, Helvetica, sans-serif; font-size:30px; font-weight:bold">{{$evento->nome}}</h3> <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") --}} {{-- @if(Auth::user()->tipo == "administrador" || Auth::user()->tipo == "administradorResponsavel") --}}
@can('isCoordenador', $evento) {{-- @can('isCoordenador', $evento)
<div class="btn-group dropright dropdown-options"> <div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <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">
...@@ -89,7 +103,7 @@ ...@@ -89,7 +103,7 @@
</form> </form>
</div> </div>
</div> </div>
@endcan @endcan --}}
{{-- @endif --}} {{-- @endif --}}
</div> </div>
...@@ -182,3 +196,40 @@ ...@@ -182,3 +196,40 @@
</div> </div>
@endsection @endsection
@section('javascript')
<script>
function exibirEditais(select) {
let abertos = document.getElementsByClassName("aberto");
let encerrados = document.getElementsByClassName("encerrado");
if(select.value == "todos"){
for(let i = 0; i < abertos.length; i++ ){
abertos[i].style.display = "";
}
for(let j = 0; j < encerrados.length; j++ ){
encerrados[j].style.display = "";
}
}else if(select.value == "aberto") {
for(let i = 0; i < abertos.length; i++){
abertos[i].style.display = "";
}
for(let j = 0; j < encerrados.length; j++ ){
encerrados[j].style.display = "none";
}
}else {
for(let i = 0; i < abertos.length; i++){
abertos[i].style.display = "none";
}
for(let j = 0; j < encerrados.length; j++ ){
encerrados[j].style.display = "";
}
}
}
</script>
@endsection
\ No newline at end of file
resources/views/evento/formulario/projeto.blade.php
View file @ 22a61341
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
<div class="form-group col-md-12" style="margin-top: 10px"> <div class="form-group col-md-12" style="margin-top: 10px">
<label for="titulo" class="col-form-label" style="font-weight: bold">{{ __('Nome do Projeto') }} <span style="color: red; font-weight:bold">*</span></label> <label for="titulo" class="col-form-label" style="font-weight: bold">{{ __('Nome do Projeto') }} <span style="color: red; font-weight:bold">*</span></label>
<input id="titulo" type="text" class="form-control @error('titulo') is-invalid @enderror" name="titulo" placeholder="Digite o nome do projeto" value="" autocomplete="titulo" maxlength="255" > <input id="titulo" type="text" class="form-control @error('titulo') is-invalid @enderror" name="titulo" placeholder="Digite o nome do projeto" value="" autocomplete="titulo" maxlength="255" >
<span style="color: red; font-size: 12px" id="caracsRestantestitulo">
</span>
@error('titulo') @error('titulo')
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong> <strong>{{ $message }}</strong>
......
resources/views/evento/submeterTrabalho.blade.php
View file @ 22a61341
...@@ -208,18 +208,6 @@ ...@@ -208,18 +208,6 @@
<script> <script>
$('input').on("input", function(){
var maxlength = $(this).attr("maxlength");
var currentLength = $(this).val().length;
var idInput = $(this).attr("id");
if( currentLength >= maxlength ){
$("#caracsRestantes"+idInput).html("Caracteres restantes: " + (maxlength - this.value.length));
}else if(currentLength == 0){
$("#caracsRestantes"+idInput).html("");
}else{
$("#caracsRestantes"+idInput).html("Caracteres restantes: " + (maxlength - this.value.length));
}
});
$( document ).ready( function () { $( document ).ready( function () {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment