Skip to content

GitLab

Commit ad87c8a9 authored by José Rômulo's avatar José Rômulo
Browse files

Modificando tela de substituição

parent 2b7168a6
Expand all Hide whitespace changes
Inline Side-by-side
resources/views/administrador/analiseSubstituicoes.blade.php
View file @ ad87c8a9
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<h5 style="color:grey; font-size:medium">{{$trabalho->titulo}}</h5> <h5 style="color:grey; font-size:medium">{{$trabalho->titulo}}</h5>
</div> </div>
<div class="card-body"> <div class="card-body">
@if($subsPendentes->count() > 0) @if($substituicoesPendentes->count() > 0)
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($subsPendentes as $subs) @foreach($substituicoesPendentes as $subs)
<tr> <tr>
<td><a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$subs->participanteSubstituido->id}}" class="button">{{$subs->participanteSubstituido->user->name}}</a></td> <td><a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$subs->participanteSubstituido()->withTrashed()->first()->id}}" class="button">{{$subs->participanteSubstituido()->withTrashed()->first()->user->name}}</a></td>
<td><a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$subs->participanteSubstituto->id}}" class="button">{{$subs->participanteSubstituto->user->name}}</a></td> <td><a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$subs->participanteSubstituto()->withTrashed()->first()->id}}" class="button">{{$subs->participanteSubstituto()->withTrashed()->first()->user->name}}</a></td>
<td><a href="{{ route('baixar.plano', ['id' => $subs->planoSubstituto->id]) }}">{{$subs->planoSubstituto->titulo}}</a></td> <td><a href="{{ route('baixar.plano', ['id' => $subs->planoSubstituto()->withTrashed()->first()->id]) }}">{{$subs->planoSubstituto()->withTrashed()->first()->titulo}}</a></td>
<td> <td>
<div class="row justify-content-around"> <div class="row justify-content-around">
<a href="" data-toggle="modal" data-target="#modalResultadoSubst{{$subs->id}}" class="button"><i class="far fa-check-circle fa-2x"></i></a> <a href="" data-toggle="modal" data-target="#modalResultadoSubst{{$subs->id}}" class="button"><i class="far fa-check-circle fa-2x"></i></a>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
</div> </div>
<!-- Modal vizualizar info participante substituido --> <!-- Modal vizualizar info participante substituido -->
<div class="modal fade" id="modalVizuParticipante{{$subs->participanteSubstituido->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="modalVizuParticipante{{$subs->participanteSubstituido()->withTrashed()->first()->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg"> <div class="modal-dialog modal-dialog-centered modal-lg">
<div class="modal-content"> <div class="modal-content">
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</div> </div>
<!-- Modal vizualizar info participante substituto --> <!-- Modal vizualizar info participante substituto -->
<div class="modal fade" id="modalVizuParticipante{{$subs->participanteSubstituto->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="modalVizuParticipante{{$subs->participanteSubstituto()->withTrashed()->first()->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg"> <div class="modal-dialog modal-dialog-centered modal-lg">
<div class="modal-content"> <div class="modal-content">
...@@ -175,50 +175,106 @@ ...@@ -175,50 +175,106 @@
<h4>Nenhuma substituição Pendente</h4> <h4>Nenhuma substituição Pendente</h4>
@endif @endif
<h4 style="margin-top: 25px">Histórico de participantes</h4> <h4 style="margin-top: 50px">Substituições</h4>
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<div class="card-header"> <div class="card-header">
<h5 class="card-title" style= "color:#1492E6"> <div class="row">
Nome/Periodo <div class="col-4">
</h5> <h5 class="card-title" style= "color:#1492E6">
Participante Substituido
</h5>
</div>
<div class="col-4">
<h5 class="card-title" style= "color:#1492E6">
Participante Substituto
</h5>
</div>
<div class="col-2">
<h5 class="card-title" style= "color:#1492E6">
Tipo
</h5>
</div>
<div class="col-2">
<h5 class="card-title" style= "color:#1492E6">
Status
</h5>
</div>
</div>
</div> </div>
<div class="card-body"> <div class="card-body">
@foreach($participantesExcluidos as $participante) @foreach($substituicoesProjeto as $subs)
<div class="row"style="margin-bottom: 20px;"> <div class="row"style="margin-bottom: 20px;">
<div class="col-10"> <div class="col-4">
<h4 style="font-size:20px">{{$participante->user->name}}</h4> <a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$subs->participanteSubstituido()->withTrashed()->first()->id}}" class="button"><h4 style="font-size:18px">{{$subs->participanteSubstituido()->withTrashed()->first()->user->name}}</h4></a>
<h5 style= "color:grey; font-size:medium">{{date('d-m-Y', strtotime($participante->created_at))}} - {{date('d-m-Y', strtotime($participante->deleted_at))}}</h5> <h5 style= "color:grey; font-size:medium">{{date('d-m-Y', strtotime($subs->participanteSubstituido()->withTrashed()->first()->created_at))}} - @if($subs->participanteSubstituido()->withTrashed()->first()->deleted_at == null) Atualmente @else {{date('d-m-Y', strtotime($subs->participanteSubstituido()->withTrashed()->first()->deleted_at))}} @endif</h5>
</div> </div>
<div class="col-2 align-self-center"> <div class="col-4">
<div class="row justify-content-center"> <a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$subs->participanteSubstituto()->withTrashed()->first()->id}}" class="button"><h4 style="font-size:18px">{{$subs->participanteSubstituto()->withTrashed()->first()->user->name}}</h4></a>
<a href="" data-toggle="modal" data-target="#modalVizuParticipanteExcluido{{$participante->id}}" class="button"><i class="far fa-eye fa-2x"></i></a> <h5 style= "color:grey; font-size:medium">{{date('d-m-Y', strtotime($subs->participanteSubstituto()->withTrashed()->first()->created_at))}} - @if($subs->participanteSubstituto()->withTrashed()->first()->deleted_at == null) Atualmente @else {{date('d-m-Y', strtotime($subs->participanteSubstituto()->withTrashed()->first()->deleted_at))}} @endif</h5>
</div>
<div class="col-2">
@if($subs->tipo == 'ManterPlano')
<h5>Manter Plano</h5>
@elseif($subs->tipo == 'TrocarPlano')
<h5>Alterar Plano</h5>
@elseif($subs->tipo == 'Completa')
<h5>Completa</h5>
@endif
</div>
<div class="col-2">
@if($subs->status == 'Finalizada')
<h5>Concluída</h5>
@elseif($subs->status == 'Negada')
<h5>Negada</h5>
@elseif($subs->status == 'Em Aguardo')
<h5>Pendente</h5>
@endif
</div> </div>
</div>
</div> </div>
<!-- Modal visualizar informações participante excluido --> <!-- Modal vizualizar info participante substituido -->
<div class="modal fade" id="modalVizuParticipanteExcluido{{$participante->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="modalVizuParticipante{{$subs->participanteSubstituido()->withTrashed()->first()->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg"> <div class="modal-dialog modal-dialog-centered modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" style="overflow-x:auto"> <div class="modal-header" style="overflow-x:auto">
<h5 class="modal-title" id="exampleModalLabel" style= "color:#1492E6">Informações Participante</h5> <h5 class="modal-title" id="exampleModalLabel" style= "color:#1492E6">Informações Participante</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="padding-top: 8px; color:#1492E6"> <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="padding-top: 8px; color:#1492E6">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div>
<div class="modal-body">
@include('administrador.vizualizarParticipante', ['visualizarSubstituido' => 1])
</div>
</div> </div>
</div>
</div>
<div class="modal-body"> <!-- Modal vizualizar info participante substituto -->
@include('administrador.substituirParticipanteForm', ['visualizarOnly' => 1]) <div class="modal fade" id="modalVizuParticipante{{$subs->participanteSubstituto()->withTrashed()->first()->id}}" tabindex="-1" 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">
<h5 class="modal-title" id="exampleModalLabel" style= "color:#1492E6">Informações Participante</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="padding-top: 8px; color:#1492E6">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
@include('administrador.vizualizarParticipante')
</div>
</div> </div>
</div> </div>
</div>
</div> </div>
@endforeach @endforeach
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
......
resources/views/administrador/substituirParticipante.blade.php
View file @ ad87c8a9
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body px-1">
@include('administrador.substituirParticipanteForm') @include('administrador.substituirParticipanteForm')
</div> </div>
</div> </div>
...@@ -88,161 +88,107 @@ ...@@ -88,161 +88,107 @@
</div> </div>
</div> </div>
@if($substituicoesPendentes->count() > 0) <h4 style="margin-top: 50px">Substituições</h4>
<h4 style="margin-top: 50px">Substituições Pendentes</h4>
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<div class="card-header"> <div class="card-header">
<div class="row"> <div class="row">
<div class="col-4"> <div class="col-4">
<h5 class="card-title" style= "color:#1492E6"> <h5 class="card-title" style= "color:#1492E6">
Participante Substituido Participante Substituido
</h5> </h5>
</div> </div>
<div class="col-4"> <div class="col-4">
<h5 class="card-title" style= "color:#1492E6"> <h5 class="card-title" style= "color:#1492E6">
Participante Substituto Participante Substituto
</h5> </h5>
</div> </div>
<div class="col-4"> <div class="col-2">
<h5 class="card-title" style= "color:#1492E6"> <h5 class="card-title" style= "color:#1492E6">
Tipo Tipo
</h5> </h5>
</div> </div>
<div class="col-2">
<h5 class="card-title" style= "color:#1492E6">
Status
</h5>
</div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@foreach($substituicoesPendentes as $substituicao) @foreach($substituicoesProjeto as $subs)
<div class="row"style="margin-bottom: 20px;"> <div class="row"style="margin-bottom: 20px;">
<div class="col-4">
<h4 style="font-size:18px">{{$substituicao->participanteSubstituido->user->name}}</h4> </div>
<div class="col-4"> <div class="col-4">
<h4 style="font-size:18px">{{$substituicao->participanteSubstituto->user->name}}</h4> <a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$subs->participanteSubstituido()->withTrashed()->first()->id}}" class="button"><h4 style="font-size:18px">{{$subs->participanteSubstituido()->withTrashed()->first()->user->name}}</h4></a>
<h5 style= "color:grey; font-size:medium">{{date('d-m-Y', strtotime($subs->participanteSubstituido()->withTrashed()->first()->created_at))}} - @if($subs->participanteSubstituido()->withTrashed()->first()->deleted_at == null) Atualmente @else {{date('d-m-Y', strtotime($subs->participanteSubstituido()->withTrashed()->first()->deleted_at))}} @endif</h5>
</div> </div>
<div class="col-4"> <div class="col-4">
@if($substituicao->tipo == 'ManterPlano') <a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$subs->participanteSubstituto()->withTrashed()->first()->id}}" class="button"><h4 style="font-size:18px">{{$subs->participanteSubstituto()->withTrashed()->first()->user->name}}</h4></a>
<h5>Manter Plano</h5> <h5 style= "color:grey; font-size:medium">{{date('d-m-Y', strtotime($subs->participanteSubstituto()->withTrashed()->first()->created_at))}} - @if($subs->participanteSubstituto()->withTrashed()->first()->deleted_at == null) Atualmente @else {{date('d-m-Y', strtotime($subs->participanteSubstituto()->withTrashed()->first()->deleted_at))}} @endif</h5>
@elseif($substituicao->tipo == 'TrocarPlano')
<h5>Alterar Plano</h5>
@elseif($substituicao->tipo == 'Completa')
<h5>Completa</h5>
@endif
</div>
</div>
@endforeach
</div>
</div>
@endif
@if($substituicoesNegadas->count() > 0)
<h4 style="margin-top: 50px">Substituições Negadas</h4>
<div style="margin-top: 20px">
<div class="card-header">
<div class="row">
<div class="col-3">
<h5 class="card-title" style= "color:#1492E6">
Participante Substituido
</h5>
</div>
<div class="col-3">
<h5 class="card-title" style= "color:#1492E6">
Participante Substituto
</h5>
</div>
<div class="col-2">
<h5 class="card-title" style= "color:#1492E6">
Tipo
</h5>
</div>
<div class="col-2">
<h5 class="card-title" style= "color:#1492E6">
Justificativa
</h5>
</div>
<div class="col-2">
<h5 class="card-title" style= "color:#1492E6">
Data
</h5>
</div>
</div>
</div>
<div class="card-body">
@foreach($substituicoesNegadas as $substituicao)
<div class="row"style="margin-bottom: 20px;">
<div class="col-3">
@if($substituicao->participanteSubstituido()->first() != null)
<h4 style="font-size:18px">{{$substituicao->participanteSubstituido->user->name}}</h4>
@else
<h4 style="font-size:18px">{{$substituicao->participanteSubstituido()->withTrashed()->first()->user->name}}</h4>
@endif
</div>
<div class="col-3">
<h4 style="font-size:18px">{{$substituicao->participanteSubstituto()->withTrashed()->first()->user->name}}</h4>
</div> </div>
<div class="col-2"> <div class="col-2">
@if($substituicao->tipo == 'ManterPlano') @if($subs->tipo == 'ManterPlano')
<h5>Manter Plano</h5> <h5>Manter Plano</h5>
@elseif($substituicao->tipo == 'TrocarPlano') @elseif($subs->tipo == 'TrocarPlano')
<h5>Alterar Plano</h5> <h5>Alterar Plano</h5>
@elseif($substituicao->tipo == 'Completa') @elseif($subs->tipo == 'Completa')
<h5>Completa</h5> <h5>Completa</h5>
@endif @endif
</div> </div>
<div class="col-2"> <div class="col-2">
<p style="max-height: 60px; overflow:auto">{{$substituicao->justificativa}}</p> @if($subs->status == 'Finalizada')
</div> <h5>Concluída</h5>
<div class="col-2"> @elseif($subs->status == 'Negada')
<p>{{$substituicao->concluida_em}}</p> <h5>Negada</h5>
@elseif($subs->status == 'Em Aguardo')
<h5>Pendente</h5>
@endif
</div> </div>
</div> </div>
@endforeach
</div>
</div>
@endif
<!-- Modal vizualizar info participante substituido -->
<div class="modal fade" id="modalVizuParticipante{{$subs->participanteSubstituido()->withTrashed()->first()->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg">
<div class="modal-content">
<h4 style="margin-top: 50px">Histórico de participantes</h4> <div class="modal-header" style="overflow-x:auto">
<div style="margin-top: 20px"> <h5 class="modal-title" id="exampleModalLabel" style= "color:#1492E6">Informações Participante</h5>
<div class="card-header">
<h5 class="card-title" style= "color:#1492E6"> <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="padding-top: 8px; color:#1492E6">
Nome/Periodo <span aria-hidden="true">&times;</span>
</h5> </button>
</div> </div>
<div class="card-body">
@foreach($participantesExcluidos as $participante) <div class="modal-body">
<div class="row"style="margin-bottom: 20px;"> @include('administrador.vizualizarParticipante', ['visualizarSubstituido' => 1])
<div class="col-10"> </div>
<h4 style="font-size:20px">{{$participante->user->name}}</h4> </div>
<h5 style= "color:grey; font-size:medium">{{date('d-m-Y', strtotime($participante->created_at))}} - {{date('d-m-Y', strtotime($participante->deleted_at))}}</h5>
</div>
<div class="col-2 align-self-center">
<div class="row justify-content-center">
<a href="" data-toggle="modal" data-target="#modalVizuParticipanteExcluido{{$participante->id}}" class="button"><i class="far fa-eye fa-2x"></i></a>
</div> </div>
</div>
</div> </div>
<!-- Modal visualizar informações participante excluido --> <!-- Modal vizualizar info participante substituto -->
<div class="modal fade" id="modalVizuParticipanteExcluido{{$participante->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="modalVizuParticipante{{$subs->participanteSubstituto()->withTrashed()->first()->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg"> <div class="modal-dialog modal-dialog-centered modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header" style="overflow-x:auto"> <div class="modal-header" style="overflow-x:auto">
<h5 class="modal-title" id="exampleModalLabel" style= "color:#1492E6">Informações Participante</h5> <h5 class="modal-title" id="exampleModalLabel" style= "color:#1492E6">Informações Participante</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="padding-top: 8px; color:#1492E6"> <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="padding-top: 8px; color:#1492E6">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@include('administrador.substituirParticipanteForm', ['visualizarOnly' => 1]) @include('administrador.vizualizarParticipante')
</div>
</div> </div>
</div> </div>
</div>
</div> </div>
@endforeach @endforeach
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -345,6 +291,8 @@ ...@@ -345,6 +291,8 @@
inputsForm.push(document.getElementById('anexoTermoCompromisso'+idParticipante)); inputsForm.push(document.getElementById('anexoTermoCompromisso'+idParticipante));
inputsForm.push(document.getElementById('anexoComprovanteMatricula'+idParticipante)); inputsForm.push(document.getElementById('anexoComprovanteMatricula'+idParticipante));
inputsForm.push(document.getElementById('anexoCurriculoLattes'+idParticipante));
inputsForm.push(document.getElementById('anexoAutorizacaoPais'+idParticipante));
if(checkboxInput.checked){ if(checkboxInput.checked){
inputsForm.forEach(function(item,indice,array){ inputsForm.forEach(function(item,indice,array){
......
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