Skip to content

GitLab

Commit 6004afc9 authored by Guilherme Silva's avatar Guilherme Silva
Browse files

Modificação nas telas de substituição do discente para o uso e visualização do campo Justificativa

parent 037d2797
Hide whitespace changes
Inline Side-by-side
resources/views/administrador/analiseSubstituicoes.blade.php
View file @ 6004afc9
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<div class="col-12"> <div class="col-12">
<div class="form-group"> <div class="form-group">
<label for="justificativaTextArea">Justificativa:</label> <label for="justificativaTextArea">Justificativa:</label>
<textarea class="form-control" id="justificativaTextArea" rows="3" name="textJustificativa" ></textarea> <textarea class="form-control" id="justificativaTextArea" rows="3" name="textJustificativa" minlength="20" >Substituição cumpre com todos os requisitos</textarea>
</div> </div>
<select class="custom-select" name="selectJustificativa" > <select class="custom-select" name="selectJustificativa" >
<option value="DESISTENCIA">DESISTÊNCIA</option> <option value="DESISTENCIA">DESISTÊNCIA</option>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<div class="col-12"> <div class="col-12">
<div class="form-group"> <div class="form-group">
<label for="justificativaTextArea">Justificativa:</label> <label for="justificativaTextArea">Justificativa:</label>
<textarea class="form-control" id="justificativaTextArea" rows="3" name="textJustificativa" ></textarea> <textarea class="form-control" id="justificativaTextArea" rows="3" name="textJustificativa" minlength="20"></textarea>
</div> </div>
<select class="custom-select" name="selectJustificativa" > <select class="custom-select" name="selectJustificativa" >
<option value="DESISTENCIA">DESISTÊNCIA</option> <option value="DESISTENCIA">DESISTÊNCIA</option>
...@@ -179,12 +179,12 @@ ...@@ -179,12 +179,12 @@
<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-3">
<h5 class="card-title" style= "color:#1492E6"> <h5 class="card-title" style= "color:#1492E6">
Participante Substituído Participante Substituído
</h5> </h5>
</div> </div>
<div class="col-4"> <div class="col-3">
<h5 class="card-title" style= "color:#1492E6"> <h5 class="card-title" style= "color:#1492E6">
Participante Substituto Participante Substituto
</h5> </h5>
...@@ -199,17 +199,22 @@ ...@@ -199,17 +199,22 @@
Status Status
</h5> </h5>
</div> </div>
<div class="col-2">
<h5 class="card-title" style= "color:#1492E6">
Justificativa
</h5>
</div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@foreach($substituicoesProjeto as $subs) @foreach($substituicoesProjeto as $subs)
<div class="row"style="margin-bottom: 20px;"> <div class="row"style="margin-bottom: 20px;">
<div class="col-4"> <div class="col-3">
<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> <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> <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-3">
<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="#modalVizuParticipante{{$subs->participanteSubstituto()->withTrashed()->first()->id}}" class="button"><h4 style="font-size:18px">{{$subs->participanteSubstituto()->withTrashed()->first()->user->name}}</h4></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> <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>
...@@ -231,6 +236,30 @@ ...@@ -231,6 +236,30 @@
<h5>Pendente</h5> <h5>Pendente</h5>
@endif @endif
</div> </div>
<div class="col-2">
@if($subs->status == 'Em Aguardo')
<h5>Pendente</h5>
@else
<a href="" data-toggle="modal" data-target="#modalVizuJustificativa{{$subs->id}}" class="button"><h4 style="font-size:18px">Visualizar</h4></a>
@endif
</div>
</div>
<!-- Modal vizualizar justificativa -->
<div class="modal fade" id="modalVizuJustificativa{{$subs->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">Justificativa</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">
<h4 style="font-size:18px">{{$subs->justificativa}}</h4>
</div>
</div>
</div>
</div> </div>
<!-- Modal vizualizar info participante substituido --> <!-- Modal vizualizar info participante substituido -->
......
resources/views/administrador/substituirParticipante.blade.php
View file @ 6004afc9
...@@ -92,12 +92,12 @@ ...@@ -92,12 +92,12 @@
<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-3">
<h5 class="card-title" style= "color:#1492E6"> <h5 class="card-title" style= "color:#1492E6">
Participante Substituído Participante Substituído
</h5> </h5>
</div> </div>
<div class="col-4"> <div class="col-3">
<h5 class="card-title" style= "color:#1492E6"> <h5 class="card-title" style= "color:#1492E6">
Participante Substituto Participante Substituto
</h5> </h5>
...@@ -112,17 +112,22 @@ ...@@ -112,17 +112,22 @@
Status Status
</h5> </h5>
</div> </div>
<div class="col-2">
<h5 class="card-title" style= "color:#1492E6">
Justificativa
</h5>
</div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@foreach($substituicoesProjeto as $subs) @foreach($substituicoesProjeto as $subs)
<div class="row"style="margin-bottom: 20px;"> <div class="row"style="margin-bottom: 20px;">
<div class="col-4"> <div class="col-3">
<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> <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> <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-3">
<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="#modalVizuParticipante{{$subs->participanteSubstituto()->withTrashed()->first()->id}}" class="button"><h4 style="font-size:18px">{{$subs->participanteSubstituto()->withTrashed()->first()->user->name}}</h4></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> <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>
...@@ -144,6 +149,30 @@ ...@@ -144,6 +149,30 @@
<h5>Pendente</h5> <h5>Pendente</h5>
@endif @endif
</div> </div>
<div class="col-2">
@if($subs->status == 'Em Aguardo')
<h5>Pendente</h5>
@else
<a href="" data-toggle="modal" data-target="#modalVizuJustificativa{{$subs->id}}" class="button"><h4 style="font-size:18px">Visualizar</h4></a>
@endif
</div>
</div>
<!-- Modal vizualizar justificativa -->
<div class="modal fade" id="modalVizuJustificativa{{$subs->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">Justificativa</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">
<h4 style="font-size:18px">{{$subs->justificativa}}</h4>
</div>
</div>
</div>
</div> </div>
<!-- Modal vizualizar info participante substituido --> <!-- Modal vizualizar info participante substituido -->
......
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