feat(vote): display ufs on public pages

nossas · Oct 1, 2024 · de1e5c3 · de1e5c3
1 parent 400568d
commit de1e5c3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/app/org_eleicoes/votepeloclima/candidature/forms/filters.py b/app/org_eleicoes/votepeloclima/candidature/forms/filters.py
@@ -8,7 +8,7 @@
 from ..layout import NoCrispyField
 from ..choices import Gender, Color, Sexuality
 from ..fields import CepField, ButtonCheckboxSelectMultiple, ButtonRadioSelect
-from ..locations_utils import get_ufs, get_choices
+from ..locations_utils import get_states, get_choices
 from ..models import Candidature
 
 from .register import ProposeForm
@@ -36,7 +36,7 @@ class FilterFormHeader(RemoveRequiredMixin, forms.ModelForm):
         field="state",
         label="Estado",
         placeholder="Todos os estados",
-        choices=[("", "Todos os estados")] + lazy(get_ufs, list)(),
+        choices=[("", "Todos os estados")] + lazy(get_states, list)(),
     )
     city = CepField(
         field="city", parent="state", label="Município", placeholder="Selecione"

diff --git a/app/org_eleicoes/votepeloclima/candidature/forms/register.py b/app/org_eleicoes/votepeloclima/candidature/forms/register.py
@@ -9,7 +9,7 @@
 from crispy_forms.layout import Layout, Div, Field, HTML
 from bootstrap_datepicker_plus.widgets import DatePickerInput
 
-from ..locations_utils import get_ufs, get_choices
+from ..locations_utils import get_states, get_choices
 from ..choices import (
     PoliticalParty,
     IntendedPosition,
@@ -192,7 +192,7 @@ class ApplicationForm(EntangledModelFormMixin, DisabledMixin, forms.ModelForm):
         field="state",
         label="Estado",
         placeholder="Selecione",
-        choices=[("", "Selecione")] + lazy(get_ufs, list)(),
+        choices=[("", "Selecione")] + lazy(get_states, list)(),
         help_text="Estado onde você está concorrendo",
     )
     city = CepField(

diff --git a/app/org_eleicoes/votepeloclima/candidature/locations_utils.py b/app/org_eleicoes/votepeloclima/candidature/locations_utils.py
@@ -6,7 +6,7 @@ def get_states(column_label="nome_uf") -> List[Tuple[str, str]]:
     return sorted([(state['uf'], state[column_label]) for state in states], key=lambda x: x[1])
 
 def get_ufs() -> List[Tuple[str, str]]:
-    return get_states(column_label="nome_uf")
+    return get_states(column_label="sigla_uf")
 
 def get_choices(uf: str) -> List[Tuple[str, str]]:
     choices = PlacesIBGE.objects.filter(uf=uf).values('codigo_municipio_completo', 'nome_municipio').distinct()

diff --git a/app/org_eleicoes/votepeloclima/candidature/models.py b/app/org_eleicoes/votepeloclima/candidature/models.py
@@ -5,7 +5,7 @@
 from django.utils.html import mark_safe
 
 from .choices import CandidatureFlowStatus, IntendedPosition, PoliticalParty, Gender, Color, Sexuality, Education
-from .locations_utils import get_choices, get_states
+from .locations_utils import get_choices, get_ufs
 
 
 # Acompanhar validação da candidatura
@@ -58,7 +58,7 @@ def status(self):
 
     @property
     def get_state_display(self):
-        states = dict(get_states())
+        states = dict(get_ufs())
         return states.get(self.state, "")
 
     @property