Skip to content

GitLab

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

Merge pull request #439 from S-Nathalia/master 

Adicao de botao externo para remover discente, trocar botao cancelar …
parents a1ef52cb e43eaffd
Expand all Hide whitespace changes
Inline Side-by-side
resources/views/administrador/analisarProposta.blade.php
View file @ b2677c52
......@@ -156,14 +156,10 @@
</div>
<div class="col-sm-5">
<h5>{{$participante->user->name}}</h5>
<h9>
<h6>
<a href="" data-toggle="modal"
data-target="#modalVizuParticipante{{$participante->id}}" class="button">Informações</a>
</h9>
<br>
<a href="">
Remover
</a>
</h6>
</div>
<!-- Modal visualizar informações participante -->
......@@ -171,12 +167,12 @@
role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl">
<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: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='arquivar1{{$participante->id}}' action='{{route('arquivo.arquivar')}}' >
......@@ -819,13 +815,13 @@
</option>
</select>
</div>
<div class="col-sm-3" style="display:flex; align-items: end;">
<input type="text" class="form-control form-control-edit" placeholder="Nome do avaliador" onkeyup="buscar(this)" style="max-width: 200px;"> <img src="{{asset('img/icons/logo_lupa.png')}}" alt="">
</div>
</div>
<div class="col-md-6">
<label style="font-weight: bold;font-size: 18px">Internos</label>
</div>
......@@ -899,7 +895,7 @@
</div>
<hr style="border-top: 1px solid#1492E6">
<!--Comissão Interna-->
<div class="row justify-content-start" style="alignment: center">
<div class="col-md-11"><h6 style="color: #234B8B; font-weight: bold">Avaliadores -
......@@ -946,7 +942,7 @@
</div>
<div class="col-sm-5">
<h5>{{$avaliador->user->name}}</h5>
<h9>@if($avaliador->trabalhos->where('id', $trabalho->id)->first()->pivot->status == false)
Pendente @else <a
href="{{ route('admin.visualizarParecer', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id]) }}">Avaliado</a> @endif
......@@ -1927,7 +1923,7 @@
}
}
}
</script>
@endsection
resources/views/evento/formulario/participantes.blade.php
View file @ b2677c52
......@@ -20,17 +20,22 @@
<div id="participante" class="row">
@for($i = 0; $i < $edital->numParticipantes; $i++)
<div @if(!isset(old('marcado')[$i])) hidden @endif class="form-row mb-1 col-md-3" style="margin-top: 10px" id="part{{$i}}">
<div class="col-sm-4" style="display: flex; align-items: center;">
<div @if(!isset(old('marcado')[$i])) hidden @endif class="form-row mb-1 col-md-6" style="margin-top: 10px" id="part{{$i}}">
<div class="col-sm-2" style="display: flex; align-items: center;">
<img src="{{asset('img/icons/usuario.svg')}}" style="width:60px" alt="">
</div>
<div class="col-sm-8" style="display: flex; align-items: center;">
<div class="col-sm-10" style="display: flex; align-items: center;">
<div class="col-sm-12">
<a href="" style="" class="justify-content-center" data-toggle="modal" data-target="#exampleModal{{$i}}" id="nomePart{{$i+1}}">
@if(isset(old('marcado')[$i]))
@if(isset(old('name')[$i]))Nome: {{old('name')[$i]}} @else Discente {{$i+1}} @endif
@if(isset(old('nomePlanoTrabalho')[$i]))<br> Plano: {{old('nomePlanoTrabalho')[$i]}} @endif
@endif
</a>
<div class="col-sm-5 pl-0" style="margin-top: 10px; text-align: left;">
<button data-dismiss="modal" type="button" id="cancelar{{$i}}" class=" btn btn-danger" style="font-size: 12px" onclick="desmarcar({{$i}})" @if(isset(old('marcado')[$i+1])) disabled @endif>Excluir</button>
</div>
</div>
</div>
</div>
......@@ -124,7 +129,7 @@
<div class="col-md-12"><h5>Endereço</h5></div>
<div class="col-6">
@component('componentes.input', ['label' => 'CEP'])
<input name="cep[{{$i}}]" type="text" id="cep{{$i}}"
<input name="cep[{{$i}}]" type="text" id="cep{{$i}}"
value="{{ old('cep')[$i] ?? ''}}" class="form-control cep"
onblur="pesquisacep(this.value, {{$i}})" />
@error('cep.'.$i)
......@@ -155,7 +160,7 @@
<div class="col-6">
@component('componentes.input', ['label' => 'Bairro'])
<input name="bairro[{{$i}}]" type="text" id="bairro{{$i}}" class="form-control"
<input name="bairro[{{$i}}]" type="text" id="bairro{{$i}}" class="form-control"
value="{{ old('bairro')[$i] ?? '' }}" />
@error('bairro.'.$i)
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block"><strong>{{ $message }}</strong></span>
......@@ -182,11 +187,11 @@
@enderror
@endcomponent
</div>
<div class="col-12">
<div class="form-group">
<label class=" control-label" for="firstname">Complemento</label>
......@@ -359,8 +364,11 @@
@endcomponent
</div>
<div class="col-6">
{{-- <div class="col-6">
<button data-dismiss="modal" type="button" id="cancelar{{$i}}" class=" btn btn-danger" style="font-size: 16px" onclick="desmarcar({{$i}})" @if(isset(old('marcado')[$i+1])) disabled @endif>Cancelar</button>
</div> --}}
<div class="col-6">
<button data-dismiss="modal" type="button" class="btn btn-secondary float-left" style="font-size: 16px">Sair</button>
</div>
<div class="col-6">
<button data-dismiss="modal" type="button" id="guardar{{$i}}" class="btn btn-success float-right" style="font-size: 16px" onclick="marcar({{$i}})">Salvar</button>
......@@ -397,7 +405,7 @@
</script>
<!-- Adicionando Javascript -->
<script>
function limpa_formulário_cep(id) {
//Limpa valores do formulário de cep.
document.getElementById(`rua${id}`).value=("");
......@@ -406,7 +414,7 @@
document.getElementById(`uf${id}`).value=("");
//document.getElementById('ibge').value=("");
}
let cont = 0; //Esse cont representa a adição de cada aluno
function meu_callback(conteudo) {
if (!("erro" in conteudo)) {
......@@ -415,8 +423,8 @@
document.getElementById(`bairro${cont}`).value=(conteudo.bairro);
document.getElementById(`cidade${cont}`).value=(conteudo.localidade);
document.getElementById(`uf${cont}`).value=(conteudo.uf);
//document.getElementById('ibge').value=(conteudo.ibge);
} //end if.
else {
......@@ -429,7 +437,7 @@
function pesquisacep(valor, id) {
//Nova variável "cep" somente com dígitos.
var cep = valor.replace(/\D/g, '');
//Verifica se campo cep possui valor informado.
if (cep != "") {
......
resources/views/projeto/formularioVisualizar/participantes2.blade.php
View file @ b2677c52
......@@ -22,6 +22,7 @@
</div>
<div class="col-sm-5">
<h5>{{$participante->user->name}}</h5>
<h5>{{$participante->planoTrabalho->titulo}}</h5>
<h9>
<a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$participante->id}}" class="button">Informações</a>
</h9>
......@@ -53,4 +54,3 @@
</div>
<!--X Participantes X-->
resources/views/proponente/projetos.blade.php
View file @ b2677c52
......@@ -109,9 +109,11 @@
Documentos Complementares
</a>
<hr class="dropdown-hr">
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar
</a>
@if($projeto->status != 'rascunho')
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar
</a>
@endif
<hr class="dropdown-hr">
<a href="{{route('planos.listar', ['id' => $projeto->id])}}" class="dropdown-item" style="text-align: center">
......
resources/views/proponente/projetosEdital.blade.php
View file @ b2677c52
......@@ -38,7 +38,7 @@
</div>
<div style="margin-top: -2rem">
<div class="col-md-12" style="margin-bottom:18px">
@if(false) {{-- Agendamento para o dia 01/07/2021 as 12:30:00--}}
<a data-toggle="modal" data-target="#exampleModal" class="btn btn-info" style="color:#fff; margin-right:-15px">Criar proposta</a>
......@@ -51,7 +51,7 @@
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body" style="text-align: center">
<h3 style="color: #005387">Site em manutenção!</h3>
</div>
......@@ -60,7 +60,7 @@
<h5 style="color: #005387; margin-bottom:-1px">Voltaremos na quinta-feira!</h5>
<h5 style="color: #909090"> 01/07/2021 às 12h30</h5>
</div>
<div class="modal-footer"style="border: 0px solid rgba(0, 0, 0, 0.2);">
<button type="button" class="btn btn-light" data-dismiss="modal">Fechar</button>
</div>
......@@ -73,7 +73,7 @@
@endif
@endif
</div>
</div>
</div>
</div>
......@@ -130,10 +130,11 @@
</a>--}}
<hr class="dropdown-hr">
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar
</a>
@if($projeto->status != 'rascunho')
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar
</a>
@endif
<hr class="dropdown-hr">
<a href="{{route('planos.listar', ['id' => $projeto->id])}}" class="dropdown-item" style="text-align: center">
......@@ -221,7 +222,7 @@
<script>
function buscarEdital(input) {
var editais = document.getElementById('projetos').children;
if(input.value.length > 2) {
if(input.value.length > 2) {
for(var i = 0; i < editais.length; i++) {
var nomeEvento = editais[i].children[0].textContent;
if(nomeEvento.substr(0).indexOf(input.value) >= 0) {
......
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