From 06b53a37a6bbca814345a25b3e09e6e422534120 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Wed, 5 Jun 2024 18:52:22 -0300
Subject: [PATCH 01/68] =?UTF-8?q?Corre=C3=A7=C3=A3o=20no=20nome=20do=20hoo?=
 =?UTF-8?q?k=20do=20registrationMetadata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/Entities/Opportunity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/Entities/Opportunity.php b/src/core/Entities/Opportunity.php
index e3894f7c13..17ef4668a4 100644
--- a/src/core/Entities/Opportunity.php
+++ b/src/core/Entities/Opportunity.php
@@ -1139,7 +1139,7 @@ function registerRegistrationMetadata($also_previous_phases = false){
             $app->registerMetadata($metadata, Registration::class);
         }
 
-        $app->applyHookBoundTo($this, "{$this->hookPrefix}.registrationMetadada");
+        $app->applyHookBoundTo($this, "{$this->hookPrefix}.registrationMetadata");
         
         if($also_previous_phases && $this->parent) {
             $this->previousPhase->registerRegistrationMetadata();

From c559de6443785ee5a8554283f315d1a7c3aecef2 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Wed, 5 Jun 2024 18:54:59 -0300
Subject: [PATCH 02/68] =?UTF-8?q?Criado=20hooks=20para=20a=20tab=20na=20te?=
 =?UTF-8?q?la=20de=20acompanhamento=20da=20inscri=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/Opportunities/views/registration/single.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/Opportunities/views/registration/single.php b/src/modules/Opportunities/views/registration/single.php
index eaec2c3330..dcafad2cfd 100644
--- a/src/modules/Opportunities/views/registration/single.php
+++ b/src/modules/Opportunities/views/registration/single.php
@@ -42,6 +42,8 @@
     <opportunity-header :opportunity="entity.opportunity"></opportunity-header>
     <registration-print :registration="entity"></registration-print>
     <mc-tabs sync-hash>
+        <?php $this->applyTemplateHook('single-tab', 'begin') ?>
+        
         <mc-tab label="<?= i::_e('Acompanhamento') ?>" slug="acompanhamento">
             <div class="registration__content">
                 <mc-card>
@@ -299,5 +301,7 @@
                 <?php endwhile ?>
             </div>
         </mc-tab>
+        
+        <?php $this->applyTemplateHook('single-tab', 'end') ?>
     </mc-tabs>
 </div>
\ No newline at end of file

From c4c93fed5c0b51b6623678f0202c463b78ced75b Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Thu, 6 Jun 2024 00:15:08 -0300
Subject: [PATCH 03/68] Implementa possibilidade de definir mascaras em inputs
 do entity-field

---
 CHANGELOG.md                                              | 1 +
 src/modules/Entities/components/entity-field/template.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6a24cd1ab..e7e8b2ba43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Melhorias
 - Implementa hook no método registerRegistrationMetadata da oportunidade, para possibilitar incremento de novos registros atrevéz de plugins e módulos
 - Implementa novos hook's para possibilitar manipulação da tela de listagem de fases
+- Implementa possibilidade de definir mascaras em inputs do entity-field
 
 ### Correções
 - Corrige erro no carregamento do formulário de avaliação para o avaliador
diff --git a/src/modules/Entities/components/entity-field/template.php b/src/modules/Entities/components/entity-field/template.php
index 4a590cf9b3..d7cdfaf9bc 100644
--- a/src/modules/Entities/components/entity-field/template.php
+++ b/src/modules/Entities/components/entity-field/template.php
@@ -25,6 +25,7 @@
         <input v-if="is('cnpj')" v-maska data-maska="##.###.###/####-##" :value="value" :id="propId" :name="prop" type="text" @input="change($event)" @blur="change($event,true)" autocomplete="off">
         <input v-if="is('brPhone')" v-maska data-maska="['(##) #####-####','(##) ####-####']" data-maska-tokens="0:[0-9]:optional" :value="value" :id="propId" :name="prop" type="text" @input="change($event)" @blur="change($event,true)" autocomplete="off">
         <input v-if="is('cep')" v-maska data-maska="#####-###" :value="value" :id="propId" :name="prop" type="text" @input="change($event)" @blur="change($event,true)" autocomplete="off">
+        <input v-if="is('fieldMask')" v-maska :data-maska="mask" :value="value" :id="propId" :name="prop" type="text" @input="change($event)" @blur="change($event,true)" autocomplete="off">
 
         <input v-if="is('string') || is('text')" :value="value" :id="propId" :name="prop" type="text" @input="change($event)" @blur="change($event,true)" autocomplete="off" :placeholder="placeholder || description?.placeholder">
         <div  v-if="is('textarea') && prop=='shortDescription'" class="field__shortdescription">

From 528cb41bf5037ef8987b57546c296ed536193ff9 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Thu, 6 Jun 2024 01:52:34 -0300
Subject: [PATCH 04/68] Ajusta prop mask no componente entity-field

---
 src/modules/Entities/components/entity-field/script.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/Entities/components/entity-field/script.js b/src/modules/Entities/components/entity-field/script.js
index 739a5f2ec9..eea0210c7d 100644
--- a/src/modules/Entities/components/entity-field/script.js
+++ b/src/modules/Entities/components/entity-field/script.js
@@ -122,6 +122,10 @@ app.component('entity-field', {
             type: Boolean,
             default: false
         },
+        mask: {
+            type: String,
+            default: null,
+        },
     },
 
     computed: {

From 218722e273364f247f908871cc2d6ed56457278b Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Thu, 6 Jun 2024 02:14:59 -0300
Subject: [PATCH 05/68] =?UTF-8?q?Implementa=20contante=20global=20mcTabAct?=
 =?UTF-8?q?ive=20para=20guadar=20a=20aba=20que=20o=20mc-tab=20est=C3=A1=20?=
 =?UTF-8?q?selecionada?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                       | 1 +
 src/modules/Components/components/mc-tab/script.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7e8b2ba43..69222e4925 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Implementa hook no método registerRegistrationMetadata da oportunidade, para possibilitar incremento de novos registros atrevéz de plugins e módulos
 - Implementa novos hook's para possibilitar manipulação da tela de listagem de fases
 - Implementa possibilidade de definir mascaras em inputs do entity-field
+- Implementa contante global mcTabActive para guadar a aba que o mc-tab está selecionada
 
 ### Correções
 - Corrige erro no carregamento do formulário de avaliação para o avaliador
diff --git a/src/modules/Components/components/mc-tab/script.js b/src/modules/Components/components/mc-tab/script.js
index 78842538c7..c6310d1bd3 100644
--- a/src/modules/Components/components/mc-tab/script.js
+++ b/src/modules/Components/components/mc-tab/script.js
@@ -34,12 +34,14 @@ app.component('mc-tab', {
         const hash = '#' + (!props.disabled ? props.slug : '')
         const isActive = Vue.ref(false)
         const tabsProvider = Vue.inject('tabsProvider')
+        const global = useGlobalState();
 
         let timeout = null
         Vue.watch(
             () => tabsProvider.activeTab,
             () => {
                 isActive.value = props.slug === tabsProvider.activeTab?.slug
+                global.mcTabActive = tabsProvider.activeTab?.slug;
 
                 window.clearTimeout(timeout)
                 if (props.cache) {

From dc7a85b03b10f31e50f511d00c68a6c205c42ed5 Mon Sep 17 00:00:00 2001
From: israelmelo <israelg.8@gmail.com>
Date: Thu, 6 Jun 2024 12:04:44 -0300
Subject: [PATCH 06/68] =?UTF-8?q?Criado=20novos=20hooks=20para=20adicionar?=
 =?UTF-8?q?=20a=20timeline=20do=20acompanhamento=20de=20inscri=C3=A7=C3=A3?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/opportunity-phases-timeline/template.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/Opportunities/components/opportunity-phases-timeline/template.php b/src/modules/Opportunities/components/opportunity-phases-timeline/template.php
index e4b4422ff8..5d42752c6b 100644
--- a/src/modules/Opportunities/components/opportunity-phases-timeline/template.php
+++ b/src/modules/Opportunities/components/opportunity-phases-timeline/template.php
@@ -12,6 +12,7 @@
 ');
 ?>
 <section :class="['timeline', {'center': center}, {'big': big}]">
+    <?php $this->applyComponentHook('item', 'before'); ?>
     <div v-for="item in phases" :class="['item', {'active': isActive(item)}, {'happened': itHappened(item)}]" :set="registration = getRegistration(item)">
         <div class="item__dot"> <span class="dot"></span> </div>
         <div class="item__content">
@@ -44,4 +45,5 @@
             <?php $this->applyComponentHook('item', 'end'); ?>
         </div>
     </div>
+    <?php $this->applyComponentHook('item', 'after'); ?>
 </section>
\ No newline at end of file

From 5443d83a0f04a51e98e28433a0c7c1743bfd3243 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Thu, 6 Jun 2024 12:59:08 -0300
Subject: [PATCH 07/68] =?UTF-8?q?Implementa=20getter=20lastPhase()=20para?=
 =?UTF-8?q?=20as=20inscri=C3=A7=C3=B5es,=20possibilitando=20recuperar=20a?=
 =?UTF-8?q?=20entidade=20da=20inscri=C3=A7=C3=A3o=20na=20ultima=20fase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                             | 1 +
 src/modules/OpportunityPhases/Module.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69222e4925..65c1e261dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Implementa novos hook's para possibilitar manipulação da tela de listagem de fases
 - Implementa possibilidade de definir mascaras em inputs do entity-field
 - Implementa contante global mcTabActive para guadar a aba que o mc-tab está selecionada
+- Implementa getter lastPhase() para as inscrições, possibilitando recuperar a entidade da inscrição na ultima fase
 
 ### Correções
 - Corrige erro no carregamento do formulário de avaliação para o avaliador
diff --git a/src/modules/OpportunityPhases/Module.php b/src/modules/OpportunityPhases/Module.php
index b83c4834ad..b77f544485 100644
--- a/src/modules/OpportunityPhases/Module.php
+++ b/src/modules/OpportunityPhases/Module.php
@@ -551,6 +551,11 @@ function _init () {
              return;
         });
 
+        $app->hook('entity(Registration).get(lastPhase)', function(&$value) use ($app) {
+            /** @var Registration $this */
+            $value = $app->repo('Registration')->findOneBy(['number' => $this->number, 'opportunity' => $this->opportunity->lastPhase]);
+        });
+
         /**
          * Getters das fases de avaliação
          */

From eead1d9c8f43e0d4e2a26a2173617a75ca63fcb8 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Thu, 6 Jun 2024 13:06:44 -0300
Subject: [PATCH 08/68] =?UTF-8?q?Corrige=20remo=C3=A7=C3=A3o=20de=20abas?=
 =?UTF-8?q?=20do=20componente=20mc-tabs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                       | 1 +
 src/modules/Components/components/mc-tab/script.js | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65c1e261dd..b5d0ef24b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Ajusta estêncil do upload de imagem para carregar ja no tamanho máximo permitido
 - Corrige db-update que atualiza legado da distribuição de avaliaçações por categoria
 - Corrige db-update que cria as colunas eligible e score
+- Corrige remoção de abas do componente mc-tabs
 
 ## [7.4] 2024-05-28
 ### Novas funcionalidades
diff --git a/src/modules/Components/components/mc-tab/script.js b/src/modules/Components/components/mc-tab/script.js
index c6310d1bd3..4c259a0ba8 100644
--- a/src/modules/Components/components/mc-tab/script.js
+++ b/src/modules/Components/components/mc-tab/script.js
@@ -69,6 +69,15 @@ app.component('mc-tab', {
             })
         })
 
+        Vue.onBeforeUnmount(() => {
+            const tab = tabsProvider.tabs.find((tab) => tab.hash == hash);
+
+            const index = tabsProvider.tabs.indexOf(tab);
+            if (index > -1) {
+                tabsProvider.tabs.splice(index, 1);
+            }
+        });
+
         return {
             cached,
             hash,

From 6509d1fe33119beb901f359ab81dba6a34d288b0 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Fri, 7 Jun 2024 09:29:16 -0300
Subject: [PATCH 09/68] Refatora script start.sh e middleware ExecutionTime
 para fornecer um log mais limpo para o desenvolvedor

---
 CHANGELOG.md                           | 3 +++
 docker/development/start.sh            | 2 +-
 src/core/Middlewares/ExecutionTime.php | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d0ef24b2..5a7ee3212b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,9 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Corrige db-update que cria as colunas eligible e score
 - Corrige remoção de abas do componente mc-tabs
 
+### Melhorias não funcionais
+- Refatora script start.sh e middleware ExecutionTime para fornecer um log mais limpo para o desenvolvedor
+
 ## [7.4] 2024-05-28
 ### Novas funcionalidades
 - Adiciona campos **total de vagas** e **valor total** nas oportunidades
diff --git a/docker/development/start.sh b/docker/development/start.sh
index be8065538e..75c1138a44 100755
--- a/docker/development/start.sh
+++ b/docker/development/start.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-php -S 0.0.0.0:80 -t /var/www/html /var/www/dev/router.php
\ No newline at end of file
+php -S 0.0.0.0:80 -q -t /var/www/html /var/www/dev/router.php
\ No newline at end of file
diff --git a/src/core/Middlewares/ExecutionTime.php b/src/core/Middlewares/ExecutionTime.php
index 95d5df4462..0ea7b41cb5 100644
--- a/src/core/Middlewares/ExecutionTime.php
+++ b/src/core/Middlewares/ExecutionTime.php
@@ -11,7 +11,8 @@ public function __invoke(Request $request, RequestHandler $handler) {
         $app = App::i();
 
         $app->log->info('=========================================================================');
-        
+        $app->log->debug($_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI']);
+
         $response = $handler->handle($request);
 
         $endTime = microtime(true);

From b74514690bac685d83a2f60d21a5c22f534dfb8c Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Fri, 7 Jun 2024 10:14:24 -0300
Subject: [PATCH 10/68] corrige hook que propaga o sentTimestamp

---
 src/modules/OpportunityPhases/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/OpportunityPhases/Module.php b/src/modules/OpportunityPhases/Module.php
index b77f544485..6bff9f8d94 100644
--- a/src/modules/OpportunityPhases/Module.php
+++ b/src/modules/OpportunityPhases/Module.php
@@ -211,7 +211,7 @@ function _init () {
         $self = $this;
         $registration_repository = $app->repo('Registration');
 
-        $app->hook("entity(Registration).<<insert|sent>>:before", function(){
+        $app->hook("entity(Registration).<<insert|send>>:before", function(){
             if(!$this->opportunity->isDataCollection){
               $this->sentTimestamp = $this->previousPhase->sentTimestamp;
             }

From 6fd7afdc57e604f6871eae905ae9c669faa67d14 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Fri, 7 Jun 2024 13:02:09 -0300
Subject: [PATCH 11/68] =?UTF-8?q?Implementa=20hook=20no=20metodo=20getVali?=
 =?UTF-8?q?dationErrors=20possibilitando=20a=20mainipula=C3=A7=C3=A3o=20fi?=
 =?UTF-8?q?nal=20dos=20erros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/Entity.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/Entity.php b/src/core/Entity.php
index e7b714eb4d..813036b152 100644
--- a/src/core/Entity.php
+++ b/src/core/Entity.php
@@ -1142,6 +1142,8 @@ public function getValidationErrors(){
         if($this->usesTaxonomies())
             $errors = $errors + $this->getTaxonomiesValidationErrors();
 
+        $app->applyHookBoundTo($this, "{$this->hookPrefix}.validationErrors", [&$errors]);
+        
         return $errors;
     }
 

From 29f58c07220192d95e0fe398d264471cae5c7125 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Fri, 7 Jun 2024 13:03:46 -0300
Subject: [PATCH 12/68] =?UTF-8?q?Melhora=20fluxo=20das=20mensagens=20de=20?=
 =?UTF-8?q?valida=C3=A7=C3=A3o=20de=20erros=20da=20inscri=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                          | 2 ++
 src/core/Controllers/Registration.php | 4 ++--
 src/core/Entities/Registration.php    | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d0ef24b2..c8d5a68852 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Implementa possibilidade de definir mascaras em inputs do entity-field
 - Implementa contante global mcTabActive para guadar a aba que o mc-tab está selecionada
 - Implementa getter lastPhase() para as inscrições, possibilitando recuperar a entidade da inscrição na ultima fase
+- Implementa hook no metodo getValidationErrors possibilitando a mainipulação final dos erros
+- Melhora fluxo das mensagens de validação de erros da inscrição
 
 ### Correções
 - Corrige erro no carregamento do formulário de avaliação para o avaliador
diff --git a/src/core/Controllers/Registration.php b/src/core/Controllers/Registration.php
index decf99a6f3..6ab7a45a75 100644
--- a/src/core/Controllers/Registration.php
+++ b/src/core/Controllers/Registration.php
@@ -602,7 +602,7 @@ function POST_validateEntity() {
             $entity->$field = $value;
         }
         
-        if ($errors = $entity->getSendValidationErrors()) {
+        if ($errors = $entity->getValidationErrors()) {
             $this->errorJson($errors);
         } else {
             $this->json(true);
@@ -623,7 +623,7 @@ function POST_validateProperties() {
             $entity->$field = $value;
         }
 
-        if ($_errors = $entity->getSendValidationErrors()) {
+        if ($_errors = $entity->getValidationErrors()) {
             $errors = [];
             foreach($this->postData as $field => $value){
                 if(key_exists($field, $_errors)){
diff --git a/src/core/Entities/Registration.php b/src/core/Entities/Registration.php
index 84dd0d348b..5c701329d8 100644
--- a/src/core/Entities/Registration.php
+++ b/src/core/Entities/Registration.php
@@ -1015,10 +1015,12 @@ function isFieldVisisble(RegistrationFieldConfiguration|RegistrationFileConfigur
 
     function getValidationErrors() {
         if($this->isNew()) {
-            return parent::getValidationErrors();
+            $errors = parent::getValidationErrors();
         } else {
-            return $this->getSendValidationErrors();
+            $errors = [...parent::getValidationErrors(), ...$this->getSendValidationErrors()];
         }
+
+        return $errors;
     }
 
     function getSendValidationErrors(string $field_prefix = 'field_', $file_prefix = 'file_', $agent_prefix = 'agent_'){

From 9b8f6a8cc847d8ecbe35471d9eeaf704dec80104 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Mon, 10 Jun 2024 10:42:31 -0300
Subject: [PATCH 13/68] Ajusta erro na modal do image-uploader (Ref.: #3194)

---
 .../Components/components/mc-image-uploader/script.js    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/Components/components/mc-image-uploader/script.js b/src/modules/Components/components/mc-image-uploader/script.js
index b271d29db8..020f398c28 100644
--- a/src/modules/Components/components/mc-image-uploader/script.js
+++ b/src/modules/Components/components/mc-image-uploader/script.js
@@ -139,13 +139,14 @@ app.component("mc-image-uploader", {
         },
 
         loadImage(event, modal) {
-            modal.open();
-            // Reference to the DOM input element
             const { files } = event.target;
-            const filename = event.target.value.split(/(\\|\/)/g).pop();
+            console.log(files);
 
-            // Ensure that you have a file before attempting to read it
             if (files && files[0]) {
+                modal.open();
+                const filename = event.target.value.split(/(\\|\/)/g).pop();
+
+                // Ensure that you have a file before attempting to read it
                 // 1. Revoke the object URL, to allow the garbage collector to destroy the uploaded before file
                 if (this.image.src) {
                     URL.revokeObjectURL(this.image.src);

From fc23109a03f1da19d86c195a3b744d323e7b0951 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Mon, 10 Jun 2024 11:54:07 -0300
Subject: [PATCH 14/68] Remove console log (Ref.: #3194)

---
 src/modules/Components/components/mc-image-uploader/script.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/Components/components/mc-image-uploader/script.js b/src/modules/Components/components/mc-image-uploader/script.js
index 020f398c28..1a5285ca3c 100644
--- a/src/modules/Components/components/mc-image-uploader/script.js
+++ b/src/modules/Components/components/mc-image-uploader/script.js
@@ -140,7 +140,6 @@ app.component("mc-image-uploader", {
 
         loadImage(event, modal) {
             const { files } = event.target;
-            console.log(files);
 
             if (files && files[0]) {
                 modal.open();

From 6d245b50c266c930ec0dfb6e25899e95ab006830 Mon Sep 17 00:00:00 2001
From: Victor Magalhaes <victor.magalhaesp@gmail.com>
Date: Mon, 10 Jun 2024 14:22:44 -0300
Subject: [PATCH 15/68] habilita hooks entity insert

---
 src/core/Entity.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/Entity.php b/src/core/Entity.php
index fe27a636a4..e7b714eb4d 100644
--- a/src/core/Entity.php
+++ b/src/core/Entity.php
@@ -1215,12 +1215,12 @@ public function postPersist($args = null){
         
         $hook_prefix = $this->getHookPrefix();
 
-//        $app->applyHookBoundTo($this, "{$hook_prefix}.insert:after");
-//
-//        if ($this->usesPermissionCache()) {
-//            $this->createPermissionsCacheForUsers([$this->ownerUser]);
-//            $app->enqueueEntityToPCacheRecreation($this);
-//        }
+        $app->applyHookBoundTo($this, "{$hook_prefix}.insert:after");
+
+        if ($this->usesPermissionCache()) {
+            $this->createPermissionsCacheForUsers([$this->ownerUser]);
+            $app->enqueueEntityToPCacheRecreation($this);
+        }
     }
 
     /**

From bc364c45dbb63aa51fecdccc4f2fd5a594e9f0f8 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 21:03:54 -0300
Subject: [PATCH 16/68] =?UTF-8?q?melhorias=20e=20corre=C3=A7=C3=B5es=20na?=
 =?UTF-8?q?=20listagem=20de=20avalia=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  2 ++
 .../opportunity-evaluations-list/script.js    | 35 ++++++++++---------
 .../opportunity-evaluations-list/template.php | 34 +++++++++---------
 .../_opportunity-evaluations-list.scss        | 10 ++++--
 4 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a7ee3212b..371c0a0240 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Implementa possibilidade de definir mascaras em inputs do entity-field
 - Implementa contante global mcTabActive para guadar a aba que o mc-tab está selecionada
 - Implementa getter lastPhase() para as inscrições, possibilitando recuperar a entidade da inscrição na ultima fase
+- Melhorias na interface e filtro na lista de inscrições da página de avaliação
 
 ### Correções
 - Corrige erro no carregamento do formulário de avaliação para o avaliador
@@ -18,6 +19,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Corrige db-update que atualiza legado da distribuição de avaliaçações por categoria
 - Corrige db-update que cria as colunas eligible e score
 - Corrige remoção de abas do componente mc-tabs
+- Corrige link dos botões de acessar inscrição na lista de inscrições da página de avaliação
 
 ### Melhorias não funcionais
 - Refatora script start.sh e middleware ExecutionTime para fornecer um log mais limpo para o desenvolvedor
diff --git a/src/modules/Opportunities/components/opportunity-evaluations-list/script.js b/src/modules/Opportunities/components/opportunity-evaluations-list/script.js
index 37cf130b19..4d2b2795f2 100644
--- a/src/modules/Opportunities/components/opportunity-evaluations-list/script.js
+++ b/src/modules/Opportunities/components/opportunity-evaluations-list/script.js
@@ -34,33 +34,29 @@ app.component('opportunity-evaluations-list', {
             keywords: "",
             timeOut: null,
             roles: $MAPAS.currentUserRoles,
-            filterKeyword: false
+            filterKeyword: false,
+            loading: false
         }
     },
     watch: {
         'pending'(_new, _old) {
-            this.timeOutFind(_new, _old);
+            this.getEvaluations();
         }
     },
     methods: {
-        timeOutFind(_new, _old) {
-            if (_new != _old) {
-                clearTimeout(this.timeOut);
-                this.timeOut = setTimeout(() => {
-                    this.getEvaluations();
-                }, 1500);
-            }
-        },
-        filterKeywordExec(_new, _old) {
-            if(!this.keywords){
-                messages.error(this.text('Informe a palavra chave'));
-            }else{
+        timeOutFind(delay = 1500) {
+            clearTimeout(this.timeOut);
+
+            this.timeOut = setTimeout(() => {
                 this.getEvaluations();
-            }
+            }, delay);
         },
         async getEvaluations() {
+            this.loading = true;
+
             let args = {};
             args['@select'] = "id,owner.name";
+            args['registration:@select'] = "id,owner.name,sentTimestamp";
             args['@opportunity'] = this.entity.opportunity.id;
 
             if(this.keywords){
@@ -77,7 +73,10 @@ app.component('opportunity-evaluations-list', {
             await api.GET(url).then(response => response.json().then(objs => {
                 this.evaluations = objs.map(function(item){
                     return {
-                        registrationid:item.registration.id,
+                        evaluationId: item.evaluation?.id,
+                        registrationNumber: item.registration.number,
+                        registrationId: item.registration.id,
+                        registrationSentTimestamp: new McDate(item.registration.sentTimestamp.date),
                         agentname: item.registration.owner?.name,
                         status: item?.evaluation?.status,
                         resultString: item?.evaluation?.resultString || null,
@@ -85,8 +84,10 @@ app.component('opportunity-evaluations-list', {
                     }
                 });
                 this.filterKeyword = false;
-                this.evaluations.sort((a, b) => (a.registrationid - b.registrationid));
+                this.evaluations.sort((a, b) => (a.registrationId - b.registrationId));
                 window.dispatchEvent(new CustomEvent('evaluationRegistrationList', {detail:{evaluationRegistrationList:this.evaluations}}));
+
+                this.loading = false;
             }));
 
             const globalState = useGlobalState();
diff --git a/src/modules/Opportunities/components/opportunity-evaluations-list/template.php b/src/modules/Opportunities/components/opportunity-evaluations-list/template.php
index 11ed01e046..39bf43b210 100644
--- a/src/modules/Opportunities/components/opportunity-evaluations-list/template.php
+++ b/src/modules/Opportunities/components/opportunity-evaluations-list/template.php
@@ -8,6 +8,7 @@
 
 $this->import('
     mc-icon
+    mc-loading
 ');
 ?>
 <div class="opportunity-evaluations-list" v-if="showList()">
@@ -18,39 +19,37 @@
 
         <div class="find">
             <div class="content">
-                <input type="text" v-model="keywords">
-                
-                <button class="button-filter button--primary" @click="filterKeywordExec()">
-                    <mc-icon name="filter"></mc-icon>
-                    <label class="button-label"><?= i::__('Filtrar') ?></label>
-                </button>
+                <input type="text" v-model="keywords" @input="timeOutFind()" @keyup.enter="timeOutFind(0)" class="label-evaluation__search">
             </div>
             <div class="label-evaluation">
                 <div class="label-evaluation__check">
-                    <input type="checkbox" v-model="pending" class="label-evaluation__check--pending">
-                    <span class="label-evaluation__check--label"><?= i::__('Mostrar somente pendentes') ?></span>
+                    <label class="label-evaluation__check--label">
+                        <input type="checkbox" v-model="pending" class="label-evaluation__check--pending">
+                        <?= i::__('Mostrar somente pendentes') ?>
+                    </label>
                 </div>
             </div>
         </div>
-        <ul class="evaluation-list">
-            <li v-for="evaluation in evaluations" :class="[{'evaluation-list__card--modify': entity.id == evaluation.registrationid}, 'evaluation-list__card']">
+        <mc-loading :condition="loading"><?= i::__('carregando...') ?></mc-loading>
+        <ul v-if="!loading" class="evaluation-list">
+            <li v-for="evaluation in evaluations" :key="evaluation.registrationId" :class="[{'evaluation-list__card--modify': entity.id == evaluation.registrationid}, 'evaluation-list__card']">
                 <div class="evaluation-list__content">
                     <a :href="evaluation.url" class="link">
                         <div class="card-header">
-                            <mc-icon name='agent-1'></mc-icon>
-                            <span class="card-header__name">{{evaluation.agentname}}</span>
+                            <span class="card-header__name">{{evaluation.registrationNumber}}</span>
                         </div>
                         <div class="card-content">
-                            <div class=" card-content__middle">
-                                <span class="subscribe"><?= i::__('Inscrição') ?></span>
+                            <div v-if="evaluation.agentname" class="card-content__middle">
+                                <mc-icon name='agent-1'></mc-icon>
+
                                 <span class="value">
-                                    <strong>{{evaluation.registrationid}}</strong>
+                                    <strong>{{evaluation.agentname}}</strong>
                                 </span>
                             </div>
                             <div class="card-content__middle">
                                 <span class="subscribe"><?= i::__('Data da inscrição') ?></span>
                                 <span class="value">
-                                    <strong>{{dateFormat(entity.createTimestamp)}}</strong>
+                                    <strong>{{evaluation.registrationSentTimestamp.date()}} {{evaluation.registrationSentTimestamp.time()}}</strong>
                                 </span>
                             </div>
                         </div>
@@ -61,8 +60,7 @@
                                 <h5 class="bold" v-if="evaluation.resultString">{{evaluation.resultString}}</h5>
                                 <h5 class="bold" v-if="!evaluation.resultString"> <?= i::__('Pendente') ?></h5>
                             </span>
-                            <mc-link route="registration/evaluation/" :params="[evaluation.registrationid]"  class="button button--primary-outline"><?= i::__('Acessar') ?></mc-link>
-
+                            <mc-link route="registration/evaluation/" :params="[evaluation.registrationId]" icon="arrowPoint-right" right-icon class="button button--primary-outline"><?= i::__('Acessar') ?></mc-link>
                         </div>
                     </a>
                 </div>
diff --git a/src/themes/BaseV2/assets-src/sass/2.components/_opportunity-evaluations-list.scss b/src/themes/BaseV2/assets-src/sass/2.components/_opportunity-evaluations-list.scss
index fbad8d354e..2c1cb8c90a 100644
--- a/src/themes/BaseV2/assets-src/sass/2.components/_opportunity-evaluations-list.scss
+++ b/src/themes/BaseV2/assets-src/sass/2.components/_opportunity-evaluations-list.scss
@@ -64,7 +64,7 @@
                         position: relative;
                         border-radius: size(69);
                         height: size(40);
-                        border: size(1) solid var(--mc-gray-100);
+                        border: size(1) solid $gray-700;
                         background: url(https://api.iconify.design/ant-design/search-outlined.svg) no-repeat calc(100% - size(10)) center/size(20);
                         width: 100%;
                         padding: size(12) size(30) size(12) size(20);
@@ -101,6 +101,10 @@
             }
 
             .label-evaluation {
+                &__search {
+                    border-color: $gray-700;
+                }
+
                 &__check {
                     margin-top: size(15);
                     display: flex;
@@ -174,9 +178,9 @@
                                     font-family: 'Open Sans';
                                     font-style: normal;
                                     font-weight: 700;
-                                    font-size: size(14);
+                                    font-size: size(22);
                                     line-height: size(19);
-                                    color: var(--mc-primary-500);
+                                    color: $opportunities-500;
                                 }
                             }
 

From b068f349bb651ca3c8da0b5df94a4b2b0d705797 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 21:06:21 -0300
Subject: [PATCH 17/68] =?UTF-8?q?corre=C3=A7=C3=A3o=20do=20componente=20mc?=
 =?UTF-8?q?-link=20para=20ser=20reativo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/components/mc-link/script.js   | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/modules/Components/components/mc-link/script.js b/src/modules/Components/components/mc-link/script.js
index d4c5d89311..d9e8ab1fb5 100644
--- a/src/modules/Components/components/mc-link/script.js
+++ b/src/modules/Components/components/mc-link/script.js
@@ -57,25 +57,35 @@ app.component('mc-link', {
 
     },
 
-    data() {
-        let url = '';
-        let classes = this.class;
-        let queryString = this.serializeQueryString();
-        queryString = queryString ? `?${queryString}` : queryString;
-
-        if (this.entity) {
-            url = this.entity.getUrl(this.route, this.params) + queryString;
-            classes += ` ${this.entity.__objectType}__color` ;
-        } else {
-            const parts = this.route.split('/');
-            url = Utils.createUrl(parts[0], parts[1], this.params)  + queryString;
-        }
+    computed: {
+        url() {
+            let url = '';
+            let queryString = this.serializeQueryString();
+            queryString = queryString ? `?${queryString}` : queryString;
+
+            if (this.entity) {
+                url = this.entity.getUrl(this.route, this.params) + queryString;
+            } else {
+                const parts = this.route.split('/');
+                url = Utils.createUrl(parts[0], parts[1], this.params)  + queryString;
+            }
 
-        if (this.hash) {
-            url = url+'#'+this.hash;
-        }
+            if (this.hash) {
+                url = url+'#'+this.hash;
+            }
+
+            return url;
+        },
+
+        classes() {
+            let classes = this.class;
 
-        return {url, classes};
+            if (this.entity) {
+                classes += ` ${this.entity.__objectType}__color` ;
+            }
+
+            return classes;
+        }
     },
 
     methods: {

From a051905dc609fcdb47435d584ea216d2870590fa Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 21:38:45 -0300
Subject: [PATCH 18/68] =?UTF-8?q?Possibilita=20a=20configura=C3=A7=C3=A3o?=
 =?UTF-8?q?=20de=20metadados=20com=20op=C3=A7=C3=B5es=20value=20=3D>=20lab?=
 =?UTF-8?q?el=20com=20valores=20num=C3=A9ricos=20atrav=C3=A9s=20da=20flag?=
 =?UTF-8?q?=20'numericKeyValueOptions'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      |  1 +
 src/core/Definitions/Metadata.php | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 371c0a0240..2482347b2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Corrige db-update que cria as colunas eligible e score
 - Corrige remoção de abas do componente mc-tabs
 - Corrige link dos botões de acessar inscrição na lista de inscrições da página de avaliação
+- Possibilita a configuração de metadados com opções value => label com valores numéricos através da flag `numericKeyValueOptions`
 
 ### Melhorias não funcionais
 - Refatora script start.sh e middleware ExecutionTime para fornecer um log mais limpo para o desenvolvedor
diff --git a/src/core/Definitions/Metadata.php b/src/core/Definitions/Metadata.php
index c1cffd6262..1b1b1b70f1 100644
--- a/src/core/Definitions/Metadata.php
+++ b/src/core/Definitions/Metadata.php
@@ -90,6 +90,10 @@ class Metadata extends \MapasCulturais\Definition{
 
     public $field_type;
 
+    public array $options = [];
+
+    public bool $numericKeyValueOptions = false;
+
     /**
      * Creates a new Metadata Definition.
      *
@@ -148,17 +152,20 @@ function __construct($key, $config) {
 
         $this->_validations = key_exists('validations', $config) && is_array($config['validations']) ? $config['validations'] : [];
 
+        $this->numericKeyValueOptions = $config['numericKeyValueOptions'] ?? false;
+
         if (isset($config['options']) && is_array($config['options'])) {
             $new_array = [];
             foreach ($config['options'] as $k => $value) {
 
-                if (is_int($k)) {
+                if (is_int($k) && !$this->numericKeyValueOptions) {
                     $k = $value;
                 }
                 $new_array[$k] = $value;
             }
 
             $config['options'] = $new_array;
+            $this->options = $new_array;
         }
 
         $this->serialize = $config['serialize'] ?? $this->getDefaultSerializer();
@@ -357,9 +364,10 @@ function getMetadata(){
             'field_type' => $this->field_type,
         ];
 
-        if(key_exists('options', $this->config)){
-            $result['options'] = $this->config['options'];
-            $result['optionsOrder'] = array_keys((array)$this->config['options']);
+        if($this->options){
+            $result['options'] = $this->options;
+            $result['optionsOrder'] = array_keys($this->options);
+            $result['numericKeyValueOptions'] = $this->numericKeyValueOptions;
         }
 
         foreach($this->config as $key => $val) {

From 919bc0c40a4f5c8b4a0be59f3ae4ce7325e31e35 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 22:39:41 -0300
Subject: [PATCH 19/68] remove debug do avatar do selos

---
 src/modules/Components/components/entity-card/template.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/Components/components/entity-card/template.php b/src/modules/Components/components/entity-card/template.php
index 352d448894..ab8562e358 100644
--- a/src/modules/Components/components/entity-card/template.php
+++ b/src/modules/Components/components/entity-card/template.php
@@ -122,8 +122,7 @@
 				<label class="seals__title">
 					<?php i::_e('Selos') ?>:
 				</label>
-				<mc-avatar v-for="seal in entity.seals" :title="seal.name + ' AQUI'" :entity="seal" square size="xsmall"></mc-avatar>
-				
+				<mc-avatar v-for="seal in entity.seals" :title="seal.name" :entity="seal" square size="xsmall"></mc-avatar>
 			</div>
 		</div>
 

From 2f0f87c2063b9bdf677d49fff12acf73fbf16c2b Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 23:04:13 -0300
Subject: [PATCH 20/68] Melhora performance do componente home-opportunities

---
 CHANGELOG.md                                            | 1 +
 src/modules/Home/components/home-opportunities/init.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2482347b2f..e8315ca6f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Implementa contante global mcTabActive para guadar a aba que o mc-tab está selecionada
 - Implementa getter lastPhase() para as inscrições, possibilitando recuperar a entidade da inscrição na ultima fase
 - Melhorias na interface e filtro na lista de inscrições da página de avaliação
+- Melhora performance do componente home-opportunities
 
 ### Correções
 - Corrige erro no carregamento do formulário de avaliação para o avaliador
diff --git a/src/modules/Home/components/home-opportunities/init.php b/src/modules/Home/components/home-opportunities/init.php
index 34a389442f..327d332107 100644
--- a/src/modules/Home/components/home-opportunities/init.php
+++ b/src/modules/Home/components/home-opportunities/init.php
@@ -7,7 +7,7 @@
 
 $queryParams =  [
     '@order' => 'registrationFrom ASC',
-    '@select' => 'id,name,shortDescription,terms,seals,singleUrl,registrationFrom,registrationTo,files', 
+    '@select' => 'id,name,shortDescription,terms,seals,singleUrl,registrationFrom,registrationTo,files.avatar', 
     'registrationFrom' => 'LTE('.$future_date.')',
     'registrationTo' => 'GTE('.$actual_date.')',
 ];

From 765f76cdb49d581e222fba125d4827163da00437 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 23:06:31 -0300
Subject: [PATCH 21/68] =?UTF-8?q?recria=20cache=20de=20resumo=20das=20fase?=
 =?UTF-8?q?s=20quando=20necess=C3=A1rio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/cache.php                              |  2 +-
 .../EvaluationMethodConfiguration.php         | 23 ++++++++----
 src/core/Entities/Opportunity.php             | 19 +++++++---
 .../Jobs/UpdateSummaryCaches.php              | 36 +++++++++++++++++++
 src/modules/Opportunities/Module.php          | 24 ++++++++++++-
 5 files changed, 92 insertions(+), 12 deletions(-)
 create mode 100644 src/modules/Opportunities/Jobs/UpdateSummaryCaches.php

diff --git a/config/cache.php b/config/cache.php
index 2de3a9c6d8..24fa9c106a 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -36,7 +36,7 @@
     'app.useRegisterCache'           => __env_not_false('CACHE_REGISTER'),
     'app.useApiCache'                => env('CACHE_API', false),
     'app.useQuotasCache'             => env('CACHE_QUOTAS', false),
-    'app.useOpportunitySummaryCache' =>false,
+    'app.useOpportunitySummaryCache' => __env_not_false('CACHE_OPPORTUNITY_SUMARY'),
 
 
     'app.registeredAutoloadCache.lifetime'  => env('CACHE_AUTOLOAD', YEAR_IN_SECONDS),
diff --git a/src/core/Entities/EvaluationMethodConfiguration.php b/src/core/Entities/EvaluationMethodConfiguration.php
index cc9a8db1a4..9fdf5c875c 100644
--- a/src/core/Entities/EvaluationMethodConfiguration.php
+++ b/src/core/Entities/EvaluationMethodConfiguration.php
@@ -17,6 +17,7 @@
  * 
  * @property-read \MapasCulturais\Definitions\EvaluationMethod $definition The evaluation method definition object
  * @property-read \MapasCulturais\EvaluationMethod $evaluationMethod The evaluation method plugin object
+ * @property-read string summaryCacheKey Chave do cache do resumo das avaliações
  * @property int $opportunity ownerId
  * @property-read \MapasCulturais\Entities\Opportunity owner
  * @property-read boolean publishedRegistration
@@ -266,22 +267,32 @@ public function getPublishTimestamp()
         return $this->opportunity->publishTimestamp;
     }
 
-      /**
+    
+    /**
+     * Retorna uma chave única para o cache do resumo das avaliações.
+     * 
+     * @return string A chave única para o cache do resumo da avaliações .
+     */
+    public function getSummaryCacheKey(): string
+    {
+        return "evaluation-summary-{$this->id}";
+    }
+
+    /**
      * Retorna um resumo do número de inscrições de uma oportunidade
      * 
      * @return array
      */
-    public function getSummary()
-    {
+    public function getSummary($skip_cache = false): array {
         if($this->isNew()) {
             return [];
         }
         
         /** @var App $app */
         $app = App::i();
-
-        if($app->config['app.useOpportunitySummaryCache']) {
-            $cache_key = __METHOD__ . ':' . $this->id; 
+        
+        $cache_key = $this->summaryCacheKey;
+        if(!$skip_cache && $app->config['app.useOpportunitySummaryCache']) {
             if ($app->cache->contains($cache_key)) {
                 return $app->cache->fetch($cache_key);
             }
diff --git a/src/core/Entities/Opportunity.php b/src/core/Entities/Opportunity.php
index 17ef4668a4..0f9441e178 100644
--- a/src/core/Entities/Opportunity.php
+++ b/src/core/Entities/Opportunity.php
@@ -963,13 +963,22 @@ function isUserEvaluationsSent($user = null){
         return $relation->status === EvaluationMethodConfigurationAgentRelation::STATUS_SENT;
     }
 
+    /**
+     * Retorna uma chave única para o cache do resumo da fase
+     * 
+     * @return string A chave única para o cache do resumo da fase.
+     */
+    public function getSummaryCacheKey(): string
+    {
+        return "opportunity-summary-{$this->id}";
+    }
+
     /**
      * Retorna um resumo do número de inscrições de uma oportunidade
      * 
      * @return array
      */
-    public function getSummary()
-    {
+    public function getSummary($skip_cache = false): array {
         if($this->isNew()) {
             return [];
         }
@@ -977,8 +986,10 @@ public function getSummary()
         /** @var App $app */
         $app = App::i();
 
-        if($app->config['app.useOpportunitySummaryCache']) {
-            $cache_key = __METHOD__ . ':' . $this->id; 
+        $cache_key = $this->summaryCacheKey;
+        
+        if(!$skip_cache && $app->config['app.useOpportunitySummaryCache']) {
+
             if ($app->cache->contains($cache_key)) {
                 return $app->cache->fetch($cache_key);
             }
diff --git a/src/modules/Opportunities/Jobs/UpdateSummaryCaches.php b/src/modules/Opportunities/Jobs/UpdateSummaryCaches.php
new file mode 100644
index 0000000000..f541fb4668
--- /dev/null
+++ b/src/modules/Opportunities/Jobs/UpdateSummaryCaches.php
@@ -0,0 +1,36 @@
+<?php
+namespace Opportunities\Jobs;
+
+use MapasCulturais\App;
+use MapasCulturais\Entities\Opportunity;
+use MapasCulturais\Entities\EvaluationMethodConfiguration;
+use MapasCulturais\Definitions\JobType;
+
+class UpdateSummaryCaches extends JobType
+{
+    const SLUG = "UpdateSummaryCaches";
+
+    protected function _generateId(array $data, string $start_string, string $interval_string, int $iterations)
+    {
+        $opportunity = $data['opportunity'] ?? (object) ['id' => null];
+        $emc = $data['evaluationMethodConfiguration'] ?? (object) ['id' => null];
+
+        return "UpdateSummaryCaches:{$opportunity->id}:{$emc->id}";
+    }
+
+    protected function _execute(\MapasCulturais\Entities\Job $job){
+        $app = App::i();
+        
+        /** @var Opportunity $opportunity */
+        if($opportunity = $job->opportunity){
+            $opportunity->getSummary(true);
+        }
+
+        /** @var EvaluationMethodConfiguration $evaluationMethodConfiguration */
+        if($evaluationMethodConfiguration = $job->evaluationMethodConfiguration){
+            $evaluationMethodConfiguration->getSummary(true);
+        }
+       
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/modules/Opportunities/Module.php b/src/modules/Opportunities/Module.php
index 37d33bf090..6c36a31a6a 100644
--- a/src/modules/Opportunities/Module.php
+++ b/src/modules/Opportunities/Module.php
@@ -11,7 +11,6 @@
 use MapasCulturais\Entities\EvaluationMethodConfiguration;
 use MapasCulturais\Entities\Registration;
 use MapasCulturais\Entities\RegistrationEvaluation;
-use PHPUnit\Util\Annotation\Registry;
 
 class Module extends \MapasCulturais\Module{
 
@@ -32,6 +31,29 @@ function _init(){
         $app->registerJobType(new Jobs\FinishEvaluationPhase(Jobs\FinishEvaluationPhase::SLUG));
         $app->registerJobType(new Jobs\FinishDataCollectionPhase(Jobs\FinishDataCollectionPhase::SLUG));
         $app->registerJobType(new Jobs\PublishResult(Jobs\PublishResult::SLUG));
+        $app->registerJobType(new Jobs\UpdateSummaryCaches(Jobs\UpdateSummaryCaches::SLUG));
+
+        // atualiza o cache dos resumos das fase de avaliação
+        $app->hook("entity(Registration).sent:before", function() use ($app) {
+            /** @var Registration $this */
+            $app->enqueueOrReplaceJob(Jobs\UpdateSummaryCaches::SLUG, [
+                'opportunity' => $this->opportunity,
+                'evaluationMethodConfiguration' => $this->opportunity->evaluationMethodConfiguration ?: null
+            ], '10 seconds');
+        });
+        $app->hook("entity(Registration).status(<<*>>)", function() use ($app) {
+            $app->log->debug("Registration {$this->id} status changed to {$this->status}");
+            /** @var Registration $this */
+            $app->enqueueOrReplaceJob(Jobs\UpdateSummaryCaches::SLUG, [
+                'opportunity' => $this->opportunity
+            ], '10 seconds');
+        });
+        $app->hook("entity(RegistrationEvaluation).save:after", function() use ($app) {
+            /** @var RegistrationEvaluation $this */
+            $app->enqueueOrReplaceJob(Jobs\UpdateSummaryCaches::SLUG, [
+                'evaluationMethodConfiguration' => $this->registration->opportunity->evaluationMethodConfiguration
+            ], '10 seconds');
+        });
 
         // Método para que devolve se existe avaliações técnicas nas fases anteriores
         $app->hook("Entities\\Opportunity::hasPreviousTechnicalEvaluation", function() use ($app) {

From 56304d94617ead69b6bef09f6fb89279df60f50f Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 23:07:15 -0300
Subject: [PATCH 22/68] =?UTF-8?q?melhora=20legibilidade=20das=20uri=20das?=
 =?UTF-8?q?=20requisi=C3=A7=C3=B5es=20no=20ambiente=20de=20dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/Middlewares/ExecutionTime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/Middlewares/ExecutionTime.php b/src/core/Middlewares/ExecutionTime.php
index 0ea7b41cb5..f769948f8f 100644
--- a/src/core/Middlewares/ExecutionTime.php
+++ b/src/core/Middlewares/ExecutionTime.php
@@ -11,7 +11,7 @@ public function __invoke(Request $request, RequestHandler $handler) {
         $app = App::i();
 
         $app->log->info('=========================================================================');
-        $app->log->debug($_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI']);
+        $app->log->debug($_SERVER['REQUEST_METHOD'] . ' ' . urldecode($_SERVER['REQUEST_URI']));
 
         $response = $handler->handle($request);
 

From b3a19d61118c9f7ccb07034530f1ae6e7a1258fd Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 23:08:31 -0300
Subject: [PATCH 23/68] =?UTF-8?q?vers=C3=A3o=207.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 2 +-
 version.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8315ca6f1..63ccafa690 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ Todas as mudanças notáveis no projeto serão documentadas neste arquivo.
 
 O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.0.0/)
 e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## [unreleased]
+## [7.4.1] 2024-06-10
 ### Melhorias
 - Implementa hook no método registerRegistrationMetadata da oportunidade, para possibilitar incremento de novos registros atrevéz de plugins e módulos
 - Implementa novos hook's para possibilitar manipulação da tela de listagem de fases
diff --git a/version.txt b/version.txt
index b616717999..815da58b7a 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-7.4.0
\ No newline at end of file
+7.4.1

From 0b8ecc1d447a49c2a9aefb494e10d90756c8e1f6 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 23:08:31 -0300
Subject: [PATCH 24/68] =?UTF-8?q?vers=C3=A3o=207.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 2 +-
 version.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8315ca6f1..63ccafa690 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ Todas as mudanças notáveis no projeto serão documentadas neste arquivo.
 
 O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.0.0/)
 e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## [unreleased]
+## [7.4.1] 2024-06-10
 ### Melhorias
 - Implementa hook no método registerRegistrationMetadata da oportunidade, para possibilitar incremento de novos registros atrevéz de plugins e módulos
 - Implementa novos hook's para possibilitar manipulação da tela de listagem de fases
diff --git a/version.txt b/version.txt
index b616717999..815da58b7a 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-7.4.0
\ No newline at end of file
+7.4.1

From 985731f763c3031db6f99efa35e71e1f748750f7 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Mon, 10 Jun 2024 23:10:36 -0300
Subject: [PATCH 25/68] =?UTF-8?q?vers=C3=A3o=20development?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 815da58b7a..6563189c54 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-7.4.1
+develop

From 52fad28ce9d1d5dc7cdbb0a3f6a246af812e728f Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Tue, 11 Jun 2024 01:56:08 -0300
Subject: [PATCH 26/68] =?UTF-8?q?evita=20que=20a=20single=20da=20inscri?=
 =?UTF-8?q?=C3=A7=C3=A3o=20se=20quebre=20quando=20nao=20existe=20data=20de?=
 =?UTF-8?q?=20envio=20da=20inscri=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/registration/single.php             | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/modules/Opportunities/views/registration/single.php b/src/modules/Opportunities/views/registration/single.php
index dcafad2cfd..6072cbe001 100644
--- a/src/modules/Opportunities/views/registration/single.php
+++ b/src/modules/Opportunities/views/registration/single.php
@@ -129,41 +129,41 @@
                             <span class="info"> 
                                 <strong><?= i::__('Dados do proponente') ?></strong> 
                             </span>
-                            <span class="info" v-if="entity.agentsData.owner.name"> 
+                            <span class="info" v-if="entity.agentsData.owner?.name"> 
                                 <strong> <?= i::__('Nome') ?>: </strong> 
-                                <span>{{entity.agentsData.owner.name}}</span>
+                                <span>{{entity.agentsData.owner?.name}}</span>
                             </span>
-                            <span class="info" v-if="entity.agentsData.owner.shortDescription"> 
+                            <span class="info" v-if="entity.agentsData.owner?.shortDescription"> 
                                 <strong> <?= i::__('Descrição curta') ?>: </strong> 
-                                <span>{{entity.agentsData.owner.shortDescription}}</span>
+                                <span>{{entity.agentsData.owner?.shortDescription}}</span>
                             </span>                            
-                            <span class="info" v-if="entity.agentsData.owner.documento || entity.agentsData.owner.cnpj"> 
+                            <span class="info" v-if="entity.agentsData.owner?.documento || entity.agentsData.owner?.cnpj"> 
                                 <strong> <?= i::__('CPF ou CNPJ') ?>: </strong> 
-                                <span>{{entity.agentsData.owner.documento || entity.agentsData.owner.cnpj}}</span>
+                                <span>{{entity.agentsData.owner?.documento || entity.agentsData.owner?.cnpj}}</span>
                             </span>                            
-                            <span class="info" v-if="entity.agentsData.owner.dataDeNascimento"> 
+                            <span class="info" v-if="entity.agentsData.owner?.dataDeNascimento"> 
                                 <strong> <?= i::__('Data de nascimento ou fundação') ?>: </strong> 
-                                <span>{{entity.agentsData.owner.dataDeNascimento}}</span><!-- .date('2-digit year') -->
+                                <span>{{entity.agentsData.owner?.dataDeNascimento}}</span><!-- .date('2-digit year') -->
                             </span>  
-                            <span class="info" v-if="entity.agentsData.owner.emailPublico"> 
+                            <span class="info" v-if="entity.agentsData.owner?.emailPublico"> 
                                 <strong> <?= i::__('Email') ?>: </strong> 
-                                <span>{{entity.agentsData.owner.emailPublico}}</span>
+                                <span>{{entity.agentsData.owner?.emailPublico}}</span>
                             </span>                            
-                            <span class="info" v-if="entity.agentsData.owner.raca"> 
+                            <span class="info" v-if="entity.agentsData.owner?.raca"> 
                                 <strong> <?= i::__('Raça') ?>: </strong> 
-                                <span>{{entity.agentsData.owner.raca}}</span>
+                                <span>{{entity.agentsData.owner?.raca}}</span>
                             </span>                            
-                            <span class="info" v-if="entity.agentsData.owner.genero"> 
+                            <span class="info" v-if="entity.agentsData.owner?.genero"> 
                                 <strong> <?= i::__('Genero') ?>: </strong> 
-                                <span>{{entity.agentsData.owner.genero}}</span>
+                                <span>{{entity.agentsData.owner?.genero}}</span>
                             </span>                            
-                            <span class="info" v-if="entity.agentsData.owner.endereco"> 
+                            <span class="info" v-if="entity.agentsData.owner?.endereco"> 
                                 <strong> <?= i::__('Endereço') ?>: </strong> 
-                                <span>{{entity.agentsData.owner.endereco}}</span>
+                                <span>{{entity.agentsData.owner?.endereco}}</span>
                             </span>                            
-                            <span class="info" v-if="entity.agentsData.owner.En_CEP"> 
+                            <span class="info" v-if="entity.agentsData.owner?.En_CEP"> 
                                 <strong> <?= i::__('CEP') ?>: </strong> 
-                                <span>{{entity.agentsData.owner.En_CEP}}</span>
+                                <span>{{entity.agentsData.owner?.En_CEP}}</span>
                             </span>
                         </div>
                     </template>

From 02f28a92ff459569663204fd1918b2fa2c5acac6 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Tue, 11 Jun 2024 01:57:30 -0300
Subject: [PATCH 27/68] =?UTF-8?q?Ajusta=20getter=20lastPhase=20na=20inscri?=
 =?UTF-8?q?=C3=A7=C3=A3o=20para=20que=20quando=20for=20a=20ultima=20fase?=
 =?UTF-8?q?=20na=20inscri=C3=A7=C3=A3o=20base,=20ele=20consiga=20devolver?=
 =?UTF-8?q?=20a=20entidade=20de=20forma=20correta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/OpportunityPhases/Module.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/modules/OpportunityPhases/Module.php b/src/modules/OpportunityPhases/Module.php
index 6bff9f8d94..1bee23b8b3 100644
--- a/src/modules/OpportunityPhases/Module.php
+++ b/src/modules/OpportunityPhases/Module.php
@@ -553,7 +553,8 @@ function _init () {
 
         $app->hook('entity(Registration).get(lastPhase)', function(&$value) use ($app) {
             /** @var Registration $this */
-            $value = $app->repo('Registration')->findOneBy(['number' => $this->number, 'opportunity' => $this->opportunity->lastPhase]);
+            $opportunity = $this->opportunity->isLastPhase ? $this->opportunity : $this->opportunity->lastPhase;
+            $value = $app->repo('Registration')->findOneBy(['number' => $this->number, 'opportunity' => $opportunity]);
         });
 
         /**
@@ -652,6 +653,17 @@ function _init () {
 
         });
 
+        $app->hook('entity(Registration).get(firstPhase)', function(&$value) use($registration_repository) {
+            /** @var Registration $this */
+            
+            $this->enableCacheGetterResult('firstPhase');
+
+            $opportunity = $this->opportunity;
+
+            $value = $registration_repository->findOneBy(['opportunity' => $opportunity->firstPhase, 'number' => $this->number]);
+
+        });
+
         /**
          * NOVAS ROTAS
          */

From b07a21928981868506ff6dae5009df217c20e6f7 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Tue, 11 Jun 2024 02:11:16 -0300
Subject: [PATCH 28/68] =?UTF-8?q?Atualiza=20para=20vers=C3=A3o=20v7.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 2 +-
 version.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31d16f4c4c..9a65701790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ Todas as mudanças notáveis no projeto serão documentadas neste arquivo.
 O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.0.0/)
 e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [unreleased]
+## [7.4.2] 2024-06-11
 ## Correções
 - Ajusta getter lastPhase() na inscrição para que quando for a última fase na inscrição base, ele consiga devolver a entidade de forma correta
 - evita que a single da inscrição se quebre quando nao existe data de envio da inscrição
diff --git a/version.txt b/version.txt
index 815da58b7a..f8cb1fa110 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-7.4.1
+7.4.2

From d240f98dba49db6d8b2d36f709e854a4ad9dafce Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Tue, 11 Jun 2024 21:47:02 -0300
Subject: [PATCH 29/68] =?UTF-8?q?Reordena=20ordem=20de=20execu=C3=A7=C3=A3?=
 =?UTF-8?q?o=20dos=20db-updates=20que=20s=C3=A3o=20respons=C3=A1veis=20por?=
 =?UTF-8?q?=20manipular=20o=20esuqema=20do=20banco?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/db-updates.php                        | 39 +++++++++++++++++------
 src/modules/UserManagement/db-updates.php | 18 -----------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/db-updates.php b/src/db-updates.php
index 7b9396ded6..02585f8ffe 100644
--- a/src/db-updates.php
+++ b/src/db-updates.php
@@ -160,6 +160,35 @@ function __try($sql, $cb = null){
             $$ LANGUAGE plpgsql strict immutable;");
     },
 
+    'create table system_role' => function () {
+        __exec("CREATE SEQUENCE system_role_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
+        __exec("CREATE TABLE system_role (
+                    id INT NOT NULL, 
+                    slug VARCHAR(64) NOT NULL, 
+                    name VARCHAR(255) NOT NULL, 
+                    subsite_context BOOLEAN NOT NULL, 
+                    permissions JSON DEFAULT NULL, 
+                    create_timestamp TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, 
+                    update_timestamp TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, 
+                    status SMALLINT NOT NULL, 
+                    PRIMARY KEY(id));");
+        __exec("COMMENT ON COLUMN system_role.permissions IS '(DC2Type:json_array)';");
+    },
+
+    'alter system_role.permissions comment' => function () {
+        __exec("COMMENT ON COLUMN system_role.permissions IS '(DC2Type:json)';");
+    },
+
+    "Cria colunas proponent_type e registration na tabela registration" => function() use ($conn){
+        if(!__column_exists('registration', 'proponent_type')) {
+            __exec("ALTER TABLE registration ADD COLUMN proponent_type VARCHAR(255) NULL");
+        }
+
+        if(!__column_exists('registration', 'range')) {
+            __exec("ALTER TABLE registration ADD COLUMN range VARCHAR(255) NULL");
+        }
+    },
+
     'migrate gender' => function() use ($conn) {
         $conn->executeQuery("UPDATE agent_meta SET value='Homem' WHERE key='genero' AND value='Masculino'");
         $conn->executeQuery("UPDATE agent_meta SET value='Mulher' WHERE key='genero' AND value='Feminino'");
@@ -2080,16 +2109,6 @@ function __try($sql, $cb = null){
                 p1.action = p2.action;");
     },
     
-    "Cria colunas proponent_type e registration na tabela registration" => function() use ($conn){
-        if(!__column_exists('registration', 'proponent_type')) {
-            __exec("ALTER TABLE registration ADD COLUMN proponent_type VARCHAR(255) NULL");
-        }
-
-        if(!__column_exists('registration', 'range')) {
-            __exec("ALTER TABLE registration ADD COLUMN range VARCHAR(255) NULL");
-        }
-    },
-    
     "Cria colunas registration_proponent_types e registration_ranges na tabela opportunity" => function() use ($conn){
         if(!__column_exists('opportunity', 'registration_proponent_types')) {
             __exec("ALTER TABLE opportunity ADD COLUMN registration_proponent_types JSON NULL");
diff --git a/src/modules/UserManagement/db-updates.php b/src/modules/UserManagement/db-updates.php
index 0990d2b929..07d8e1b00a 100644
--- a/src/modules/UserManagement/db-updates.php
+++ b/src/modules/UserManagement/db-updates.php
@@ -3,22 +3,4 @@
 use function MapasCulturais\__exec;
 
 return [
-    'create table system_role' => function () {
-        __exec("CREATE SEQUENCE system_role_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        __exec("CREATE TABLE system_role (
-                    id INT NOT NULL, 
-                    slug VARCHAR(64) NOT NULL, 
-                    name VARCHAR(255) NOT NULL, 
-                    subsite_context BOOLEAN NOT NULL, 
-                    permissions JSON DEFAULT NULL, 
-                    create_timestamp TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, 
-                    update_timestamp TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, 
-                    status SMALLINT NOT NULL, 
-                    PRIMARY KEY(id));");
-        __exec("COMMENT ON COLUMN system_role.permissions IS '(DC2Type:json_array)';");
-    },
-
-    'alter system_role.permissions comment' => function () {
-        __exec("COMMENT ON COLUMN system_role.permissions IS '(DC2Type:json)';");
-    },
 ];
\ No newline at end of file

From a6d2124922040843eab7c2ea8b106263b4e83bd6 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Tue, 11 Jun 2024 21:48:14 -0300
Subject: [PATCH 30/68] Verrifica se as colinas price, description e priceInfo
 ja existe na tabela event_ocurrence antes de tentar criar as mesmas

---
 src/db-updates.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/db-updates.php b/src/db-updates.php
index 02585f8ffe..b0d0ff3db7 100644
--- a/src/db-updates.php
+++ b/src/db-updates.php
@@ -1951,13 +1951,19 @@ function __try($sql, $cb = null){
     },
 
     'Adiciona a coluna description para a descrição da ocorrência' => function() {
-        __exec("ALTER TABLE event_occurrence ADD description TEXT DEFAULT NULL;");
+        if(!__column_exists('event_occurrence', 'description')) {
+            __exec("ALTER TABLE event_occurrence ADD description TEXT DEFAULT NULL;");
+        }
     },
     'Adiciona a coluna price para a o valor de entrada da ocorrência' => function() {
-        __exec("ALTER TABLE event_occurrence ADD price TEXT DEFAULT NULL;");
+        if(!__column_exists('event_occurrence', 'price')) {
+            __exec("ALTER TABLE event_occurrence ADD price TEXT DEFAULT NULL;");
+        }
     },
     'Adiciona a coluna priceInfo para a informações sobre o valor de entrada da ocorrência' => function() {
-        __exec("ALTER TABLE event_occurrence ADD priceInfo TEXT DEFAULT NULL;");
+        if(!__column_exists('event_occurrence', 'priceInfo')) {
+            __exec("ALTER TABLE event_occurrence ADD priceInfo TEXT DEFAULT NULL;");
+        }
     },
     
     'Apaga registro do db-update de "Definição dos cammpos cpf e cnpj com base no documento" para que rode novamente' => function() use ($conn, $app){

From c16bf0ec69906e861c4a806a805b323c252f23f1 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Tue, 11 Jun 2024 21:49:26 -0300
Subject: [PATCH 31/68] =?UTF-8?q?Ajusta=20para=20verificar=20se=20campos?=
 =?UTF-8?q?=20de=20configura=C3=A7=C3=A3o=20ta=20tabela=20registration=5Ff?=
 =?UTF-8?q?ield=5Fconfiguration=20ja=20est=C3=A3o=20convertidos=20para=20j?=
 =?UTF-8?q?son=20antes=20de=20tentar=20converter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/db-updates.php | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/db-updates.php b/src/db-updates.php
index b0d0ff3db7..dbf948eb80 100644
--- a/src/db-updates.php
+++ b/src/db-updates.php
@@ -2036,11 +2036,25 @@ function __try($sql, $cb = null){
     "migra valores das colunas do tipo array para do tipo json" => function() use ($conn) {
         $fields = $conn->fetchAll("SELECT id, config, field_options, categories from registration_field_configuration");
         $count = count($fields);
+
+        $json_validate = function (string $string): bool {
+            json_decode($string);
+            return json_last_error() === JSON_ERROR_NONE;
+        };
+        
+        $check_serialize = function($value) use ($json_validate) {
+            if((is_string($value) && $json_validate($value)) || !$value) {
+                return $value;
+            }
+
+            return json_encode(unserialize($value));
+        };
+
         foreach($fields as $i => $field) {
             echo "migrando registration_field_configuration ({$i} / $count)\n";
-            $field['config'] = json_encode(unserialize($field['config']));
-            $field['field_options'] = json_encode(unserialize($field['field_options']));
-            $field['categories'] = json_encode(unserialize($field['categories']));
+            $field['config'] = $check_serialize($field['config']);
+            $field['field_options'] = $check_serialize($field['field_options']);
+            $field['categories'] = $check_serialize($field['categories']);
 
             $conn->executeQuery("
                 UPDATE registration_field_configuration 
@@ -2055,7 +2069,7 @@ function __try($sql, $cb = null){
         $count = count($files);
         foreach($files as $i => $file) {
             echo "migrando registration_file_configuration ({$i} / $count)\n";
-            $file['categories'] = json_encode(unserialize($file['categories']));
+            $file['categories'] = $check_serialize($file['categories']);
 
             $conn->executeQuery("
                 UPDATE registration_file_configuration 
@@ -2068,7 +2082,7 @@ function __try($sql, $cb = null){
         foreach($requests as $i => $request) {
             echo "migrando request ({$i} / $count)\n";
             $id = $request['id'];
-            $metadata = json_encode(unserialize($request['metadata']));
+            $metadata = $check_serialize($request['metadata']);
 
             $conn->executeQuery("
                 UPDATE request 

From b57111720a59cdc3585d1182ed26057bd85791f4 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Tue, 11 Jun 2024 21:55:05 -0300
Subject: [PATCH 32/68] Atualiza CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a65701790..450843b720 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ Todas as mudanças notáveis no projeto serão documentadas neste arquivo.
 O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.0.0/)
 e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.4.3]
+### Correções
+- Reordena db-updates para evitar problemas com colunas e tabelas nao criadas
+- Corrige db-update que ajusta configurações dos campos das inscrições
+
 ## [7.4.2] 2024-06-11
 ## Correções
 - Ajusta getter lastPhase() na inscrição para que quando for a última fase na inscrição base, ele consiga devolver a entidade de forma correta

From 1e1aeda055007535462ec3c5a91717947349419b Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Tue, 11 Jun 2024 21:56:22 -0300
Subject: [PATCH 33/68] =?UTF-8?q?Atualiza=20para=20vers=C3=A3o=20v7.4.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 6563189c54..0f4a1d6e34 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-develop
+7.4.3

From d7221b9e56a44604547192b14e55182cb46859f8 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Wed, 12 Jun 2024 11:54:23 -0300
Subject: [PATCH 34/68] =?UTF-8?q?Ajusta=20para=20que=20seja=20poss=C3=ADve?=
 =?UTF-8?q?l=20um=20convidado=20ver=20a=20lista=20das=20inscri=C3=A7=C3=B5?=
 =?UTF-8?q?es=20publicadas=20na=20fase=20de=20publica=C3=A7=C3=A3o=20de=20?=
 =?UTF-8?q?resultado=20final?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         |  6 +++++-
 src/core/ApiQuery.php                |  4 +++-
 src/core/Controllers/Opportunity.php | 11 +++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 450843b720..b111fbee64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,11 @@ Todas as mudanças notáveis no projeto serão documentadas neste arquivo.
 O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.0.0/)
 e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [7.4.3]
+## [7.4.4] 2024-06-12
+### Correções
+- Corrige lista de inscrições da publicação de resultado final
+
+## [7.4.3] 2024-06-11
 ### Correções
 - Reordena db-updates para evitar problemas com colunas e tabelas nao criadas
 - Corrige db-update que ajusta configurações dos campos das inscrições
diff --git a/src/core/ApiQuery.php b/src/core/ApiQuery.php
index 2a1c6c73ca..e74ab31094 100644
--- a/src/core/ApiQuery.php
+++ b/src/core/ApiQuery.php
@@ -286,7 +286,7 @@ class ApiQuery {
      * List of parameters that will be used to run the DQL
      * @var array
      */
-    protected $_dqlParams = [];
+    public $_dqlParams = [];
 
     /**
      * Fields that are being selected
@@ -3065,6 +3065,8 @@ protected function parseQueryParams() {
         if($class::isPrivateEntity() && !isset($this->apiParams['@permissions'])){
             $this->_addFilterByPermissions('view');
         }
+
+        $app->applyHookBoundTo($this, "{$this->hookPrefix}.parseQueryParams");
     }
     
     protected function _addFilterBySeals($seals_ids){
diff --git a/src/core/Controllers/Opportunity.php b/src/core/Controllers/Opportunity.php
index b31fd1c76d..bdb116fc20 100644
--- a/src/core/Controllers/Opportunity.php
+++ b/src/core/Controllers/Opportunity.php
@@ -492,6 +492,17 @@ function apiFindRegistrations($opportunity, $query_data) {
 
             $current_phase_query_params['@select'] = implode(',', $current_phase_query_select);
 
+            if($phase->isLastPhase && $phase->publishedRegistrations) {
+                $app->hook('ApiQuery(Registration).parseQueryParams', function() use ($current_phase_query_params) {
+                    if($this->apiParams['opportunity'] == $current_phase_query_params['opportunity']) {
+                        $this->joins = "";
+                        $params = $this->_dqlParams;
+                        array_pop($params);
+                        $this->_dqlParams = $params;
+                    }
+                });
+            }
+
             $current_phase_query = new ApiQuery(Registration::class, $current_phase_query_params);
             if(isset($previous_phase_query) && !$phase->isLastPhase) {
                 $current_phase_query->addFilterByApiQuery($previous_phase_query, 'number', 'number');

From f23d9f33b72c85e86b3d1005c784357b1f6d67be Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Wed, 12 Jun 2024 11:56:20 -0300
Subject: [PATCH 35/68] =?UTF-8?q?vers=C3=A3o=207.4.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 0f4a1d6e34..4e61aeef90 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-7.4.3
+7.4.4

From 329b9bfb28e04cb93ca34138cc8bdca7a068b0fc Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Wed, 12 Jun 2024 12:17:28 -0300
Subject: [PATCH 36/68] =?UTF-8?q?Evita=20que=20os=20bot=C3=B5es=20de=20bai?=
 =?UTF-8?q?xar=20rascunhos=20e=20baixar=20lista=20de=20avalia=C3=A7=C3=B5e?=
 =?UTF-8?q?s=20sejam=20exibidos=20com=20usuario=20deslogado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                              | 1 +
 .../components/opportunity-registrations-table/script.js  | 8 +++-----
 .../opportunity-registrations-table/template.php          | 4 ++--
 .../components/opportunity-results-table/template.php     | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b111fbee64..79d71c1221 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [7.4.4] 2024-06-12
 ### Correções
 - Corrige lista de inscrições da publicação de resultado final
+- Corrige exibição dos botões de baixar rascunhos e baixar lista de inscrições
 
 ## [7.4.3] 2024-06-11
 ### Correções
diff --git a/src/modules/Opportunities/components/opportunity-registrations-table/script.js b/src/modules/Opportunities/components/opportunity-registrations-table/script.js
index 17368365c2..e47cb561c9 100644
--- a/src/modules/Opportunities/components/opportunity-registrations-table/script.js
+++ b/src/modules/Opportunities/components/opportunity-registrations-table/script.js
@@ -12,11 +12,8 @@ app.component('opportunity-registrations-table', {
         avaliableColumns: Array,
         hideFilters: Boolean,
         hideSort: Boolean,
+        hideActions: Boolean,
         statusNotEditable: Boolean,
-        order: {
-            type: String,
-            default: "",
-        }
     },
     setup() {
         // os textos estão localizados no arquivo texts.php deste componente
@@ -113,7 +110,7 @@ app.component('opportunity-registrations-table', {
                 sortOptions.splice(0, 0, {value: '@quota', label: 'classificação final'});
             }
         }
-
+        
         return {
             sortOptions,
             filters: {},
@@ -121,6 +118,7 @@ app.component('opportunity-registrations-table', {
             query: {
                 '@opportunity': this.phase.id,
                 'status': 'GTE(0)',
+                '@permission': 'view'
             },
             selectedCategories: [],
             selectedProponentTypes: [],
diff --git a/src/modules/Opportunities/components/opportunity-registrations-table/template.php b/src/modules/Opportunities/components/opportunity-registrations-table/template.php
index ff67e94c5b..80628e4c91 100644
--- a/src/modules/Opportunities/components/opportunity-registrations-table/template.php
+++ b/src/modules/Opportunities/components/opportunity-registrations-table/template.php
@@ -39,7 +39,7 @@
         <?php $this->applyTemplateHook('registration-list-actions', 'after', ['entity' => $entity]); ?>
 
         <div class="col-12"> 
-            <entity-table controller="opportunity" endpoint="findRegistrations" type="registration" :query="query" :limit="100" :sort-options="sortOptions" :order="order" :select="select" :headers="headers" phase:="phase" required="number,options" :visible="visibleColumns" @clear-filters="clearFilters" @remove-filter="removeFilter($event)" show-index :hide-filters="hideFilters" :hide-sort="hideSort">
+            <entity-table controller="opportunity" endpoint="findRegistrations" type="registration" :query="query" :limit="100" :sort-options="sortOptions" :order="order" :select="select" :headers="headers" phase:="phase" required="number,options" :visible="visibleColumns" @clear-filters="clearFilters" @remove-filter="removeFilter($event)" show-index :hide-filters="hideFilters" :hide-sort="hideSort" :hide-actions='hideActions'>
                 <template #title>
                     <slot name="title">
                         <h5>
@@ -50,7 +50,7 @@
                 </template>
                 
                 <?php $this->applyTemplateHook('registration-list-actions-entity-table', 'before', ['entity' => $entity]); ?>
-                <template #actions="{entities,filters}">
+                <template v-if="!hideActions" #actions="{entities,filters}">
                     <h4 class="bold"><?= i::__('Ações:') ?></h4>
                     <div class="opportunity-payment-table__actions">
                         <div class="opportunity-payment-table__actions grid-12">
diff --git a/src/modules/Opportunities/components/opportunity-results-table/template.php b/src/modules/Opportunities/components/opportunity-results-table/template.php
index 8cc08eb934..059a62bb64 100644
--- a/src/modules/Opportunities/components/opportunity-results-table/template.php
+++ b/src/modules/Opportunities/components/opportunity-results-table/template.php
@@ -11,7 +11,7 @@
 ');
 ?>
 
-<opportunity-registrations-table :phase="lastPhase" :visible-columns="visibleColumns" :avaliable-columns="visibleColumns" hide-filters hide-sort status-not-editable>
+<opportunity-registrations-table :phase="lastPhase" :visible-columns="visibleColumns" :avaliable-columns="visibleColumns" hide-filters hide-sort status-not-editable hide-actions>
     <template #title>
         <b><?= i::__("Clique no número de uma inscrição para conferir todas as avaliações realizadas.") ?></b>
     </template>

From af111e19f19a678c6a44773af3e1b1d8c7bf8c2e Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Wed, 12 Jun 2024 12:20:44 -0300
Subject: [PATCH 37/68] Atualzia version.txt

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 4e61aeef90..6563189c54 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-7.4.4
+develop

From 5599deae74f0e8fc47bb8d226960bdc96ef8fffe Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Wed, 12 Jun 2024 15:41:49 -0300
Subject: [PATCH 38/68] =?UTF-8?q?Ajusta=20espa=C3=A7os=20entre=20os=20chec?=
 =?UTF-8?q?kboxes=20do=20formul=C3=A1rio=20de=20inscri=C3=A7=C3=A3o=20-=20?=
 =?UTF-8?q?embedtools=20(Ref.:=20sem=20issue)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseV1EmbedTools/assets/css/embedtools.css       | 12 ++++++++++++
 .../parts/registration-field-types/checkboxes.php    |  4 +---
 .../registration-field-types/fields/checkboxes.php   |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/modules/BaseV1EmbedTools/assets/css/embedtools.css b/src/modules/BaseV1EmbedTools/assets/css/embedtools.css
index 93bac85bdb..e4081442cb 100644
--- a/src/modules/BaseV1EmbedTools/assets/css/embedtools.css
+++ b/src/modules/BaseV1EmbedTools/assets/css/embedtools.css
@@ -325,6 +325,18 @@ textarea {
     line-height: 19px;
 }
 
+.action-registrationform .registration-edit-mode ul.attachment-list li.attachment-list-item div[id^=field] .two-column {
+    display: inline-flex;
+}
+
+.action-registrationform .registration-edit-mode ul.attachment-list li.attachment-list-item div[id^=field] .field_checkbox {
+    margin-bottom: 8px;
+}
+
+.action-registrationform .registration-edit-mode ul.attachment-list li.attachment-list-item div[id^=field] .field_checkbox:last-child {
+    margin-bottom: 0;
+}
+
 .action-registrationform .registration-edit-mode ul.attachment-list li.attachment-list-item .title_section {
     background-color: #F5F5F5 !important;
     padding: 40px 0 24px!important;
diff --git a/src/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/checkboxes.php b/src/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/checkboxes.php
index a174de8a76..6dd2d89a88 100644
--- a/src/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/checkboxes.php
+++ b/src/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/checkboxes.php
@@ -10,7 +10,5 @@
 
     <div ng-if="::field.description" class="attachment-description">{{::field.description}}</div>
 
-    <p>
-        <?php $this->part('registration-field-types/fields/checkboxes') ?>
-    </p>
+    <?php $this->part('registration-field-types/fields/checkboxes') ?>
 </div>
\ No newline at end of file
diff --git a/src/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/fields/checkboxes.php b/src/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/fields/checkboxes.php
index aba01e73be..efd395e291 100644
--- a/src/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/fields/checkboxes.php
+++ b/src/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/fields/checkboxes.php
@@ -1,5 +1,5 @@
 
-<div class="{{setClassColumn(field.fieldOptions)}}" ng-repeat="option in ::field.fieldOptions">
+<div class="{{setClassColumn(field.fieldOptions)}} field_checkbox" ng-repeat="option in ::field.fieldOptions">
     <label>
         <input type="checkbox" checklist-model="entity[fieldName]" ng-click="saveField(field, entity[fieldName])" checklist-value="option.indexOf(':') >= 0 ? option.split(':')[0] : option"> {{::option.indexOf(':') >= 0 ? option.split(':')[1] : option}}
     </label>

From 09ca33bb5730a3c9defda530f88dc41699b855e6 Mon Sep 17 00:00:00 2001
From: Victor Magalhaes <victor.magalhaesp@gmail.com>
Date: Wed, 12 Jun 2024 15:53:00 -0300
Subject: [PATCH 39/68] =?UTF-8?q?feat:=20deixa=20din=C3=A2mico=20o=20m?=
 =?UTF-8?q?=C3=AAs=20seguinte=20para=20consulta=20nos=20filtros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cypress/commands/genNextMonth.js   | 13 +++++++++++++
 src/cypress/e2e/eventsPage/index.cy.js |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 src/cypress/commands/genNextMonth.js

diff --git a/src/cypress/commands/genNextMonth.js b/src/cypress/commands/genNextMonth.js
new file mode 100644
index 0000000000..575c3f69b4
--- /dev/null
+++ b/src/cypress/commands/genNextMonth.js
@@ -0,0 +1,13 @@
+const months = [
+  "Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho",
+  "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"
+];
+
+function getNextMonth() {
+  const currentDate = new Date();
+  const currentMonth = currentDate.getMonth(); 
+  const nextMonth = (currentMonth + 1) % 12; 
+  return months[nextMonth];
+}
+
+module.exports = getNextMonth;
\ No newline at end of file
diff --git a/src/cypress/e2e/eventsPage/index.cy.js b/src/cypress/e2e/eventsPage/index.cy.js
index 65de35e630..559429ea3f 100644
--- a/src/cypress/e2e/eventsPage/index.cy.js
+++ b/src/cypress/e2e/eventsPage/index.cy.js
@@ -1,3 +1,5 @@
+const getNextMonth = require('../../commands/genNextMonth');
+
 describe("Events Page", () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
@@ -18,7 +20,10 @@ describe("Events Page", () => {
         cy.get(".dp__menu_content_wrapper").should("exist");
         cy.get(".dp__preset_ranges").should("exist");
         cy.get(".dp__flex_display").should("exist");
-        ["Hoje", "Amanhã", "Esta semana", "Este fim de semana", "Próximo fim de semana", "Próximos 7 dias", "Próximos 30 dias", "Junho", "2024"].forEach(dateRange => {
+
+        const nextMonth = getNextMonth();
+
+        ["Hoje", "Amanhã", "Esta semana", "Este fim de semana", "Próximo fim de semana", "Próximos 7 dias", "Próximos 30 dias", nextMonth, "2024"].forEach(dateRange => {
             cy.contains(dateRange).should("exist");
         });
     });

From 82e77d69f61343c87e433f6df9ae8224c4c8ae8d Mon Sep 17 00:00:00 2001
From: Victor Magalhaes <victor.magalhaesp@gmail.com>
Date: Wed, 12 Jun 2024 15:53:41 -0300
Subject: [PATCH 40/68] =?UTF-8?q?feat:=20testes=20tratamento=20de=20regist?=
 =?UTF-8?q?ros=20por=20p=C3=A1ginas=20nas=20oportunidades?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cypress/commands/checkFilterCountOf.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cypress/commands/checkFilterCountOf.js b/src/cypress/commands/checkFilterCountOf.js
index a6de0c8c07..02f2ba3458 100644
--- a/src/cypress/commands/checkFilterCountOf.js
+++ b/src/cypress/commands/checkFilterCountOf.js
@@ -1,26 +1,28 @@
 /* Checa a contagem de um elemento específico na página de filtros. */
 function checkFilterCountOf(element) {
         cy.get('.foundResults').then(($foundResults) => {
+                const countPerPage = 20;
                 var resultsTextArray = $foundResults.text().split(" ");
                 var resultsCount = Number(resultsTextArray[0]);
+                const resultsCountPerPage = resultsCount < countPerPage ? resultsCount : countPerPage;
 
                 switch (element) {
                         case "opportunity":
-                                cy.get(".upper." + element + "__color").should("have.length", resultsCount);
+                                cy.get("span.upper." + element + "__color").should("have.length", resultsCountPerPage);
                                 cy.wait(1000);
                                 cy.contains(resultsCount + " Oportunidades encontradas");
                                 
                                 break;
                         
                         case "project":
-                                cy.get(".upper." + element + "__color").should("have.length", resultsCount);
+                                cy.get("span.upper." + element + "__color").should("have.length", resultsCountPerPage);
                                 cy.wait(1000);
                                 cy.contains(resultsCount + " Projetos encontrados");
         
                                 break;
                         
                         case "space":
-                                cy.get(".upper." + element + "__color").should("have.length", resultsCount);
+                                cy.get("span.upper." + element + "__color").should("have.length", resultsCountPerPage);
                                 cy.wait(1000);
                                 cy.contains(resultsCount + " Espaços encontrados");
                 

From 43131fe03ac544816603f9b4bb0e011895d3056b Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Wed, 12 Jun 2024 16:33:21 -0300
Subject: [PATCH 41/68] Corrije erro no carregamento das oportunidades
 relacionadas dos projetos

---
 .../Opportunities/components/opportunity-list/init.php     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/modules/Opportunities/components/opportunity-list/init.php b/src/modules/Opportunities/components/opportunity-list/init.php
index 3fac7c8e4b..adf2d094e4 100644
--- a/src/modules/Opportunities/components/opportunity-list/init.php
+++ b/src/modules/Opportunities/components/opportunity-list/init.php
@@ -8,7 +8,12 @@ function orderEntities($a, $b) {
 
 usort($relatedOpportunities, 'orderEntities');
 
+$opportunities = [];
 
-$this->jsObject['opportunityList']['opportunity'] = $relatedOpportunities;
+foreach($relatedOpportunities as $opportunity) {
+    $opportunities[] = $opportunity->simplify("id,name,avatar,registrationFrom,registrationTo");
+}
+
+$this->jsObject['opportunityList']['opportunity'] = $opportunities;
 
 

From 3b08de8ceb7daa54a95fc2b17036139c0a792301 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Wed, 12 Jun 2024 16:33:35 -0300
Subject: [PATCH 42/68] Atualiza CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79d71c1221..c381c1e45e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ Todas as mudanças notáveis no projeto serão documentadas neste arquivo.
 O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.0.0/)
 e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased]
+### Correções
+- Corrige erro no carregamento da single de projetos
+- Ajusta exibição dos campos do tipo checkebox do formulário
+
 ## [7.4.4] 2024-06-12
 ### Correções
 - Corrige lista de inscrições da publicação de resultado final

From d6304699ec513d74e158d9c15935fc0439f1f6ea Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Wed, 12 Jun 2024 18:06:13 -0300
Subject: [PATCH 43/68] =?UTF-8?q?=20Corrige=20endpoit=20apiFindRegistratio?=
 =?UTF-8?q?ns=20para=20que=20um=20usu=C3=A1rio=20comum=20possa=20ver=20as?=
 =?UTF-8?q?=20inscri=C3=A7=C3=B5es=20na=20fase=20de=20publica=C3=A7=C3=A3o?=
 =?UTF-8?q?=20de=20resultado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         | 1 +
 src/core/Controllers/Opportunity.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c381c1e45e..ee70631dbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Correções
 - Corrige erro no carregamento da single de projetos
 - Ajusta exibição dos campos do tipo checkebox do formulário
+- Corrige endpoit apiFindRegistrations para que um usuario comum posso ver as inscrições na fase de publicação de resultado
 
 ## [7.4.4] 2024-06-12
 ### Correções
diff --git a/src/core/Controllers/Opportunity.php b/src/core/Controllers/Opportunity.php
index bdb116fc20..c4b95f3bcb 100644
--- a/src/core/Controllers/Opportunity.php
+++ b/src/core/Controllers/Opportunity.php
@@ -492,7 +492,7 @@ function apiFindRegistrations($opportunity, $query_data) {
 
             $current_phase_query_params['@select'] = implode(',', $current_phase_query_select);
 
-            if($phase->isLastPhase && $phase->publishedRegistrations) {
+            if($phase->isLastPhase && $phase->publishedRegistrations && !$phase->canUser('@control')) {
                 $app->hook('ApiQuery(Registration).parseQueryParams', function() use ($current_phase_query_params) {
                     if($this->apiParams['opportunity'] == $current_phase_query_params['opportunity']) {
                         $this->joins = "";

From 18e793a053123de2337522e216e6fd717d69b778 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Thu, 13 Jun 2024 11:04:40 -0300
Subject: [PATCH 44/68] =?UTF-8?q?corrige=20header=20da=20p=C3=A1gina=20de?=
 =?UTF-8?q?=20publica=C3=A7=C3=A3o=20de=20resultado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/entity-table/script.js         |  1 +
 .../components/entity-table/template.php      |  2 +-
 .../opportunity-registrations-table/script.js |  2 ++
 .../template.php                              | 29 ++++++++-----------
 .../opportunity-results-table/template.php    |  6 +---
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/modules/Entities/components/entity-table/script.js b/src/modules/Entities/components/entity-table/script.js
index 451001fe30..8427c76203 100644
--- a/src/modules/Entities/components/entity-table/script.js
+++ b/src/modules/Entities/components/entity-table/script.js
@@ -66,6 +66,7 @@ app.component('entity-table', {
         hideFilters: Boolean,
         hideSort: Boolean,
         hideActions: Boolean,
+        hideHeader: Boolean,
     },
 
     created() {
diff --git a/src/modules/Entities/components/entity-table/template.php b/src/modules/Entities/components/entity-table/template.php
index a3029c903b..8cc7bd6a40 100644
--- a/src/modules/Entities/components/entity-table/template.php
+++ b/src/modules/Entities/components/entity-table/template.php
@@ -24,7 +24,7 @@
     <mc-entities :select="select" :type="apiController" :query="query" :order="entitiesOrder" :watch-debounce="watchDebounce" :limit="limit" :endpoint="endpoint" @fetch="resize()" watch-query>
 
         <template #header="{entities, filters}">
-            <div class="entity-table__header">
+            <div v-if="!hideHeader" class="entity-table__header">
                 <!-- título - opcional -->
                 <div v-if="hasSlot('title')" class="entity-table__title">
                     <slot name="title"></slot>
diff --git a/src/modules/Opportunities/components/opportunity-registrations-table/script.js b/src/modules/Opportunities/components/opportunity-registrations-table/script.js
index e47cb561c9..f589457009 100644
--- a/src/modules/Opportunities/components/opportunity-registrations-table/script.js
+++ b/src/modules/Opportunities/components/opportunity-registrations-table/script.js
@@ -13,6 +13,8 @@ app.component('opportunity-registrations-table', {
         hideFilters: Boolean,
         hideSort: Boolean,
         hideActions: Boolean,
+        hideTitle: Boolean,
+        hideHeader: Boolean,
         statusNotEditable: Boolean,
     },
     setup() {
diff --git a/src/modules/Opportunities/components/opportunity-registrations-table/template.php b/src/modules/Opportunities/components/opportunity-registrations-table/template.php
index 80628e4c91..6934628020 100644
--- a/src/modules/Opportunities/components/opportunity-registrations-table/template.php
+++ b/src/modules/Opportunities/components/opportunity-registrations-table/template.php
@@ -22,31 +22,26 @@
 $entity = $this->controller->requestedEntity;
 ?>
 <div class="opportunity-registration-table grid-12">
-    <div class="col-12">
+    <div v-if="!hideTitle" class="col-12">
         <h2 class="opportunity-status" v-if="phase.publishedRegistrations"><?= i::__("Os resultados já foram publicados") ?></h2>
         <h2 class="opportunity-status" v-if="!phase.publishedRegistrations && isPast()"><?= i::__("A fase já está encerrada") ?></h2>
         <h2 class="opportunity-status" v-if="isHappening()"><?= i::__("A fase está em andamento") ?></h2>
         <h2 class="opportunity-status" v-if="isFuture()"><?= i::__("A fase ainda não iniciou") ?></h2>
     </div>
     <template v-if="!isFuture()">
-
-        <?php $this->applyTemplateHook('registration-list-actions', 'before', ['entity' => $entity]); ?>
-        <div class="col-12 opportunity-registration-table__buttons">
-            <?php $this->applyTemplateHook('registration-list-actions', 'begin', ['entity' => $entity]); ?>
-            
-            <?php $this->applyTemplateHook('registration-list-actions', 'end', ['entity' => $entity]); ?>
-        </div>
-        <?php $this->applyTemplateHook('registration-list-actions', 'after', ['entity' => $entity]); ?>
-
+        <template v-if="!hideActions">
+            <?php $this->applyTemplateHook('registration-list-actions', 'before', ['entity' => $entity]); ?>
+            <div class="col-12 opportunity-registration-table__buttons">
+                <?php $this->applyTemplateHook('registration-list-actions', 'begin', ['entity' => $entity]); ?>
+                
+                <?php $this->applyTemplateHook('registration-list-actions', 'end', ['entity' => $entity]); ?>
+            </div>
+            <?php $this->applyTemplateHook('registration-list-actions', 'after', ['entity' => $entity]); ?>
+        </template>
         <div class="col-12"> 
-            <entity-table controller="opportunity" endpoint="findRegistrations" type="registration" :query="query" :limit="100" :sort-options="sortOptions" :order="order" :select="select" :headers="headers" phase:="phase" required="number,options" :visible="visibleColumns" @clear-filters="clearFilters" @remove-filter="removeFilter($event)" show-index :hide-filters="hideFilters" :hide-sort="hideSort" :hide-actions='hideActions'>
+            <entity-table controller="opportunity" endpoint="findRegistrations" type="registration" :query="query" :limit="100" :sort-options="sortOptions" :order="order" :select="select" :headers="headers" phase:="phase" required="number,options" :visible="visibleColumns" @clear-filters="clearFilters" @remove-filter="removeFilter($event)" show-index :hide-filters="hideFilters" :hide-sort="hideSort" :hide-actions='hideActions' :hide-header="hideHeader">
                 <template #title>
-                    <slot name="title">
-                        <h5>
-                            <strong><?= i::__("Clique no número de uma inscrição para conferir todas as avaliações realizadas.") ?></strong>
-                            <?= i::__("Após conferir, você pode alterar os status das inscrições de maneira coletiva ou individual e aplicar os resultados das avaliações.") ?>
-                        </h5>
-                    </slot>
+                    <slot name="title"></slot>
                 </template>
                 
                 <?php $this->applyTemplateHook('registration-list-actions-entity-table', 'before', ['entity' => $entity]); ?>
diff --git a/src/modules/Opportunities/components/opportunity-results-table/template.php b/src/modules/Opportunities/components/opportunity-results-table/template.php
index 059a62bb64..5a6475abf0 100644
--- a/src/modules/Opportunities/components/opportunity-results-table/template.php
+++ b/src/modules/Opportunities/components/opportunity-results-table/template.php
@@ -11,8 +11,4 @@
 ');
 ?>
 
-<opportunity-registrations-table :phase="lastPhase" :visible-columns="visibleColumns" :avaliable-columns="visibleColumns" hide-filters hide-sort status-not-editable hide-actions>
-    <template #title>
-        <b><?= i::__("Clique no número de uma inscrição para conferir todas as avaliações realizadas.") ?></b>
-    </template>
-</opportunity-registrations-table>
\ No newline at end of file
+<opportunity-registrations-table :phase="lastPhase" :visible-columns="visibleColumns" :avaliable-columns="visibleColumns" hide-filters hide-sort status-not-editable hide-actions hide-title hide-header></opportunity-registrations-table>
\ No newline at end of file

From e429a8b6f49df10896c4f007644bbf4233ef76d9 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Thu, 13 Jun 2024 11:05:06 -0300
Subject: [PATCH 45/68] =?UTF-8?q?impede=20que=20a=20tabela=20de=20inscri?=
 =?UTF-8?q?=C3=A7=C3=B5es=20quebre=20quando=20n=C3=A3o=20vem=20o=20owner?=
 =?UTF-8?q?=20da=20inscri=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/opportunity-registrations-table/template.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/Opportunities/components/opportunity-registrations-table/template.php b/src/modules/Opportunities/components/opportunity-registrations-table/template.php
index 6934628020..be76e318ac 100644
--- a/src/modules/Opportunities/components/opportunity-registrations-table/template.php
+++ b/src/modules/Opportunities/components/opportunity-registrations-table/template.php
@@ -115,7 +115,7 @@
                 </template>
 
                 <template #agent="{entity}">
-                    <a :href="entity.owner.singleUrl">{{entity.owner.name}}</a>
+                    <a :href="entity.owner?.singleUrl">{{entity.owner?.name}}</a>
                 </template>
 
                 <template #number="{entity}">

From 55b1b24e2d0b46b47a90d552bc5706156539ebc0 Mon Sep 17 00:00:00 2001
From: Carolina Pedrosa <carolinasouza0@gmail.com>
Date: Thu, 13 Jun 2024 12:17:44 -0300
Subject: [PATCH 46/68] =?UTF-8?q?fix:=20corrige=20quebra=20de=20modal=20pa?=
 =?UTF-8?q?ra=20aplicar=20resultados=20das=20avalia=C3=A7=C3=B5es=20t?=
 =?UTF-8?q?=C3=A9cnicas.=20Ref:=20#3196?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../script.js                                 |  46 ++++--
 .../template.php                              | 136 +++++++++---------
 .../sass/2.components/_apply-evaluations.scss |   4 +
 3 files changed, 101 insertions(+), 85 deletions(-)

diff --git a/src/modules/EvaluationMethodTechnical/components/evaluation-method-technical--apply/script.js b/src/modules/EvaluationMethodTechnical/components/evaluation-method-technical--apply/script.js
index f95375347e..d5927b6305 100644
--- a/src/modules/EvaluationMethodTechnical/components/evaluation-method-technical--apply/script.js
+++ b/src/modules/EvaluationMethodTechnical/components/evaluation-method-technical--apply/script.js
@@ -15,22 +15,26 @@ app.component('evaluation-method-technical--apply', {
     },
 
     data() {
-        let max = parseFloat($MAPAS.config.evaluationMethodTechnicalApply.max_result || "0.00");
-        applyData = {
-            from: [0, max],
-        };
-        const api = new API();
-
+        const max = parseFloat($MAPAS.config.evaluationMethodTechnicalApply.max_result || "0.00");
         return {
             processing: false,
-            applyData,
+            applyData: {
+                from: [0, max],
+                setStatusTo: '',
+                cutoffScore: 0,
+                earlyRegistrations: false,
+                waitList: false,
+                invalidateRegistrations: false,
+                considerQuotas: true,
+                quantityVacancies: 0
+            },
             considerQuotas: true,
             enableConsiderQuotas: $MAPAS.config.evaluationMethodTechnicalApply.isAffirmativePoliciesActive,
             selectionType: [],
             tabSelected: 'score',
             cutoffScore: this.entity.evaluationMethodConfiguration?.cutoffScore ?? 0,
-            api
-        }
+            api: new API()
+        };
     },
 
     computed: {
@@ -56,12 +60,7 @@ app.component('evaluation-method-technical--apply', {
         },
 
         modalClose() {
-            if (this.applyData.hasOwnProperty('from')) {
-                delete this.applyData.setStatusTo;
-                this.applyData.from[0] = 0;
-                this.applyData.from[1] = this.maxResult;
-            }
-            this.selectionType = [];
+            this.resetApplyData();
         },
 
         apply(modal, entity) {
@@ -124,6 +123,23 @@ app.component('evaluation-method-technical--apply', {
             }
 
             this.applyData.tabSelected = this.tabSelected;
+        },
+
+        resetApplyData() {
+            const max = this.maxResult;
+            this.applyData = {
+                from: [0, max],
+                setStatusTo: '',
+                cutoffScore: 0,
+                earlyRegistrations: false,
+                waitList: false,
+                invalidateRegistrations: false,
+                considerQuotas: true,
+                quantityVacancies: 0
+            };
+            this.selectionType = [];
+            this.tabSelected = 'score';
+            this.cutoffScore = this.entity.evaluationMethodConfiguration?.cutoffScore ?? 0;
         }
     },
 });
diff --git a/src/modules/EvaluationMethodTechnical/components/evaluation-method-technical--apply/template.php b/src/modules/EvaluationMethodTechnical/components/evaluation-method-technical--apply/template.php
index 655c5a793f..3572812f83 100644
--- a/src/modules/EvaluationMethodTechnical/components/evaluation-method-technical--apply/template.php
+++ b/src/modules/EvaluationMethodTechnical/components/evaluation-method-technical--apply/template.php
@@ -17,7 +17,6 @@
 ?>
 
 <mc-modal title="<?= i::esc_attr__('Aplicar resultados das avaliações') ?>" classes="apply-evaluations" @close="modalClose()">
-
     <template #button="modal">
         <button class="button button--primary button--icon col-4" @click="modal.open()">
             <mc-icon name="add"></mc-icon>
@@ -26,78 +25,75 @@
     </template>
 
     <template #default>
-        <div class="grid-12">
-            <div class="col-12">
-                <mc-tabs @changed="changed($event)">
-                    <mc-tab label="<?= i::esc_attr__('Por pontuação') ?>" slug='score'>
-                        <div class="grid-12 classification__panel">
-                            <div class="col-12 apply-evaluations__range">
-                                <Slider :step="-1" :tooltips="true" :max="maxResult" v-model="applyData.from"></Slider>
-                            </div>
-                            <div class="col-12 grid-12">
-                                <div class="field field--horizontal col-6">
-                                    <label><?php i::_e('Nota mínima:') ?></label>
-                                    <input v-model.number.trim="applyData.from[0]" type="number" min="0" :max="maxResult" step="0.01" @input="validateValues()">
-                                </div>
-                                <div class="field field--horizontal col-6">
-                                    <label><?php i::_e('Nota maximo:') ?></label>
-                                    <input v-model.number.trim="applyData.from[1]" type="number" min="0" :max="maxResult" step="0.01" @input="validateValues()">
-                                </div>
-                            </div>
-                            <div class="field col-12">
-                                <label><?php i::_e('Status') ?></label>
-                                <select v-model="applyData.setStatusTo">
-                                    <option v-for="item in statusList" :value="item.value">{{item.label}}</option>
-                                </select>
-                            </div>
-                        </div>
-                    </mc-tab>
-
-                    <mc-tab label="<?= i::esc_attr__('Por classificação') ?>" slug='classification'>
-                        <div class="grid-12 classification__panel">
-                            <div class="field col-6">
-                                <label>
-                                    <?php i::_e('Total de vagas:') ?>
-                                    <input type="number" v-model="entity.vacancies">
-                                </label>
-                            </div>
-                            <div class="field col-6">
-                                <label>
-                                    <?php i::_e('Nota de corte:') ?>
-                                    <input type="number" v-model="cutoffScore">
-                                </label>
-                            </div>
-                            <div class="field col-12">
-                                <label>
-                                    <input type="checkbox" v-model="considerQuotas" @checked="considerQuotas">
-                                    <?php i::_e('Considerar cotas') ?>
-                                </label>
-                            </div>
-                            <div class="field col-12">
-                                <label>
-                                    <input type="checkbox" value="earlyRegistrations" v-model="selectionType">
-                                    <?php i::_e('Selecionar as inscrições posicionadas na faixa de classificação') ?>
-                                </label>
-                            </div>
-                            <div class="field col-12">
-                                <label>
-                                    <input class="field__input" type="checkbox" value="waitList" v-model="selectionType">
-                                    <?php i::_e('Marcar como suplente as inscrições posicionadas fora da faixa de classificação que estejam acima da nota de corte') ?>
-                                </label>
-                            </div>
+        <mc-tabs @changed="changed($event)">
+            <mc-tab label="<?= i::esc_attr__('Por pontuação') ?>" slug='score'>
+                <div class="grid-12 classification__panel">
+                    <div class="col-12 apply-evaluations__range">
+                        <Slider :step="-1" :tooltips="true" :max="maxResult" v-model="applyData.from"></Slider>
+                    </div>
 
-                            <div class="field col-12">
-                                <label>
-                                    <input type="checkbox" value="invalidateRegistrations" v-model="selectionType">
-                                    <?php i::_e('Eliminar as inscrições com notas inferiores à nota de corte') ?>
-                                </label>
-                            </div>
+                    <div class="col-12 grid-12">
+                        <div class="field field--horizontal col-6">
+                            <label><?php i::_e('Nota mínima:') ?></label>
+                            <input v-model.number.trim="applyData.from[0]" type="number" min="0" :max="maxResult" step="0.01" @input="validateValues()">
                         </div>
-                    </mc-tab>
-                </mc-tabs>
-            </div>
+                        <div class="field field--horizontal col-6">
+                            <label><?php i::_e('Nota maximo:') ?></label>
+                            <input v-model.number.trim="applyData.from[1]" type="number" min="0" :max="maxResult" step="0.01" @input="validateValues()">
+                        </div>
+                    </div>
+
+                    <div class="field col-12">
+                        <label><?php i::_e('Status') ?></label>
+                        <select v-model="applyData.setStatusTo">
+                            <option v-for="item in statusList" :value="item.value">{{item.label}}</option>
+                        </select>
+                    </div>
+                </div>
+            </mc-tab>
+            
+            <mc-tab label="<?= i::esc_attr__('Por classificação') ?>" slug='classification'>
+                <div class="grid-12 classification__panel">
+                    <div class="field col-6">
+                        <label>
+                            <?php i::_e('Total de vagas:') ?>
+                            <input type="number" v-model="entity.vacancies">
+                        </label>
+                    </div>
+                    <div class="field col-6">
+                        <label>
+                            <?php i::_e('Nota de corte:') ?>
+                            <input type="number" v-model="cutoffScore">
+                        </label>
+                    </div>
+                    <div class="field col-12">
+                        <label>
+                            <input type="checkbox" v-model="considerQuotas">
+                            <?php i::_e('Considerar cotas') ?>
+                        </label>
+                    </div>
+                    <div class="field col-12">
+                        <label>
+                            <input type="checkbox" value="earlyRegistrations" v-model="selectionType">
+                            <?php i::_e('Selecionar as inscrições posicionadas na faixa de classificação') ?>
+                        </label>
+                    </div>
+                    <div class="field col-12">
+                        <label class="field__waitlist">
+                            <input class="field__input" type="checkbox" value="waitList" v-model="selectionType">
+                            <?php i::_e('Marcar como suplente as inscrições posicionadas fora da faixa de classificação que estejam acima da nota de corte') ?>
+                        </label>
+                    </div>
 
-        </div>
+                    <div class="field col-12">
+                        <label>
+                            <input type="checkbox" value="invalidateRegistrations" v-model="selectionType">
+                            <?php i::_e('Eliminar as inscrições com notas inferiores à nota de corte') ?>
+                        </label>
+                    </div>
+                </div>
+            </mc-tab>
+        </mc-tabs>
     </template>
 
     <template v-if="!processing" #actions="modal">
diff --git a/src/themes/BaseV2/assets-src/sass/2.components/_apply-evaluations.scss b/src/themes/BaseV2/assets-src/sass/2.components/_apply-evaluations.scss
index cfc6090de2..c8e8ed383b 100644
--- a/src/themes/BaseV2/assets-src/sass/2.components/_apply-evaluations.scss
+++ b/src/themes/BaseV2/assets-src/sass/2.components/_apply-evaluations.scss
@@ -12,6 +12,10 @@
         margin-top: size(20);
     }
 
+    .field__waitlist {
+        text-align: start;
+    }
+    
     .field__input[type=checkbox] {
         width: size(29.6);
     }

From e4acfffec2d406a9b13a45b85d90047939196ca9 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Thu, 13 Jun 2024 12:24:34 -0300
Subject: [PATCH 47/68] =?UTF-8?q?Ajusta=20distribu=C3=A7=C3=A3o=20de=20ava?=
 =?UTF-8?q?lia=C3=A7=C3=B5es=20atrav=C3=A9s=20dos=20finais=20das=20inscri?=
 =?UTF-8?q?=C3=A7=C3=B5es=20para=20que=20seja=20poss=C3=ADvel=20usar=20mai?=
 =?UTF-8?q?s=20caracteres?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                                    | 1 +
 .../components/opportunity-evaluation-committee/template.php    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee70631dbe..364aad09e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Corrige erro no carregamento da single de projetos
 - Ajusta exibição dos campos do tipo checkebox do formulário
 - Corrige endpoit apiFindRegistrations para que um usuario comum posso ver as inscrições na fase de publicação de resultado
+- Ajusta distribução de avaliações através dos finais das inscrições para que seja possível usar mais caracteres
 
 ## [7.4.4] 2024-06-12
 ### Correções
diff --git a/src/modules/Opportunities/components/opportunity-evaluation-committee/template.php b/src/modules/Opportunities/components/opportunity-evaluation-committee/template.php
index 9072198d60..cc0a5adf0f 100644
--- a/src/modules/Opportunities/components/opportunity-evaluation-committee/template.php
+++ b/src/modules/Opportunities/components/opportunity-evaluation-committee/template.php
@@ -70,7 +70,7 @@
                 <div v-if="!infoReviewer.default" class="opportunity-evaluation-committee__distributions">
                     <div class="field opportunity-evaluation-committee__distribution">
                         <label><?php i::_e('Distribuição') ?></label>
-                        <input type="text" placeholder="0-9" maxlength="3" @change="sendDefinition('addDistribution', infoReviewer.agentUserId)" v-model="entity.fetch[infoReviewer.agentUserId]"/>
+                        <input type="text" placeholder="00-99" maxlength="5" @change="sendDefinition('addDistribution', infoReviewer.agentUserId)" v-model="entity.fetch[infoReviewer.agentUserId]"/>
                     </div>
                     <div v-if="registrationCategories.length > 0" class="field">
                         <label><?php i::_e('Categorias a serem avaliadas') ?></label>

From a484d53b1dac607bdd74f472b47702fd2f88d2f5 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Thu, 13 Jun 2024 14:11:13 -0300
Subject: [PATCH 48/68] =?UTF-8?q?evita=20erro=20no=20formul=C3=A1rio=20de?=
 =?UTF-8?q?=20inscri=C3=A7=C3=A0o=20quando=20a=20oportunidade=20receber=20?=
 =?UTF-8?q?configura=C3=A7=C3=A3o=20de=20range,=20proponentType=20ou=20cat?=
 =?UTF-8?q?egory=20ap=C3=B3s=20o=20envio=20da=20inscri=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                          |  4 ++++
 src/core/Entities/Registration.php                    | 11 ++++++++---
 .../BaseV1/assets/js/ng.entity.module.opportunity.js  |  6 +++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee70631dbe..eaf3fde110 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,14 @@ O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.0.
 e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [unreleased]
+### Melhorias
+- melhora exibição do header da tabela de publicação de resultados
+
 ### Correções
 - Corrige erro no carregamento da single de projetos
 - Ajusta exibição dos campos do tipo checkebox do formulário
 - Corrige endpoit apiFindRegistrations para que um usuario comum posso ver as inscrições na fase de publicação de resultado
+- Corrige formulário de inscriçào em casos onde foi configurado tipo de proponente ou faixa após envio de inscrições
 
 ## [7.4.4] 2024-06-12
 ### Correções
diff --git a/src/core/Entities/Registration.php b/src/core/Entities/Registration.php
index 5c701329d8..88b74b52a1 100644
--- a/src/core/Entities/Registration.php
+++ b/src/core/Entities/Registration.php
@@ -998,15 +998,20 @@ function isFieldVisisble(RegistrationFieldConfiguration|RegistrationFileConfigur
         $use_range = (bool) $opportunity->registrationRanges;
         $use_proponent_types = (bool) $opportunity->registrationProponentTypes;
 
-        if ($use_category && count($field->categories) > 0 && !in_array($this->category, $field->categories)) {
+        $field_categories = $field->categories ?: [];
+        $field_ranges = $field->registrationRanges ?: [];
+        $field_proponent_types = $field->proponentTypes ?: [];
+
+
+        if ($use_category && count($field_categories) > 0 && !in_array($this->category, $field_categories)) {
             return false;
         }
 
-        if ($use_range && count($field->registrationRanges) > 0 && !in_array($this->range, $field->registrationRanges)) {
+        if ($use_range && count($field_ranges) > 0 && !in_array($this->range, $field_ranges)) {
             return false;
         }
 
-        if ($use_proponent_types && count($field->proponentTypes) > 0 && !in_array($this->proponentType, $field->proponentTypes)) {
+        if ($use_proponent_types && count($field_proponent_types) > 0 && !in_array($this->proponentType, $field_proponent_types)) {
             return false;
         }
 
diff --git a/src/themes/BaseV1/assets/js/ng.entity.module.opportunity.js b/src/themes/BaseV1/assets/js/ng.entity.module.opportunity.js
index 42130d4eff..58db2aaef8 100644
--- a/src/themes/BaseV1/assets/js/ng.entity.module.opportunity.js
+++ b/src/themes/BaseV1/assets/js/ng.entity.module.opportunity.js
@@ -1732,17 +1732,17 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int
         var result = true;
 
         if ($scope.useCategories) {
-            result = result && (field.categories.length === 0 || field.categories.indexOf($scope.selectedCategory) >= 0);
+            result = result && (field.categories?.length === 0 || field.categories.indexOf($scope.selectedCategory) >= 0);
         }
 
         if ($scope.useRegistrationsRanges) {
-            if(field.registrationRanges.length > 0  && !field.registrationRanges.includes(MapasCulturais.entity.object.range)) {
+            if(field.registrationRanges?.length > 0  && !field.registrationRanges.includes(MapasCulturais.entity.object.range)) {
                 result = false;
             }
         }
 
         if ($scope.useProponentTypes) {
-            if(field.proponentTypes.length > 0 && !field.proponentTypes.includes(MapasCulturais.entity.object.proponentType)) {
+            if(field.proponentTypes?.length > 0 && !field.proponentTypes.includes(MapasCulturais.entity.object.proponentType)) {
                 result = false;
             }
         }

From 0e9956ced7a125c79207d20b933723ffcf8117b0 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Thu, 13 Jun 2024 15:55:27 -0300
Subject: [PATCH 49/68] =?UTF-8?q?s=C3=B3=20exibe=20categoria,=20tipo=20de?=
 =?UTF-8?q?=20proponente=20e=20faixa=20quando=20h=C3=A1=20essa=20informa?=
 =?UTF-8?q?=C3=A7=C3=A3o=20(Ref.:=20#3201)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                    |  3 ++-
 .../components/registration-info/template.php   | 17 +++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2d922d502..b93ea74a0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [unreleased]
 ### Melhorias
-- melhora exibição do header da tabela de publicação de resultados
+- Melhora exibição do header da tabela de publicação de resultados
 
 ### Correções
 - Corrige erro no carregamento da single de projetos
@@ -15,6 +15,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Corrige endpoit apiFindRegistrations para que um usuario comum posso ver as inscrições na fase de publicação de resultado
 - Corrige formulário de inscriçào em casos onde foi configurado tipo de proponente ou faixa após envio de inscrições
 - Ajusta distribução de avaliações através dos finais das inscrições para que seja possível usar mais caracteres
+- Só exibe categoria, tipo de proponente e faixa quando há essa informação na inscrição
 
 ## [7.4.4] 2024-06-12
 ### Correções
diff --git a/src/modules/Opportunities/components/registration-info/template.php b/src/modules/Opportunities/components/registration-info/template.php
index 834577d231..c5f6915c4d 100644
--- a/src/modules/Opportunities/components/registration-info/template.php
+++ b/src/modules/Opportunities/components/registration-info/template.php
@@ -19,26 +19,23 @@
             <h5 class="registration-info__data__title semibold"> <?= i::__('Data') ?> </h5>
             <h4 class="registration-info__data__info bold">{{registration?.createTimestamp?.date('2-digit year')}}</h4>
         </div>
-        <div class="registration-info__data">
+        <div v-if="registration.category" class="registration-info__data">
             <h5 class="registration-info__data__title semibold"> <?= i::__('Categoria') ?> </h5>
-            <h4 v-if="registration.category" class="registration-info__data__info bold">{{registration.category}}</h4>
-            <h4 v-if="!registration.category" class="registration-info__data__info bold"><?php i::_e('Sem categoria') ?></h4>
+            <h4 class="registration-info__data__info bold">{{registration.category}}</h4>
         </div>
     </div>
 </div>
 
-<div :class="['registration-info', classes]">
+<div v-if="registration.range || registration.proponentType" :class="['registration-info', classes]">
     <div class="registration-info__content">
-        <div class="registration-info__data">
+        <div v-if="registration.range" class="registration-info__data">
             <h5 class="registration-info__data__title semibold"> <?= i::__('Faixa') ?> </h5>
-            <h4 v-if="registration.range" class="registration-info__data__info bold">{{registration.range}}</h4>
-            <h4 v-if="!registration.range" class="registration-info__data__info bold"><?php i::_e('Sem faixa') ?></h4>
+            <h4 class="registration-info__data__info bold">{{registration.range}}</h4>
         </div>
 
-        <div class="registration-info__data">
+        <div v-if="registration.proponentType" class="registration-info__data">
             <h5 class="registration-info__data__title semibold"> <?= i::__('Tipo de proponente') ?> </h5>
-            <h4 v-if="registration.proponentType" class="registration-info__data__info bold">{{registration.proponentType}}</h4>
-            <h4 v-if="!registration.proponentType" class="registration-info__data__info bold"><?php i::_e('Tipo de proponente não informado') ?></h4>
+            <h4 class="registration-info__data__info bold">{{registration.proponentType}}</h4>
         </div>
     </div>
 </div>
\ No newline at end of file

From 1a146608806f1ab5e7f634b5525b6d3b9b489ea5 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Thu, 13 Jun 2024 17:15:54 -0300
Subject: [PATCH 50/68] Evita a possibilidade de selecionar sub-agentes como
 admnistradores de entidades (Ref.: #3195)

---
 src/modules/Entities/components/entity-admins/script.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/Entities/components/entity-admins/script.js b/src/modules/Entities/components/entity-admins/script.js
index 2d86e51929..f05f4a97bf 100644
--- a/src/modules/Entities/components/entity-admins/script.js
+++ b/src/modules/Entities/components/entity-admins/script.js
@@ -34,6 +34,8 @@ app.component('entity-admins', {
             if (idFilter) {
                 query['id'] = idFilter;
             }
+            
+            query['parent'] = 'NULL()'
 
             return query;
 

From 553ddc971f06a6be3921ac47cba4de4e52e2c642 Mon Sep 17 00:00:00 2001
From: Welington De Lima Olegario <wolegario49@gmail.com>
Date: Fri, 14 Jun 2024 11:01:10 -0300
Subject: [PATCH 51/68] Corrige e automatiza o preenchimento do campo pessoa
 idosa

---
 src/conf/agent-types.php        | 16 ++++++++++------
 src/modules/Entities/Module.php | 23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/conf/agent-types.php b/src/conf/agent-types.php
index 941493836f..6d3795d629 100644
--- a/src/conf/agent-types.php
+++ b/src/conf/agent-types.php
@@ -189,15 +189,19 @@
             'private' => true,
             'label' => \MapasCulturais\i::__('Pessoa idosa'),
             'type' => 'readonly',
-            'serialize' => function($value, $entity = null){
-                if($entity->dataDeNascimento){
+            'serialize' => function($value, $entity = null) {
+                if ($entity->dataDeNascimento) {
                     $today = new DateTime('now');
-                    $calc = (new DateTime($entity->dataDeNascimento))->diff($today);
-                    return ($calc->y >= 60) ? "1" : "0";
-                }else{
-                    return null;
+                    $birthdate = new DateTime($entity->dataDeNascimento);
+                    $age = $birthdate->diff($today)->y;
+                    return ($age >= 60);
+                } else {
+                    return false;
                 }
             },
+            'unserialize' => function($value){
+                return $value ? true : false;
+            },
             'available_for_opportunities' => true
         ),
 
diff --git a/src/modules/Entities/Module.php b/src/modules/Entities/Module.php
index 91743aab16..292155eacb 100644
--- a/src/modules/Entities/Module.php
+++ b/src/modules/Entities/Module.php
@@ -3,6 +3,7 @@
 namespace Entities;
 
 use MapasCulturais\App;
+use MapasCulturais\Entity;
 
 class Module extends \MapasCulturais\Module{
 
@@ -17,6 +18,28 @@ function __construct(array $config = [])
     function _init(){
         $app = App::i();
 
+        // Atualiza o campo pessoa idosa no momento de login
+        $app->hook('GET(<<*>>)', function () use($app){
+            if ($app->auth->isUserAuthenticated()) {
+                $cache_key = "profile:idoso:{$app->user->id}";
+                if(!$app->cache->contains($cache_key)){
+                    $entity = $app->user->profile;
+                    if($entity->dataDeNascimento){
+                        $app->log->debug('Entrou aqui 1');
+                        $today = new \DateTime('now');
+                        $calc = (new \DateTime($entity->dataDeNascimento))->diff($today);
+                        $idoso = ($calc->y >= 60) ? "1" : "0";
+                        if($entity->idoso != $idoso){
+                            $app->log->debug('Entrou aqui 2');
+                            $entity->idoso = $idoso;
+                            $entity->save(true);
+                        }
+                    }
+                    $app->cache->save($cache_key,1,DAY_IN_SECONDS);
+                }
+            } 
+        });
+
         $app->hook('Theme::isRequestedEntityMine', function () use($app) {
             $entity = $this->controller->requestedEntity;
 

From 9e198b85c7346bb9067cc75430f1a58d335dfffb Mon Sep 17 00:00:00 2001
From: Welington De Lima Olegario <wolegario49@gmail.com>
Date: Fri, 14 Jun 2024 11:15:16 -0300
Subject: [PATCH 52/68] =?UTF-8?q?Ajusta=20termos=20de=20projetos,=20oportu?=
 =?UTF-8?q?nidades=20e=20espa=C3=A7o=20e=20ordem=20alfab=C3=A9tica?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/conf/opportunity-types.php |  42 ++++----
 src/conf/project-types.php     |  44 ++++----
 src/conf/space-types.php       | 187 ++++++++++++++++-----------------
 3 files changed, 136 insertions(+), 137 deletions(-)

diff --git a/src/conf/opportunity-types.php b/src/conf/opportunity-types.php
index 3057225f4c..c99ecae9c2 100644
--- a/src/conf/opportunity-types.php
+++ b/src/conf/opportunity-types.php
@@ -10,35 +10,35 @@ function compareNamesOpportunity ($item1, $item2) {
 }
 
 $items = array(
-    1 =>  array( 'name' => \MapasCulturais\i::__("Festival")),
-    2 =>  array( 'name' => \MapasCulturais\i::__("Encontro")),
-    3 =>  array( 'name' => \MapasCulturais\i::__("Sarau")),
-    4 =>  array( 'name' => \MapasCulturais\i::__("Reunião")),
-    5 =>  array( 'name' => \MapasCulturais\i::__("Mostra")),
-    6 =>  array( 'name' => \MapasCulturais\i::__("Convenção")),
     7 =>  array( 'name' => \MapasCulturais\i::__("Ciclo")),
-    8 =>  array( 'name' => \MapasCulturais\i::__("Programa")),
-    9 =>  array( 'name' => \MapasCulturais\i::__("Edital")),
+    26 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Setorial")),
+    27 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Nacional")),
+    28 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Estadual")),
+    29 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Municipal")),
     10 => array( 'name' => \MapasCulturais\i::__("Concurso")),
+    6 =>  array( 'name' => \MapasCulturais\i::__("Convenção")),
+    19 => array( 'name' => \MapasCulturais\i::__("Congresso")),
+    23 => array( 'name' => \MapasCulturais\i::__("Curso")),
+    9 =>  array( 'name' => \MapasCulturais\i::__("Edital")),
     11 => array( 'name' => \MapasCulturais\i::__("Exposição")),
-    12 => array( 'name' => \MapasCulturais\i::__("Jornada")),
+    2 =>  array( 'name' => \MapasCulturais\i::__("Encontro")),
     13 => array( 'name' => \MapasCulturais\i::__("Exibição")),
-    14 => array( 'name' => \MapasCulturais\i::__("Feira")),
-    15 => array( 'name' => \MapasCulturais\i::__("Intercâmbio Cultural")),
+    1 =>  array( 'name' => \MapasCulturais\i::__("Festival")),
     16 => array( 'name' => \MapasCulturais\i::__("Festa Popular")),
     17 => array( 'name' => \MapasCulturais\i::__("Festa Religiosa")),
-    18 => array( 'name' => \MapasCulturais\i::__("Seminário")),
-    19 => array( 'name' => \MapasCulturais\i::__("Congresso")),
-    20 => array( 'name' => \MapasCulturais\i::__("Palestra")),
-    21 => array( 'name' => \MapasCulturais\i::__("Simpósio")),
+    14 => array( 'name' => \MapasCulturais\i::__("Feira")),
     22 => array( 'name' => \MapasCulturais\i::__("Fórum")),
-    23 => array( 'name' => \MapasCulturais\i::__("Curso")),
-    24 => array( 'name' => \MapasCulturais\i::__("Oficina")),
+    15 => array( 'name' => \MapasCulturais\i::__("Intercâmbio Cultural")),
     25 => array( 'name' => \MapasCulturais\i::__("Jornada")),
-    26 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Setorial")),
-    27 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Nacional")),
-    28 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Estadual")),
-    29 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Municipal")),
+    12 => array( 'name' => \MapasCulturais\i::__("Jornada")),
+    5 =>  array( 'name' => \MapasCulturais\i::__("Mostra")),
+    24 => array( 'name' => \MapasCulturais\i::__("Oficina")),
+    20 => array( 'name' => \MapasCulturais\i::__("Palestra")),
+    8 =>  array( 'name' => \MapasCulturais\i::__("Programa")),
+    4 =>  array( 'name' => \MapasCulturais\i::__("Reunião")),
+    3 =>  array( 'name' => \MapasCulturais\i::__("Sarau")),
+    21 => array( 'name' => \MapasCulturais\i::__("Simpósio")),
+    18 => array( 'name' => \MapasCulturais\i::__("Seminário")),
 //        30 => array( 'name' => \MapasCulturais\i::__("Parada e Desfile Militar")),
 //        31 => array( 'name' => \MapasCulturais\i::__("Parada e Desfile Cívico")),
 //        32 => array( 'name' => \MapasCulturais\i::__("Parada e Desfile Festivo")),
diff --git a/src/conf/project-types.php b/src/conf/project-types.php
index e977b53270..e42fc889b1 100644
--- a/src/conf/project-types.php
+++ b/src/conf/project-types.php
@@ -11,43 +11,43 @@ function compareNamesProject($a, $b){
 }
 
 $items = array(
-    1 =>  array( 'name' => \MapasCulturais\i::__("Festival")),
-    2 =>  array( 'name' => \MapasCulturais\i::__("Encontro")),
-    3 =>  array( 'name' => \MapasCulturais\i::__("Sarau")),
-    4 =>  array( 'name' => \MapasCulturais\i::__("Reunião")),
-    5 =>  array( 'name' => \MapasCulturais\i::__("Mostra")),
-    6 =>  array( 'name' => \MapasCulturais\i::__("Convenção")),
     7 =>  array( 'name' => \MapasCulturais\i::__("Ciclo")),
-    8 =>  array( 'name' => \MapasCulturais\i::__("Programa")),
-    9 =>  array( 'name' => \MapasCulturais\i::__("Edital")),
+    19 => array( 'name' => \MapasCulturais\i::__("Congresso")),
+    6 =>  array( 'name' => \MapasCulturais\i::__("Convenção")),
     10 => array( 'name' => \MapasCulturais\i::__("Concurso")),
+    26 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Setorial")),
+    27 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Nacional")),
+    28 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Estadual")),
+    122 => ['name' => \MapasCulturais\i::__("Consulta")],
+    29 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Municipal")),
+    23 => array( 'name' => \MapasCulturais\i::__("Curso")),
+    9 =>  array( 'name' => \MapasCulturais\i::__("Edital")),
+    2 =>  array( 'name' => \MapasCulturais\i::__("Encontro")),
     11 => array( 'name' => \MapasCulturais\i::__("Exposição")),
-    12 => array( 'name' => \MapasCulturais\i::__("Jornada")),
     13 => array( 'name' => \MapasCulturais\i::__("Exibição")),
     14 => array( 'name' => \MapasCulturais\i::__("Feira")),
-    15 => array( 'name' => \MapasCulturais\i::__("Intercâmbio Cultural")),
+    1 =>  array( 'name' => \MapasCulturais\i::__("Festival")),
     16 => array( 'name' => \MapasCulturais\i::__("Festa Popular")),
     17 => array( 'name' => \MapasCulturais\i::__("Festa Religiosa")),
-    18 => array( 'name' => \MapasCulturais\i::__("Seminário")),
-    19 => array( 'name' => \MapasCulturais\i::__("Congresso")),
-    20 => array( 'name' => \MapasCulturais\i::__("Palestra")),
-    21 => array( 'name' => \MapasCulturais\i::__("Simpósio")),
     22 => array( 'name' => \MapasCulturais\i::__("Fórum")),
-    23 => array( 'name' => \MapasCulturais\i::__("Curso")),
-    24 => array( 'name' => \MapasCulturais\i::__("Oficina")),
+    35 => ['name' => \MapasCulturais\i::__("Inscrições")],
+    15 => array( 'name' => \MapasCulturais\i::__("Intercâmbio Cultural")),
     25 => array( 'name' => \MapasCulturais\i::__("Jornada")),
-    26 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Setorial")),
-    27 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Nacional")),
-    28 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Estadual")),
-    29 => array( 'name' => \MapasCulturais\i::__("Conferência Pública Municipal")),
+    12 => array( 'name' => \MapasCulturais\i::__("Jornada")),
+    5 =>  array( 'name' => \MapasCulturais\i::__("Mostra")),
+    24 => array( 'name' => \MapasCulturais\i::__("Oficina")),
+    20 => array( 'name' => \MapasCulturais\i::__("Palestra")),
     30 => array( 'name' => \MapasCulturais\i::__("Parada e Desfile Militar")),
     31 => array( 'name' => \MapasCulturais\i::__("Parada e Desfile Cívico")),
     32 => array( 'name' => \MapasCulturais\i::__("Parada e Desfile Festivo")),
     33 => array( 'name' => \MapasCulturais\i::__("Parada e Desfile Político")),
     34 => array( 'name' => \MapasCulturais\i::__("Parada e Desfile de Ações Afirmativas")),
-    35 => ['name' => \MapasCulturais\i::__("Inscrições")],
     121 => ['name' => \MapasCulturais\i::__("Pesquisa")],
-    122 => ['name' => \MapasCulturais\i::__("Consulta")]
+    8 =>  array( 'name' => \MapasCulturais\i::__("Programa")),
+    4 =>  array( 'name' => \MapasCulturais\i::__("Reunião")),
+    3 =>  array( 'name' => \MapasCulturais\i::__("Sarau")),
+    18 => array( 'name' => \MapasCulturais\i::__("Seminário")),
+    21 => array( 'name' => \MapasCulturais\i::__("Simpósio")),
 );
 
 uasort($items, 'compareNamesProject');
diff --git a/src/conf/space-types.php b/src/conf/space-types.php
index df2d476a86..9de84ed960 100644
--- a/src/conf/space-types.php
+++ b/src/conf/space-types.php
@@ -9,11 +9,11 @@
     \MapasCulturais\i::__('Espaços de Exibição de Filmes') => array(
         'range' => array(10,19),
         'items' => array(
-            10 => array( 'name' => \MapasCulturais\i::__('Cine itinerante' )),
-            11 => array( 'name' => \MapasCulturais\i::__('Cineclube' )),
-            12 => array( 'name' => \MapasCulturais\i::__('Drive-in' )),
+            10 => array( 'name' => \MapasCulturais\i::__('Cine itinerante')),
+            11 => array( 'name' => \MapasCulturais\i::__('Cineclube')),
+            12 => array( 'name' => \MapasCulturais\i::__('Drive-in')),
             13 => array( 'name' => \MapasCulturais\i::__('Espaço Público Para Projeção de Filmes') ),
-            14 => array( 'name' => \MapasCulturais\i::__('Sala de cinema' )),
+            14 => array( 'name' => \MapasCulturais\i::__('Sala de cinema')),
         ),
         
     ),
@@ -22,7 +22,7 @@
         'range' => array(20,29),
         'items' => array(
             20 => array( 'name' => \MapasCulturais\i::__('Biblioteca Pública') ),
-            21 => array( 'name' => \MapasCulturais\i::__('Biblioteca Privada' )),
+            21 => array( 'name' => \MapasCulturais\i::__('Biblioteca Privada')),
             22 => array( 'name' => \MapasCulturais\i::__('Biblioteca Comunitária (incluí­dos os pontos de leitura)')),
             23 => array( 'name' => \MapasCulturais\i::__('Biblioteca Escolar')),
             24 => array( 'name' => \MapasCulturais\i::__('Biblioteca Nacional')),
@@ -42,19 +42,19 @@
     \MapasCulturais\i::__('Circos') => array(
         'range' => array(90,99),
         'items' => array(
-            90 => array( 'name' => \MapasCulturais\i::__('Circo Itinerante' )),
-            91 => array( 'name' => \MapasCulturais\i::__('Circo Fixo' )),
-            92 => array( 'name' => \MapasCulturais\i::__('Terreno para Circo') ),
+            90 => array( 'name' => \MapasCulturais\i::__('Circo Itinerante')),
+            91 => array( 'name' => \MapasCulturais\i::__('Circo Fixo')),
             93 => array( 'name' => \MapasCulturais\i::__('Circo Tradicional') ),
-            94 => array( 'name' => \MapasCulturais\i::__('Circo Moderno' )),
+            94 => array( 'name' => \MapasCulturais\i::__('Circo Moderno')),
+            92 => array( 'name' => \MapasCulturais\i::__('Terreno para Circo') ),
         )
     ),
 
    \MapasCulturais\i::__('Centros Culturais') => array(
         'range' => array(40,49),
         'items' => array(
-            40 => array( 'name' => \MapasCulturais\i::__('Centro Cultural Público' )),
-            41 => array( 'name' => \MapasCulturais\i::__('Centro Cultural Privado' )),
+            40 => array( 'name' => \MapasCulturais\i::__('Centro Cultural Público')),
+            41 => array( 'name' => \MapasCulturais\i::__('Centro Cultural Privado')),
         )
     ),
 
@@ -62,7 +62,7 @@
         'range' => array(50,59),
         'items' => array(
             50 => array( 'name' => \MapasCulturais\i::__('Arquivo Público') ),
-            51 => array( 'name' => \MapasCulturais\i::__('Arquivo Privado' )),
+            51 => array( 'name' => \MapasCulturais\i::__('Arquivo Privado')),
         )
     ),
 
@@ -70,53 +70,53 @@
         'range' => array(60,69),
         'items' => array(
             60 => array( 'name' => \MapasCulturais\i::__('Museu Público') ),
-            61 => array( 'name' => \MapasCulturais\i::__('Museu Privado' )),
+            61 => array( 'name' => \MapasCulturais\i::__('Museu Privado')),
         )
     ),
 
     \MapasCulturais\i::__('Demais Equipamentos Culturais') => array(
         'range' => array(100,199),
         'items' => array(
-            100 => array( 'name' => \MapasCulturais\i::__('Galeria de arte') ),
-            101 => array( 'name' => \MapasCulturais\i::__('Livraria' )),
-            102 => array( 'name' => \MapasCulturais\i::__('Sebo' )),
-            103 => array( 'name' => \MapasCulturais\i::__('Videolocadora') ),
-            104 => array( 'name' => \MapasCulturais\i::__('Lan-house' )),
-            105 => array( 'name' => \MapasCulturais\i::__('Antiquário' )),
-            106 => array( 'name' => \MapasCulturais\i::__('Ateliê' )),
+            105 => array( 'name' => \MapasCulturais\i::__('Antiquário')),
+            106 => array( 'name' => \MapasCulturais\i::__('Ateliê')),
+            131 => array( 'name' => \MapasCulturais\i::__('Audioteca')),
+            112 => array( 'name' => \MapasCulturais\i::__('Banca de jornal')),
+            108 => array( 'name' => \MapasCulturais\i::__('Casa de espetáculo')),
+            117 => array( 'name' => \MapasCulturais\i::__('Casa do Patrimônio')),
             107 => array( 'name' => \MapasCulturais\i::__('Centro de artesanato') ),
-            108 => array( 'name' => \MapasCulturais\i::__('Casa de espetáculo' )),
-            109 => array( 'name' => \MapasCulturais\i::__('Danceteria' )),
-            110 => array( 'name' => \MapasCulturais\i::__('Estúdio' )),
-            111 => array( 'name' => \MapasCulturais\i::__('Concha acústica' )),
-            112 => array( 'name' => \MapasCulturais\i::__('Banca de jornal' )),
-            113 => array( 'name' => \MapasCulturais\i::__('Espaço para Eventos' )),
-            114 => array( 'name' => \MapasCulturais\i::__('Creative Bureau' )),
-            115 => array( 'name' => \MapasCulturais\i::__('Ponto de Leitura Afro' )),
-            116 => array( 'name' => \MapasCulturais\i::__('Centro Comunitário' )),
-            117 => array( 'name' => \MapasCulturais\i::__('Casa do Patrimônio' )),
-            125 => array( 'name' => \MapasCulturais\i::__('Ponto de Cultura' )),
-            118 => array( 'name' => \MapasCulturais\i::__('Usina Cultural' )),
-            119 => array( 'name' => \MapasCulturais\i::__('Praça dos esportes e da cultura') ),
-            120 => array( 'name' => \MapasCulturais\i::__('Espaço Mais Cultura' )),
-            121 => array( 'name' => \MapasCulturais\i::__('Sala de dança' )),
-            122 => array( 'name' => \MapasCulturais\i::__('Gafieira' )),
-            123 => array( 'name' => \MapasCulturais\i::__('Espaço para apresentação de dança' )),
-            126 => array( 'name' => \MapasCulturais\i::__('Centro cultural itinerante' )),
-            127 => array( 'name' => \MapasCulturais\i::__('Trio elétrico' )),
-            128 => array( 'name' => \MapasCulturais\i::__('Clube social' )),
+            132 => array( 'name' => \MapasCulturais\i::__('Centro de Artes e Esportes Unificados - CEUs')),
             129 => array( 'name' => \MapasCulturais\i::__('Centro de tradições') ),
-            130 => array( 'name' => \MapasCulturais\i::__('Sala Multiuso' )),
-            124 => array( 'name' => \MapasCulturais\i::__('Rádio Comunitária' )),
-            131 => array( 'name' => \MapasCulturais\i::__('Audioteca' )),
-            132 => array( 'name' => \MapasCulturais\i::__('Centro de Artes e Esportes Unificados - CEUs' )),
-            133 => array( 'name' => \MapasCulturais\i::__('Coreto' )),
+            116 => array( 'name' => \MapasCulturais\i::__('Centro Comunitário')),
+            114 => array( 'name' => \MapasCulturais\i::__('Creative Bureau')),
+            128 => array( 'name' => \MapasCulturais\i::__('Clube social')),
+            126 => array( 'name' => \MapasCulturais\i::__('Centro cultural itinerante')),
+            133 => array( 'name' => \MapasCulturais\i::__('Coreto')),
+            111 => array( 'name' => \MapasCulturais\i::__('Concha acústica')),
+            109 => array( 'name' => \MapasCulturais\i::__('Danceteria')),
+            110 => array( 'name' => \MapasCulturais\i::__('Estúdio')),
+            113 => array( 'name' => \MapasCulturais\i::__('Espaço para Eventos')),
+            123 => array( 'name' => \MapasCulturais\i::__('Espaço para apresentação de dança')),
+            120 => array( 'name' => \MapasCulturais\i::__('Espaço Mais Cultura')),
+            100 => array( 'name' => \MapasCulturais\i::__('Galeria de arte') ),
             134 => array( 'name' => \MapasCulturais\i::__('Ginásio Poliesportivo') ),
-            135 => array( 'name' => \MapasCulturais\i::__('Sala de Leitura' )),
-            136 => array( 'name' => \MapasCulturais\i::__('Pontos de Memória' )),
-            137 => array( 'name' => \MapasCulturais\i::__('Núcleos de Produção Digital' )),
+            122 => array( 'name' => \MapasCulturais\i::__('Gafieira')),
+            104 => array( 'name' => \MapasCulturais\i::__('Lan-house')),
+            101 => array( 'name' => \MapasCulturais\i::__('Livraria')),
+            137 => array( 'name' => \MapasCulturais\i::__('Núcleos de Produção Digital')),
+            115 => array( 'name' => \MapasCulturais\i::__('Ponto de Leitura Afro')),
+            119 => array( 'name' => \MapasCulturais\i::__('Praça dos esportes e da cultura') ),
+            125 => array( 'name' => \MapasCulturais\i::__('Ponto de Cultura')),
+            136 => array( 'name' => \MapasCulturais\i::__('Pontos de Memória')),
+            124 => array( 'name' => \MapasCulturais\i::__('Rádio Comunitária')),
+            135 => array( 'name' => \MapasCulturais\i::__('Sala de Leitura')),
+            130 => array( 'name' => \MapasCulturais\i::__('Sala Multiuso')),
+            121 => array( 'name' => \MapasCulturais\i::__('Sala de dança')),
+            102 => array( 'name' => \MapasCulturais\i::__('Sebo')),
+            127 => array( 'name' => \MapasCulturais\i::__('Trio elétrico')),
+            118 => array( 'name' => \MapasCulturais\i::__('Usina Cultural')),
+            103 => array( 'name' => \MapasCulturais\i::__('Videolocadora') ),
 
-            199 => array( 'name' => \MapasCulturais\i::__('Outros Equipamentos Culturais' )), // adicionado na importação dos dados do Ceará para receber as endidades do tipo "equipamento"
+            199 => array( 'name' => \MapasCulturais\i::__('Outros Equipamentos Culturais')), // adicionado na importação dos dados do Ceará para receber as endidades do tipo "equipamento"
         )
     ),
 
@@ -124,19 +124,19 @@
         'range' => array(70,79),
         'items' => array(
             70 => array( 'name' => \MapasCulturais\i::__('Centro de Documentação Público') ),
-            71 => array( 'name' => \MapasCulturais\i::__('Centro de Documentação Privado' )),
+            71 => array( 'name' => \MapasCulturais\i::__('Centro de Documentação Privado')),
         )
     ),
 
    \MapasCulturais\i::__('Espaços Religiosos') => array(
         'range' => array(80,89),
         'items' => array(
-            80 => array( 'name' => \MapasCulturais\i::__('Templo' )),
-            81 => array( 'name' => \MapasCulturais\i::__('Terreiro' )),
-            82 => array( 'name' => \MapasCulturais\i::__('Mesquitas' )),
-            83 => array( 'name' => \MapasCulturais\i::__('Sinagoga' )),
-            84 => array( 'name' => \MapasCulturais\i::__('Igreja' )),
             85 => array( 'name' => \MapasCulturais\i::__('Centro Espírita') ),
+            84 => array( 'name' => \MapasCulturais\i::__('Igreja')),
+            82 => array( 'name' => \MapasCulturais\i::__('Mesquitas')),
+            83 => array( 'name' => \MapasCulturais\i::__('Sinagoga')),
+            81 => array( 'name' => \MapasCulturais\i::__('Terreiro')),
+            80 => array( 'name' => \MapasCulturais\i::__('Templo')),
           )
     ),
 
@@ -147,57 +147,57 @@
    \MapasCulturais\i::__('Instituições Públicas de Ensino Regular') => array(
         'range' => array(300,399),
         'items' => array(
-            300 => array( 'name' => \MapasCulturais\i::__('Instituição Pública de Ensino Regular Federal' )),
-            301 => array( 'name' => \MapasCulturais\i::__('Instituição Pública de Ensino Regular Estadual' )),
-            302 => array( 'name' => \MapasCulturais\i::__('Instituição Pública de Ensino Regular Municipal' )),
-            303 => array( 'name' => \MapasCulturais\i::__('Instituição Pública de Ensino Regular Distrital' )),
+            300 => array( 'name' => \MapasCulturais\i::__('Instituição Pública de Ensino Regular Federal')),
+            301 => array( 'name' => \MapasCulturais\i::__('Instituição Pública de Ensino Regular Estadual')),
+            302 => array( 'name' => \MapasCulturais\i::__('Instituição Pública de Ensino Regular Municipal')),
+            303 => array( 'name' => \MapasCulturais\i::__('Instituição Pública de Ensino Regular Distrital')),
           )
     ),
 
    \MapasCulturais\i::__('Instituições Privadas de Ensino Regular') => array(
         'range' => array(400,499),
         'items' => array(
-            400 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Particular' )),
-            401 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Comunitária' )),
-            402 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Confessional' )),
-            403 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Filantrópica' )),
+            400 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Particular')),
+            401 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Comunitária')),
+            402 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Confessional')),
+            403 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Filantrópica')),
           )
     ),
 
    \MapasCulturais\i::__('Instituições Públicas exclusivamente voltada para formação artistica e cultural') => array(
         'range' => array(601,699),
         'items' => array(
-            601 => array( 'name' => \MapasCulturais\i::__('Instituição Pública Federal exclusivamente voltada para formação artistica e cultural' )),
-            602 => array( 'name' => \MapasCulturais\i::__('Instituição Pública Estadual exclusivamente voltada para formação artistica e cultural' )),
-            603 => array( 'name' => \MapasCulturais\i::__('Instituição Pública Municipal exclusivamente voltada para formação artistica e cultural' )),
-            604 => array( 'name' => \MapasCulturais\i::__('Instituição Pública Distrital exclusivamente voltada para formação artistica e cultural' )),
+            601 => array( 'name' => \MapasCulturais\i::__('Instituição Pública Federal exclusivamente voltada para formação artistica e cultural')),
+            602 => array( 'name' => \MapasCulturais\i::__('Instituição Pública Estadual exclusivamente voltada para formação artistica e cultural')),
+            603 => array( 'name' => \MapasCulturais\i::__('Instituição Pública Municipal exclusivamente voltada para formação artistica e cultural')),
+            604 => array( 'name' => \MapasCulturais\i::__('Instituição Pública Distrital exclusivamente voltada para formação artistica e cultural')),
           )
     ),
 
    \MapasCulturais\i::__('Instituições Privadas exclusivamente voltada para formação artistica e cultural') => array(
         'range' => array(700,799),
         'items' => array(
-            700 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Particular exclusivamente voltada para formação artistica e cultural' )),
-            701 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Comunitária exclusivamente voltada para formação artistica e cultural' )),
-            702 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Confessional exclusivamente voltada para formação artistica e cultural' )),
-            703 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Filantrópica exclusivamente voltada para formação artistica e cultural' )),
+            700 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Particular exclusivamente voltada para formação artistica e cultural')),
+            701 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Comunitária exclusivamente voltada para formação artistica e cultural')),
+            702 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Confessional exclusivamente voltada para formação artistica e cultural')),
+            703 => array( 'name' => \MapasCulturais\i::__('Instituição Privada Filantrópica exclusivamente voltada para formação artistica e cultural')),
           )
     ),
 
    \MapasCulturais\i::__('Escolas livres') => array(
         'range' => array(800,899),
         'items' => array(
-            800 => array( 'name' => \MapasCulturais\i::__('Escola livre de Artes Cênicas' )),
-            801 => array( 'name' => \MapasCulturais\i::__('Escola livre de Artes Visuais' )),
-            802 => array( 'name' => \MapasCulturais\i::__('Escola livre de Audiovisual' )),
-            803 => array( 'name' => \MapasCulturais\i::__('Escola livre de Hip Hop' )),
-            804 => array( 'name' => \MapasCulturais\i::__('Escola livre de Cultura Digital' )),
-            805 => array( 'name' => \MapasCulturais\i::__('Escola livre de Música' )),
-            806 => array( 'name' => \MapasCulturais\i::__('Escola livre de Cultura Popular' )),
-            807 => array( 'name' => \MapasCulturais\i::__('Escola livre de Gestão Cultural' )),
+            800 => array( 'name' => \MapasCulturais\i::__('Escola livre de Artes Cênicas')),
+            801 => array( 'name' => \MapasCulturais\i::__('Escola livre de Artes Visuais')),
+            802 => array( 'name' => \MapasCulturais\i::__('Escola livre de Audiovisual')),
+            803 => array( 'name' => \MapasCulturais\i::__('Escola livre de Hip Hop')),
+            804 => array( 'name' => \MapasCulturais\i::__('Escola livre de Cultura Digital')),
+            805 => array( 'name' => \MapasCulturais\i::__('Escola livre de Música')),
+            806 => array( 'name' => \MapasCulturais\i::__('Escola livre de Cultura Popular')),
+            807 => array( 'name' => \MapasCulturais\i::__('Escola livre de Gestão Cultural')),
             808 => array( 'name' => \MapasCulturais\i::__('Escola livre de Pontinhos de cultura') ),
-            809 => array( 'name' => \MapasCulturais\i::__('Escola livre de Patrimônio' )),
-            810 => array( 'name' => \MapasCulturais\i::__('Escola livre de Design' )),
+            809 => array( 'name' => \MapasCulturais\i::__('Escola livre de Patrimônio')),
+            810 => array( 'name' => \MapasCulturais\i::__('Escola livre de Design')),
           )
     ),
 
@@ -208,25 +208,24 @@
     \MapasCulturais\i::__('Bens culturais de natureza material') => array(
         'range' => array(200, 299),
         'items' => array(
-            200 => array( 'name' => \MapasCulturais\i::__('Bens culturais de natureza material' )),
-            201 => array( 'name' => \MapasCulturais\i::__('Bem Imóvel' )),
-            202 => array( 'name' => \MapasCulturais\i::__('Bem Arqueológico' )),
-            203 => array( 'name' => \MapasCulturais\i::__('Bem Paisagístico' )),
-            204 => array( 'name' => \MapasCulturais\i::__('Bem Móvel ou Integrado' )),
-            205 => array( 'name' => \MapasCulturais\i::__('Sitio Histórico' )),
-            206 => array( 'name' => \MapasCulturais\i::__('Documentação' )),
-            207 => array( 'name' => \MapasCulturais\i::__('Coleções' )),
-
-            210 => array( 'name' => \MapasCulturais\i::__('Bens culturais de natureza imaterial' )), // adicionado na importação dos dados do Ceará para receber as endidades do tipo "patrimonio-imaterial"
-
-            299 => array( 'name' => \MapasCulturais\i::__('Outros' )) // adicionado na importação dos dados do Ceará para receber as endidades do tipo "post"
+            200 => array( 'name' => \MapasCulturais\i::__('Bens culturais de natureza material')),
+            201 => array( 'name' => \MapasCulturais\i::__('Bem Imóvel')),
+            202 => array( 'name' => \MapasCulturais\i::__('Bem Arqueológico')),
+            203 => array( 'name' => \MapasCulturais\i::__('Bem Paisagístico')),
+            204 => array( 'name' => \MapasCulturais\i::__('Bem Móvel ou Integrado')),
+            210 => array( 'name' => \MapasCulturais\i::__('Bens culturais de natureza imaterial')), // adicionado na importação dos dados do Ceará para receber as endidades do tipo "patrimonio-imaterial"
+            207 => array( 'name' => \MapasCulturais\i::__('Coleções')),
+            206 => array( 'name' => \MapasCulturais\i::__('Documentação')),
+            205 => array( 'name' => \MapasCulturais\i::__('Sitio Histórico')),
+
+            299 => array( 'name' => \MapasCulturais\i::__('Outros')) // adicionado na importação dos dados do Ceará para receber as endidades do tipo "post"
         )
     ),
 
     \MapasCulturais\i::__('Temporário') => array(
         'range' => array(500,600),
         'items' => array(
-            501 => array( 'name' => \MapasCulturais\i::__('Palco de Rua' )),
+            501 => array( 'name' => \MapasCulturais\i::__('Palco de Rua')),
         )
     ),
 );

From 71f96396b6ab4c74440bc1498438a6e6980f7c36 Mon Sep 17 00:00:00 2001
From: Welington De Lima Olegario <wolegario49@gmail.com>
Date: Fri, 14 Jun 2024 11:16:35 -0300
Subject: [PATCH 53/68] Aplica PHP doc para a propriedade $alth no sigleton App

---
 src/core/App.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/App.php b/src/core/App.php
index 5a38354141..a945563e9b 100644
--- a/src/core/App.php
+++ b/src/core/App.php
@@ -62,6 +62,7 @@
  * @property-read Slim\App $slim instância do Slim
  * @property-read Hooks $hooks gerenciador de hooks
  * @property-read EntityManager $em Doctrine Entity Manager
+ * @property-read AuthProvider $auth Auth provider
  * @property-read string $siteName nome do site
  * @property-read string $siteDescription descrição do site
  * @property-read string $currentLCode código da linguagem configurada. ex: pt_BR

From da5d181b80eb783c1189fa7fe7c3925bd1fe869e Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Fri, 14 Jun 2024 11:25:16 -0300
Subject: [PATCH 54/68] Atualiza CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2d922d502..7efbc0628c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Corrige endpoit apiFindRegistrations para que um usuario comum posso ver as inscrições na fase de publicação de resultado
 - Corrige formulário de inscriçào em casos onde foi configurado tipo de proponente ou faixa após envio de inscrições
 - Ajusta distribução de avaliações através dos finais das inscrições para que seja possível usar mais caracteres
+- Evita que seja possível selecionar sub-agentes como administradores de entidades
+- Corrige atualização do campo pessoa idosa
+- Ordena os termos das entidades em ordem alfabética
 
 ## [7.4.4] 2024-06-12
 ### Correções

From 8911b9e3abab3d1ec2440c31b2835746a787836c Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Fri, 14 Jun 2024 12:11:43 -0300
Subject: [PATCH 55/68] melhora retorno do endpoint enqueuePCache

---
 src/core/Traits/ControllerEntityActions.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/Traits/ControllerEntityActions.php b/src/core/Traits/ControllerEntityActions.php
index ffec686a62..42d225fc8d 100644
--- a/src/core/Traits/ControllerEntityActions.php
+++ b/src/core/Traits/ControllerEntityActions.php
@@ -69,6 +69,8 @@ public function ALL_enqueuePCache() {
         }
 
         $entity->enqueueToPCacheRecreation($users);
+
+        $this->json(true);
     }
 
     /**

From 8bd46bde173e5eeb8375c342f7ddb6ed5892d917 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Fri, 14 Jun 2024 12:34:47 -0300
Subject: [PATCH 56/68] =?UTF-8?q?corrige=20mensagens=20de=20erro=20de=20va?=
 =?UTF-8?q?lida=C3=A7=C3=A3o=20da=20=C3=A1rea=20de=20interesse=20das=20opo?=
 =?UTF-8?q?rtunidades?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                |  1 +
 src/core/Traits/ControllerEntityActions.php |  7 -------
 src/modules/Opportunities/Module.php        | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b93ea74a0a..bc5e02e9d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Corrige formulário de inscriçào em casos onde foi configurado tipo de proponente ou faixa após envio de inscrições
 - Ajusta distribução de avaliações através dos finais das inscrições para que seja possível usar mais caracteres
 - Só exibe categoria, tipo de proponente e faixa quando há essa informação na inscrição
+- Validação da área de interesse das fases de coleta de dados
 
 ## [7.4.4] 2024-06-12
 ### Correções
diff --git a/src/core/Traits/ControllerEntityActions.php b/src/core/Traits/ControllerEntityActions.php
index 42d225fc8d..4a500cc161 100644
--- a/src/core/Traits/ControllerEntityActions.php
+++ b/src/core/Traits/ControllerEntityActions.php
@@ -107,13 +107,6 @@ function POST_index($data = null) {
         }
 
         if($errors = $entity->validationErrors){
-            if ($entity->getEntityType() == 'Opportunity' && in_array("term-area", array_keys($errors)) && $errors['term-area']) {
-                foreach($errors['term-area'] as &$termError) {
-                    if(strpos($termError, i::__('área de atuação')) !== false) {
-                        $termError = str_replace(i::__('área de atuação'), i::__('área de interesse'), $termError);
-                    }
-                }
-            }
             $this->errorJson($errors);
         }else{
             $this->_finishRequest($entity, true);
diff --git a/src/modules/Opportunities/Module.php b/src/modules/Opportunities/Module.php
index 6c36a31a6a..a2709f0d9e 100644
--- a/src/modules/Opportunities/Module.php
+++ b/src/modules/Opportunities/Module.php
@@ -33,6 +33,23 @@ function _init(){
         $app->registerJobType(new Jobs\PublishResult(Jobs\PublishResult::SLUG));
         $app->registerJobType(new Jobs\UpdateSummaryCaches(Jobs\UpdateSummaryCaches::SLUG));
 
+
+        // ajusta validação da área de interesse
+        $app->hook('entity(Opportunity).validationErrors', function(&$errors) use ($app){
+            /** @var Opportunity $this */
+            if(isset($errors['term-area'])) {
+                if($this->parent){
+                    unset($errors['term-area']);
+                } else {
+                    foreach($errors['term-area'] as &$termError) {
+                        if(strpos($termError, i::__('área de atuação')) !== false) {
+                            $termError = str_replace(i::__('área de atuação'), i::__('área de interesse'), $termError);
+                        }
+                    }
+                }
+            }
+        });
+
         // atualiza o cache dos resumos das fase de avaliação
         $app->hook("entity(Registration).sent:before", function() use ($app) {
             /** @var Registration $this */

From 3d88a4d90d6b9be0d0dacf87b212660e3db746d8 Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Fri, 14 Jun 2024 12:37:04 -0300
Subject: [PATCH 57/68] =?UTF-8?q?Corrige=20serializa=C3=A7=C3=A3o=20de=20r?=
 =?UTF-8?q?oles=20do=20usu=C3=A1rio=20logado=20que=20as=20vezes=20estava?=
 =?UTF-8?q?=20quebrando=20a=20p=C3=A1gina=20de=20gest=C3=A3o=20de=20usu?=
 =?UTF-8?q?=C3=A1rios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      | 1 +
 src/modules/Components/Module.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc5e02e9d9..9a42f31fa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Ajusta distribução de avaliações através dos finais das inscrições para que seja possível usar mais caracteres
 - Só exibe categoria, tipo de proponente e faixa quando há essa informação na inscrição
 - Validação da área de interesse das fases de coleta de dados
+- Serialização de roles do usuário logado as vezes quebrando a página de gestão de usuários
 
 ## [7.4.4] 2024-06-12
 ### Correções
diff --git a/src/modules/Components/Module.php b/src/modules/Components/Module.php
index 13826a95e6..14014b4a7b 100644
--- a/src/modules/Components/Module.php
+++ b/src/modules/Components/Module.php
@@ -90,7 +90,7 @@ function _init()
                 }
             }
             
-            $this->jsObject['currentUserRoles'] = array_unique($roles);
+            $this->jsObject['currentUserRoles'] = array_values(array_unique($roles));
 
             /* Definindo entidades desligadas */
             $entities = ['agents', 'events', 'projects', 'opportunities', 'spaces', 'seals', 'subsites', 'apps'];

From 479f83121e2df494f9ab988114c0f1a4e3b9767a Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Fri, 14 Jun 2024 12:38:33 -0300
Subject: [PATCH 58/68] =?UTF-8?q?Adiciona=20bot=C3=A3o=20para=20saasSuperA?=
 =?UTF-8?q?dmins=20regerarem=20o=20cache=20de=20permiss=C3=A3o=20das=20ent?=
 =?UTF-8?q?idades=20na=20p=C3=A1gina=20de=20gest=C3=A3o=20de=20um=20usu?=
 =?UTF-8?q?=C3=A1rio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                      |  1 +
 .../components/registration-card/template.php     |  1 +
 .../components/panel--entity-tabs/template.php    |  6 +++++-
 .../user-management--ownership-tabs/script.js     | 15 +++++++++++++++
 .../user-management--ownership-tabs/template.php  |  9 +++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a42f31fa4..ea7c0a7133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [unreleased]
 ### Melhorias
 - Melhora exibição do header da tabela de publicação de resultados
+- Botão para recriar caches de permissão das entidades na página de gestão de usuários
 
 ### Correções
 - Corrige erro no carregamento da single de projetos
diff --git a/src/modules/Opportunities/components/registration-card/template.php b/src/modules/Opportunities/components/registration-card/template.php
index 39122f22ac..c103b9f3b8 100644
--- a/src/modules/Opportunities/components/registration-card/template.php
+++ b/src/modules/Opportunities/components/registration-card/template.php
@@ -71,6 +71,7 @@
             <div v-if="!pictureCard" class="status">
                 {{status}}
             </div>
+            <slot name="entity-actions-left" :entity="entity"></slot>
         </div>
         <div class="right">
             <slot name="button" :entity="entity">
diff --git a/src/modules/Panel/components/panel--entity-tabs/template.php b/src/modules/Panel/components/panel--entity-tabs/template.php
index f3a5637e99..abddb6c250 100644
--- a/src/modules/Panel/components/panel--entity-tabs/template.php
+++ b/src/modules/Panel/components/panel--entity-tabs/template.php
@@ -78,7 +78,11 @@
             <template #default="{entities}">
                 <slot name='before-list' :entities="entities" :query="queries['<?=$status?>']"></slot>
                 <slot v-for="entity in entities" :key="entity.__objectId" :entity="entity" :moveEntity="moveEntity">
-                    <registration-card v-if="entity.__objectType=='registration'" :entity="entity" pictureCard hasBorders class="panel__row"></registration-card>
+                    <registration-card v-if="entity.__objectType=='registration'" :entity="entity" pictureCard hasBorders class="panel__row">
+                        <template #entity-actions-left>
+                            <slot name="entity-actions-left" :entity="entity"></slot>
+                        </template>
+                    </registration-card>
                     <panel--entity-card  v-if="entity.__objectType!='registration'" :key="entity.id" :entity="entity" 
                         @undeleted="moveEntity(entity, $event)" 
                         @deleted="moveEntity(entity, $event)" 
diff --git a/src/modules/UserManagement/components/user-management--ownership-tabs/script.js b/src/modules/UserManagement/components/user-management--ownership-tabs/script.js
index 8acf8721f2..519d05a372 100644
--- a/src/modules/UserManagement/components/user-management--ownership-tabs/script.js
+++ b/src/modules/UserManagement/components/user-management--ownership-tabs/script.js
@@ -42,6 +42,12 @@ app.component('user-management--ownership-tabs', {
             default: 'id,name,status,subsite.name,files'
         },
     },
+
+    data() {
+        return {
+            recreatingPCache: false
+        };
+    },
     computed: {
         newSelect() {
             if(this.type=='registration') {
@@ -52,4 +58,13 @@ app.component('user-management--ownership-tabs', {
         },
 
     },
+
+    methods: {
+        recreatePCache(entity) {
+            entity.recreatingPCache = true;
+            entity.POST('enqueuePCache',{callback: () => {
+                entity.recreatingPCache = false;
+            }});
+        }
+    }
 });
diff --git a/src/modules/UserManagement/components/user-management--ownership-tabs/template.php b/src/modules/UserManagement/components/user-management--ownership-tabs/template.php
index 613c69aada..080f4bb610 100644
--- a/src/modules/UserManagement/components/user-management--ownership-tabs/template.php
+++ b/src/modules/UserManagement/components/user-management--ownership-tabs/template.php
@@ -10,7 +10,16 @@
     mc-link
     panel--entity-actions
     panel--entity-tabs
+    mc-loading
+    mc-icon
 ');
 ?>
 <panel--entity-tabs tabs="publish,draft,trash,archived" :type='type' :user="user.id" :select="newSelect">
+    <template v-if="global.auth.is('saasSuperAdmin')" #entity-actions-left="{entity}">
+        <mc-loading :condition="entity.recreatingPCache"><?= i::__('processando...') ?></mc-loading>
+        <button v-if="!entity.recreatingPCache" class="button button-secondary button--sm" @click="recreatePCache(entity)">
+            <mc-icon name="settings"></mc-icon>
+            <?= i::__('recriar pcache') ?>
+        </button>
+    </template>
 </panel--entity-tabs>

From fc252ab5df40dcd3cafd1b62588f5ef104a2e20f Mon Sep 17 00:00:00 2001
From: Rafael Chaves Freitas <rafael.chaves.freitas@gmail.com>
Date: Fri, 14 Jun 2024 12:39:04 -0300
Subject: [PATCH 59/68] mapeamento do subsite na entidade Opportunity

---
 src/core/Entities/Opportunity.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/core/Entities/Opportunity.php b/src/core/Entities/Opportunity.php
index 0f9441e178..c316859ce8 100644
--- a/src/core/Entities/Opportunity.php
+++ b/src/core/Entities/Opportunity.php
@@ -275,6 +275,16 @@ abstract class Opportunity extends \MapasCulturais\Entity
      * @ORM\Column(name="subsite_id", type="integer", nullable=true)
      */
     protected $_subsiteId;
+    
+    /**
+    * @var \MapasCulturais\Entities\Subsite
+    *
+    * @ORM\ManyToOne(targetEntity="MapasCulturais\Entities\Subsite")
+    * @ORM\JoinColumns({
+    *   @ORM\JoinColumn(name="subsite_id", referencedColumnName="id", nullable=true, onDelete="SET NULL")
+    * })
+    */
+   protected $subsite;
 
     /**
      * @var string

From e6f14aa9725ff6edf203b80c486cfc23ee0fd28e Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Fri, 14 Jun 2024 17:00:31 -0300
Subject: [PATCH 60/68] =?UTF-8?q?Adiciona=20os=20metadados=20'registration?=
 =?UTF-8?q?Ranges'=20e=20'registrationProponentTypes'=20na=20exporta=C3=A7?=
 =?UTF-8?q?=C3=A3o=20do=20formul=C3=A1rio=20(Ref.:=20#3199)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/Controllers/Opportunity.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/Controllers/Opportunity.php b/src/core/Controllers/Opportunity.php
index c4b95f3bcb..3f5c722e8f 100644
--- a/src/core/Controllers/Opportunity.php
+++ b/src/core/Controllers/Opportunity.php
@@ -1059,7 +1059,9 @@ function GET_exportFields() {
             'introInscricoes',
             'useSpaceRelationIntituicao',
             'registrationSeals',
-            'registrationLimit'
+            'registrationLimit',
+            'registrationRanges',
+            'registrationProponentTypes',
         );
 
         $metadata = [];

From 63bdf561f9c5dd28d13701a68ee317aa558c7f04 Mon Sep 17 00:00:00 2001
From: Raul Vitor Lucena Brito <raulvitorcc@gmail.com>
Date: Fri, 14 Jun 2024 17:00:52 -0300
Subject: [PATCH 61/68] =?UTF-8?q?Adiciona=20os=20metadados=20'registration?=
 =?UTF-8?q?Ranges'=20e=20'registrationProponentTypes'=20na=20importa=C3=A7?=
 =?UTF-8?q?=C3=A3o=20de=20formul=C3=A1rios=20(Ref.:=20#3199)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/Entities/Opportunity.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/Entities/Opportunity.php b/src/core/Entities/Opportunity.php
index c316859ce8..786764b9be 100644
--- a/src/core/Entities/Opportunity.php
+++ b/src/core/Entities/Opportunity.php
@@ -819,6 +819,8 @@ function importFields($importSource) {
                 $newField->displayOrder = $field->displayOrder;
                 $newField->conditional = $field->conditional;
                 $newField->conditionalValue = $field->conditionalValue;
+                $newField->proponentTypes = $field->proponentTypes;
+                $newField->registrationRanges = $field->registrationRanges;
 
                 $field->newField = $newField;
 
@@ -860,6 +862,8 @@ function importFields($importSource) {
                 $newFile->displayOrder = $file->displayOrder;
                 $newFile->conditional = $file->conditional;
                 $newFile->conditionalValue = $file->conditionalValue;
+                $newFile->proponentTypes = $field->proponentTypes;
+                $newField->registrationRanges = $field->registrationRanges;
 
                 $app->em->persist($newFile);
 

From 3bcf75cd6f4aeb2b628e895b76fe49e860de48c7 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Fri, 14 Jun 2024 17:08:19 -0300
Subject: [PATCH 62/68] Implementa mc-update para garantir que o campo de
 pessoa idosa corresponda com a data de nascimento fornecida

---
 src/mc-updates.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/mc-updates.php b/src/mc-updates.php
index d3e15e7e57..3f7c609f89 100644
--- a/src/mc-updates.php
+++ b/src/mc-updates.php
@@ -1,10 +1,11 @@
 <?php
 
+use MapasCulturais\i;
 use MapasCulturais\App;
+use MapasCulturais\Utils;
+use MapasCulturais\Entities\Agent;
 use MapasCulturais\Entities\Opportunity;
 use MapasCulturais\Entities\Registration;
-use MapasCulturais\i;
-use MapasCulturais\Utils;
 
 return [
     'recreate pcache' => function () {
@@ -437,5 +438,21 @@
                 $opportunity->enqueueRegistrationSync();
             }
         });
+    },
+    'Atualiza campo pessoa idosa' => function() {
+        DB_UPDATE::enqueue(Agent::class, "id > 0", function (Agent $agent) {
+            $app = \MapasCulturais\App::i();
+            $app->disableAccessControl();
+            if ($agent->dataDeNascimento) {
+                $today = new \DateTime('now');
+                $calc = (new \DateTime($agent->dataDeNascimento))->diff($today);
+                $idoso = ($calc->y >= 60) ? "1" : "0";
+                if($agent->idoso != $idoso){
+                    $agent->idoso = $idoso;
+                    $agent->save(true);
+                }
+            } 
+            $app->enableAccessControl();
+        });
     }
 ];

From 0be7455080fd3bb4d0a862384a6de012de46e12b Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Fri, 14 Jun 2024 17:10:16 -0300
Subject: [PATCH 63/68] Implementa mc-update para garantir que o campo de
 pessoa idosa corresponda com a data de nascimento fornecida

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e60cd26638..9047d2818c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Só exibe categoria, tipo de proponente e faixa quando há essa informação na inscrição
 - Validação da área de interesse das fases de coleta de dados
 - Serialização de roles do usuário logado as vezes quebrando a página de gestão de usuários
+- Implementa mc-update para garantir/corrigir que o campo de pessoa idosa corresponda com a data de nascimento fornecida no cadastro do agente
 
 ## [7.4.4] 2024-06-12
 ### Correções

From aad28e7cb1cfa2af6e0eebba4e091943bc6dcf09 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Fri, 14 Jun 2024 17:11:51 -0300
Subject: [PATCH 64/68] Atualiza CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9047d2818c..60ed3dcc5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Validação da área de interesse das fases de coleta de dados
 - Serialização de roles do usuário logado as vezes quebrando a página de gestão de usuários
 - Implementa mc-update para garantir/corrigir que o campo de pessoa idosa corresponda com a data de nascimento fornecida no cadastro do agente
+- Ajusta importação e exportação do formulário para garantir que as faixas e tipos de proponentes sejam enviados
 
 ## [7.4.4] 2024-06-12
 ### Correções

From 5d2bf59307c933d026071a11130622184f4367fa Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Mon, 17 Jun 2024 10:17:08 -0300
Subject: [PATCH 65/68] =?UTF-8?q?Corrige=20valida=C3=A7=C3=A3o=20de=20erro?=
 =?UTF-8?q?s=20dos=20metadados=20de=20inscri=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                       | 1 +
 src/core/Traits/EntityMetadata.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60ed3dcc5e..26e70e35de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Serialização de roles do usuário logado as vezes quebrando a página de gestão de usuários
 - Implementa mc-update para garantir/corrigir que o campo de pessoa idosa corresponda com a data de nascimento fornecida no cadastro do agente
 - Ajusta importação e exportação do formulário para garantir que as faixas e tipos de proponentes sejam enviados
+- Corrige validação de erros dos metadados de inscrições
 
 ## [7.4.4] 2024-06-12
 ### Correções
diff --git a/src/core/Traits/EntityMetadata.php b/src/core/Traits/EntityMetadata.php
index 20764e92c9..653ce1e1b0 100644
--- a/src/core/Traits/EntityMetadata.php
+++ b/src/core/Traits/EntityMetadata.php
@@ -370,7 +370,7 @@ function getMetadataValidationErrors(){
 
             $unserialize = $metadata_definition->unserialize;
             if (is_callable($unserialize)) {
-                $val = $unserialize($val, $this);
+                $val = $unserialize($val, $this, $metadata_definition);
             }
 
             $metadata_value_errors = $metadata_definition->validate($this, $val);

From 1c7bb08eae7bd852f7e1f9cc1bcc92e9510d05d7 Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Mon, 17 Jun 2024 11:31:15 -0300
Subject: [PATCH 66/68] =?UTF-8?q?Corrige=20valida=C3=A7=C3=A3o=20de=20erro?=
 =?UTF-8?q?s=20para=20campos=20n=C3=A3o=20vis=C3=ADveis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/core/Entities/Registration.php            |  9 +++++++++
 src/modules/RegistrationFieldTypes/Module.php | 15 +++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26e70e35de..c604aadc0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Implementa mc-update para garantir/corrigir que o campo de pessoa idosa corresponda com a data de nascimento fornecida no cadastro do agente
 - Ajusta importação e exportação do formulário para garantir que as faixas e tipos de proponentes sejam enviados
 - Corrige validação de erros dos metadados de inscrições
+- Corrige validação de erros para campos não visíveis
 
 ## [7.4.4] 2024-06-12
 ### Correções
diff --git a/src/core/Entities/Registration.php b/src/core/Entities/Registration.php
index 88b74b52a1..8b6a7752e4 100644
--- a/src/core/Entities/Registration.php
+++ b/src/core/Entities/Registration.php
@@ -1015,6 +1015,12 @@ function isFieldVisisble(RegistrationFieldConfiguration|RegistrationFileConfigur
             return false;
         }
 
+        if($field->conditional){
+            $_fied_name = $field->conditionalField;
+            $_fied_value = $field->conditionalValue;
+            return $this->$_fied_name == $_fied_value;
+        }
+
         return true;
     }
 
@@ -1114,6 +1120,8 @@ function getSendValidationErrors(string $field_prefix = 'field_', $file_prefix =
             }
 
             $field_required = $rfc->required;
+            
+            /** @todo Verificar se este if ainda é necessário após a implementação do isFieldVisisble()*/
             if($rfc->conditional){
                 $_fied_name = $rfc->conditionalField;
                 $_fied_value = $rfc->conditionalValue;
@@ -1145,6 +1153,7 @@ function getSendValidationErrors(string $field_prefix = 'field_', $file_prefix =
             $field_name = $field_prefix . $field->id;
             $field_required = $field->required;
             
+            /** @todo Verificar se este if ainda é necessário após a implementação do isFieldVisisble()*/
             if($metadata_definition && $metadata_definition->config && $metadata_definition->config['registrationFieldConfiguration'] && $metadata_definition->config['registrationFieldConfiguration']->conditional){
                 $conf =  $metadata_definition->config['registrationFieldConfiguration'];
               
diff --git a/src/modules/RegistrationFieldTypes/Module.php b/src/modules/RegistrationFieldTypes/Module.php
index 0012381770..a65f0c71ac 100644
--- a/src/modules/RegistrationFieldTypes/Module.php
+++ b/src/modules/RegistrationFieldTypes/Module.php
@@ -48,6 +48,21 @@ public function _init()
             $module->entities = [];
         });
 
+        $app->hook("entity(Registration).validationErrors", function(&$errors) use($module, $app) {
+            /** @var Registration $this */
+
+            $fields = $this->opportunity->registrationFieldConfigurations;
+            foreach($errors as $field_name => $error) {
+                foreach($fields as $field) {
+                    if($field->fieldName == $field_name) {
+                        if(!$this->isFieldVisisble($field)) {
+                            unset($errors[$field_name]);
+                        }
+                    }
+                }
+            }
+        });
+
         $app->hook("entity(Registration).save:before", function() use($module, $app) {
             /** @var Registration $this */
             $fix_field = function($entity, $field) use($module){

From 2b50991f2abbb2e8ab7763505061e0eebe7cafdb Mon Sep 17 00:00:00 2001
From: erleibiazzio <erleibiazzio@gmail.com>
Date: Mon, 17 Jun 2024 11:32:12 -0300
Subject: [PATCH 67/68] =?UTF-8?q?Vers=C3=A3o=207.4.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c604aadc0d..6f06572a78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ Todas as mudanças notáveis no projeto serão documentadas neste arquivo.
 O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.0.0/)
 e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [unreleased]
+## [7.4.5] - 2024-06-17
 ### Melhorias
 - Melhora exibição do header da tabela de publicação de resultados
 - Botão para recriar caches de permissão das entidades na página de gestão de usuários

From 6964e784ece5c5d005576efe119e50cccc2bda30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20Magalh=C3=A3es?= <victor.magalhaesp@gmail.com>
Date: Wed, 19 Jun 2024 08:12:11 -0300
Subject: [PATCH 68/68] Feature/dashboards search (#222)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: adiciona componente dashboard agent

* feat: add cards indicadores agentes

* feat: add hook tabs espaços

* feat: add tabs e cards para espaços

* feat: adiciona config dos cards nas configs do plugin

* feat: separa cards home e entidades

* feat: add regra contagem agente ultimos 7 dias card entidade

* feat: add id para os cards

* feat: add class para ícone card config

* feat: remove cards espaços

* feat: adiciona config cards home e entidades
---
 config/Metabase.php                           | 229 +++++++++++++++++-
 dev/config.d/Metabase.php                     | 229 +++++++++++++++++-
 .../Search/components/search/template.php     |   5 +-
 src/modules/Search/views/search/agent.php     |   3 +
 src/modules/Search/views/search/space.php     |   2 +
 src/plugins/Metabase/Plugin.php               |  86 ++-----
 src/plugins/Metabase/README.md                |  82 +++++++
 .../sass/4-components/_entity-cards.scss      | 126 ++++++++++
 .../assets-src/sass/plugin-metabase.scss      |   1 +
 .../Metabase/assets/css/plugin-metabase.css   |   2 +-
 .../components/entity-cards/README.md         |  47 ++++
 .../Metabase/components/entity-cards/init.php |  25 ++
 .../components/entity-cards/script.js         |  61 +++++
 .../components/entity-cards/template.php      |  29 +++
 .../components/entity-cards/texts.php         |   5 +
 .../components/home-metabase/init.php         |   3 +-
 .../components/search-dashboard/README.md     |  47 ++++
 .../components/search-dashboard/init.php      |   5 +
 .../components/search-dashboard/script.js     |  50 ++++
 .../components/search-dashboard/template.php  |  18 ++
 .../components/search-dashboard/texts.php     |   6 +
 .../layouts/parts/search-tabs/agent.php       |  19 ++
 .../parts/search-tabs/entity-agent-cards.php  |  14 ++
 .../parts/search-tabs/entity-space-cards.php  |  14 ++
 .../layouts/parts/search-tabs/space.php       |  19 ++
 25 files changed, 1053 insertions(+), 74 deletions(-)
 create mode 100644 src/plugins/Metabase/assets-src/sass/4-components/_entity-cards.scss
 create mode 100644 src/plugins/Metabase/components/entity-cards/README.md
 create mode 100644 src/plugins/Metabase/components/entity-cards/init.php
 create mode 100644 src/plugins/Metabase/components/entity-cards/script.js
 create mode 100644 src/plugins/Metabase/components/entity-cards/template.php
 create mode 100644 src/plugins/Metabase/components/entity-cards/texts.php
 create mode 100644 src/plugins/Metabase/components/search-dashboard/README.md
 create mode 100644 src/plugins/Metabase/components/search-dashboard/init.php
 create mode 100644 src/plugins/Metabase/components/search-dashboard/script.js
 create mode 100644 src/plugins/Metabase/components/search-dashboard/template.php
 create mode 100644 src/plugins/Metabase/components/search-dashboard/texts.php
 create mode 100644 src/plugins/Metabase/layouts/parts/search-tabs/agent.php
 create mode 100644 src/plugins/Metabase/layouts/parts/search-tabs/entity-agent-cards.php
 create mode 100644 src/plugins/Metabase/layouts/parts/search-tabs/entity-space-cards.php
 create mode 100644 src/plugins/Metabase/layouts/parts/search-tabs/space.php

diff --git a/config/Metabase.php b/config/Metabase.php
index 62ff9b5637..01fb009e7c 100644
--- a/config/Metabase.php
+++ b/config/Metabase.php
@@ -7,19 +7,242 @@
                 'painel-agentes' => [
                     'link' => 'https://metabase.mapas.tec.br/public/dashboard/898173be-47ae-4987-894c-b7e54914539c',
                     'text' => 'Saiba os números de agentes individuais cadastrados, quantos são criados mensalmente, por onde estão distribuídos no território e outras informações.',
-                    'title' => 'Painel sobre agentes individuais'
+                    'title' => 'Painel sobre agentes individuais',
+                    'entity' => 'Agent'
                 ],
                 'painel-espacos' => [
                     'link' => 'https://metabase.mapas.tec.br/public/dashboard/ea36c1b3-c3f3-4435-afc6-9faeea4c7c8f',
                     'text' => 'Saiba os números de espaços cadastrados, quantos são criados mensalmente, por onde estão distribuídos no território e outras informações.',
-                    'title' => 'Painel sobre espaços'
+                    'title' => 'Painel sobre espaços',
+                    'entity' => 'Space'
                 ],
                 'painel-oportunidades' => [
                     'link' => 'https://metabase.mapas.tec.br/public/dashboard/496d0b03-0476-4497-9a3d-719198cfe083',
                     'text' => 'Tenha acesso ao número de oportunidades e editais cadastrados, a quantidade de pessoas participantes inscritas, o perfil demográfico e mais informações.',
-                    'title' => 'Painel sobre oportunidades'
+                    'title' => 'Painel sobre oportunidades',
+                    'entity' => 'Opportunity'
                 ],
             ],
+            'cards' => [
+                    'home' => [
+                        [
+                            'type' => 'space',
+                            'label' => '',
+                            'icon'=> 'space',
+                            'iconClass'=> 'space__color',
+                            'panelLink'=> 'painel-espacos',
+                            'data'=> [
+                                [
+                                    'icon'=> 'space',
+                                    'label' => 'Espaços cadastrados',
+                                    'entity' => 'MapasCulturais\\Entities\\Space',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'type' => 'space',
+                            'label' => '',
+                            'icon'=> 'space',
+                            'iconClass'=> 'space__color',
+                            'panelLink'=> 'painel-espacos',
+                            'data'=> [
+                                [
+                                    'icon'=> 'space',
+                                    'label'=> 'Espaços certificados',
+                                    'entity'=> 'MapasCulturais\\Entities\\Space',
+                                    'query'=> [
+                                        '@verified'=> 1
+                                    ],
+                                    'value'=> null
+                                ]
+                            ]
+                        ],
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes cadastrados',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes individuais',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => ['type' => 'EQ(1)'],
+                                    'value' => null
+                                ],
+                            ]
+                        ], 
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes coletivos',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => ['type' => 'EQ(2)'],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        // opportunity
+                        [
+                            'type' => 'opportunity',
+                            'label' => 'Oportunidades',
+                            'icon'=> 'opportunity',
+                            'iconClass'=> 'opportunity__color',
+                            'panelLink'=> 'painel-oportunidades',
+                            'data'=> [
+                                [
+                                    'label' => 'Oportunidades criadas',
+                                    'entity' => 'MapasCulturais\\Entities\\Opportunity',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                                [
+                                    'label' => 'Oportunidades certificadas',
+                                    'entity' => 'MapasCulturais\\Entities\\Opportunity',
+                                    'query'=> [
+                                        '@verified'=> 1
+                                    ],
+                                    'value' => null
+                                ],
+                            ]
+                        ]
+                            
+                    ],
+                    'entities' => [
+                        [
+                            'id' => 'espacos-cadastrados',
+                            'type' => 'space',
+                            'label' => '',
+                            'icon'=> 'space',
+                            'iconClass'=> 'space__color',
+                            'panelLink'=> 'painel-espacos',
+                            'data'=> [
+                                [
+                                    'icon'=> 'space',
+                                    'label' => 'Espaços cadastrados',
+                                    'entity' => 'MapasCulturais\\Entities\\Space',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'id' => 'espacos-certificados',
+                            'type' => 'space',
+                            'label' => '',
+                            'icon'=> 'space',
+                            'iconClass'=> 'space__color',
+                            'panelLink'=> 'painel-espacos',
+                            'data'=> [
+                                [
+                                    'icon'=> 'space',
+                                    'label'=> 'Espaços certificados',
+                                    'entity'=> 'MapasCulturais\\Entities\\Space',
+                                    'query'=> [
+                                        '@verified'=> 1
+                                    ],
+                                    'value'=> null
+                                ]
+                            ]
+                        ],
+                        [
+                            'id' => 'agentes-cadastrados',
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes cadastrados',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'id' => 'agentes-individuais',
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes individuais',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => ['type' => 'EQ(1)'],
+                                    'value' => null
+                                ],
+                            ]
+                        ], 
+                        [
+                            'id' => 'agentes-coletivos',
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes coletivos',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => ['type' => 'EQ(2)'],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'id' => 'agentes-cadastrados-7-dias',
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Cadastrados nos últimos 7 dias',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query'=> [
+                                        '@select' => 'createTimestamp'
+                                    ],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                    ]
+                
+            ]
         ]
     ]
 ];
diff --git a/dev/config.d/Metabase.php b/dev/config.d/Metabase.php
index 62ff9b5637..6967ae669d 100644
--- a/dev/config.d/Metabase.php
+++ b/dev/config.d/Metabase.php
@@ -7,19 +7,242 @@
                 'painel-agentes' => [
                     'link' => 'https://metabase.mapas.tec.br/public/dashboard/898173be-47ae-4987-894c-b7e54914539c',
                     'text' => 'Saiba os números de agentes individuais cadastrados, quantos são criados mensalmente, por onde estão distribuídos no território e outras informações.',
-                    'title' => 'Painel sobre agentes individuais'
+                    'title' => 'Painel sobre agentes individuais',
+                    'entity' => 'Agent'
                 ],
                 'painel-espacos' => [
                     'link' => 'https://metabase.mapas.tec.br/public/dashboard/ea36c1b3-c3f3-4435-afc6-9faeea4c7c8f',
                     'text' => 'Saiba os números de espaços cadastrados, quantos são criados mensalmente, por onde estão distribuídos no território e outras informações.',
-                    'title' => 'Painel sobre espaços'
+                    'title' => 'Painel sobre espaços',
+                    'entity' => 'Space'
                 ],
                 'painel-oportunidades' => [
                     'link' => 'https://metabase.mapas.tec.br/public/dashboard/496d0b03-0476-4497-9a3d-719198cfe083',
                     'text' => 'Tenha acesso ao número de oportunidades e editais cadastrados, a quantidade de pessoas participantes inscritas, o perfil demográfico e mais informações.',
-                    'title' => 'Painel sobre oportunidades'
+                    'title' => 'Painel sobre oportunidades',
+                    'entity' => 'Opportunity'
                 ],
             ],
+            'cards' => [
+                    'home' => [
+                        [
+                            'type' => 'space',
+                            'label' => '',
+                            'icon'=> 'space',
+                            'iconClass'=> 'space__color',
+                            'panelLink'=> 'painel-espacos',
+                            'data'=> [
+                                [
+                                    'icon'=> 'space',
+                                    'label' => 'Espaços cadastrados',
+                                    'entity' => 'MapasCulturais\\Entities\\Space',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'type' => 'space',
+                            'label' => '',
+                            'icon'=> 'space',
+                            'iconClass'=> 'space__color',
+                            'panelLink'=> 'painel-espacos',
+                            'data'=> [
+                                [
+                                    'icon'=> 'space',
+                                    'label'=> 'Espaços certificados',
+                                    'entity'=> 'MapasCulturais\\Entities\\Space',
+                                    'query'=> [
+                                        '@verified'=> 1
+                                    ],
+                                    'value'=> null
+                                ]
+                            ]
+                        ],
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes cadastrados',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes individuais',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => ['type' => 'EQ(1)'],
+                                    'value' => null
+                                ],
+                            ]
+                        ], 
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes coletivos',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => ['type' => 'EQ(2)'],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        // opportunity
+                        [
+                            'type' => 'opportunity',
+                            'label' => 'Oportunidades',
+                            'icon'=> 'opportunity',
+                            'iconClass'=> 'opportunity__color',
+                            'panelLink'=> 'painel-oportunidades',
+                            'data'=> [
+                                [
+                                    'label' => 'Oportunidades criadas',
+                                    'entity' => 'MapasCulturais\\Entities\\Opportunity',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                                [
+                                    'label' => 'Oportunidades certificadas',
+                                    'entity' => 'MapasCulturais\\Entities\\Opportunity',
+                                    'query'=> [
+                                        '@verified'=> 1
+                                    ],
+                                    'value' => null
+                                ],
+                            ]
+                        ]
+                            
+                    ],
+                    'entities' => [
+                        [
+                            'type' => 'space',
+                            'label' => '',
+                            'icon'=> 'space',
+                            'iconClass'=> 'space__color',
+                            'panelLink'=> 'painel-espacos',
+                            'data'=> [
+                                [
+                                    'id' => 'espacos-cadastrados',
+                                    'icon'=> 'space',
+                                    'label' => 'Espaços cadastrados',
+                                    'entity' => 'MapasCulturais\\Entities\\Space',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'type' => 'space',
+                            'label' => '',
+                            'icon'=> 'space',
+                            'iconClass'=> 'space__color',
+                            'panelLink'=> 'painel-espacos',
+                            'data'=> [
+                                [
+                                    'id' => 'espacos-certificados',
+                                    'icon'=> 'space',
+                                    'label'=> 'Espaços certificados',
+                                    'entity'=> 'MapasCulturais\\Entities\\Space',
+                                    'query'=> [
+                                        '@verified'=> 1
+                                    ],
+                                    'value'=> null
+                                ]
+                            ]
+                        ],
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'id' => 'agentes-cadastrados',
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes cadastrados',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => [],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'id' => 'agentes-individuais',
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes individuais',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => ['type' => 'EQ(1)'],
+                                    'value' => null
+                                ],
+                            ]
+                        ], 
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'id' => 'agentes-coletivos',
+                                    'icon'=> 'agent',
+                                    'label' => 'Agentes coletivos',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query' => ['type' => 'EQ(2)'],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                        [
+                            'type' => 'agent',
+                            'label' => '',
+                            'icon'=> 'agent',
+                            'iconClass'=> 'agent__color',
+                            'panelLink'=> 'painel-agentes',
+                            'data'=> [
+                                [
+                                    'id' => 'agentes-cadastrados-7-dias',
+                                    'icon'=> 'agent',
+                                    'label' => 'Cadastrados nos últimos 7 dias',
+                                    'entity' => 'MapasCulturais\\Entities\\Agent',
+                                    'query'=> [
+                                        '@select' => 'createTimestamp'
+                                    ],
+                                    'value' => null
+                                ],
+                            ]
+                        ],
+                    ]
+                
+            ]
         ]
     ]
 ];
diff --git a/src/modules/Search/components/search/template.php b/src/modules/Search/components/search/template.php
index 5ade62b987..5b57f765a1 100644
--- a/src/modules/Search/components/search/template.php
+++ b/src/modules/Search/components/search/template.php
@@ -9,9 +9,12 @@
     mc-title
 ');
 ?>
+
+
 <div class="search">
     <mc-breadcrumb></mc-breadcrumb>
 
+    <?php $this->applyTemplateHook('search-header', 'before'); ?>
     <header class="search__header">
         <div class="search__header--content">
             <div class="search__header--content-left">
@@ -27,6 +30,6 @@
             </div>
         </div>
     </header>
-    
+    <?php $this->applyTemplateHook('search-header', 'after'); ?>
     <slot :pseudo-query="pseudoQuery" :changeTab="changeTab"></slot>
 </div>
\ No newline at end of file
diff --git a/src/modules/Search/views/search/agent.php b/src/modules/Search/views/search/agent.php
index 3fcf9156cd..09e2f1560e 100644
--- a/src/modules/Search/views/search/agent.php
+++ b/src/modules/Search/views/search/agent.php
@@ -22,6 +22,7 @@
 ]; 
 ?>
 <search page-title="<?php i::esc_attr_e('Agentes') ?>" entity-type="agent" :initial-pseudo-query="{'term:area':[]}">
+
     <template v-if="global.auth.isLoggedIn" #create-button>
         <create-agent #default="{modal}">
             <button @click="modal.open()" class="button button--primary button--icon">
@@ -37,6 +38,7 @@
                     <?= i::_e('Visualizar como:') ?>
                 </label>
             </template>
+            <?php $this->applyTemplateHook('search-tabs', 'before'); ?>
             <mc-tab icon="list" label="<?php i::esc_attr_e('Lista') ?>" slug="list">
                 <div class="search__tabs--list">
                     <search-list :pseudo-query="pseudoQuery" type="agent" select="name,type,shortDescription,files.avatar,seals,endereco,terms" >
@@ -55,6 +57,7 @@
                     </search-map>
                 </div>
             </mc-tab>
+            <?php $this->applyTemplateHook('search-tabs', 'after'); ?>
         </mc-tabs>
     </template>
 </search>
\ No newline at end of file
diff --git a/src/modules/Search/views/search/space.php b/src/modules/Search/views/search/space.php
index 39eadd5076..6d8c1e2470 100644
--- a/src/modules/Search/views/search/space.php
+++ b/src/modules/Search/views/search/space.php
@@ -37,6 +37,7 @@
                     <?= i::_e('Visualizar como:') ?>
                 </label> 
             </template>
+            <?php $this->applyTemplateHook('search-tabs', 'before'); ?>
             <mc-tab icon="list" label="<?php i::esc_attr_e('Lista') ?>" slug="list">
                 <div class="search__tabs--list">
                     <search-list :pseudo-query="pseudoQuery" type="space" select="name,type,shortDescription,files.avatar,seals,endereco,terms,acessibilidade" >
@@ -55,6 +56,7 @@
                     </search-map>
                 </div>
             </mc-tab>
+            <?php $this->applyTemplateHook('search-tabs', 'after'); ?>
         </mc-tabs>
     </template>
 </search>
\ No newline at end of file
diff --git a/src/plugins/Metabase/Plugin.php b/src/plugins/Metabase/Plugin.php
index c71f32df68..176cf1d0ba 100644
--- a/src/plugins/Metabase/Plugin.php
+++ b/src/plugins/Metabase/Plugin.php
@@ -8,70 +8,6 @@ class Plugin extends \MapasCulturais\Plugin
 {
     function __construct($config = [])
     {
-        $config += [
-            'links' => [],
-            'cards' => [
-                [
-                    'label' => 'Espaços',
-                    'icon'=> 'space',
-                    'iconClass'=> 'space__color',
-                    'panelLink'=> 'painel-espacos',
-                    'data'=> [
-                        [
-                            'label' => 'espaços cadastrados',
-                            'entity' => 'MapasCulturais\\Entities\\Space',
-                            'query' => [],
-                            'value' => null
-                        ],
-                        [
-                            'label'=> 'espaços certificados',
-                            'entity'=> 'MapasCulturais\\Entities\\Space',
-                            'query'=> [
-                                '@verified'=> 1
-                            ],
-                            'value'=> null
-                        ]
-                    ]
-                ],
-                [
-                    'label' => 'Agentes',
-                    'icon'=> 'agent-1',
-                    'iconClass'=> 'agent__color',
-                    'panelLink'=> 'painel-agentes',
-                    'data'=> [
-                        [
-                            'label' => 'agentes individuais cadastrados',
-                            'entity' => 'MapasCulturais\\Entities\\Agent',
-                            'query' => [],
-                            'value' => null
-                        ],
-                    ]
-                ],
-                [
-                    'label' => 'Oportunidades',
-                    'icon'=> 'opportunity',
-                    'iconClass'=> 'opportunity__color',
-                    'panelLink'=> 'painel-oportunidades',
-                    'data'=> [
-                        [
-                            'label' => 'Oportunidades criadas',
-                            'entity' => 'MapasCulturais\\Entities\\Opportunity',
-                            'query' => [],
-                            'value' => null
-                        ],
-                        [
-                            'label' => 'Oportunidades certificadas',
-                            'entity' => 'MapasCulturais\\Entities\\Opportunity',
-                            'query'=> [
-                                '@verified'=> 1
-                            ],
-                            'value' => null
-                        ],
-                    ]
-                ]
-            ],
-        ];
-
         parent::__construct($config);
     }
 
@@ -79,7 +15,7 @@ public function _init()
     {
         $app = App::i();
         //load css
-        $app->hook('<<GET|POST>>(<<metabase|site>>.<<*>>)', function() use ($app) {
+        $app->hook('<<GET|POST>>(<<*>>.<<*>>)', function() use ($app) {
             $app->view->enqueueStyle('app-v2', 'metabase', 'css/plugin-metabase.css');
         });
         $app->hook('component(home-feature):after', function() {
@@ -87,11 +23,31 @@ public function _init()
             $this->part('home-metabase');
         });
 
+        $app->hook('template(search.agents.search-tabs):after', function(){
+            $this->part('search-tabs/agent');
+        });
+
+        // $app->hook('template(search.spaces.search-tabs):after', function(){
+        //     $this->part('search-tabs/space');
+        // });
+
+        $app->hook('template(search.agents.search-header):after', function(){
+            $this->part('search-tabs/entity-agent-cards');
+        });
+
+        // $app->hook('template(search.spaces.search-header):after', function(){
+        //     $this->part('search-tabs/entity-space-cards');
+        // });
+
         $self= $this;
         $app->hook('app.init:after', function() use ($self){
             $this->view->metabasePlugin = $self;
         });
 
+        $app->hook('component(mc-icon).iconset', function(&$iconset) {
+            $iconset['indicator'] = 'cil:chart-line';
+        });
+
     }
 
     public function register()
diff --git a/src/plugins/Metabase/README.md b/src/plugins/Metabase/README.md
index 55a3f3ba37..287f0eb214 100644
--- a/src/plugins/Metabase/README.md
+++ b/src/plugins/Metabase/README.md
@@ -1,2 +1,84 @@
 # plugin-Metabase
+
 Plugin que faz o embed dos dashboards do metabase no MapasCulturais
+
+## Instalação e Configuração
+
+Faça download ou um clone do plugin na pasta `src/plugins` do Mapas Culturais.
+
+Para clonar o plugin, utilize o comando:
+```
+git clone https://github.com/mapasculturais/plugin-Metabase.git Metabase
+```
+
+No arquivo de configuração do Mapas Culturais, config.php, você deve:
+
+1. Ativar o plugin
+2. Criar arquivo de configuração do plugin
+
+Para ativar o plugin, adicione na sua array de Plugins:
+```
+'plugins' => [
+    // ... outros plugins
+    'Metabase',
+],
+```
+
+Criação do arquivo de configuração do plugin Metabase.php no diretório config/ com seguinte conteúdo:
+
+```
+'[
+    'Metabase' => [
+        'config' => [
+            'links' => [
+                'NOME_DASHBOARD' => [
+                    'link' => 'LINK_DASHBOARD_DO_METABASE_PUBLICO',
+                    'text' => 'DESCRICAO_DASHBOARD.',
+                    'title' => 'TITULO_DASHBOARD'
+                ],
+            ],
+            'cards' => [
+              // cards que aparecem na home
+              'home' => [
+                  [
+                      'type' => 'agent',
+                      'label' => '',
+                      'icon'=> 'agent',
+                      'iconClass'=> 'agent__color',
+                      'panelLink'=> 'painel-agentes',
+                      'data'=> [
+                          [
+                              'icon'=> 'agent',
+                              'label' => 'Agentes cadastrados',
+                              'entity' => 'MapasCulturais\\Entities\\Agent',
+                              'query' => [],
+                              'value' => null
+                          ],
+                      ]
+                  ],     
+              ],
+              // cards que aparecem na entidade (página de pesquisa)
+              'entities' => [
+                  [
+                      'type' => 'agent',
+                      'label' => '',
+                      'icon'=> 'agent',
+                      'iconClass'=> 'agent__color',
+                      'panelLink'=> 'painel-agentes',
+                      'data'=> [
+                          [
+                              'id' => 'agentes-cadastrados',
+                              'icon'=> 'agent',
+                              'label' => 'Agentes cadastrados',
+                              'entity' => 'MapasCulturais\\Entities\\Agent',
+                              'query' => [],
+                              'value' => null
+                          ],
+                      ]
+                  ],
+              ]
+            ]
+        ]
+    ]
+];
+```
\ No newline at end of file
diff --git a/src/plugins/Metabase/assets-src/sass/4-components/_entity-cards.scss b/src/plugins/Metabase/assets-src/sass/4-components/_entity-cards.scss
new file mode 100644
index 0000000000..f03dc33b2d
--- /dev/null
+++ b/src/plugins/Metabase/assets-src/sass/4-components/_entity-cards.scss
@@ -0,0 +1,126 @@
+@use '../2-atoms/a-mixins' as *;
+
+
+.entity-cards {
+    margin: 0 auto;
+    position: relative;
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+    flex-direction: column;
+    padding: 2px;
+
+    &__header {
+        margin: 0 auto;
+        width: 100%;
+        display: grid;
+        align-items: center;
+        grid-template-columns: 1fr size(455);
+
+        @media (max-width:size(600)) {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+        }
+    }
+
+    &__panel {
+        display: flex;
+        flex-direction: column;
+        gap: size(12);
+    }
+
+
+    &__content {
+        align-items: stretch;
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        margin: 0 auto;
+        max-width: size(1170);
+        z-index: 2;
+        gap: size(18) size(13);
+
+
+        @media (max-width:size(500)) {
+            gap: size(18) 0;
+        }
+    }
+}
+
+.entity-cards-cards {
+    width: size(220);
+    max-width: 100%;
+    background-color: var(--mc-white);
+    border: size(2) solid var(--mc-gray-100);
+    box-shadow: 2px 2px 8px 0px #00000040;
+    // border: size(1) solid red;
+    border-radius: size(8);
+    display: grid;
+    align-content: space-between;
+    padding: size(5);
+
+    &__header {
+        display: grid;
+        grid-template-columns: size(32) 1fr;
+        gap: size(16);
+    }
+    &__icon {
+        background-color: var(--mc-white);
+        align-self:self-start;
+        color: #EF7B45;
+    }
+
+    &__content {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: end;
+        text-align: center;
+        border-radius: size(8);
+
+    }
+
+    &__number {
+        font-size: var(--mc-font-size-lg)
+    }
+
+    &__label {
+
+        color: #666666;
+        font-size: var(--mc-font-size-xxxs);
+    }
+
+    &__info {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+
+        align-items: left;
+        text-align: left;
+        margin-left: size(2);
+    }
+
+    &--double & {
+        &__content {
+            grid-template-columns: 1fr 1fr;
+        }
+
+        &__info:first-of-type .metabase-card__number {
+            font-size: var(--mc-font-size-lg);
+
+            &--long {
+                font-size: var(--mc-font-size-sm);
+            }
+        }
+        
+        &__number {
+            font-size: var(--mc-font-size-md);
+        }
+       
+    }
+    @media (max-width:size(500)){
+        min-width: size(297);
+        width: 100%;
+    }
+}
\ No newline at end of file
diff --git a/src/plugins/Metabase/assets-src/sass/plugin-metabase.scss b/src/plugins/Metabase/assets-src/sass/plugin-metabase.scss
index 4a9a89b959..69d9690f0e 100755
--- a/src/plugins/Metabase/assets-src/sass/plugin-metabase.scss
+++ b/src/plugins/Metabase/assets-src/sass/plugin-metabase.scss
@@ -17,6 +17,7 @@
 @import '4-components/metabase-dashboard';
 @import '4-components/metabase-card';
 @import '4-components/single-dashboard';
+@import '4-components/entity-cards';
 
 
 /* ----- 5: AREAS ------- */
\ No newline at end of file
diff --git a/src/plugins/Metabase/assets/css/plugin-metabase.css b/src/plugins/Metabase/assets/css/plugin-metabase.css
index b415e303f2..ccccaefed6 100644
--- a/src/plugins/Metabase/assets/css/plugin-metabase.css
+++ b/src/plugins/Metabase/assets/css/plugin-metabase.css
@@ -1 +1 @@
-.list-dashboard{background-color:var(--mc-white);color:var(--mc-black);display:grid;grid-template-columns:19.0625rem calc(100% - 19.0625rem);margin:0 auto;max-width:90rem}.list-dashboard .selected{background-color:var(--mc-primary-500)}.list-dashboard__title{color:var(--mc-gray-700);font-size:.75rem;margin:0 auto;padding:1rem 1rem 1rem 0;text-transform:uppercase}.list-dashboard__text{color:var();font-size:.875rem}.list-dashboard .textselected{color:var(--mc-white)}.list-dashboard__link{color:var(--mc-black);text-decoration:none}.list-dashboard__link a{text-decoration:none}.list-dashboard__nav{background-color:var(--mc-white);border-right:1px solid var(--mc-gray-100);display:flex;flex-direction:column;gap:.5rem;list-style-type:none;margin:0;padding:1rem 2rem 1rem 1.5rem}.list-dashboard__iframe{border-style:none;height:100%;width:100%}.list-dashboard__item{background-color:var(--mc-white);border-radius:.25rem;color:var(--mc-black);margin:0;padding:.5rem 1rem;width:15.625rem}.home-metabase{align-items:center;background-color:var(--mc-home-opportunities);display:flex;flex-direction:column;margin:0 auto;overflow:hidden;padding:3.75rem 1rem;position:relative}.home-metabase__header{align-items:center;display:grid;grid-template-columns:1fr 28.4375rem;margin:0 auto;max-width:73.125rem;width:100%}@media (max-width:37.5rem){.home-metabase__header{align-items:center;display:flex;flex-direction:column}}.home-metabase__left{align-items:flex-start;color:var(--mc-white);display:flex;flex-direction:column;gap:1rem}@media (max-width:37.5rem){.home-metabase__left{align-items:center}.home-metabase__text{text-align:center}}.home-metabase__img{max-width:100%;width:17.8125rem}.home-metabase__panel{display:flex;flex-direction:column;gap:.75rem}.home-metabase__subtitle{color:var(--mc-white)}.home-metabase__content{align-items:stretch;display:flex;flex-direction:row;flex-wrap:wrap;gap:1.125rem .8125rem;margin:0 auto;max-width:73.125rem;z-index:2}@media (max-width:31.25rem){.home-metabase__content{gap:1.125rem 0}}.metabase-dashboard{background-color:var(--mc-gray-100);margin:0 auto;max-width:90rem;padding-inline:7.4375rem}@media (max-width:31.25rem){.metabase-dashboard{padding-inline:1rem}}.metabase-dashboard__page{background-color:var(--mc-gray-100)}.metabase-dashboard__header{display:flex;flex-direction:column;padding:2.5rem 0 1rem}.metabase-dashboard__content{display:flex;flex-direction:row;flex-wrap:wrap;gap:1.5rem;padding-bottom:13.5rem}.metabase-dashboard__card{align-items:flex-start;background:var(--mc-white);border:1px solid var(--mc-gray-100);border-radius:8px;display:inline-flex;flex-direction:column;gap:6px;max-width:23.0625rem;padding:16px 35px 16px 16px}.metabase-card{align-content:space-between;background-color:var(--mc-white);border:.0625rem solid var(--mc-gray-100);border-radius:.5rem;display:grid;max-width:100%;padding:1rem;width:23.1875rem}.metabase-card__header{display:grid;gap:1rem;grid-template-columns:2rem 1fr}.metabase-card__icon{background-color:var(--mc-white);font-size:1.5rem;justify-self:center}.metabase-card__content{align-items:end;display:grid;gap:1.625rem;grid-template-columns:1fr;text-align:center}.metabase-card__number{font-size:var(--mc-font-size-lg)}.metabase-card__label{font-weight:600}.metabase-card__info{align-items:center;display:flex;flex-direction:column;margin:1.125rem 0;text-align:center}.metabase-card__number{font-size:var(--mc-font-size-xl)}.metabase-card__number--long{font-size:var(--mc-font-size-sm)}.metabase-card--double .metabase-card__content{grid-template-columns:1fr 1fr}.metabase-card--double .metabase-card__info:first-of-type .metabase-card__number{font-size:var(--mc-font-size-lg)}.metabase-card--double .metabase-card__info:first-of-type .metabase-card__number--long{font-size:var(--mc-font-size-sm)}.metabase-card--double .metabase-card__number{font-size:var(--mc-font-size-md)}@media (max-width:31.25rem){.metabase-card{min-width:18.5625rem;width:100%}}.controller-metabase{background-color:var(--mc-gray-100)}
+.list-dashboard{background-color:var(--mc-white);color:var(--mc-black);display:grid;grid-template-columns:19.0625rem calc(100% - 19.0625rem);margin:0 auto;max-width:90rem}.list-dashboard .selected{background-color:var(--mc-primary-500)}.list-dashboard__title{color:var(--mc-gray-700);font-size:.75rem;margin:0 auto;padding:1rem 1rem 1rem 0;text-transform:uppercase}.list-dashboard__text{color:var();font-size:.875rem}.list-dashboard .textselected{color:var(--mc-white)}.list-dashboard__link{color:var(--mc-black);text-decoration:none}.list-dashboard__link a{text-decoration:none}.list-dashboard__nav{background-color:var(--mc-white);border-right:1px solid var(--mc-gray-100);display:flex;flex-direction:column;gap:.5rem;list-style-type:none;margin:0;padding:1rem 2rem 1rem 1.5rem}.list-dashboard__iframe{border-style:none;height:100%;width:100%}.list-dashboard__item{background-color:var(--mc-white);border-radius:.25rem;color:var(--mc-black);margin:0;padding:.5rem 1rem;width:15.625rem}.home-metabase{align-items:center;background-color:var(--mc-home-opportunities);display:flex;flex-direction:column;margin:0 auto;overflow:hidden;padding:3.75rem 1rem;position:relative}.home-metabase__header{align-items:center;display:grid;grid-template-columns:1fr 28.4375rem;margin:0 auto;max-width:73.125rem;width:100%}@media (max-width:37.5rem){.home-metabase__header{align-items:center;display:flex;flex-direction:column}}.home-metabase__left{align-items:flex-start;color:var(--mc-white);display:flex;flex-direction:column;gap:1rem}@media (max-width:37.5rem){.home-metabase__left{align-items:center}.home-metabase__text{text-align:center}}.home-metabase__img{max-width:100%;width:17.8125rem}.home-metabase__panel{display:flex;flex-direction:column;gap:.75rem}.home-metabase__subtitle{color:var(--mc-white)}.home-metabase__content{align-items:stretch;display:flex;flex-direction:row;flex-wrap:wrap;gap:1.125rem .8125rem;margin:0 auto;max-width:73.125rem;z-index:2}@media (max-width:31.25rem){.home-metabase__content{gap:1.125rem 0}}.metabase-dashboard{background-color:var(--mc-gray-100);margin:0 auto;max-width:90rem;padding-inline:7.4375rem}@media (max-width:31.25rem){.metabase-dashboard{padding-inline:1rem}}.metabase-dashboard__page{background-color:var(--mc-gray-100)}.metabase-dashboard__header{display:flex;flex-direction:column;padding:2.5rem 0 1rem}.metabase-dashboard__content{display:flex;flex-direction:row;flex-wrap:wrap;gap:1.5rem;padding-bottom:13.5rem}.metabase-dashboard__card{align-items:flex-start;background:var(--mc-white);border:1px solid var(--mc-gray-100);border-radius:8px;display:inline-flex;flex-direction:column;gap:6px;max-width:23.0625rem;padding:16px 35px 16px 16px}.metabase-card{align-content:space-between;background-color:var(--mc-white);border:.0625rem solid var(--mc-gray-100);border-radius:.5rem;display:grid;max-width:100%;padding:1rem;width:23.1875rem}.metabase-card__header{display:grid;gap:1rem;grid-template-columns:2rem 1fr}.metabase-card__icon{background-color:var(--mc-white);font-size:1.5rem;justify-self:center}.metabase-card__content{align-items:end;display:grid;gap:1.625rem;grid-template-columns:1fr;text-align:center}.metabase-card__number{font-size:var(--mc-font-size-lg)}.metabase-card__label{font-weight:600}.metabase-card__info{align-items:center;display:flex;flex-direction:column;margin:1.125rem 0;text-align:center}.metabase-card__number{font-size:var(--mc-font-size-xl)}.metabase-card__number--long{font-size:var(--mc-font-size-sm)}.metabase-card--double .metabase-card__content{grid-template-columns:1fr 1fr}.metabase-card--double .metabase-card__info:first-of-type .metabase-card__number{font-size:var(--mc-font-size-lg)}.metabase-card--double .metabase-card__info:first-of-type .metabase-card__number--long{font-size:var(--mc-font-size-sm)}.metabase-card--double .metabase-card__number{font-size:var(--mc-font-size-md)}@media (max-width:31.25rem){.metabase-card{min-width:18.5625rem;width:100%}}.controller-metabase{background-color:var(--mc-gray-100)}.entity-cards{align-items:center;display:flex;flex-direction:column;margin:0 auto;overflow:hidden;padding:2px;position:relative}.entity-cards__header{align-items:center;display:grid;grid-template-columns:1fr 28.4375rem;margin:0 auto;width:100%}@media (max-width:37.5rem){.entity-cards__header{align-items:center;display:flex;flex-direction:column}}.entity-cards__panel{display:flex;flex-direction:column;gap:.75rem}.entity-cards__content{align-items:stretch;display:flex;flex-direction:row;flex-wrap:wrap;gap:1.125rem .8125rem;margin:0 auto;max-width:73.125rem;z-index:2}@media (max-width:31.25rem){.entity-cards__content{gap:1.125rem 0}}.entity-cards-cards{align-content:space-between;background-color:var(--mc-white);border:.125rem solid var(--mc-gray-100);border-radius:.5rem;box-shadow:2px 2px 8px 0 rgba(0,0,0,.251);display:grid;max-width:100%;padding:.3125rem;width:13.75rem}.entity-cards-cards__header{display:grid;gap:1rem;grid-template-columns:2rem 1fr}.entity-cards-cards__icon{align-self:self-start;background-color:var(--mc-white);color:#ef7b45}.entity-cards-cards__content{align-items:end;border-radius:.5rem;display:flex;flex-direction:row;justify-content:space-between;text-align:center}.entity-cards-cards__number{font-size:var(--mc-font-size-lg)}.entity-cards-cards__label{color:#666;font-size:var(--mc-font-size-xxxs)}.entity-cards-cards__info{align-items:left;display:flex;flex-direction:column;justify-content:space-between;margin-left:.125rem;text-align:left}.entity-cards-cards--double .entity-cards-cards__content{grid-template-columns:1fr 1fr}.entity-cards-cards--double .entity-cards-cards__info:first-of-type .metabase-card__number{font-size:var(--mc-font-size-lg)}.entity-cards-cards--double .entity-cards-cards__info:first-of-type .metabase-card__number--long{font-size:var(--mc-font-size-sm)}.entity-cards-cards--double .entity-cards-cards__number{font-size:var(--mc-font-size-md)}@media (max-width:31.25rem){.entity-cards-cards{min-width:18.5625rem;width:100%}}
diff --git a/src/plugins/Metabase/components/entity-cards/README.md b/src/plugins/Metabase/components/entity-cards/README.md
new file mode 100644
index 0000000000..6ae8199d9f
--- /dev/null
+++ b/src/plugins/Metabase/components/entity-cards/README.md
@@ -0,0 +1,47 @@
+# Componente `<__template__>`
+A ideia do componente `__template__` é servir de modelo para a criação de novos componentes. Este implementa um exemplo 
+de componente que manipula um objeto do tipo `Entity` e dispara um evento quando este for modificado.
+
+Este documento (README.md) deve conter a descrição do que o componente faz e toda a interface pública do componente.
+
+Neste exemplo, o componente recebe obrigatoriamente um nome e uma entidade e opcionalmente um apelido (nickname) e um sobrenome.
+Baseado nos parâmetros passados para o componente, este gera um `displayName` e um `fullname`.
+
+Quando o botão "Definir Nomes" é clicado, este definirá o `entity.name` e `entity.nomeCompleto` com o valores `displaName` e `fullname`, 
+respectivamente, e emitirá o evento `namesDefined`, que poderá ser capturado fora do componente.
+
+### Eventos
+- **namesDefined** - disparado quando o método `defineNames` é chamado, após a definição do `name` e `nomeCompleto`
+  
+## Propriedades
+- *Entity **entity*** - Entidade
+- *String **name*** - Nome
+- *String **lastname** = ''* - Sobrenome
+
+## Slots
+- **default** `{fullname, displayName, compareDisplayName, compareFullname}`: informações dos nomes e comparação com o nome gerado
+
+### Importando componente
+```PHP
+<?php 
+$this->import('__template__');
+?>
+```
+### Exemplos de uso
+```HTML
+<!-- utilizaçao básica -->
+<__template__ :entity="entity" name="Fulano"></__template__>
+
+<!-- utilizano o evento on-names-defined para salvar a entidade -->
+<__template__ :entity="entity" name="Fulano" nickname="Lano" @names-defined="entity.save()"></__template__>
+
+<!-- utilizano o evento on-names-defined para salvar a entidade -->
+<__template__ :entity="entity" name="Fulano" nickname="Lano" @names-defined="entity.save()" #default="props">
+    <div v-if="props.compareDisplayName"> o nome está atualizado</div>
+    <div v-if="!props.compareDisplayName"> o novo nome será <strong>{{props.displayName}}</strong></div>
+
+    <div v-if="props.compareFullname"> o nome completo está atualizado</div>
+    <div v-if="!props.compareFullname"> o novo nome completo será <strong>{{props.fullname}}</strong></div>
+</__template__>
+
+```
\ No newline at end of file
diff --git a/src/plugins/Metabase/components/entity-cards/init.php b/src/plugins/Metabase/components/entity-cards/init.php
new file mode 100644
index 0000000000..3bdc88d9d6
--- /dev/null
+++ b/src/plugins/Metabase/components/entity-cards/init.php
@@ -0,0 +1,25 @@
+<?php
+
+use MapasCulturais\ApiQuery;
+use MapasCulturais\App;
+
+$app = App::i();
+
+$cards = $app->config['Metabase']['config']['cards']['entities'];
+
+$app->applyHook('component(home-metabase).data', [&$cards]);
+
+foreach ($cards as &$card) {
+    foreach ($card['data'] as &$data) {
+        $query = $data['query'];
+        $entity = $data['entity'];
+        $api_query = new ApiQuery($entity, $query);
+        $data['data'] = $api_query->getFindResult();
+        $data['value'] = $api_query->getCountResult();
+    }
+}
+
+$this->jsObject['config']['homeMetabase'] = $cards;
+
+return;
+
diff --git a/src/plugins/Metabase/components/entity-cards/script.js b/src/plugins/Metabase/components/entity-cards/script.js
new file mode 100644
index 0000000000..dc8d96a852
--- /dev/null
+++ b/src/plugins/Metabase/components/entity-cards/script.js
@@ -0,0 +1,61 @@
+app.component('entity-cards', {
+    template: $TEMPLATES['entity-cards'],
+
+    props: {
+        classes: {
+            type: [String, Array, Object],
+            required: false
+        },
+        type: {
+            type: String,
+            default: '',
+        },
+    },
+
+    setup({ slots }) {
+        const hasSlot = name => !!slots[name];
+        const text = Utils.getTexts('entity-cards')
+        return { text, hasSlot }
+    },
+
+    data() {
+        const cards = $MAPAS.config.homeMetabase.filter((c) => {
+            return c.type == this.type
+        });
+
+        cards.map((c) => {
+            c.data.map((d) => {
+                if (d.id == 'agentes-cadastrados-7-dias') {
+                    const today = new Date();
+                    const sevenDaysBefore = new Date();
+                    sevenDaysBefore.setDate(today.getDate() - 7);
+
+                    const newData = d.data.filter(dd => {
+                        const dateObject = new Date(dd.createTimestamp.date);
+                        return dateObject >= sevenDaysBefore && dateObject <= today;
+                    });
+
+                    d.value = newData.length;
+                    return d;
+                }
+
+                return d;
+            });
+        });
+        
+        return {
+            cards: cards,
+        }
+    },
+
+    computed: { },
+
+    methods: {
+        lengthClass(text) {
+            const textString = String(text);
+            if (textString.length > 5) {
+                return 'metabase-card__number--long';
+            }
+        },
+    },
+});
diff --git a/src/plugins/Metabase/components/entity-cards/template.php b/src/plugins/Metabase/components/entity-cards/template.php
new file mode 100644
index 0000000000..b2a9aaba14
--- /dev/null
+++ b/src/plugins/Metabase/components/entity-cards/template.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @var MapasCulturais\App $app
+ * @var MapasCulturais\Themes\BaseV2\Theme $this
+ */
+
+use MapasCulturais\i;
+$this->import('
+    mc-link
+    mc-icon
+');
+
+?>
+
+<div class="entity-cards">
+    <div class="entity-cards__panel">
+        <div class="entity-cards__content">
+            <div v-for="card in cards" class="entity-cards-cards" :class="{'entity-cards--double' : card.data.length > 1}">
+                <div v-for="data in card.data" class="entity-cards-cards__content">
+                    <div class="entity-cards-cards__info">
+                        <strong class="entity-cards-cards__number" :class="lengthClass(data.value)">{{data.value}}</strong>
+                        <label class="entity-cards-cards__label">{{data.label}}</label>                    
+                    </div>
+                    <div class="entity-cards-cards__icon"><mc-icon :class="card.iconClass" :name="data.icon"></mc-icon></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/plugins/Metabase/components/entity-cards/texts.php b/src/plugins/Metabase/components/entity-cards/texts.php
new file mode 100644
index 0000000000..2e01a92b5a
--- /dev/null
+++ b/src/plugins/Metabase/components/entity-cards/texts.php
@@ -0,0 +1,5 @@
+<?php
+use MapasCulturais\i;
+
+return [
+];
\ No newline at end of file
diff --git a/src/plugins/Metabase/components/home-metabase/init.php b/src/plugins/Metabase/components/home-metabase/init.php
index 9e9970c2be..9feb846ba0 100644
--- a/src/plugins/Metabase/components/home-metabase/init.php
+++ b/src/plugins/Metabase/components/home-metabase/init.php
@@ -4,7 +4,8 @@
 use MapasCulturais\App;
 
 $app = App::i();
-$cards = $this->metabasePlugin->config['cards'];
+
+$cards = $app->config['Metabase']['config']['cards']['home'];
 
 $app->applyHook('component(home-metabase).data', [&$cards]);
 
diff --git a/src/plugins/Metabase/components/search-dashboard/README.md b/src/plugins/Metabase/components/search-dashboard/README.md
new file mode 100644
index 0000000000..6ae8199d9f
--- /dev/null
+++ b/src/plugins/Metabase/components/search-dashboard/README.md
@@ -0,0 +1,47 @@
+# Componente `<__template__>`
+A ideia do componente `__template__` é servir de modelo para a criação de novos componentes. Este implementa um exemplo 
+de componente que manipula um objeto do tipo `Entity` e dispara um evento quando este for modificado.
+
+Este documento (README.md) deve conter a descrição do que o componente faz e toda a interface pública do componente.
+
+Neste exemplo, o componente recebe obrigatoriamente um nome e uma entidade e opcionalmente um apelido (nickname) e um sobrenome.
+Baseado nos parâmetros passados para o componente, este gera um `displayName` e um `fullname`.
+
+Quando o botão "Definir Nomes" é clicado, este definirá o `entity.name` e `entity.nomeCompleto` com o valores `displaName` e `fullname`, 
+respectivamente, e emitirá o evento `namesDefined`, que poderá ser capturado fora do componente.
+
+### Eventos
+- **namesDefined** - disparado quando o método `defineNames` é chamado, após a definição do `name` e `nomeCompleto`
+  
+## Propriedades
+- *Entity **entity*** - Entidade
+- *String **name*** - Nome
+- *String **lastname** = ''* - Sobrenome
+
+## Slots
+- **default** `{fullname, displayName, compareDisplayName, compareFullname}`: informações dos nomes e comparação com o nome gerado
+
+### Importando componente
+```PHP
+<?php 
+$this->import('__template__');
+?>
+```
+### Exemplos de uso
+```HTML
+<!-- utilizaçao básica -->
+<__template__ :entity="entity" name="Fulano"></__template__>
+
+<!-- utilizano o evento on-names-defined para salvar a entidade -->
+<__template__ :entity="entity" name="Fulano" nickname="Lano" @names-defined="entity.save()"></__template__>
+
+<!-- utilizano o evento on-names-defined para salvar a entidade -->
+<__template__ :entity="entity" name="Fulano" nickname="Lano" @names-defined="entity.save()" #default="props">
+    <div v-if="props.compareDisplayName"> o nome está atualizado</div>
+    <div v-if="!props.compareDisplayName"> o novo nome será <strong>{{props.displayName}}</strong></div>
+
+    <div v-if="props.compareFullname"> o nome completo está atualizado</div>
+    <div v-if="!props.compareFullname"> o novo nome completo será <strong>{{props.fullname}}</strong></div>
+</__template__>
+
+```
\ No newline at end of file
diff --git a/src/plugins/Metabase/components/search-dashboard/init.php b/src/plugins/Metabase/components/search-dashboard/init.php
new file mode 100644
index 0000000000..c7187f7543
--- /dev/null
+++ b/src/plugins/Metabase/components/search-dashboard/init.php
@@ -0,0 +1,5 @@
+<?php 
+ $this->jsObject['config']['listDashboard'] = [
+    'links'=> $app->config['Metabase']['config']['links'],
+
+ ];
diff --git a/src/plugins/Metabase/components/search-dashboard/script.js b/src/plugins/Metabase/components/search-dashboard/script.js
new file mode 100644
index 0000000000..ea843a5df3
--- /dev/null
+++ b/src/plugins/Metabase/components/search-dashboard/script.js
@@ -0,0 +1,50 @@
+const iFrameResizeModule = import('https://unpkg.com/iframe-resizer@4.3.1/js/iframeResizer.min.js');
+app.component('search-dashboard', {
+    template: $TEMPLATES['search-dashboard'],
+
+    setup({ slots }) {
+        const hasSlot = name => !!slots[name];
+        // os textos estão localizados no arquivo texts.php deste componente 
+        const text = Utils.getTexts('search-dashboard')
+        return { text, hasSlot }
+    },
+    props: {
+        panelId: {
+            type: String,
+            default: '',
+        },
+    },
+    mounted() {
+        // this.$refs.dashboardIframe.src = this.links[this.panelId].link;
+        iFrameResizeModule.then(() => {
+            iFrameResize({ log: false }, this.$refs.dashboardIframe);
+        });
+    },
+
+    data() {
+        return {};
+    },
+
+    computed: {
+        link() {
+            return this.links[this.panelId].link;
+        },
+        links() {
+            return $MAPAS.config.listDashboard.links;
+        },
+        names() {
+            const result = [];
+            Object.keys(this.links).forEach(name => {
+                result.push(name);
+            })
+            return result;
+        },
+    },
+
+    methods: {
+        getUrl(name) {
+            let url = Utils.createUrl('metabase', 'dashboard', { panelId: name });
+            return url;
+        }
+    },
+});
diff --git a/src/plugins/Metabase/components/search-dashboard/template.php b/src/plugins/Metabase/components/search-dashboard/template.php
new file mode 100644
index 0000000000..2c9a417dfe
--- /dev/null
+++ b/src/plugins/Metabase/components/search-dashboard/template.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @var MapasCulturais\App $app
+ * @var MapasCulturais\Themes\BaseV2\Theme $this
+ */
+
+use MapasCulturais\i;
+
+$this->import('
+    mc-icon
+    mc-link
+');
+
+?>
+<div>
+    <iframe width="100%" :src="link"></iframe>
+</div>
\ No newline at end of file
diff --git a/src/plugins/Metabase/components/search-dashboard/texts.php b/src/plugins/Metabase/components/search-dashboard/texts.php
new file mode 100644
index 0000000000..90629fb33b
--- /dev/null
+++ b/src/plugins/Metabase/components/search-dashboard/texts.php
@@ -0,0 +1,6 @@
+<?php
+use MapasCulturais\i;
+
+return [
+   
+];
\ No newline at end of file
diff --git a/src/plugins/Metabase/layouts/parts/search-tabs/agent.php b/src/plugins/Metabase/layouts/parts/search-tabs/agent.php
new file mode 100644
index 0000000000..e2bde2ce5b
--- /dev/null
+++ b/src/plugins/Metabase/layouts/parts/search-tabs/agent.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @var MapasCulturais\App $app
+ * @var MapasCulturais\Themes\BaseV2\Theme $this
+ */
+
+use MapasCulturais\i;
+
+$this->import('
+    search-dashboard
+');
+
+?>
+<mc-tab icon="indicator" label="<?php i::esc_attr_e('Indicadores') ?>" slug="indicator">
+    <div class="search__tabs--indicator">
+       <search-dashboard panel-Id="painel-agentes"></search-dashboard>
+    </div>
+</mc-tab>
\ No newline at end of file
diff --git a/src/plugins/Metabase/layouts/parts/search-tabs/entity-agent-cards.php b/src/plugins/Metabase/layouts/parts/search-tabs/entity-agent-cards.php
new file mode 100644
index 0000000000..e582d07d64
--- /dev/null
+++ b/src/plugins/Metabase/layouts/parts/search-tabs/entity-agent-cards.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @var MapasCulturais\App $app
+ * @var MapasCulturais\Themes\BaseV2\Theme $this
+ */
+
+use MapasCulturais\i;
+
+$this->import('
+    entity-cards
+');
+?>
+<entity-cards type="agent"></entity-cards>
\ No newline at end of file
diff --git a/src/plugins/Metabase/layouts/parts/search-tabs/entity-space-cards.php b/src/plugins/Metabase/layouts/parts/search-tabs/entity-space-cards.php
new file mode 100644
index 0000000000..0d6fd6ff77
--- /dev/null
+++ b/src/plugins/Metabase/layouts/parts/search-tabs/entity-space-cards.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @var MapasCulturais\App $app
+ * @var MapasCulturais\Themes\BaseV2\Theme $this
+ */
+
+use MapasCulturais\i;
+
+$this->import('
+    entity-cards
+');
+?>
+<entity-cards type="space"></entity-cards>
\ No newline at end of file
diff --git a/src/plugins/Metabase/layouts/parts/search-tabs/space.php b/src/plugins/Metabase/layouts/parts/search-tabs/space.php
new file mode 100644
index 0000000000..a0518965c3
--- /dev/null
+++ b/src/plugins/Metabase/layouts/parts/search-tabs/space.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @var MapasCulturais\App $app
+ * @var MapasCulturais\Themes\BaseV2\Theme $this
+ */
+
+use MapasCulturais\i;
+
+$this->import('
+    search-dashboard
+');
+
+?>
+<mc-tab icon="indicator" label="<?php i::esc_attr_e('Indicadores') ?>" slug="indicator">
+    <div class="search__tabs--indicator">
+       <search-dashboard panel-Id="painel-espacos"></search-dashboard>
+    </div>
+</mc-tab>
\ No newline at end of file