Merge pull request #28 from secultce/develop

Adição de critérios e políticas afirmativas ao exibir pareceres

Author: ronnyjohnti

CHANGELOG.md

@@ -3,6 +3,11 @@ Todas as mudanças relevantes serão documentadas nesse arquivo.
 
 O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.1.0), e esse projeto adere ao [Semantic Versionning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.1] - 2024-09-13
+### Adicionado
+- Adicionada seção que mostra a nota final com as políticas afirmativas distinguidas.
+- Adicionadas notas individuais dos critérios a avaliação.
+
 ## [1.2.0] - 2024-08-19
 ### Adicionado
 - Agora as avaliações não iniciadas também são listadas para o administrador.

Controllers/OpinionManagement.php

@@ -3,9 +3,14 @@
 namespace OpinionManagement\Controllers;
 
 use Doctrine\Common\Collections\Criteria;
+use EvaluationMethodTechnical\Plugin as EvaluationTechnicalPlugin;
 use MapasCulturais\Controller,
     MapasCulturais\App;
+use MapasCulturais\Entities\Opportunity;
+use MapasCulturais\Entities\EvaluationMethodConfigurationMeta;
 use MapasCulturais\Entities\Notification;
+use MapasCulturais\Entities\Registration;
+use MapasCulturais\Entities\RegistrationEvaluation;
 use OpinionManagement\Helpers\EvaluationList;
 
 class OpinionManagement extends Controller
@@ -32,14 +37,20 @@ public function GET_opinions(): void
         $this->requireAuthentication();
 
         /**
-         * @var $registration \MapasCulturais\Entities\Registration
+         * @var $registration Registration
          */
-        $registration = $app->repo('Registration')->find($this->data['id']);
-        if($registration->canUser('view')) {
+        $registration = $app->repo(Registration::class)->find($this->data['id']);
+        if ($registration->canUser('view')) {
+            $evaluationsAvg = self::getEvaluationsAvg($registration);
+            (new EvaluationTechnicalPlugin())->applyAffirmativePolicies($evaluationsAvg, $registration);
+
             $opinions = new EvaluationList($registration);
             $this->json([
+                'appliedAffirmativePolicy' => $registration->appliedAffirmativePolicy ?? false,
                 'evaluationMethod' => (string) $registration->opportunity->evaluationMethodConfiguration->type,
+                'criteria' => self::getCriteriaMeta($registration->opportunity),
                 'opinions' => $opinions,
+                'registration' => $registration,
             ]);
             return;
         }
@@ -60,10 +71,10 @@ public function POST_publishOpinions(): void
             return;
         }
 
-
-        $opportunity->setMetadata('publishedOpinions', true);
-        $error = $opportunity->save(true);
-        if($error) {
+        try {
+            $opportunity->setMetadata('publishedOpinions', true);
+            $opportunity->save(true);
+        } catch (\Exception $e) {
             $this->errorJson(['error' => new \PDOException('Cannot save this data')], 500);
             return;
         }
@@ -92,17 +103,46 @@ public static function notificateUsers(int $opportunityId, bool $verifyPublishin
         foreach ($registrations as $i => $registration) {
             $notification = new Notification();
             $notification->user = $registration->owner->user;
-            $notification->message =
-                sprintf(
-                    "Sua inscrição <a style='font-weight:bold;' href='/inscricao/{$registration->id}'>%s</a>" .
-                    " da oportunidade <a style='font-weight:bold;' href='/oportunidade/{$opportunity->id}'/>%s</a>está com os pareceres publicados.",
-                    $registration->number,
-                    $opportunity->name
-                );
+            $notification->message = sprintf(
+                "Sua inscrição <a style='font-weight:bold;' href='/inscricao/{$registration->id}'>%s</a>" .
+                " da oportunidade <a style='font-weight:bold;' href='/oportunidade/{$opportunity->id}'/>%s</a>está com os pareceres publicados.",
+                $registration->number,
+                $opportunity->name
+            );
             $notification->save(true);
             $app->log->debug("Notificação ".($i+1)."/$count enviada para o usuário {$registration->owner->user->id} ({$registration->owner->name})");
         }
 
         return true;
     }
+
+    public static function getCriteriaMeta(Opportunity $opportunity): array
+    {
+        $app = App::i();
+        $criteria = $app->repo(EvaluationMethodConfigurationMeta::class)->findOneBy([
+            'key' => 'criteria',
+            'owner' => $opportunity->evaluationMethodConfiguration,
+        ]);
+        $criteria = json_decode($criteria->value, true);
+        $finalCriteria = [];
+        array_walk($criteria, function ($criterion) use (&$finalCriteria){
+            $finalCriteria[$criterion['id']] = $criterion;
+        });
+
+        return $finalCriteria;
+    }
+
+    public static function getEvaluationsAvg(Registration $registration): float
+    {
+        $app = App::i();
+
+        $evaluations = $app->repo(RegistrationEvaluation::class)->findBy(['registration' => $registration]);
+        $evaluationsAvg = 0;
+        foreach ($evaluations as $evaluation) {
+            $evaluationsAvg += (float) $evaluation->result;
+        }
+        $evaluationsAvg /= count($evaluations); // Necessário utilizar a média das avaliações para aplicar as políticas afirmativas
+
+        return $evaluationsAvg;
+    }
 }

assets/OpinionManagement/css/opinionManagement.css

@@ -90,6 +90,10 @@ div:has(>.showOpinion) {
     display: initial;
 }
 
+.opinion .criteria-fields {
+    text-align: justify;
+}
+
 .opinion .chk-collapse {display: none}
 
 .opinion .evaluation-title h3,