From ecdd5e98b94d516df3571cded5e5ff45a5f7af8a Mon Sep 17 00:00:00 2001 From: miguelzinh3 Date: Thu, 5 Sep 2024 20:19:06 -0300 Subject: [PATCH 1/3] hotfix(vote): change sexuality and race/color label --- .../votepeloclima/candidature/choices.py | 3 +-- .../candidature/forms/register.py | 2 +- .../0020_alter_candidature_sexuality.py | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 app/org_eleicoes/votepeloclima/candidature/migrations/0020_alter_candidature_sexuality.py diff --git a/app/org_eleicoes/votepeloclima/candidature/choices.py b/app/org_eleicoes/votepeloclima/candidature/choices.py index 854e165b..452e0210 100644 --- a/app/org_eleicoes/votepeloclima/candidature/choices.py +++ b/app/org_eleicoes/votepeloclima/candidature/choices.py @@ -76,10 +76,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" diff --git a/app/org_eleicoes/votepeloclima/candidature/forms/register.py b/app/org_eleicoes/votepeloclima/candidature/forms/register.py index ba447f6d..f44e70d4 100644 --- a/app/org_eleicoes/votepeloclima/candidature/forms/register.py +++ b/app/org_eleicoes/votepeloclima/candidature/forms/register.py @@ -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 ) diff --git a/app/org_eleicoes/votepeloclima/candidature/migrations/0020_alter_candidature_sexuality.py b/app/org_eleicoes/votepeloclima/candidature/migrations/0020_alter_candidature_sexuality.py new file mode 100644 index 00000000..b83fff5f --- /dev/null +++ b/app/org_eleicoes/votepeloclima/candidature/migrations/0020_alter_candidature_sexuality.py @@ -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'), + ), + ] From bbd996d860557f04638f976ff07d21eec2142caf Mon Sep 17 00:00:00 2001 From: miguelzinh3 Date: Thu, 5 Sep 2024 20:27:13 -0300 Subject: [PATCH 2/3] hotfix(vote): add new political party --- .../votepeloclima/candidature/choices.py | 65 ++++++++++--------- .../0021_alter_candidature_political_party.py | 18 +++++ 2 files changed, 52 insertions(+), 31 deletions(-) create mode 100644 app/org_eleicoes/votepeloclima/candidature/migrations/0021_alter_candidature_political_party.py diff --git a/app/org_eleicoes/votepeloclima/candidature/choices.py b/app/org_eleicoes/votepeloclima/candidature/choices.py index 452e0210..39508b4c 100644 --- a/app/org_eleicoes/votepeloclima/candidature/choices.py +++ b/app/org_eleicoes/votepeloclima/candidature/choices.py @@ -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): diff --git a/app/org_eleicoes/votepeloclima/candidature/migrations/0021_alter_candidature_political_party.py b/app/org_eleicoes/votepeloclima/candidature/migrations/0021_alter_candidature_political_party.py new file mode 100644 index 00000000..67082b27 --- /dev/null +++ b/app/org_eleicoes/votepeloclima/candidature/migrations/0021_alter_candidature_political_party.py @@ -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'), + ), + ] From 8acfa53e437edcb2a2fc0ddd26224761071c8a4d Mon Sep 17 00:00:00 2001 From: miguelzinh3 Date: Thu, 5 Sep 2024 20:29:49 -0300 Subject: [PATCH 3/3] =?UTF-8?q?hotfix(vote):=20add=20new=20link=20for=20cl?= =?UTF-8?q?ima=20de=20elei=C3=A7=C3=A3o=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../votepeloclima/templates/votepeloclima/base.html | 2 +- .../votepeloclima/templates/votepeloclima/home.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/org_eleicoes/votepeloclima/templates/votepeloclima/base.html b/app/org_eleicoes/votepeloclima/templates/votepeloclima/base.html index cf098ed4..850b097d 100644 --- a/app/org_eleicoes/votepeloclima/templates/votepeloclima/base.html +++ b/app/org_eleicoes/votepeloclima/templates/votepeloclima/base.html @@ -75,7 +75,7 @@
Realização
NOSSAS - + Clima de Eleição diff --git a/app/org_eleicoes/votepeloclima/templates/votepeloclima/home.html b/app/org_eleicoes/votepeloclima/templates/votepeloclima/home.html index 301274c1..c139b1f8 100644 --- a/app/org_eleicoes/votepeloclima/templates/votepeloclima/home.html +++ b/app/org_eleicoes/votepeloclima/templates/votepeloclima/home.html @@ -187,9 +187,9 @@

A POLÍTICA PRECISA MUDAR.

- - - + + +