Skip to content

GitLab

Unverified Commit 06c7787e authored by Alisson Albuquerque's avatar Alisson Albuquerque Committed by GitHub
Browse files

Merge pull request #5 from yuriresendematias/main 

Alterações na listagem de atividades
parents fdee3809 dcf0ea16
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/AvaliadorController.php
View file @ 06c7787e
...@@ -59,7 +59,7 @@ class AvaliadorController extends Controller ...@@ -59,7 +59,7 @@ class AvaliadorController extends Controller
$avaliacao->horas_reajuste = $req->hora_reajuste; $avaliacao->horas_reajuste = $req->hora_reajuste;
if ($avaliacao->save()) { if ($avaliacao->save()) {
return redirect()->back(); return redirect()->back()->with(['mensage'=>'Atividade aprovada!']);
} }
} }
} }
......
app/Http/Controllers/PadController.php
View file @ 06c7787e
...@@ -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 @ 06c7787e
...@@ -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 @ 06c7787e
...@@ -13,12 +13,40 @@ ...@@ -13,12 +13,40 @@
@endsection @endsection
@section('body') @section('body')
<div class="container"> <div class="container">
@if(session('mensage'))
<div class="alert alert-success">
{{session('mensage')}}
</div>
@endif
<h3>{{$professor->name}}</h3><br><br> <h3>{{$professor->name}}</h3><br><br>
<div class="row justify-content-end">
<div class="col-1">
<a href='{{route("pad_professores", ["id" => $pad->id])}}' class='btn btn-outline-primary' >Voltar</a>
</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>
</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) @foreach ($avaliacoes_ensino as $avaliacao)
<div class="card"> <div class="card">
<h5 class="card-header">Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}}</h5> <h5 class="card-header">Cód. Atividade - {{$avaliacao->tarefa->cod_atividade}}</h5>
...@@ -31,9 +59,10 @@ ...@@ -31,9 +59,10 @@
@endforeach @endforeach
</ul> </ul>
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p> <span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}}
<div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end"> @if($avaliacao->status == 3)
<div style="width: 100%;" class="btns-avaliar d-flex justify-content-end">
<button <button
type="button" type="button"
class="btn btn-outline-danger" class="btn btn-outline-danger"
...@@ -56,14 +85,24 @@ ...@@ -56,14 +85,24 @@
<input type="submit" class="btn btn-primary" value="Aprovar"> <input type="submit" class="btn btn-primary" value="Aprovar">
</form> </form>
</div> </div>
@endif
</div> </div>
</div><br> </div><br>
@endforeach @endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_ensino->links() }}
</ul>
</div>
@endif @endif
</div>
<div class="tab-pane fade" id="pesquisa" role="tabpanel" aria-labelledby="pesquisa-tab">
@if (isset($avaliacoes_pesquisa) && !empty($avaliacoes_pesquisa)) @if (isset($avaliacoes_pesquisa) && !empty($avaliacoes_pesquisa))
<h4><strong>Pesquisa</strong></h4>
@foreach ($avaliacoes_pesquisa as $avaliacao) @foreach ($avaliacoes_pesquisa as $avaliacao)
<div class="card"> <div class="card">
...@@ -79,12 +118,14 @@ ...@@ -79,12 +118,14 @@
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p> <p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p>
<div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end"> @if($avaliacao->status == 3)
<div style="width: 100%; " class="btns-avaliar d-flex justify-content-end">
<button <button
type="button" type="button"
class="btn btn-outline-danger" class="btn btn-outline-danger"
data-bs-toggle="modal" data-bs-toggle="modal"
data-bs-target="#modal_avaliacao" data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') "> onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar Reprovar
</button> </button>
...@@ -102,14 +143,23 @@ ...@@ -102,14 +143,23 @@
</form> </form>
</div> </div>
@endif
</div> </div>
</div><br> </div><br>
@endforeach @endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_pesquisa->links() }}
</ul>
</div>
@endif @endif
</div>
<div class="tab-pane fade" id="extensao" role="tabpanel" aria-labelledby="extensao-tab">
@if (isset($avaliacoes_extensao) && !empty($avaliacoes_extensao)) @if (isset($avaliacoes_extensao) && !empty($avaliacoes_extensao))
<h4><strong>Extensão</strong></h4>
@foreach ($avaliacoes_extensao as $avaliacao) @foreach ($avaliacoes_extensao as $avaliacao)
<div class="card"> <div class="card">
...@@ -125,11 +175,13 @@ ...@@ -125,11 +175,13 @@
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p> <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 mt-5 d-flex justify-content-end">
<button <button
type="button" class="btn btn-outline-danger" type="button" class="btn btn-outline-danger"
data-bs-toggle="modal" data-bs-toggle="modal"
data-bs-target="#modal_avaliacao" data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') "> onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar Reprovar
</button> </button>
...@@ -147,15 +199,25 @@ ...@@ -147,15 +199,25 @@
</form> </form>
</div> </div>
@endif
</div> </div>
</div><br> </div><br>
@endforeach @endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_extensao->links() }}
</ul>
</div>
@endif @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) @foreach ($avaliacoes_gestao as $avaliacao)
<div class="mb-4"> <div class="mb-4">
...@@ -172,12 +234,14 @@ ...@@ -172,12 +234,14 @@
<p> <span class="fw-bold ">Status: </span> {{$avaliacao->getStatusAsText()}} </p> <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"> <div class="btns-avaliar mt-4 d-flex justify-content-end">
<button <button
type="button" type="button"
class="btn btn-outline-danger" class="btn btn-outline-danger"
data-bs-toggle="modal" data-bs-toggle="modal"
data-bs-target="#modal_avaliacao" data-bs-target="#modal_avaliacao"
style="height: 38px;"
onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') "> onclick=" setaDadosModalAvaliacao('{{$avaliacao->tarefa->id}}', '{{$avaliacao->tarefa->userPad->user->id}}', '6', '{{$avaliacao->type}}') ">
Reprovar Reprovar
</button> </button>
...@@ -195,13 +259,24 @@ ...@@ -195,13 +259,24 @@
</form> </form>
</div> </div>
@endif
</div> </div>
</div> </div>
</div> </div>
@endforeach @endforeach
<div class="row justify-content-center">
<ul class="col-4 pagination pagination-sm ">
{{ $avaliacoes_gestao->links() }}
</ul>
</div>
@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