From 095f8312cfa00a14d4b40cac543ec4792359b8ac Mon Sep 17 00:00:00 2001
From: Yuri Resende <yresendeo@gmail.com>
Date: Sat, 25 Feb 2023 15:29:01 -0300
Subject: [PATCH] =?UTF-8?q?Exibindo=20a=20m=C3=A9dia=20das=20avalia=C3=A7?=
 =?UTF-8?q?=C3=B5es=20dos=20relat=C3=B3rios=20para=20o=20coordenador=20na?=
 =?UTF-8?q?=20p=C3=A1gina=20do=20projeto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AdministradorController.php   | 30 ++++++++++++++++++-
 .../administrador/analisarProposta.blade.php  | 10 +++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AdministradorController.php b/app/Http/Controllers/AdministradorController.php
index 3cf3b18..534ab16 100755
--- a/app/Http/Controllers/AdministradorController.php
+++ b/app/Http/Controllers/AdministradorController.php
@@ -126,6 +126,11 @@ class AdministradorController extends Controller
         //$avaliacoesRelatorio = [];->join('users','users.id','=','candidatos.user_id')
         $AvalRelatParcial = [];
         $AvalRelatFinal = [];
+        $MediaAvalRelatParcial = 0;
+        $AvalRelatParcialPendentes = 0;
+        $MediaAvalRelatFinal = 0;
+        $AvalRelatFinalPendentes = 0;
+
         foreach ($trabalho->participantes as $participante) {
             if (isset($participante->planoTrabalho)) {
                 $avals = AvaliacaoRelatorio::where('arquivo_id', $participante->planoTrabalho->id)->get();
@@ -135,12 +140,30 @@ class AdministradorController extends Controller
             foreach ($avals as $aval) {
                 if ($aval->tipo == 'Parcial') {
                     array_push($AvalRelatParcial, $aval);
+                    $MediaAvalRelatParcial += $aval->nota;
+
+                    if($aval->nota == null){
+                        $AvalRelatParcialPendentes += 1;
+                    }
                 } else {
                     array_push($AvalRelatFinal, $aval);
+                    $MediaAvalRelatFinal += $aval->nota;
+
+                    if($aval->nota == null){
+                        $AvalRelatFinalPendentes += 1;
+                    }
                 }
             }
         }
 
+        if(count($AvalRelatParcial) > 0){
+            $MediaAvalRelatParcial  = $MediaAvalRelatParcial / count($AvalRelatParcial);
+        }
+
+        if(count($AvalRelatFinal) > 0){
+            $MediaAvalRelatFinal = $MediaAvalRelatFinal / count($AvalRelatFinal);
+        }
+
         // Verficação de pendencia de substituição
         $aux = count(Substituicao::where('status', 'Em Aguardo')->whereIn('participanteSubstituido_id', $trabalho->participantes->pluck('id'))->get());
         $flagSubstituicao = 1;
@@ -166,7 +189,12 @@ class AdministradorController extends Controller
                 'AvalRelatFinal' => $AvalRelatFinal,
                 'hoje' => $hoje,
                 'flagSubstituicao' => $flagSubstituicao,
-                'areasTematicas' => $areasTematicas, ]);
+                'areasTematicas' => $areasTematicas, 
+                'MediaAvalRelatParcial' => $MediaAvalRelatParcial,
+                'AvalRelatParcialPendentes' => $AvalRelatParcialPendentes,
+                'MediaAvalRelatFinal' => $MediaAvalRelatFinal,
+                'AvalRelatFinalPendentes' => $AvalRelatFinalPendentes,
+                ]);
     }
 
     public function showProjetos(Request $request)
diff --git a/resources/views/administrador/analisarProposta.blade.php b/resources/views/administrador/analisarProposta.blade.php
index a3c565b..023cdf8 100644
--- a/resources/views/administrador/analisarProposta.blade.php
+++ b/resources/views/administrador/analisarProposta.blade.php
@@ -701,6 +701,11 @@
                         <div class="row justify-content-start" style="alignment: center">
                             <div class="col-md-11"><h6 style="color: #234B8B; font-weight: bold">Avaliações de Relatórios Parciais</h6></div>
                         </div>
+                        <div class='row justify-content-start'>
+                            <h6 class='col-9' style="color: black; font-weight: bold">Media das avaliações:<span style="font-weight: normal"> {{$MediaAvalRelatParcial}}</span><h6>
+                            <h6 class='col-3' style="color: black; font-weight: bold">Avaliações pendentes: <span style="font-weight: normal"> {{$AvalRelatParcialPendentes}}</span><h6>   
+                            <br><br>
+                        </div>
                         <div class="row justify-content-start" style="alignment: center">
                             @foreach($AvalRelatParcial as $aval)
                                 <div class="col-sm-1" style="margin-bottom: 7px">
@@ -771,6 +776,11 @@
                             <div class="row justify-content-start" style="alignment: center">
                                 <div class="col-md-11"><h6 style="color: #234B8B; font-weight: bold">Avaliações de Relatórios Finais</h6></div>
                             </div>
+                            <div class='row justify-content-start'>
+                                <h6 class='col-9' style="color: black; font-weight: bold">Media das avaliações:<span style="font-weight: normal"> {{$MediaAvalRelatFinal}}</span><h6>
+                                <h6 class='col-3' style="color: black; font-weight: bold">Avaliações pendentes: <span style="font-weight: normal"> {{$AvalRelatFinalPendentes}}</span><h6>   
+                                <br><br>
+                            </div>
                             <div class="row justify-content-start" style="alignment: center">
                                 @foreach($AvalRelatFinal as $aval)
                                     <div class="col-sm-1" style="margin-bottom: 7px">
-- 
GitLab