diff --git a/app/Http/Controllers/PadController.php b/app/Http/Controllers/PadController.php index 04a153a2e4c9f86dc64cd4292074fd78d90a2f8b..58765ee0ff8076738a9cae5918c2ca8f79979dc2 100644 --- a/app/Http/Controllers/PadController.php +++ b/app/Http/Controllers/PadController.php @@ -339,6 +339,7 @@ class PadController extends Controller } $professor->ch = $this->get_carga_horaria_total($avaliacoes); + $professor->ch_corrigida = $this->get_carga_horaria_corrigida($avaliacoes_ensino, $avaliacoes_pesquisa, $avaliacoes_extensao, $avaliacoes_gestao); } return view("pad.avaliacao.professores", compact('professores', 'pad', 'index_menu')); @@ -624,6 +625,45 @@ class PadController extends Controller } + private function get_carga_horaria_corrigida($ensino, $pesquisa, $extensao, $gestao) + { + $ch = 0; + + if($ensino) { + for ($i = 0; $i < count($ensino->all()); $i++){ + if($ensino[$i]->status != Status::REPROVADO){ + $ch += $ensino[$i]->tarefa()->first()->ch_semanal; + } + } + } + + if($pesquisa) { + for ($i = 0; $i < count($pesquisa->all()); $i++){ + if($pesquisa[$i]->status != Status::REPROVADO){ + $ch += $pesquisa[$i]->tarefa()->first()->ch_semanal; + } + } + } + + if($extensao) { + for ($i = 0; $i < count($extensao->all()); $i++){ + if($extensao[$i]->status != Status::REPROVADO){ + $ch += $extensao[$i]->tarefa()->first()->ch_semanal; + } + } + } + + if($gestao) { + for ($i = 0; $i < count($gestao->all()); $i++){ + if($gestao[$i]->status != Status::REPROVADO){ + $ch += $gestao[$i]->tarefa()->first()->ch_semanal; + } + } + } + + return $ch; + } + public function relatorio($id){ $user = Auth::user(); $pad = Pad::find($id); diff --git a/resources/views/pad/avaliacao/professores.blade.php b/resources/views/pad/avaliacao/professores.blade.php index e8882bd2951f9d0b2031a4c7dca4ed980319b4c8..c0e70b438ebcc9be7da421a7a5001cae0356e4a2 100644 --- a/resources/views/pad/avaliacao/professores.blade.php +++ b/resources/views/pad/avaliacao/professores.blade.php @@ -25,6 +25,7 @@ Professor Status CH + CH Corrigida Opções @@ -39,6 +40,7 @@ {{$professor->status}} @endif @if($professor->ch > 0) {{$professor->ch}}H @endif + @if($professor->ch_corrigida > 0 && $professor->ch != $professor->ch_corrigida) {{$professor->ch_corrigida}}H @endif @include('components.buttons.btn-avaliar', [