Skip to content

GitLab

Unverified Commit 2b5258e1 authored by GuilhermeGz's avatar GuilhermeGz Committed by GitHub
Browse files

Merge pull request #219 from antonioDurval/master 

Correções de erros e ajustes visuais
parents 82508a9a 5f4cfcb8
Hide whitespace changes
Inline Side-by-side
resources/views/administrador/analisar.blade.php
View file @ 2b5258e1
......@@ -18,7 +18,7 @@
<option value="reprovado">Não Recomendados</option>
<option value="submetido">Submetidos</option>
<option value="avaliado">Avaliados</option>
<option value="corrigido">Parcialmente Recomendados</option>
@foreach($grandesAreas as $grandeArea)
......@@ -47,8 +47,8 @@
<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;">
<h6 style="color: #234B8B; font-weight: bold;font-size: 13px; text-align: right;padding-bottom: 35px">
<div class="col-sm-5" style="display:flex; align-items: center;">
<h6 style="color: #234B8B; font-weight: bold; margin-left: 30px;">
<img src="{{asset('img/icons/pendente.png')}}" style="width: 22px"/>
Proposta Pendente
<img src="{{asset('img/icons/aprovado.png')}}" style="width: 22px"/>
......@@ -56,8 +56,7 @@
<img src="{{asset('img/icons/negado.png')}}" style="width: 22px"/>
Proposta Negada
<br>
<img src="{{asset('img/icons/parcialmenteAprovado.png')}}" style="width: 22px"/>
Proposta Parcialmente Recomendada
</h6>
</div>
</div>
......@@ -82,8 +81,7 @@
<img src="{{asset('img/icons/aprovado.png')}}" style="width: 23%;margin: auto;display: flex;margin-top: 0px;justify-content: center;align-items: center;" alt="">
@elseif($trabalho->status == "reprovado")
<img src="{{asset('img/icons/negado.png')}}" style="width: 23%;margin: auto;display: flex;margin-top: 0px;justify-content: center;align-items: center;" alt="">
@elseif($trabalho->status == "corrigido")
<img src="{{asset('img/icons/parcialmenteAprovado.png')}}" style="width: 23%;margin: auto;display: flex;margin-top: 0px;justify-content: center;align-items: center;" alt="">
@else
<img src="{{asset('img/icons/pendente.png')}}" style="width: 20%;margin: auto;display: flex;justify-content: center;align-items: center;" alt="">
@endif
......
resources/views/administrador/analisarProposta.blade.php
View file @ 2b5258e1
......@@ -23,7 +23,7 @@
<div class="col-md-12">
<h5 style="color: #234B8B; font-weight: bold">Informações da Proposta
@if($trabalho->arquivado == false)
<a title="Arquivar" href='javascript:arquivar.submit()' >
<a title="Arquivar" href='javascript:arquivar.submit()'>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#ed1212" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"></path><line x1="12" y1="11" x2="12" y2="17"></line><line x1="9" y1="14" x2="15" y2="14"></line></svg> </a>
<form method="GET" name='arquivar' action='{{route('projeto.arquivar')}}' >
@csrf
......@@ -32,7 +32,7 @@
</form>
@else
<a title="Desarquivar" href='javascript:arquivar.submit()'>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#ed1212" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h5l2 3h9a2 2 0 0 1 2 2v11zM9.9 16.1L14 12M9.9 11.9L14 16"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#808080" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h5l2 3h9a2 2 0 0 1 2 2v11zM9.9 16.1L14 12M9.9 11.9L14 16"/></svg>
</a>
<form method="GET" name='arquivar' action='{{route('projeto.arquivar')}}' >
@csrf
......@@ -171,23 +171,24 @@
role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg">
<div class="modal-content">
<div class="modal-header" style="overflow-x:auto; padding-left: 31px">
<h5 class="modal-title" id="exampleModalLabel" style="color:#1492E6">
Informações Participante
@if($participante->planoTrabalho->arquivado == false)
<a title="Arquivar" href='javascript:arquivar2.submit()' >
<a title="Arquivar" href='javascript:arquivar1{{$participante->id}}.submit()' >
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#ed1212" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"></path><line x1="12" y1="11" x2="12" y2="17"></line><line x1="9" y1="14" x2="15" y2="14"></line></svg> </a>
<form method="GET" name='arquivar2' action='{{route('arquivo.arquivar')}}' >
<form method="GET" name='arquivar1{{$participante->id}}' action='{{route('arquivo.arquivar')}}' >
@csrf
<input value='{{$participante->planoTrabalho->id}}' name='arquivo_id' type='hidden'/>
<input value='1' name='arquivar_tipo' type='hidden'/>
</form>
@else
<a title="Desarquivar" href='javascript:arquivar2.submit()'>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#ed1212" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h5l2 3h9a2 2 0 0 1 2 2v11zM9.9 16.1L14 12M9.9 11.9L14 16"/></svg>
<a title="Desarquivar" href='javascript:arquivar2{{$participante->id}}.submit()'>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#808080" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h5l2 3h9a2 2 0 0 1 2 2v11zM9.9 16.1L14 12M9.9 11.9L14 16"/></svg>
</a>
<form method="GET" name='arquivar2' action='{{route('arquivo.arquivar')}}' >
<form method="GET" name='arquivar2{{$participante->id}}' action='{{route('arquivo.arquivar')}}' >
@csrf
<input value='{{$participante->planoTrabalho->id}}' name='arquivo_id' type='hidden'/>
<input value='0' name='arquivar_tipo' type='hidden'/>
......@@ -900,10 +901,11 @@
<h9>@if($parecerInterno == null) Pendente @else <a
href="{{ route('admin.visualizarParecerInterno', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id]) }}">Avaliado</a> @endif
</h9>
{{--<br>
<a href="{{ route('admin.removerProjAval', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id]) }}" >
Remover
</a> --}}
<br>
{{-- <a href="{{ route('admin.removerProjAval', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id]) }}" >
Remover
</a>--}}
<a href="{{ route('admin.reenviar.atribuicao.projeto', ['evento_id' => $evento->id, 'avaliador_id'=>$avaliador->id, 'trabalho_id' => $trabalho->id]) }}">
Reenviar convite
</a>
......@@ -938,10 +940,10 @@
href="{{ route('admin.visualizarParecerInterno', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id]) }}">Avaliado</a> @endif
</h9>
@endif
{{-- <br>
<a href="{{ route('admin.removerProjAval', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id]) }}" >
Remover
</a>--}}
{{--<br>
<a href="{{ route('admin.removerProjAval', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id]) }}" >
Remover
</a> --}}
<br>
<a href="{{ route('admin.reenviar.atribuicao.projeto', ['evento_id' => $evento->id, 'avaliador_id'=>$avaliador->id, 'trabalho_id' => $trabalho->id]) }}">
Reenviar convite
......@@ -963,7 +965,7 @@
<div class="card-body" style="padding-top: 0.2rem;">
<div class="container">
<div class="form-row mt-3">
<div class="col-md-11"><h5 style="color: #234B8B; font-weight: bold">Recomendação</h5></div>
<div class="col-md-11"><h5 style="color: #234B8B; font-weight: bold">Recomendação da Proposta</h5></div>
</div>
<hr style="border-top: 1px solid#1492E6">
<form action="{{ route('trabalho.aprovarProposta', ['id' => $trabalho->id]) }}" method="post">
......@@ -982,12 +984,7 @@
@if($trabalho->status=="aprovado") checked @endif>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Recomendado</a>
<br>
<input class="col-md-1" type="radio" id="parcialAprovado" name="statusProp"
value="corrigido" required
@if($trabalho->status=="corrigido") checked @endif>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Parcialmente
Recomendado</a>
<br>
<input class="col-md-1" type="radio" id="reprovado" name="statusProp"
value="reprovado" required
@if($trabalho->status=="reprovado") checked @endif>
......
resources/views/coordenador/home.blade.php
View file @ 2b5258e1
......@@ -63,7 +63,7 @@
@elseif($hoje > $evento->fimSubmissao)
<a href="{{ route('evento.visualizarNaoLogado', ['id'=>$evento->id]) }}" style="text-decoration: none" class="encerrado">
@else
<a href="{{ route('evento.visualizar',['id'=> $evento->id]) }}" style="text-decoration: none" class="vaiAbrir">
<a href="{{ route('evento.visualizarNaoLogado',['id'=> $evento->id]) }}" style="text-decoration: none" class="vaiAbrir">
@endif
@endif
<div class="card" style="width: 18rem; border-radius:12px; border-width:0px; margin:10px">
......@@ -232,6 +232,11 @@
vaiAbrir[l].style.display = "none";
}
}else if(select.value == "abrira"){
for(let l = 0; l < vaiAbrir.length; l++ ){
vaiAbrir[l].style.display = "";
}
for(let i = 0; i < abertos.length; i++){
abertos[i].style.display = "none";
}
......@@ -240,10 +245,12 @@
encerrados[j].style.display = "none";
}
for(let l = 0; l < vaiAbrir.length; l++ ){
vaiAbrir[l].style.display = "";
}
}else {
for(let j = 0; j < encerrados.length; j++ ){
encerrados[j].style.display = "";
}
for(let i = 0; i < abertos.length; i++){
abertos[i].style.display = "none";
}
......@@ -252,9 +259,6 @@
vaiAbrir[l].style.display = "none";
}
for(let j = 0; j < encerrados.length; j++ ){
encerrados[j].style.display = "";
}
}
......
resources/views/planosTrabalho/listar.blade.php
View file @ 2b5258e1
......@@ -39,9 +39,13 @@
</button>
@else
<!-- Button trigger modal -->
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioParcial{{ $arquivo->id }}">
@if($arquivo->relatorioParcial!=null)Visualizar @elseif($arquivo->arquivado) Arquivado @else Pendente @endif
</button>
@if($arquivo->relatorioParcial != null)
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioParcial{{ $arquivo->id }}"> Visualizar </button>
@elseif($arquivo->arquivado)
<button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#modalRelatorioParcial{{ $arquivo->id }}"> Arquivado </button>
@else
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioParcial{{ $arquivo->id }}"> Pendente </button>
@endif
@endif
</td>
......@@ -54,10 +58,14 @@
</button>
@else
<!-- Button trigger modal -->
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioFinal{{ $arquivo->id }}">
@if($arquivo->relatorioFinal!=null)Visualizar @elseif($arquivo->arquivado) Arquivado @else Pendente @endif
</button>
@if($arquivo->relatorioParcial != null)
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioParcial{{ $arquivo->id }}"> Visualizar </button>
@elseif($arquivo->arquivado)
<button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#modalRelatorioParcial{{ $arquivo->id }}"> Arquivado </button>
@else
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioParcial{{ $arquivo->id }}"> Pendente </button>
@endif
@endif
</td>
<!-- Modal Relatorio Parcial-->
......
resources/views/projeto/formularioVisualizar/resultado2.blade.php
View file @ 2b5258e1
......@@ -4,7 +4,7 @@
<div class="card-body" style="padding-top: 0.2rem;">
<div class="container">
<div class="form-row mt-3">
<div class="col-md-11"><h5 style="color: #234B8B; font-weight: bold">Recomendação</h5></div>
<div class="col-md-11"><h5 style="color: #234B8B; font-weight: bold">Recomendação da Proposta</h5></div>
</div>
<hr style="border-top: 1px solid#1492E6">
<div class="row">
......@@ -18,10 +18,7 @@
@if($projeto->status=="aprovado") checked @endif>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Recomendado</a>
<br>
<input class="col-md-1" type="radio" id="parcialAprovado" name="statusProp" value="corrigido" required disabled
@if($projeto->status=="corrigido") checked @endif>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Parcialmente Recomendado</a>
<br>
<input class="col-md-1" type="radio" id="reprovado" name="statusProp" value="reprovado" required disabled
@if($projeto->status=="reprovado") checked @endif>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Não Recomendado</a>
......
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