From 24be49ef3335a25a335af25b2ab817945bee4304 Mon Sep 17 00:00:00 2001
From: cristian-longhi <cristian-longhi@camaranh.rs.gov.br>
Date: Mon, 1 Sep 2025 15:11:59 -0300
Subject: [PATCH] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Todas as sugestões de alteração acatadas.

Co-authored-by: Edward <9326037+edwardoliveira@users.noreply.github.com>
---
 sapl/relatorios/forms.py                           | 14 ++++++--------
 sapl/relatorios/views.py                           |  8 +-------
 .../materia/materialegislativa_filter.html         |  5 +----
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/sapl/relatorios/forms.py b/sapl/relatorios/forms.py
index 5523d7514..cfbf369c1 100644
--- a/sapl/relatorios/forms.py
+++ b/sapl/relatorios/forms.py
@@ -91,14 +91,12 @@ class RelatorioVotacoesNominaisFilterSet(django_filters.FilterSet):
         )
 
     def ordem_or_expediente(self, queryset, name, value):
-        if value:
-            try:
-                val = value.id
-            except AttributeError:
-                val = value
-            return queryset.filter(
-                    eval(f'Q(ordem__materia__{name}={val}) | Q(expediente__materia__{name}={val})')
-                   )
+        if value is None:
+           return queryset
+        value = getattr(value, "pk", value)
+            ordem_q = f"ordem__materia__{name}"
+            expediente_q = f"expediente__materia__{name}"
+            return queryset.filter(Q(**{ordem_q: val})|Q(**{expediente_q: val}))
         return queryset
 
     class Meta(FilterOverridesMetaMixin):
diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py
index 1708b420b..b7dbdad76 100755
--- a/sapl/relatorios/views.py
+++ b/sapl/relatorios/views.py
@@ -1891,16 +1891,10 @@ class RelatorioVotacoesNominaisView(RelatorioMixin, VotacoesMultiFormatOutputMix
     relatorio = relatorio_votacao_nominal
     paginate_by = 20
 
-    fields_base_report = [
+    export_fields = [
         'votacao_id', 'votacao', 'parlamentar__nome_parlamentar', 'voto'
     ]
 
-    fields_report = {
-        'csv': fields_base_report,
-        'xlsx': fields_base_report,
-        'json': fields_base_report,
-    }
-
     def get_queryset(self):
         if 'format' in self.request.GET:
             self.model = VotoParlamentar
diff --git a/sapl/templates/materia/materialegislativa_filter.html b/sapl/templates/materia/materialegislativa_filter.html
index 6412ef7f0..f74c5d5ab 100644
--- a/sapl/templates/materia/materialegislativa_filter.html
+++ b/sapl/templates/materia/materialegislativa_filter.html
@@ -244,12 +244,9 @@
 
   <script type="text/javascript" >
   $( document ).ready(function() {
-    const links_votacao = document.querySelectorAll('.link_votacao_nominal');
-    links_votacao.forEach(link => {
-      link.addEventListener('click', function(event) {
+      $('.link_votacao_nominal').on('click', function(event) {
         event.preventDefault();
       });
-    });
   });
 
   function pesquisaAvancada(){