Apply suggestions from code review

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

Co-authored-by: Edward <9326037+edwardoliveira@users.noreply.github.com>

sapl/relatorios/forms.py

@@ -91,14 +91,12 @@ class RelatorioVotacoesNominaisFilterSet(django_filters.FilterSet):
         )
 
     def ordem_or_expediente(self, queryset, name, value):
-        if value:
+        if value is None:
-            try:
+           return queryset
-                val = value.id
+        value = getattr(value, "pk", value)
-            except AttributeError:
+            ordem_q = f"ordem__materia__{name}"
-                val = value
+            expediente_q = f"expediente__materia__{name}"
-            return queryset.filter(
+            return queryset.filter(Q(**{ordem_q: val})|Q(**{expediente_q: val}))
-                    eval(f'Q(ordem__materia__{name}={val}) | Q(expediente__materia__{name}={val})')
-                   )
         return queryset
 
     class Meta(FilterOverridesMetaMixin):

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

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');
+      $('.link_votacao_nominal').on('click', function(event) {
-    links_votacao.forEach(link => {
-      link.addEventListener('click', function(event) {
         event.preventDefault();
       });
-    });
   });
 
   function pesquisaAvancada(){