Skip to content

GitLab

Commit b28eb1c3 authored by Guilherme Silva's avatar Guilherme Silva
Browse files

Ajuste na exibição de texto nas tabelas

parent 7092f348
master carl-branch dependabot/composer/dompdf/dompdf-1.2.2 dependabot/composer/guzzlehttp/guzzle-6.5.8 dependabot/composer/guzzlehttp/psr7-1.8.5 dependabot/composer/symfony/http-kernel-4.4.50 dependabot/npm_and_yarn/decode-uri-component-0.2.2 dependabot/npm_and_yarn/express-4.18.2 dependabot/npm_and_yarn/json5-and-json5-2.2.3 dependabot/npm_and_yarn/loader-utils-and-webpack-cli-1.4.2 dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8 dependabot/npm_and_yarn/qs-and-express-6.11.0 excluir_projeto_submetido updates_mar
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 26 additions and 10 deletions
+26 -10
resources/views/administrador/listarBolsas.blade.php
View file @ b28eb1c3
......@@ -7,7 +7,7 @@
<div class="row justify-content-center titulo-menu mb-0">
<h4>Dados Bolsa </h4>
</div>
<div class="card-body" style="width: 75% !important;margin: auto;">
<div class="card-body" style="width: 80% !important;margin: auto;">
<table class="table table-bordered table-hover" style="display: block; overflow-x: visible; white-space: nowrap; border-radius:10px; margin-bottom:0px">
<thead>
......@@ -23,12 +23,12 @@
@foreach($trabalho->participantes as $participante)
<tbody>
<td style="text-align: center;">{{$trabalho->evento->nome}}</td>
<td style="text-align: center;">{{$trabalho->titulo}}</td>
<td style="text-align: center;">{{$trabalho->status}}</td>
<td style="text-align: center;">{{$participante->user->name}}</td>
<td style="text-align: center;" title="{{$trabalho->evento->nome}}">{{$trabalho->evento->nome}}</td>
<td style="text-align: center;" title="{{$trabalho->titulo}}">{{$trabalho->titulo}}</td>
<td style="text-align: center; text-transform: capitalize;" >{{$trabalho->status}}</td>
<td style="text-align: center;" title="{{$participante->user->name}}">{{$participante->user->name}}</td>
<td style="text-align: center;">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalConfirm{{$participante->id}}">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalConfirm{{$participante->id}}" @if($trabalho->status!="aprovado")disabled="disabled" @endif>
@if($participante->tipoBolsa==null)
Não Definida
@elseif($participante->tipoBolsa == "Voluntario")
......@@ -98,5 +98,13 @@
</div>
</div>
<style>
td {
max-width: 25ch;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
@endsection
resources/views/planosTrabalho/listar.blade.php
View file @ b28eb1c3
......@@ -22,8 +22,8 @@
@foreach($arquivos as $arquivo)
<tbody>
<td style="text-align: center;">{{$arquivo->titulo}}</td>
<td style="text-align: center;">{{$arquivo->participante->user->name}}</td>
<td style="text-align: center;" title="{{$arquivo->titulo}}">{{$arquivo->titulo}}</td>
<td style="text-align: center;" title="{{$arquivo->participante->user->name}}">{{$arquivo->participante->user->name}}</td>
<td style="text-align: center;">
@if((Auth::user()->proponentes != null) && ($arquivo->relatorioParcial == null) &&
($arquivo->trabalho->evento->dt_inicioRelatorioParcial <= $hoje) && ($hoje <= $arquivo->trabalho->evento->dt_fimRelatorioParcial))
......@@ -34,7 +34,7 @@
@else
<!-- Button trigger modal -->
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioParcial{{ $arquivo->id }}">
Visualizar
@if($arquivo->relatorioParcial!=null)Visualizar @else Pendente @endif
</button>
@endif
</td>
......@@ -49,7 +49,7 @@
@else
<!-- Button trigger modal -->
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modalRelatorioFinal{{ $arquivo->id }}">
Visualizar
@if($arquivo->relatorioFinal!=null)Visualizar @else Pendente @endif
</button>
@endif
</td>
......@@ -191,6 +191,14 @@
</div>
</div>
<style>
td {
max-width: 25ch;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>
@endsection
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