diff --git a/app/Http/Controllers/PadController.php b/app/Http/Controllers/PadController.php index 03411fb6905b8c23f94fc264566e5d914e7069ef..31f25189ad02b4aa6508c3bcdaa551ade2b88d62 100644 --- a/app/Http/Controllers/PadController.php +++ b/app/Http/Controllers/PadController.php @@ -638,25 +638,36 @@ class PadController extends Controller $userPad = $professor->userPads()->where('pad_id', '=', $pad->id)->first(); $avaliacoes = $this->get_avaliacoes($userPad, $avaliador_pad); - $avaliacoes_ensino = $avaliacoes['ensino']->get(); - $avaliacoes_pesquisa = $avaliacoes['pesquisa']->get(); - $avaliacoes_extensao = $avaliacoes['extensao']->get(); - $avaliacoes_gestao = $avaliacoes['gestao']->get(); + $professor->ch_ensino = $this->get_carga_horaria($avaliacoes['ensino']->get()); + $professor->ch_pesquisa = $this->get_carga_horaria($avaliacoes['pesquisa']->get()); + $professor->ch_extensao = $this->get_carga_horaria($avaliacoes['extensao']->get()); + $professor->ch_gestao = $this->get_carga_horaria($avaliacoes['gestao']->get()); - if( $avaliacoes_ensino->all() != null || - $avaliacoes_pesquisa->all() != null || - $avaliacoes_extensao->all() != null || - $avaliacoes_gestao->all() != null){ + if( $professor->ch_ensino > 0 || + $professor->ch_pesquisa > 0 || + $professor->ch_extensao > 0 || + $professor->ch_gestao > 0){ $professor->status = "Enviado"; } + } - // dd($professores[1]->status); return view('pad.relatorio.relatorio', [ 'pad' => $pad, 'index_menu' => $index_menu, 'professores' => $professores]); } + + private function get_carga_horaria($avaliacoes){ + $ch = 0; + + foreach ($avaliacoes as $avaliacao){ + $ch += $avaliacao->tarefa->ch_semanal; + } + + return $ch; + } + } diff --git a/resources/views/pad/relatorio/relatorio.blade.php b/resources/views/pad/relatorio/relatorio.blade.php index ea36b17d1f99da8890aa59a286d6f52a6e96daef..3f67592d3565b602967fa43c361028c0f7194469 100644 --- a/resources/views/pad/relatorio/relatorio.blade.php +++ b/resources/views/pad/relatorio/relatorio.blade.php @@ -26,7 +26,7 @@
- +
@@ -50,7 +50,7 @@ @endif @endforeach - +
@@ -58,6 +58,50 @@ +
+
+
RELAÇÃO DOS PROFESSORES QUE ENVIARAM O PAD
+
+
+ + + + + + + + + + + + + + + + @php $index = 1; @endphp + @foreach($professores as $professor) + @if($professor->status != "Pendente") + + + + + + + + + + + + @php $index += 1 @endphp + @endif + @endforeach + + +
ProfessorCH EnsinoCH PesquisaCH ExtensãoCH GestãoCampus
{{$index}}{{$professor->name}}{{$professor->ch_ensino}}{{$professor->ch_pesquisa}}{{$professor->ch_extensao}}{{$professor->ch_gestao}}{{$professor->campus}}
+ +
+
+ @endsection \ No newline at end of file