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
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/PadController.php
View file @ dcf0ea16
...@@ -393,7 +393,7 @@ class PadController extends Controller ...@@ -393,7 +393,7 @@ class PadController extends Controller
$avaliacoes_ensino_ids = array_merge($avaliacoes_ensino_ids, $avaliacao_ids); $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 ...@@ -426,7 +426,7 @@ class PadController extends Controller
$avaliacoes_pesquisa_ids = array_merge($avaliacoes_pesquisa_ids, $avaliacao_ids); $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)) { if (in_array(Dimensao::EXTENSAO, $dimensoes)) {
...@@ -454,7 +454,7 @@ class PadController extends Controller ...@@ -454,7 +454,7 @@ class PadController extends Controller
$avaliacoes_extensao_ids = array_merge($avaliacoes_extensao_ids, $avaliacao_ids); $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)) { if (in_array(Dimensao::GESTAO, $dimensoes)) {
...@@ -502,7 +502,7 @@ class PadController extends Controller ...@@ -502,7 +502,7 @@ class PadController extends Controller
$avaliacoes_gestao_ids = array_merge($avaliacoes_gestao_ids, $avaliacao_ids); $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')); 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 @@ ...@@ -2,6 +2,7 @@
namespace App\Providers; namespace App\Providers;
use Illuminate\Pagination\Paginator;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
class AppServiceProvider extends ServiceProvider class AppServiceProvider extends ServiceProvider
...@@ -23,6 +24,7 @@ class AppServiceProvider extends ServiceProvider ...@@ -23,6 +24,7 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
// Paginator::useBootstrap();
} }
} }
resources/views/pad/avaliacao/taferas_professor.blade.php
View file @ dcf0ea16
...@@ -26,206 +26,257 @@ ...@@ -26,206 +26,257 @@
</div> </div>
</div> </div>
@if (isset($avaliacoes_ensino) && !empty($avaliacoes_ensino)) <ul class="nav nav-tabs justify-content-center" id="myTab" role="tablist">
<h4><strong>Ensino</strong></h4> <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>
@foreach ($avaliacoes_ensino as $avaliacao) </li>
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}}</h5> <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>
<div class="card-body"> </li>
<ul> <li class="nav-item" role="presentation">
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute) <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> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li> </li>
@endforeach
</ul> <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>
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p> </li>
</ul>
@if($avaliacao->status == 3)
<div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end"> <div class="tab-content" id="myTabContent">
<button <div class="tab-pane fade show active" id="ensino" role="tabpanel" aria-labelledby="ensino-tab">
type="button" @if (isset($avaliacoes_ensino) && !empty($avaliacoes_ensino))
class="btn btn-outline-danger" @foreach ($avaliacoes_ensino as $avaliacao)
data-bs-toggle="modal" <div class="card">
data-bs-target="#modal_avaliacao" <h5 class="card-header">Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}}</h5>
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') "> <div class="card-body">
Reprovar
</button> <ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<span>&nbsp;&nbsp;</span> <li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
<form action="{{route('avaliador_avaliar')}}" method="POST"> </ul>
@csrf
@method("PUT") <span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}}
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$avaliacao->tarefa->id}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$avaliacao->tarefa->userPad->user->id}}"> @if($avaliacao->status == 3)
<input type="hidden" name="status" id="status_aprovar" value='7'> <div style="width: 100%;" class="btns-avaliar d-flex justify-content-end">
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$avaliacao->type}}"> <button
<input type="submit" class="btn btn-primary" value="Aprovar"> type="button"
</form> class="btn btn-outline-danger"
</div> data-bs-toggle="modal"
@endif data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$avaliacao->tarefa->id}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$avaliacao->tarefa->userPad->user->id}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$avaliacao->type}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div>
@endif
</div>
</div><br>
@endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_ensino->links() }}
</ul>
</div> </div>
</div><br>
@endforeach
@endif @endif
</div>
@if (isset($avaliacoes_pesquisa) && !empty($avaliacoes_pesquisa))
<h4><strong>Pesquisa</strong></h4>
@foreach ($avaliacoes_pesquisa as $avaliacao)
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}}</h5>
<div class="card-body">
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
</ul>
<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">
<button
type="button"
class="btn btn-outline-danger"
data-bs-toggle="modal"
data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$avaliacao->tarefa->id}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$avaliacao->tarefa->userPad->user->id}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$avaliacao->type}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div> <div class="tab-pane fade" id="pesquisa" role="tabpanel" aria-labelledby="pesquisa-tab">
@endif @if (isset($avaliacoes_pesquisa) && !empty($avaliacoes_pesquisa))
@foreach ($avaliacoes_pesquisa as $avaliacao)
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}}</h5>
<div class="card-body">
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
</ul>
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p>
@if($avaliacao->status == 3)
<div style="width: 100%; " class="btns-avaliar d-flex justify-content-end">
<button
type="button"
class="btn btn-outline-danger"
data-bs-toggle="modal"
data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$avaliacao->tarefa->id}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$avaliacao->tarefa->userPad->user->id}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$avaliacao->type}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div>
@endif
</div>
</div><br>
@endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_pesquisa->links() }}
</ul>
</div> </div>
</div><br> @endif
@endforeach
@endif
@if (isset($avaliacoes_extensao) && !empty($avaliacoes_extensao))
<h4><strong>Extensão</strong></h4>
@foreach ($avaliacoes_extensao as $avaliacao)
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}}</h5>
<div class="card-body">
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
</ul>
<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">
<button
type="button" class="btn btn-outline-danger"
data-bs-toggle="modal"
data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$avaliacao->tarefa->id}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$avaliacao->tarefa->userPad->user->id}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$avaliacao->type}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div> </div>
@endif
<div class="tab-pane fade" id="extensao" role="tabpanel" aria-labelledby="extensao-tab">
@if (isset($avaliacoes_extensao) && !empty($avaliacoes_extensao))
@foreach ($avaliacoes_extensao as $avaliacao)
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}}</h5>
<div class="card-body">
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
</ul>
<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">
<button
type="button" class="btn btn-outline-danger"
data-bs-toggle="modal"
data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$avaliacao->tarefa->id}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$avaliacao->tarefa->userPad->user->id}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$avaliacao->type}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div>
@endif
</div>
</div><br>
@endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_extensao->links() }}
</ul>
</div> </div>
</div><br>
@endforeach
@endif @endif
</div>
@if (isset($avaliacoes_gestao) && !empty($avaliacoes_gestao))
<h4><strong>Gestão</strong></h4>
@foreach ($avaliacoes_gestao as $avaliacao)
<div class="mb-4">
<div class="card">
<h5 class="card-header"> Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}} </h5>
<div class="card-body">
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
</ul>
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p>
@if($avaliacao->status == 3)
<div class="btns-avaliar mt-4 d-flex justify-content-end">
<button
type="button"
class="btn btn-outline-danger"
data-bs-toggle="modal"
data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$avaliacao->tarefa->id}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$avaliacao->tarefa->userPad->user->id}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$avaliacao->type}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
<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">
<div class="card">
<h5 class="card-header"> Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}} </h5>
<div class="card-body">
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
</ul>
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p>
@if($avaliacao->status == 3)
<div class="btns-avaliar mt-4 d-flex justify-content-end">
<button
type="button"
class="btn btn-outline-danger"
data-bs-toggle="modal"
data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$avaliacao->tarefa->id}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$avaliacao->tarefa->userPad->user->id}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$avaliacao->type}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div>
@endif
</div>
</div> </div>
@endif
</div> </div>
@endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_gestao->links() }}
</ul>
</div> </div>
</div>
@endforeach
@endif @endif
</div>
</div>
<div class="modal fade" id="modal_avaliacao" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="modal_avaliacao" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document"> <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