Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hotfix(vote): change sexuality and race/color label #287

Merged
merged 3 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 35 additions & 33 deletions app/org_eleicoes/votepeloclima/candidature/choices.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,41 @@ class IntendedPosition(models.TextChoices):

class PoliticalParty(models.TextChoices):
empty = "", "Selecione o partido"
pdt = "pdt", "PDT"
agir = "agir", "Agir"
avante = "avante", "Avante"
cidadania = "cidadania", "Cidadania"
dc = "dc", "DC"
mdb = "mdb", "MDB"
mobiliza = "mobiliza", "Mobiliza"
novo = "novo", "Novo"
psdb= "psdb", "PSDB"
rede= "rede", "Rede"
mdb= "mdb", "MDB"
ptb= "ptb", "PTB"
pt= "pt", "PT"
união= "união", "União"
pcdob= "pcdob", "PCdoB"
psb= "psb", "PSB"
ptc= "ptc", "PTC"
psc= "psc", "PSC"
pmn= "pmn", "PMN"
cidadania= "cidadania", "Cidadania"
pv= "pv", "PV"
avante= "avante", "Avante"
pp= "pp", "PP"
pstu= "pstu", "PSTU"
pcb= "pcb", "PCB"
prtb= "prtb", "PRTB"
dc= "dc", "DC"
pco= "pco", "PCO"
pode= "pode", "PODE"
republicanos= "republicanos", "Republicanos"
psol= "psol", "PSOL"
pl= "pl", "PL"
psd= "psd", "PSD"
patriota= "patriota", "Patriota"
pros= "pros", "PROS"
solidariedade= "solidariedade", "Solidariedade"
pmb= "pmb", "PMB"
up= "up", "UP"
patriota = "patriota", "Patriota"
pcb = "pcb", "PCB"
pcdob = "pcdob", "PCdoB"
pco = "pco", "PCO"
pdt = "pdt", "PDT"
pl = "pl", "PL"
pmb = "pmb", "PMB"
pmn = "pmn", "PMN"
pode = "pode", "PODE"
pp = "pp", "PP"
prd = "prd", "PRD"
pros = "pros", "PROS"
prtb = "prtb", "PRTB"
psb = "psb", "PSB"
psc = "psc", "PSC"
psd = "psd", "PSD"
psdb = "psdb", "PSDB"
psol = "psol", "PSOL"
pstu = "pstu", "PSTU"
pt = "pt", "PT"
ptb = "ptb", "PTB"
ptc = "ptc", "PTC"
pv = "pv", "PV"
rede = "rede", "Rede"
republicanos = "republicanos", "Republicanos"
solidariedade = "solidariedade", "Solidariedade"
união = "união", "União"
up = "up", "UP"


class Gender(models.TextChoices):
Expand All @@ -76,10 +79,9 @@ class Sexuality(models.TextChoices):
empty = "", "Selecione uma opção"
heterossexual = "heterossexual", "Heterossexual"
pansexual = "pansexual", "Pansexual"
assexual = "assexual", "Assexual"
bissexual = "bissexual", "Bissexual"
gay = "gay", "Homossexual"
queer = "queer", "Queer"
gay = "gay", "Gay"
lesbica = "lesbica", "Lésbica"
nao_declarada = "nao_declarada", "Não declarada"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ class ProfileForm(EntangledModelFormMixin, DisabledMixin, forms.ModelForm):
video = VideoField(label="Vídeo", required=False, help_text="Tamanho máximo 50mb.")
photo = ImageField(label="Foto", help_text="Tipo de imagem JPEG ou PNG. Tamanho máximo 10mb.")
gender = forms.ChoiceField(label="Gênero", choices=Gender.choices)
color = forms.ChoiceField(label="Raça", choices=Color.choices)
color = forms.ChoiceField(label="Cor ou Raça", choices=Color.choices)
sexuality = forms.ChoiceField(
label="Sexualidade", required=False, choices=Sexuality.choices
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.2 on 2024-09-05 23:18

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('candidature', '0019_alter_candidature_intended_position'),
]

operations = [
migrations.AlterField(
model_name='candidature',
name='sexuality',
field=models.CharField(blank=True, choices=[('', 'Selecione uma opção'), ('heterossexual', 'Heterossexual'), ('pansexual', 'Pansexual'), ('bissexual', 'Bissexual'), ('gay', 'Homossexual'), ('queer', 'Queer'), ('lesbica', 'Lésbica'), ('nao_declarada', 'Não declarada')], max_length=30, null=True, verbose_name='Sexualidade'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.2 on 2024-09-05 23:27

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('candidature', '0020_alter_candidature_sexuality'),
]

operations = [
migrations.AlterField(
model_name='candidature',
name='political_party',
field=models.CharField(choices=[('', 'Selecione o partido'), ('agir', 'Agir'), ('avante', 'Avante'), ('cidadania', 'Cidadania'), ('dc', 'DC'), ('mdb', 'MDB'), ('mobiliza', 'Mobiliza'), ('novo', 'Novo'), ('patriota', 'Patriota'), ('pcb', 'PCB'), ('pcdob', 'PCdoB'), ('pco', 'PCO'), ('pdt', 'PDT'), ('pl', 'PL'), ('pmb', 'PMB'), ('pmn', 'PMN'), ('pode', 'PODE'), ('pp', 'PP'), ('prd', 'PRD'), ('pros', 'PROS'), ('prtb', 'PRTB'), ('psb', 'PSB'), ('psc', 'PSC'), ('psd', 'PSD'), ('psdb', 'PSDB'), ('psol', 'PSOL'), ('pstu', 'PSTU'), ('pt', 'PT'), ('ptb', 'PTB'), ('ptc', 'PTC'), ('pv', 'PV'), ('rede', 'Rede'), ('republicanos', 'Republicanos'), ('solidariedade', 'Solidariedade'), ('união', 'União'), ('up', 'UP')], max_length=60, verbose_name='Partido Político'),
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h5 class="fw-bold text-uppercase text-white">Realização</h5>
<a href="https://nossas.org" target="_blank" rel="noopener noreferrer">
<img src="{% static "imgs/logo-nossas.png" %}" alt="NOSSAS">
</a>
<a href="https://climadeeleicao.com.br/" target="_blank" rel="noopener noreferrer">
<a href="https://www.instagram.com/climadeeleicao/" target="_blank" rel="noopener noreferrer">
<img src="{% static "imgs/logo-clima-de-eleicao.png" %}" alt="Clima de Eleição">
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ <h1>A POLÍTICA PRECISA MUDAR.</h1>





<img src="https://votepeloclima.s3.amazonaws.com/media/filer_public_thumbnails/filer_public/76/3f/763f6ad4-74f3-4d2e-b14a-2a41fa014ea2/logo-vpc-footer_1.png__250x414_subsampling-2.png" alt="" width="250" class="align- mx-auto img-fluid ">
<a href="https://www.instagram.com/climadeeleicao/" target="_blank" rel="noopener noreferrer">
<img src="https://votepeloclima.s3.amazonaws.com/media/filer_public_thumbnails/filer_public/76/3f/763f6ad4-74f3-4d2e-b14a-2a41fa014ea2/logo-vpc-footer_1.png__250x414_subsampling-2.png" alt="" width="250" class="align- mx-auto img-fluid ">
</a>



Expand Down
Loading