Skip to content

GitLab

"...Controllers/git@sites.upe.br:walter.felipe/submeta.git" did not exist on "2a69095282ce16382d91ece737615117e0b5ec04"
Commit e43eaffd authored by S-Nathalia's avatar S-Nathalia
Browse files

Adicao de botao externo para remover discente, trocar botao cancelar para... 

Adicao de botao externo para remover discente, trocar botao cancelar para sair, adicicao de titulo do projeto na visualizacao do admin
parent a1ef52cb
Show whitespace changes
Inline Side-by-side
resources/views/administrador/analisarProposta.blade.php
View file @ e43eaffd
...@@ -156,14 +156,10 @@ ...@@ -156,14 +156,10 @@
</div> </div>
<div class="col-sm-5"> <div class="col-sm-5">
<h5>{{$participante->user->name}}</h5> <h5>{{$participante->user->name}}</h5>
<h9> <h6>
<a href="" data-toggle="modal" <a href="" data-toggle="modal"
data-target="#modalVizuParticipante{{$participante->id}}" class="button">Informações</a> data-target="#modalVizuParticipante{{$participante->id}}" class="button">Informações</a>
</h9> </h6>
<br>
<a href="">
Remover
</a>
</div> </div>
<!-- Modal visualizar informações participante --> <!-- Modal visualizar informações participante -->
......
resources/views/evento/formulario/participantes.blade.php
View file @ e43eaffd
...@@ -20,17 +20,22 @@ ...@@ -20,17 +20,22 @@
<div id="participante" class="row"> <div id="participante" class="row">
@for($i = 0; $i < $edital->numParticipantes; $i++) @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 @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-4" style="display: flex; align-items: center;"> <div class="col-sm-2" style="display: flex; align-items: center;">
<img src="{{asset('img/icons/usuario.svg')}}" style="width:60px" alt=""> <img src="{{asset('img/icons/usuario.svg')}}" style="width:60px" alt="">
</div> </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}}"> <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('marcado')[$i]))
@if(isset(old('name')[$i]))Nome: {{old('name')[$i]}} @else Discente {{$i+1}} @endif @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 @if(isset(old('nomePlanoTrabalho')[$i]))<br> Plano: {{old('nomePlanoTrabalho')[$i]}} @endif
@endif @endif
</a> </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>
</div> </div>
...@@ -359,8 +364,11 @@ ...@@ -359,8 +364,11 @@
@endcomponent @endcomponent
</div> </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> <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>
<div class="col-6"> <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> <button data-dismiss="modal" type="button" id="guardar{{$i}}" class="btn btn-success float-right" style="font-size: 16px" onclick="marcar({{$i}})">Salvar</button>
......
resources/views/projeto/editaFormulario/participantes.blade.php
View file @ e43eaffd
...@@ -26,11 +26,12 @@ ...@@ -26,11 +26,12 @@
@endphp @endphp
<div @if(!$participante) hidden @endif class="form-row mb-1 col-md-3" style="margin-top: 10px" id="part{{$i}}"> <div @if(!$participante) hidden @endif class="form-row mb-1 col-md-6" style="margin-top: 10px" id="part{{$i}}">
<div class="col-sm-4" style="display: flex; align-items: center;"> <div class="col-sm-2" style="display: flex; align-items: center;">
<img src="{{asset('img/icons/usuario.svg')}}" style="width:60px" alt=""> <img src="{{asset('img/icons/usuario.svg')}}" style="width:60px" alt="">
</div> </div>
<div class="col-sm-8" style="display: flex; align-items: center;"> <div class="col-sm-8" 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}}"> <a href="" style="" class="justify-content-center" data-toggle="modal" data-target="#exampleModal{{$i}}" id="nomePart{{$i+1}}">
@if($participante) @if($participante)
@if(isset(old('name')[$i]))Nome: {{old('name')[$i]}} @else Nome: {{$participante->user->name}} @endif @if(isset(old('name')[$i]))Nome: {{old('name')[$i]}} @else Nome: {{$participante->user->name}} @endif
...@@ -39,6 +40,11 @@ ...@@ -39,6 +40,11 @@
Discente Discente
@endif @endif
</a> </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>
</div> </div>
...@@ -353,7 +359,7 @@ ...@@ -353,7 +359,7 @@
@endcomponent @endcomponent
</div> </div>
<div class="col-12" style="margin-bottom: 10px"> <div class="col-12" style="margin-bottom: 10px">
<label>Anexo (.pfd)<span style="color: red;font-weight: bold">* </span> <label>Anexo (.pdf)<span style="color: red;font-weight: bold">* </span>
@if($participante !=null && $participante->planoTrabalho) @if($participante !=null && $participante->planoTrabalho)
...@@ -377,8 +383,11 @@ ...@@ -377,8 +383,11 @@
@enderror @enderror
</div> </div>
{{-- <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>Excluir</button>
</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> <button data-dismiss="modal" type="button" class="btn btn-secondary float-left" style="font-size: 16px">Sair</button>
</div> </div>
<div class="col-6"> <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> <button data-dismiss="modal" type="button" id="guardar{{$i}}" class="btn btn-success float-right" style="font-size: 16px" onclick="marcar({{$i}})">Salvar</button>
...@@ -408,8 +417,8 @@ ...@@ -408,8 +417,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
function limpa_formulário_cep(id) { function limpa_formulário_cep(id) {
//Limpa valores do formulário de cep. //Limpa valores do formulário de cep.
...@@ -482,5 +491,4 @@ ...@@ -482,5 +491,4 @@
} }
}; };
</script> </script>
resources/views/projeto/formularioVisualizar/participantes2.blade.php
View file @ e43eaffd
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
</div> </div>
<div class="col-sm-5"> <div class="col-sm-5">
<h5>{{$participante->user->name}}</h5> <h5>{{$participante->user->name}}</h5>
<h5>{{$participante->planoTrabalho->titulo}}</h5>
<h9> <h9>
<a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$participante->id}}" class="button">Informações</a> <a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$participante->id}}" class="button">Informações</a>
</h9> </h9>
...@@ -53,4 +54,3 @@ ...@@ -53,4 +54,3 @@
</div> </div>
<!--X Participantes X--> <!--X Participantes X-->
resources/views/proponente/projetos.blade.php
View file @ e43eaffd
...@@ -109,9 +109,11 @@ ...@@ -109,9 +109,11 @@
Documentos Complementares Documentos Complementares
</a> </a>
<hr class="dropdown-hr"> <hr class="dropdown-hr">
@if($projeto->status != 'rascunho')
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center"> <a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar Visualizar
</a> </a>
@endif
<hr class="dropdown-hr"> <hr class="dropdown-hr">
<a href="{{route('planos.listar', ['id' => $projeto->id])}}" class="dropdown-item" style="text-align: center"> <a href="{{route('planos.listar', ['id' => $projeto->id])}}" class="dropdown-item" style="text-align: center">
......
resources/views/proponente/projetosEdital.blade.php
View file @ e43eaffd
...@@ -130,10 +130,11 @@ ...@@ -130,10 +130,11 @@
</a>--}} </a>--}}
<hr class="dropdown-hr"> <hr class="dropdown-hr">
@if($projeto->status != 'rascunho')
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center"> <a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar Visualizar
</a> </a>
@endif
<hr class="dropdown-hr"> <hr class="dropdown-hr">
<a href="{{route('planos.listar', ['id' => $projeto->id])}}" class="dropdown-item" style="text-align: center"> <a href="{{route('planos.listar', ['id' => $projeto->id])}}" class="dropdown-item" style="text-align: center">
......
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