diff --git a/api/mapas/config/authentication.php b/api/mapas/config/authentication.php index 9a3e62318f..c4a6be699a 100644 --- a/api/mapas/config/authentication.php +++ b/api/mapas/config/authentication.php @@ -8,6 +8,7 @@ 'auth.redirect_path' => '/edital/4', 'auth.config' => [ 'salt' => env('AUTH_SALT', null), + 'urlImageToUseInEmails' => 'https://iniciativas-mapadasperiferias.cidades.gov.br/files/opportunity/4/file/30/logo-ppv2024-f33ccbf81a4f55ec30ccb6c03264c7a7-23.jpg', 'timeout' => '24 hours', 'enableLoginByCPF' => false, 'loginOnRegister' => true, diff --git a/api/mapas/src/core/Entities/AgentRelation.php b/api/mapas/src/core/Entities/AgentRelation.php index d44441f1b3..22b9f9bfeb 100644 --- a/api/mapas/src/core/Entities/AgentRelation.php +++ b/api/mapas/src/core/Entities/AgentRelation.php @@ -95,7 +95,7 @@ abstract class AgentRelation extends \MapasCulturais\Entity /** * @var \MapasCulturais\Entities\Agent * - * @ORM\ManyToOne(targetEntity="MapasCulturais\Entities\Agent", fetch="EAGER") + * @ORM\ManyToOne(targetEntity="MapasCulturais\Entities\Agent", fetch="LAZY") * @ORM\JoinColumns({ * @ORM\JoinColumn(name="agent_id", referencedColumnName="id", onDelete="CASCADE") * }) diff --git a/api/mapas/src/core/Middlewares/Redirect.php b/api/mapas/src/core/Middlewares/Redirect.php index f8131a5b6b..51964a06cb 100644 --- a/api/mapas/src/core/Middlewares/Redirect.php +++ b/api/mapas/src/core/Middlewares/Redirect.php @@ -20,14 +20,15 @@ public function __invoke(Request $request, RequestHandler $handler) $mem = memory_get_usage(true) / 1024 / 1024; $route = $app->request->route; - if (str_contains($route, 'site.index')) { + if ( + str_contains($route, 'site.index') || + str_contains($route, 'panel.index') || + str_contains($route, 'panel.registration') + ) { $response = $response->withStatus(302); return $response->withHeader('Location', '/edital/4'); } - if (str_contains($route, 'panel.index')) { - $response = $response->withStatus(302); - return $response->withHeader('Location', '/minhas-inscricoes'); - } + return $response; } diff --git a/api/mapas/src/modules/Opportunities/components/opportunity-subscription/template.php b/api/mapas/src/modules/Opportunities/components/opportunity-subscription/template.php index 8453700f9e..f63ef70b3f 100644 --- a/api/mapas/src/modules/Opportunities/components/opportunity-subscription/template.php +++ b/api/mapas/src/modules/Opportunities/components/opportunity-subscription/template.php @@ -61,7 +61,7 @@
diff --git a/api/mapas/src/modules/Opportunities/components/opportunity-subscription/texts.php b/api/mapas/src/modules/Opportunities/components/opportunity-subscription/texts.php index d55c872f8b..952909ccc9 100644 --- a/api/mapas/src/modules/Opportunities/components/opportunity-subscription/texts.php +++ b/api/mapas/src/modules/Opportunities/components/opportunity-subscription/texts.php @@ -1,8 +1,9 @@ $this->text('error-category', i::__('Por favor, selecione a categoria da inscrição')), + 'selecione categoria' => $this->text('error-category', i::__('Por favor, selecione o eixo da inscrição')), 'selecione tipo de proponente' => $this->text('error-proponent-type', i::__('Por favor, selecione o tipo de proponente da inscrição')), 'selecione faixa' => $this->text('error-range', i::__('Por favor, selecione a faixa para inscrição')), 'selecione agente' => i::__('Por favor, selecione o agente responsável pela inscrição'), @@ -14,4 +15,4 @@ 'limite de inscrições' => i::__('O limite de inscrições nessa oportunidade foi atingido.'), 'limite de inscrições por usuário' => i::__('O limite de inscrições por usuário nessa oportunidade foi atingido.'), -]; \ No newline at end of file +]; diff --git a/api/mapas/src/modules/Opportunities/components/registration-actions/template.php b/api/mapas/src/modules/Opportunities/components/registration-actions/template.php index 2e5c5e2bb6..242823d668 100644 --- a/api/mapas/src/modules/Opportunities/components/registration-actions/template.php +++ b/api/mapas/src/modules/Opportunities/components/registration-actions/template.php @@ -1,4 +1,5 @@
+
+ + + + +
- +
- {{fieldName(index)}}:

{{text}}

-
+ {{fieldName(index)}}: +

{{text}}

+
@@ -28,22 +40,12 @@ - + - +
-
- - - - -
\ No newline at end of file diff --git a/api/mapas/src/modules/Opportunities/views/opportunity/single.php b/api/mapas/src/modules/Opportunities/views/opportunity/single.php index 0724ae7d91..b62c854fe2 100644 --- a/api/mapas/src/modules/Opportunities/views/opportunity/single.php +++ b/api/mapas/src/modules/Opportunities/views/opportunity/single.php @@ -63,7 +63,7 @@
{{entity.type.name}}
-
+
diff --git a/api/mapas/src/modules/Opportunities/views/registration/edit.php b/api/mapas/src/modules/Opportunities/views/registration/edit.php index 12c705379c..7abd16ec56 100644 --- a/api/mapas/src/modules/Opportunities/views/registration/edit.php +++ b/api/mapas/src/modules/Opportunities/views/registration/edit.php @@ -79,7 +79,7 @@

- +