Skip to content

GitLab

Commit dcf0ea16 authored by Yuri Resende's avatar Yuri Resende
Browse files

Adicionando tabs e paginação nas atividades

parent 4ca3449f
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/PadController.php
View file @ dcf0ea16
......@@ -393,7 +393,7 @@ class PadController extends Controller
$avaliacoes_ensino_ids = array_merge($avaliacoes_ensino_ids, $avaliacao_ids);
}
$avaliacoes_ensino = Avaliacao::whereIn('id', $avaliacoes_ensino_ids)->get();
$avaliacoes_ensino = Avaliacao::whereIn('id', $avaliacoes_ensino_ids)->orderBy('status')->paginate(5);
//
}
......@@ -426,7 +426,7 @@ class PadController extends Controller
$avaliacoes_pesquisa_ids = array_merge($avaliacoes_pesquisa_ids, $avaliacao_ids);
}
$avaliacoes_pesquisa = Avaliacao::whereIn('id', $avaliacoes_pesquisa_ids)->get();
$avaliacoes_pesquisa = Avaliacao::whereIn('id', $avaliacoes_pesquisa_ids)->orderBy('status')->paginate(5);
}
if (in_array(Dimensao::EXTENSAO, $dimensoes)) {
......@@ -454,7 +454,7 @@ class PadController extends Controller
$avaliacoes_extensao_ids = array_merge($avaliacoes_extensao_ids, $avaliacao_ids);
}
$avaliacoes_extensao = Avaliacao::whereIn('id', $avaliacoes_extensao_ids)->get();
$avaliacoes_extensao = Avaliacao::whereIn('id', $avaliacoes_extensao_ids)->orderBy('status')->paginate(5);
}
if (in_array(Dimensao::GESTAO, $dimensoes)) {
......@@ -502,7 +502,7 @@ class PadController extends Controller
$avaliacoes_gestao_ids = array_merge($avaliacoes_gestao_ids, $avaliacao_ids);
}
$avaliacoes_gestao = Avaliacao::whereIn('id', $avaliacoes_gestao_ids)->get();
$avaliacoes_gestao = Avaliacao::whereIn('id', $avaliacoes_gestao_ids)->orderBy('status')->paginate(5);
}
return view('pad.avaliacao.taferas_professor', compact('pad', 'index_menu', 'professor', 'avaliacoes_ensino', 'avaliacoes_pesquisa', 'avaliacoes_extensao', 'avaliacoes_gestao', 'niveis', 'modalidades'));
......
app/Providers/AppServiceProvider.php
View file @ dcf0ea16
......@@ -2,6 +2,7 @@
namespace App\Providers;
use Illuminate\Pagination\Paginator;
use Illuminate\Support\ServiceProvider;
class AppServiceProvider extends ServiceProvider
......@@ -23,6 +24,7 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
//
Paginator::useBootstrap();
}
}
resources/views/pad/avaliacao/taferas_professor.blade.php
View file @ dcf0ea16
......@@ -26,9 +26,27 @@
</div>
</div>
@if (isset($avaliacoes_ensino) && !empty($avaliacoes_ensino))
<h4><strong>Ensino</strong></h4>
<ul class="nav nav-tabs justify-content-center" id="myTab" role="tablist">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="home-tab" data-bs-toggle="tab" data-bs-target="#ensino" type="button" role="tab" aria-controls="home" aria-selected="true">Ensino</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="profile-tab" data-bs-toggle="tab" data-bs-target="#pesquisa" type="button" role="tab" aria-controls="profile" aria-selected="false">Pesquisa</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="contact-tab" data-bs-toggle="tab" data-bs-target="#extensao" type="button" role="tab" aria-controls="contact" aria-selected="false">Extensão</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="contact-tab" data-bs-toggle="tab" data-bs-target="#gestao" type="button" role="tab" aria-controls="contact" aria-selected="false">Gestão</button>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="ensino" role="tabpanel" aria-labelledby="ensino-tab">
@if (isset($avaliacoes_ensino) && !empty($avaliacoes_ensino))
@foreach ($avaliacoes_ensino as $avaliacao)
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}}</h5>
......@@ -41,10 +59,10 @@
@endforeach
</ul>
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p>
<span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}}
@if($avaliacao->status == 3)
<div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
<div style="width: 100%;" class="btns-avaliar d-flex justify-content-end">
<button
type="button"
class="btn btn-outline-danger"
......@@ -73,10 +91,18 @@
</div><br>
@endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_ensino->links() }}
</ul>
</div>
@endif
</div>
<div class="tab-pane fade" id="pesquisa" role="tabpanel" aria-labelledby="pesquisa-tab">
@if (isset($avaliacoes_pesquisa) && !empty($avaliacoes_pesquisa))
<h4><strong>Pesquisa</strong></h4>
@foreach ($avaliacoes_pesquisa as $avaliacao)
<div class="card">
......@@ -93,7 +119,7 @@
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p>
@if($avaliacao->status == 3)
<div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
<div style="width: 100%; " class="btns-avaliar d-flex justify-content-end">
<button
type="button"
class="btn btn-outline-danger"
......@@ -122,11 +148,18 @@
</div>
</div><br>
@endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_pesquisa->links() }}
</ul>
</div>
@endif
</div>
<div class="tab-pane fade" id="extensao" role="tabpanel" aria-labelledby="extensao-tab">
@if (isset($avaliacoes_extensao) && !empty($avaliacoes_extensao))
<h4><strong>Extensão</strong></h4>
@foreach ($avaliacoes_extensao as $avaliacao)
<div class="card">
......@@ -171,12 +204,20 @@
</div>
</div><br>
@endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_extensao->links() }}
</ul>
</div>
@endif
@if (isset($avaliacoes_gestao) && !empty($avaliacoes_gestao))
</div>
<h4><strong>Gestão</strong></h4>
<div class="tab-pane fade" id="gestao" role="tabpanel" aria-labelledby="gestao-tab">
@if (isset($avaliacoes_gestao) && !empty($avaliacoes_gestao))
@foreach ($avaliacoes_gestao as $avaliacao)
<div class="mb-4">
......@@ -224,8 +265,18 @@
</div>
</div>
@endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_gestao->links() }}
</ul>
</div>
@endif
</div>
</div>
<div class="modal fade" id="modal_avaliacao" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
......
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