From ca6df52166cf1448524396fa9d3813a12e0fb3cf Mon Sep 17 00:00:00 2001
From: Yuri Resende <yresendeo@gmail.com>
Date: Sun, 28 May 2023 12:33:45 -0300
Subject: [PATCH] =?UTF-8?q?Adicionando=20uma=20coluna=20de=20carga=20hor?=
 =?UTF-8?q?=C3=A1ria=20corrigida=20na=20listagem=20dos=20professores?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/PadController.php        | 40 +++++++++++++++++++
 .../views/pad/avaliacao/professores.blade.php |  2 +
 2 files changed, 42 insertions(+)

diff --git a/app/Http/Controllers/PadController.php b/app/Http/Controllers/PadController.php
index 04a153a..58765ee 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 e8882bd..c0e70b4 100644
--- a/resources/views/pad/avaliacao/professores.blade.php
+++ b/resources/views/pad/avaliacao/professores.blade.php
@@ -25,6 +25,7 @@
                     <th scope="col">Professor</th>
                     <th scope="col">Status</th>
                     <th scope="col">CH</th>
+                    <th scope="col">CH Corrigida</th>
                     <th scope="col">Opções</th>
                 </tr>
             </thead>
@@ -39,6 +40,7 @@
                             <td style="color:green;">{{$professor->status}}</td>
                         @endif
                         <td>@if($professor->ch > 0) {{$professor->ch}}H @endif</td>
+                        <td>@if($professor->ch_corrigida > 0 && $professor->ch != $professor->ch_corrigida) {{$professor->ch_corrigida}}H @endif</td>
                         <td>
 
                             @include('components.buttons.btn-avaliar', [
-- 
GitLab