diff --git a/app/Http/Controllers/PadController.php b/app/Http/Controllers/PadController.php index 77b9c13442826a81ad0760fa6b6fb425d6b96b2a..394e29f22c7f24b4801ee1928612fc4a0557ad29 100644 --- a/app/Http/Controllers/PadController.php +++ b/app/Http/Controllers/PadController.php @@ -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')); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index ee8ca5bcd8f77d219f29529a9163587235c545d5..a3bb719289e5f183afa1f8f072baf7e6be278b40 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -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(); + } } diff --git a/resources/views/pad/avaliacao/taferas_professor.blade.php b/resources/views/pad/avaliacao/taferas_professor.blade.php index a64b9f09046366cac80d8da78f10545454c469cc..8d1438dd6f3f1749f18a5bd3c81c8e3f520283f1 100644 --- a/resources/views/pad/avaliacao/taferas_professor.blade.php +++ b/resources/views/pad/avaliacao/taferas_professor.blade.php @@ -26,206 +26,257 @@ - @if (isset($avaliacoes_ensino) && !empty($avaliacoes_ensino)) -
Status: {{$avaliacao->getStatusAsText()}}
- - @if($avaliacao->status == 3) -Status: {{$avaliacao->getStatusAsText()}}
- - @if($avaliacao->status == 3) -Status: {{$avaliacao->getStatusAsText()}}
+ + @if($avaliacao->status == 3) +Status: {{$avaliacao->getStatusAsText()}}
- - @if($avaliacao->status == 3) -Status: {{$avaliacao->getStatusAsText()}}
+ + @if($avaliacao->status == 3) +Status: {{$avaliacao->getStatusAsText()}}
- - @if($avaliacao->status == 3) -Status: {{$avaliacao->getStatusAsText()}}
+ + @if($avaliacao->status == 3) +