Merge branch 'feature/opportunity-AccountabilityAndMonitoring' into dev/v7.7-alpha

erleibiazzio · erleibiazzio · commit 904f923bd41a · 2025-03-12T14:15:07.000-03:00
diff --git a/src/core/Entities/Opportunity.php b/src/core/Entities/Opportunity.php
@@ -91,6 +91,7 @@ abstract class Opportunity extends \MapasCulturais\Entity
 
     const STATUS_APPEAL_PHASE = -20;
     const STATUS_PHASE = -1;
+    const CONTINUOUS_FLOW_DATE =  "2111-01-01 00:00";
 
     protected $__enableMagicGetterHook = true;
     protected $__enableMagicSetterHook = true;
diff --git a/src/modules/EvaluationMethodContinuous/components/evaluation-continuous-detail/init.php b/src/modules/EvaluationMethodContinuous/components/evaluation-continuous-detail/init.php
@@ -10,44 +10,41 @@
 
 // SOLUÇÃO TEMPORÁRIA
 $class = $entity->getClassName();
-
 if($class == Registration::class) {
-    
-    $opportunity = $entity->opportunity;
-
-    if(!$opportunity->isReportingPhase) {
-        $opportunity = $entity->opportunity->isAppealPhase ? $entity->opportunity : $entity->opportunity->appealPhase;
-    }
 
-    $evaluation_configuration = $opportunity->evaluationMethodConfiguration;
-    $registration_appeal_phase = $app->repo('Registration')->findOneBy(['number' => $entity->number, 'opportunity' => $opportunity]);
-    if(!$evaluation_configuration) {
-        return;
-    }
+    $registration = $this->controller->requestedEntity;
+    $registration_number = $registration->number;
     
-    $registration = $entity;
-    if (!$entity->opportunity->isAppealPhase) {
-        $registration_appeal_phase = $app->repo('Registration')->findOneBy(['number' => $entity->number, 'opportunity' => $opportunity]);
-        $registration = $registration_appeal_phase;
+    $all_registrations = $app->repo('Registration')->findBy(['number' => $registration_number]);
+    $registrations = [];
+
+    foreach($all_registrations as $reg) {
+        if ($reg->evaluationMethod && $reg->evaluationMethod->slug == 'continuous') {
+            $registrations[] = $reg;
+            
+        }
     }
-
-    if (!$registration) {
-        return;
-    }
-
-    $data = [];
-    $em = $evaluation_configuration->evaluationMethod;
-    $data['consolidatedDetails'] = $em->getConsolidatedDetails($registration);
-    $data['evaluationsDetails'] = [];
-
-    $evaluations = $registration->sentEvaluations;
+   
+    $result = [];
+    foreach($registrations as $reg) {
+        $em = $reg->evaluationMethod;
+        $data = [
+            'consolidatedDetails' => $em->getConsolidatedDetails($reg),
+            'evaluationsDetails' => []
+        ];
+
+        $evaluations = $reg->sentEvaluations;
     
-    foreach ($evaluations as $eval) {
-        $detail = $em->getEvaluationDetails($eval);
-        $detail['valuer'] = $eval->user->profile->simplify('id,name,singleUrl');
-        $data['evaluationsDetails'][] = $detail;
+        foreach ($evaluations as $eval) {
+            $detail = $em->getEvaluationDetails($eval);
+            $detail['valuer'] = $eval->user->profile->simplify('id,name,singleUrl');
+            $data['evaluationsDetails'][] = $detail;
+        }
+
+        $result[$reg->id] = $data;
+        
     }
-    $this->jsObject['config']['continuousEvaluationDetail'] = [
-        'data' => $data,
-    ];
+    
+    
+    $this->jsObject['config']['continuousEvaluationDetail'] = (object) $result;
 }
diff --git a/src/modules/EvaluationMethodContinuous/components/evaluation-continuous-detail/script.js b/src/modules/EvaluationMethodContinuous/components/evaluation-continuous-detail/script.js
@@ -15,8 +15,12 @@ app.component('evaluation-continuous-detail', {
     },
 
     computed: {
+        evaluationData() {
+            return $MAPAS.config.continuousEvaluationDetail[this.registration.id];
+        },
+
         evaluationDetails() {
-            return this.registration.evaluationsDetails ? this.registration.evaluationsDetails : $MAPAS.config.continuousEvaluationDetail.data?.evaluationsDetails;
+            return this.registration.evaluationsDetails ? this.registration.evaluationsDetails : this.evaluationData?.evaluationsDetails;
         }
     },
 
diff --git a/src/modules/Opportunities/components/opportunity-basic-info/init.php b/src/modules/Opportunities/components/opportunity-basic-info/init.php
@@ -1,2 +1,7 @@
 <?php
-$this->useOpportunityAPI();
+$this->useOpportunityAPI();
+$entity = $this->controller->requestedEntity;
+
+$this->jsObject['config']['opportunityBasicInfo'] = [
+    'date' => $entity::CONTINUOUS_FLOW_DATE,
+];
diff --git a/src/modules/Opportunities/components/opportunity-basic-info/script.js b/src/modules/Opportunities/components/opportunity-basic-info/script.js
@@ -1,8 +1,14 @@
 app.component('opportunity-basic-info' , {
     template: $TEMPLATES['opportunity-basic-info'],
 
+    setup() {
+        const text = Utils.getTexts('opportunity-basic-info');
+        return { text }
+    },
+
     data () {
         return {
+            continuousFlowDate: $MAPAS.config.opportunityBasicInfo.date,
             phases: []
         };
     },
@@ -23,7 +29,6 @@ app.component('opportunity-basic-info' , {
         }
     },
 
-
     computed: {
         lastPhase () {
             const phase = this.phases.find(item => item.isLastPhase);
@@ -32,39 +37,69 @@ app.component('opportunity-basic-info' , {
     },
 
     watch: {
-        'entity.isContinuousFlow'(newVal) {
-            if (!newVal) {
-                this.entity.hasEndDate = false;
-                this.entity.continuousFlow = null;
-                this.entity.publishedRegistrations = false;
-                this.entity.registrationTo = null;
+        'entity.isContinuousFlow'(newVal, oldValue) {
+            if(newVal != oldValue){
+                if (!newVal) {
+                    this.entity.hasEndDate = false;
+                    this.entity.continuousFlow = null;
+                    this.entity.publishedRegistrations = false;
 
-                this.lastPhase.name = "Publicação final do resultado";
-            } else if (this.entity.registrationFrom) {
-                const myDate = new McDate(new Date(`2111-01-01 00:00`));
-                
-                this.entity.continuousFlow = myDate.sql('full');
-                this.entity.publishedRegistrations = true;
-                
-                this.lastPhase.name = "Resultado";
-            }
+                    if (this.entity.registrationFrom && this.entity.registrationFrom._date instanceof Date) {
+                        this.incrementRegistrationTo();
+                    } 
+                       
+                    this.lastPhase.name = this.text("Publicação final do resultado");
+                       
+                } else {
+                    if(this.entity.registrationFrom){
+                        const myDate = new McDate(new Date(this.continuousFlowDate));
+                        
+                        this.entity.continuousFlow = myDate.sql('full');
+                        this.entity.registrationTo = myDate.sql('full');
+                        this.entity.publishedRegistrations = true;
+                        
+                    } else {
+                        this.entity.registrationTo = null;
+                    }
+                    
+                    this.lastPhase.name = this.text("Resultado");
+                }
 
-            this.lastPhase.disableMessages();
-            this.lastPhase.save();
-            this.entity.save();
+                this.lastPhase.disableMessages();
+                this.lastPhase.save();
+                this.entity.save();
+            }
         },
 
-        'entity.hasEndDate'(newVal) {
-            if (!newVal) {
-                const myDate = new McDate(new Date(`2111-01-01 00:00`));
-                
-                this.entity.continuousFlow = myDate;
-                this.entity.registrationTo = myDate;
-            } else {
-                this.entity.continuousFlow = null;
-                this.entity.registrationTo = null;
-                this.entity.publishedRegistrations = false;
+        'entity.hasEndDate'(newVal, oldValue) {
+            if(newVal != oldValue){
+                if (this.entity.isContinuousFlow) {
+                    if(newVal){
+                        this.entity.continuousFlow = null;
+                        this.entity.registrationTo = null;
+                        this.entity.publishedRegistrations = false;
+
+                        if (this.entity.registrationFrom && this.entity.registrationFrom._date instanceof Date) {
+                           this.incrementRegistrationTo();
+                        } 
+
+                    } else {
+                        const myDate = new McDate(new Date(this.continuousFlowDate));
+                        
+                        this.entity.continuousFlow = myDate;
+                        this.entity.registrationTo = myDate;
+                    }
+                } 
             }
         },
+    },
+
+    methods: {
+        incrementRegistrationTo (){
+            let newDate = new Date(this.entity.registrationFrom._date);
+            newDate.setDate(newDate.getDate() + 2);
+    
+            this.entity.registrationTo = new McDate(newDate);
+        }
     }
 });
diff --git a/src/modules/Opportunities/components/opportunity-basic-info/template.php b/src/modules/Opportunities/components/opportunity-basic-info/template.php
@@ -42,8 +42,8 @@
                 <entity-field :entity="entity" type="checkbox" prop="isContinuousFlow" label="<?php i::esc_attr_e('É um edital de fluxo contínuo?')?>" classes="col-12 sm:col-12"></entity-field>
                 <entity-field v-if="entity?.isContinuousFlow" :entity="entity" type="checkbox" prop="hasEndDate" label="<?php i::esc_attr_e('Definir data final para inscrições')?>" :autosave="3000" classes="col-12 sm:col-12"></entity-field>
 
-                <entity-field :entity="entity" prop="registrationFrom" :max="entity.registrationTo?._date" :autosave="3000" classes="col-6 sm:col-12"></entity-field>
-                <entity-field v-if="!entity?.isContinuousFlow || entity?.hasEndDate" :entity="entity" prop="registrationTo" :min="entity.registrationFrom?._date" :autosave="3000" classes="col-6 sm:col-12"></entity-field>
+                <entity-field :entity="entity" prop="registrationFrom" :autosave="3000" classes="col-6 sm:col-12"></entity-field>
+                <entity-field v-if="!entity?.isContinuousFlow || entity?.hasEndDate" :entity="entity" prop="registrationTo"  :autosave="3000" classes="col-6 sm:col-12"></entity-field>
 
                 <entity-field v-if="lastPhase && (!entity?.isContinuousFlow || entity?.hasEndDate)" :entity="lastPhase" prop="publishTimestamp" :autosave="3000" classes="col-6 sm:col-12">
                     <label><?= i::__("Publicação final de resultados (data e hora)") ?></label>
diff --git a/src/modules/Opportunities/components/opportunity-basic-info/texts.php b/src/modules/Opportunities/components/opportunity-basic-info/texts.php
@@ -0,0 +1,7 @@
+<?php
+use MapasCulturais\i;
+
+return [
+    'Resultado' => i::__('Resultado'),
+    'Publicação final do resultado' => i::__('Resultado'),
+];
diff --git a/src/modules/Opportunities/components/opportunity-phases-config/template.php b/src/modules/Opportunities/components/opportunity-phases-config/template.php
@@ -99,11 +99,11 @@
         <template v-else-if="index === phases.length - 1">
             <div class="add-phase grid-12">
                 <div class="col-12" v-if="!finalReportingPhase">
-                    <mc-alert v-if="!lastPhase?.publishTimestamp" type="warning">
+                    <mc-alert v-if="!firstPhase?.isContinuousFlow && !lastPhase?.publishTimestamp" type="warning">
                         <p><small class="required"><?= i::__("A data e hora da 'Publicação final' precisa estar preenchida para adicionar novas fases de prestação de informações.") ?></small></p>
                     </mc-alert>
 
-                    <opportunity-create-reporting-phase v-if="lastPhase?.publishTimestamp" :opportunity="entity" @create="addReportingPhases"></opportunity-create-reporting-phase>
+                    <opportunity-create-reporting-phase v-if="!firstPhase?.isContinuousFlow && lastPhase?.publishTimestamp" :opportunity="entity" @create="addReportingPhases"></opportunity-create-reporting-phase>
                 </div>
             </div>
         </template>
diff --git a/src/modules/Opportunities/components/opportunity-phases-timeline/script.js b/src/modules/Opportunities/components/opportunity-phases-timeline/script.js
@@ -107,7 +107,9 @@ app.component('opportunity-phases-timeline', {
 
 			const phaseOpportunity = item.__objectType == 'opportunity' ? item : item.opportunity;
 
-			return phaseOpportunity.publishedRegistrations && (isRegistrationOnly || isEvaluation);
+			const allowProponentResponse = phaseOpportunity.allow_proponent_response === '1';
+
+			return (phaseOpportunity.publishedRegistrations && (isRegistrationOnly || isEvaluation)) || allowProponentResponse;
 		
 		},
 
diff --git a/src/modules/Opportunities/components/registration-results/script.js b/src/modules/Opportunities/components/registration-results/script.js
@@ -10,11 +10,6 @@ app.component('registration-results', {
             type: Entity,
             required: true
         },
-
-        hideAppealStatus: {
-            type: Boolean,
-            default: false,
-        },
     },
     
     setup(props, { slots }) {
@@ -44,6 +39,10 @@ app.component('registration-results', {
             return $MAPAS.registrationPhases[appealPhaseId] || this.entity;
         },
 
+        hideAppealStatus() {
+            return this.registration.status != 10;
+        },
+
         currentEvaluation() {
             return $MAPAS.config.appealPhaseEvaluationForm?.currentEvaluation;
         },
@@ -54,9 +53,18 @@ app.component('registration-results', {
                 `${this.phase.name} - ${this.registration.number}`;
         },
 
-        showAppealPhaseEvaluationDetails() {
-            return $MAPAS.config.continuousEvaluationDetail?.data.consolidatedDetails?.sentEvaluationCount;
-        }
+        evaluationData() {
+            return $MAPAS.config.continuousEvaluationDetail[this.registration.id];
+        },
+
+        showEvaluationDetails() {
+            if (this.phase.opportunity?.allow_proponent_response && this.evaluationData?.consolidatedDetails?.sentEvaluationCount) {
+                return true;
+            } else {
+                return this.evaluationData?.consolidatedDetails?.sentEvaluationCount
+                    || this.registration.consolidatedDetails?.sentEvaluationCount;
+            }
+        },
     },
 
     methods: {
diff --git a/src/modules/Opportunities/components/registration-results/template.php b/src/modules/Opportunities/components/registration-results/template.php
@@ -10,7 +10,7 @@
 
 $entity = $this->controller->requestedEntity;
 ?>
-<div v-if="registration.consolidatedDetails?.sentEvaluationCount || showAppealPhaseEvaluationDetails" class="registration-results">  
+<div v-if="showEvaluationDetails" class="registration-results">  
     <mc-modal :title="modalTitle" classes="registration-results__modal registration-results__modal--with-chat">
         <template #default>
             <?php foreach($app->getRegisteredEvaluationMethods(true) as $evaluation_method): ?>
@@ -19,7 +19,7 @@
                 </div>
             <?php endforeach ?>
 
-            <div v-if="!registration.opportunity.isReportingPhase && !appealRegistration && !hideAppealStatus" class="registration-results__request-appeal">
+            <div v-if="!registration.opportunity.isReportingPhase && !appealRegistration && hideAppealStatus" class="registration-results__request-appeal">
                 <button class="button button--primary" @click="createAppealPhaseRegistration()"><?= i::__('Solicitar recurso') ?></button>
             </div>
         </template>
diff --git a/src/modules/Opportunities/components/registration-status/script.js b/src/modules/Opportunities/components/registration-status/script.js
@@ -43,7 +43,18 @@ app.component('registration-status', {
             }
 
             return $MAPAS.registrationPhases[appealPhaseId] || this.entity;
-        }
+        },
+
+        showRegistrationResults() {
+            const { isReportingPhase, __objectType, publishEvaluationDetails } = this.phase;
+            const { allow_proponent_response } = this.registration.opportunity;
+
+            if (isReportingPhase === '1' && __objectType === 'opportunity' && allow_proponent_response == '1') {
+                return false;
+            }
+
+            return publishEvaluationDetails || allow_proponent_response === '1';
+        },
     },
 
     methods: {
diff --git a/src/modules/Opportunities/components/registration-status/template.php b/src/modules/Opportunities/components/registration-status/template.php
@@ -43,7 +43,7 @@
             <div class="registration-results" v-if="registration.opportunity.isReportingPhase === '1' || registration.opportunity.isFinalReportingPhase === '1'">
                 <button class="button button--primary button--sm button--large" @click="redirectToRegistrationForm()"><?php i::_e('Visualizar relatório') ?></button>
             </div>
-            <registration-results v-if="phase.publishEvaluationDetails" :registration="registration" :phase="phase"></registration-results>
+            <registration-results v-if="showRegistrationResults" :registration="registration" :phase="phase"></registration-results>
         </div>
     </div>
 </div>
