diff --git a/app/Http/Controllers/AdministradorController.php b/app/Http/Controllers/AdministradorController.php index 3cf3b18e3310164af5e0946bd8687d8e31ee67dc..534ab16591d475674ca70fee07c7716357b6b6fe 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 a3c565b8c3c4e598593c4a30ff485489dc8d0afc..023cdf8cc8089f40f0b27a0f869c367416e59ddd 100644 --- a/resources/views/administrador/analisarProposta.blade.php +++ b/resources/views/administrador/analisarProposta.blade.php @@ -701,6 +701,11 @@