Unverified Commit f8e36c74 authored by Antônio Durval's avatar Antônio Durval Committed by GitHub
Browse files

Merge pull request #863 from antonioDurval/master

Correções
parents 31099375 87bfb866
...@@ -1026,7 +1026,8 @@ ...@@ -1026,7 +1026,8 @@
</div> </div>
</div> </div>
@if($evento->natureza_id != 3)
<div class="col-md-6"> <div class="col-md-6">
<label style="font-weight: bold;font-size: 18px">Internos</label> <label style="font-weight: bold;font-size: 18px">Internos</label>
</div> </div>
...@@ -1054,7 +1055,7 @@ ...@@ -1054,7 +1055,7 @@
@endif @endif
@endforeach @endforeach
</select> </select>
@endif
<div class="col-md-6"> <div class="col-md-6">
<label style="font-weight: bold;font-size: 18px"><i>Ad Hoc</i></label> <label style="font-weight: bold;font-size: 18px"><i>Ad Hoc</i></label>
......
...@@ -22,7 +22,11 @@ ...@@ -22,7 +22,11 @@
<div class="col-md-2"> <div class="col-md-2">
<!-- Button trigger modal --> <!-- Button trigger modal -->
<button type="button" class="btn btn-info" data-toggle="modal" data-target="#exampleModalCenter"> <button type="button" class="btn btn-info" data-toggle="modal" data-target="#exampleModalCenter">
Enviar Convite @if($evento->natureza_id == 3)
Enviar Convite para Banca
@else
Enviar Convite
@endif
</button> </button>
</div> </div>
</div> </div>
...@@ -247,7 +251,13 @@ ...@@ -247,7 +251,13 @@
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content modal-submeta"> <div class="modal-content modal-submeta">
<div class="modal-header modal-header-submeta"> <div class="modal-header modal-header-submeta">
<h5 class="modal-title titulo-table" id="exampleModalLongTitle" style="font-size: 20px;">Enviar Convite</h5> <h5 class="modal-title titulo-table" id="exampleModalLongTitle" style="font-size: 20px;">
@if($evento->natureza_id == 3)
Enviar Convite para Banca
@else
Enviar Convite
@endif
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color: rgb(182, 182, 182)"> <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color: rgb(182, 182, 182)">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div class="row justify-content-center" style="margin-top: 3rem;"> <div class="row justify-content-center" style="margin-top: 3rem;">
<div class="col-md-11" style="margin-bottom: -3rem"> <div class="col-md-11" style="margin-bottom: -3rem">
<div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;"> <div class="card card_conteudo shadow bg-white" style="border-radius:12px; border-width:0px;">
@if($trabalhosIn != null) @if($trabalhosIn != null && $evento->natureza_id != 3)
<div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff"> <div class="card-header" style="border-top-left-radius: 12px; border-top-right-radius: 12px; background-color: #fff">
<div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:-1rem"> <div class="d-flex justify-content-between align-items-center" style="margin-top: 9px; margin-bottom:-1rem">
<div class="bottomVoltar" style="margin-top: -20px"> <div class="bottomVoltar" style="margin-top: -20px">
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
</div> </div>
@endif @endif
@if($trabalhosIn != null) @if($trabalhosIn != null && $evento->natureza_id != 3)
<div class="card-body" > <div class="card-body" >
<table class="table table-bordered table-hover" style="display: block; white-space: nowrap; border-radius:10px; margin-bottom:0px"> <table class="table table-bordered table-hover" style="display: block; white-space: nowrap; border-radius:10px; margin-bottom:0px">
<thead> <thead>
...@@ -215,9 +215,9 @@ ...@@ -215,9 +215,9 @@
@if ($planoTrabalho != null) @if ($planoTrabalho != null)
<a href="{{route('download', ['file' => $planoTrabalho])}}" target="_new" style="font-size: 20px; color: #114048ff;" class="btn btn-light"> <a href="{{route('download', ['file' => $planoTrabalho])}}" target="_new" style="font-size: 20px; color: #114048ff;" class="btn btn-light">
<img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:15px"> <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:15px">
</a> </a> <br>
@else @else
Não planos de trabalho. Não planos de trabalho. <br>
@endif @endif
@endforeach @endforeach
@endif @endif
......
...@@ -50,9 +50,10 @@ ...@@ -50,9 +50,10 @@
} }
@endphp @endphp
<div class="col-sm-12"> <div class="col-sm-12">
<label for="anexoProjeto" class="col-form-label font-tam" style="font-weight: bold" @if($participante->planoTrabalho != null)
title="{{$participante->planoTrabalho->titulo}}">{{ __('Projeto: ') }}{{$participante->planoTrabalho->titulo}}</label> <label for="anexoProjeto" class="col-form-label font-tam" style="font-weight: bold"
title="{{$participante->planoTrabalho->titulo}}">{{ __('Projeto: ') }}{{$participante->planoTrabalho->titulo}}</label>
@endif
@if($planoTrabalhoTemp != null) @if($planoTrabalhoTemp != null)
<a href="{{route('download', ['file' => $planoTrabalhoTemp])}}"><img src="{{asset('img/icons/pdf.ico')}}" style="width:40px" alt=""></a> <a href="{{route('download', ['file' => $planoTrabalhoTemp])}}"><img src="{{asset('img/icons/pdf.ico')}}" style="width:40px" alt=""></a>
@endif @endif
......
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