From 2f391fd41b7b1f6d56d0894dfbd66119b77a2062 Mon Sep 17 00:00:00 2001 From: Javier Daza Date: Sat, 21 Oct 2023 19:08:36 -0500 Subject: [PATCH 1/7] feat: Formulario y vista para proponer una nueva charla --- temii/talks/admin.py | 3 ++- temii/talks/forms.py | 18 ++++++++++++++++++ temii/talks/models.py | 19 +++++++++++++++++-- temii/talks/urls.py | 4 ++++ temii/talks/views.py | 21 +++++++++++++++++++++ temii/templates/base.html | 8 ++++++++ temii/templates/talks/talk_form.html | 23 +++++++++++++++++++++++ temii/templates/talks/talk_thanks.html | 21 +++++++++++++++++++++ 8 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 temii/talks/forms.py create mode 100644 temii/templates/talks/talk_form.html create mode 100644 temii/templates/talks/talk_thanks.html diff --git a/temii/talks/admin.py b/temii/talks/admin.py index 27fae27f..ed0c7e9a 100644 --- a/temii/talks/admin.py +++ b/temii/talks/admin.py @@ -5,5 +5,6 @@ @admin.register(Talk) class TalkAdmin(admin.ModelAdmin): - list_display = ["name"] + list_display = ["name", "user", "months"] search_fields = ["name"] + list_filter = ["level", "precense", "language"] diff --git a/temii/talks/forms.py b/temii/talks/forms.py new file mode 100644 index 00000000..3a28b71c --- /dev/null +++ b/temii/talks/forms.py @@ -0,0 +1,18 @@ +from django import forms + +from .models import Talk + + +class NewTalkForm(forms.ModelForm): + class Meta: + model = Talk + fields = [ + "name", + "description", + "level", + "language", + "timezone", + "comments", + "precense", + "months", + ] diff --git a/temii/talks/models.py b/temii/talks/models.py index ae8953e2..78df7af5 100644 --- a/temii/talks/models.py +++ b/temii/talks/models.py @@ -23,10 +23,25 @@ class InPerson(models.IntegerChoices): description = models.CharField(_("Description"), max_length=300) level = models.PositiveIntegerField(_("Level"), choices=Level.choices, default=Level.BEGINNER) language = models.CharField(_("Language"), max_length=2, choices=Language.choices, default=Language.ES) - timezone = models.CharField(_("Timezone"), max_length=60) + timezone = models.CharField( + _("Timezone"), + max_length=60, + help_text=_( + "Timezone of the place you are located. E.g., " + "Colombia (UTC-5), Argentina or Chile (UTC-3), Mexico (UTC-6), etc." + ), + ) comments = models.CharField(_("Comments"), max_length=300) precense = models.PositiveIntegerField(_("Precense"), choices=InPerson.choices, default=InPerson.ON_SITE) - months = models.CharField(_("Months"), max_length=100, blank=True) + months = models.CharField( + _("Months"), + max_length=100, + blank=True, + help_text=_( + "Please write your time availability in months." + "The more specific, the better. E.g., October and November, any day after 6pm." + ), + ) class Meta: verbose_name = _("Talk") diff --git a/temii/talks/urls.py b/temii/talks/urls.py index a661a00a..6a830929 100644 --- a/temii/talks/urls.py +++ b/temii/talks/urls.py @@ -1,7 +1,11 @@ from django.urls import path from django.views.generic import TemplateView +from .views import talk_create_view + app_name = "talks" urlpatterns = [ path("", TemplateView.as_view(template_name="pages/about.html"), name="talks"), + path("~create/", view=talk_create_view, name="create"), + path("thanks/", TemplateView.as_view(template_name="talks/talk_thanks.html"), name="thanks"), ] diff --git a/temii/talks/views.py b/temii/talks/views.py index e69de29b..0b791839 100644 --- a/temii/talks/views.py +++ b/temii/talks/views.py @@ -0,0 +1,21 @@ +from django.contrib.auth.mixins import LoginRequiredMixin +from django.urls import reverse_lazy +from django.views.generic.edit import CreateView + +from .forms import NewTalkForm +from .models import Talk + + +class TalkCreateView(LoginRequiredMixin, CreateView): + """Propose a new talk.""" + + model = Talk + form_class = NewTalkForm + success_url = reverse_lazy("talks:thanks") + + def form_valid(self, form): + form.instance.user = self.request.user + return super().form_valid(form) + + +talk_create_view = TalkCreateView.as_view() diff --git a/temii/templates/base.html b/temii/templates/base.html index a81efabb..9b905ca8 100644 --- a/temii/templates/base.html +++ b/temii/templates/base.html @@ -53,6 +53,11 @@
  • Home
    • + {% if request.user.is_staff %} +
  • + {% translate "Admin" %} +
    • + {% endif %}
  • About
    • @@ -60,6 +65,9 @@
  • {% translate "My Profile" %}
    • +
  • + Proponer una charla +
  • {# URL provided by django-allauth/account/urls.py #} {% translate "Sign Out" %} diff --git a/temii/templates/talks/talk_form.html b/temii/templates/talks/talk_form.html new file mode 100644 index 00000000..fe757261 --- /dev/null +++ b/temii/templates/talks/talk_form.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} +{% load crispy_forms_tags i18n %} + +{% block title %}Create Talk{% endblock %} + +{% block content %} + +

    Proponer una charla

    + +

    Aquí puedes proponer una futura charla.

    +

    Si deseas hacer más de una propuesta debes diligenciar nuevamente el formulario.

    + +
    + {% csrf_token %} + {{ form|crispy }} +
    +
    + +
    +
    +
    + +{% endblock content %} diff --git a/temii/templates/talks/talk_thanks.html b/temii/templates/talks/talk_thanks.html new file mode 100644 index 00000000..8e34e605 --- /dev/null +++ b/temii/templates/talks/talk_thanks.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block title %}Thanks for your proposal{% endblock %} + +{% block content %} + +
    +
    +
    +

    Muchas gracias por tu propuesta

    +

    + Tu aporte contribuye enormemente a la comunidad. +

    +

    + Si deseas, puedes volver a proponer otra charla. +

    +
    +
    +
    +{% endblock content %} From 5c973e53066d88a9343222a3ae3efc7b01cacdf6 Mon Sep 17 00:00:00 2001 From: Javier Daza Date: Fri, 27 Oct 2023 18:17:00 -0500 Subject: [PATCH 2/7] docs: como correr el coverage con docker compose --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 957807f7..924b3957 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ De esta forma podrás usar `import ipdb; ipdb.set_trace()` en tu código de Pyth Para ejecutar los tests, verificar el coverage y generar un reporte de coverage en HTML: - coverage run -m pytest - coverage html + docker compose -f local.yml run --rm django coverage run -m pytest + docker compose -f local.yml run --rm django coverage html open htmlcov/index.html #### Ejecutar los test usando pytest From 03113da031b4051b0c8e9fde980df6bde7254f8a Mon Sep 17 00:00:00 2001 From: Javier Daza Date: Fri, 27 Oct 2023 18:19:09 -0500 Subject: [PATCH 3/7] test: unit tests para vista CreateView de modelo Talk --- temii/talks/tests/test_views.py | 26 ++++++++++++++++++++++++++ temii/talks/views.py | 1 + 2 files changed, 27 insertions(+) diff --git a/temii/talks/tests/test_views.py b/temii/talks/tests/test_views.py index e69de29b..31c82eff 100644 --- a/temii/talks/tests/test_views.py +++ b/temii/talks/tests/test_views.py @@ -0,0 +1,26 @@ +import pytest +from django.test import RequestFactory + +from temii.talks.forms import NewTalkForm +from temii.talks.tests.factories import TalkFactory +from temii.talks.views import TalkCreateView +from temii.users.models import User + +pytestmark = pytest.mark.django_db + + +class TestTalkCreateView: + def test_form_valid(self, user: User, rf: RequestFactory): + view = TalkCreateView() + talk = TalkFactory() + request = rf.get("/fake-url/") + request.user = user + + view.request = request + + # Initialize the form + form = NewTalkForm(instance=talk) + form.cleaned_data = {} + view.form_valid(form) + + assert form.instance.user == request.user diff --git a/temii/talks/views.py b/temii/talks/views.py index 0b791839..e7dac81d 100644 --- a/temii/talks/views.py +++ b/temii/talks/views.py @@ -14,6 +14,7 @@ class TalkCreateView(LoginRequiredMixin, CreateView): success_url = reverse_lazy("talks:thanks") def form_valid(self, form): + # Se agrega el usuario que hace la petición al formulario form.instance.user = self.request.user return super().form_valid(form) From 559c9714b196ed7fec8aa397cb97b1eb398a1d3e Mon Sep 17 00:00:00 2001 From: Javier Daza Date: Fri, 27 Oct 2023 18:46:49 -0500 Subject: [PATCH 4/7] chore: internacionalizacion formulario charlas --- locale/es/LC_MESSAGES/django.po | 126 ++++++++++++++++++------- temii/templates/base.html | 4 +- temii/templates/talks/talk_form.html | 8 +- temii/templates/talks/talk_thanks.html | 23 ++--- 4 files changed, 110 insertions(+), 51 deletions(-) diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index ba2ccdd0..47d3b6d6 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-07 12:27-0500\n" +"POT-Creation-Date: 2023-10-27 18:39-0500\n" "PO-Revision-Date: 2023-09-05 23:34-0500\n" "Last-Translator: Sergio Orozco \n" "Language-Team: \n" @@ -18,6 +18,32 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.0.1\n" +#: htmlcov/d_afce42a2cf3d92da_base_html.html:140 temii/templates/base.html:58 +msgid "Admin" +msgstr "Administrador" + +#: htmlcov/d_afce42a2cf3d92da_base_html.html:148 temii/templates/base.html:66 +msgid "My Profile" +msgstr "Mi perfil" + +#: htmlcov/d_afce42a2cf3d92da_base_html.html:155 +#: temii/templates/account/logout.html:5 temii/templates/account/logout.html:8 +#: temii/templates/account/logout.html:17 temii/templates/base.html:73 +msgid "Sign Out" +msgstr "Salir" + +#: htmlcov/d_afce42a2cf3d92da_base_html.html:161 +#: temii/templates/account/signup.html:9 temii/templates/account/signup.html:19 +#: temii/templates/base.html:79 +msgid "Sign Up" +msgstr "Inscribirse" + +#: htmlcov/d_afce42a2cf3d92da_base_html.html:166 +#: temii/templates/account/login.html:7 temii/templates/account/login.html:11 +#: temii/templates/account/login.html:56 temii/templates/base.html:84 +msgid "Sign In" +msgstr "Iniciar sesión" + #: temii/talks/apps.py:7 msgid "Talks" msgstr "Charlas" @@ -66,23 +92,35 @@ msgstr "Nivel" msgid "Language" msgstr "Lenguaje" -#: temii/talks/models.py:26 +#: temii/talks/models.py:27 msgid "Timezone" msgstr "Zona horaria" -#: temii/talks/models.py:27 +#: temii/talks/models.py:30 +msgid "" +"Timezone of the place you are located. E.g., Colombia (UTC-5), Argentina or " +"Chile (UTC-3), Mexico (UTC-6), etc." +msgstr "" + +#: temii/talks/models.py:34 msgid "Comments" msgstr "Comentarios" -#: temii/talks/models.py:28 +#: temii/talks/models.py:35 msgid "Precense" msgstr "Presencialidad" -#: temii/talks/models.py:29 +#: temii/talks/models.py:37 msgid "Months" msgstr "Meses" -#: temii/talks/models.py:32 +#: temii/talks/models.py:41 +msgid "" +"Please write your time availability in months.The more specific, the better. " +"E.g., October and November, any day after 6pm." +msgstr "" + +#: temii/talks/models.py:47 msgid "Talk" msgstr "Charla" @@ -178,18 +216,13 @@ msgstr "Confirmar" #: temii/templates/account/email_confirm.html:27 #, python-format msgid "" -"This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request." +"This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request." msgstr "" "Este enlace de confirmación de correo electrónico expiro o es invalido. Por " "favor solicite una nueva confirmación de correo " "electrónico." -#: temii/templates/account/login.html:7 temii/templates/account/login.html:11 -#: temii/templates/account/login.html:56 temii/templates/base.html:76 -msgid "Sign In" -msgstr "Iniciar sesión" - #: temii/templates/account/login.html:17 msgid "Please sign in with one of your existing third party accounts:" msgstr "" @@ -211,21 +244,16 @@ msgstr "o" #: temii/templates/account/login.html:41 #, python-format msgid "" -"If you have not created an account yet, then please sign up first." +"If you have not created an account yet, then please sign up first." msgstr "" -"Si no has creado tu cuenta aún, por favor registrate." +"Si no has creado tu cuenta aún, por favor registrate." #: temii/templates/account/login.html:55 msgid "Forgot Password?" msgstr "Olvido su contraseña?" -#: temii/templates/account/logout.html:5 temii/templates/account/logout.html:8 -#: temii/templates/account/logout.html:17 temii/templates/base.html:65 -msgid "Sign Out" -msgstr "Salir" - #: temii/templates/account/logout.html:10 msgid "Are you sure you want to sign out?" msgstr "¿Estás seguro que deseas salir?" @@ -302,11 +330,6 @@ msgstr "" msgid "Signup" msgstr "" -#: temii/templates/account/signup.html:9 temii/templates/account/signup.html:19 -#: temii/templates/base.html:71 -msgid "Sign Up" -msgstr "" - #: temii/templates/account/signup.html:11 #, python-format msgid "" @@ -357,9 +380,48 @@ msgid "" "mail address." msgstr "" -#: temii/templates/base.html:61 -msgid "My Profile" -msgstr "Mi perfil" +#: temii/templates/base.html:62 +msgid "About" +msgstr "" + +#: temii/templates/base.html:69 temii/templates/talks/talk_form.html:8 +msgid "Propose a talk" +msgstr "Proponer una charla" + +#: temii/templates/talks/talk_form.html:4 +msgid "Create Talk" +msgstr "Crear una charla" + +#: temii/templates/talks/talk_form.html:10 +msgid "Here you can propose a future talk" +msgstr "Aquí puedes proponer una futura charla" + +#: temii/templates/talks/talk_form.html:11 +msgid "" +"If you wish to make more than one proposal, you must fill out the form again" +msgstr "Si deseas hacer más de una propuesta debes diligenciar nuevamente el formulario" + +#: temii/templates/talks/talk_form.html:18 +#: temii/templates/users/user_form.html:13 +msgid "Save" +msgstr "Guardar" + +#: temii/templates/talks/talk_thanks.html:4 +#: temii/templates/talks/talk_thanks.html:11 +msgid "Thanks for your proposal" +msgstr "Gracias por tu propuesta" + +#: temii/templates/talks/talk_thanks.html:13 +msgid "Your contribution greatly contributes to the community" +msgstr "Tu aporte contribuye enormemente a la comunidad" + +#: temii/templates/talks/talk_thanks.html:16 +msgid "If you wish, you can" +msgstr "Si deseas, puedes" + +#: temii/templates/talks/talk_thanks.html:17 +msgid "propose another talk again" +msgstr "volver a proponer otra charla" #: temii/templates/users/user_detail.html:19 temii/users/forms.py:37 #: temii/users/models.py:23 @@ -379,10 +441,6 @@ msgstr "Actualizar" msgid "E-Mail" msgstr "Coreo electrónico" -#: temii/templates/users/user_form.html:13 -msgid "Save" -msgstr "Guardar" - #: temii/users/admin.py:17 msgid "Personal info" msgstr "Información personal" diff --git a/temii/templates/base.html b/temii/templates/base.html index 9b905ca8..ed76ff59 100644 --- a/temii/templates/base.html +++ b/temii/templates/base.html @@ -59,14 +59,14 @@
    • {% endif %}
  • - About + {% translate "About" %}
    • {% if request.user.is_authenticated %}
  • {% translate "My Profile" %}
  • - Proponer una charla + {% translate "Propose a talk" %}
  • {# URL provided by django-allauth/account/urls.py #} diff --git a/temii/templates/talks/talk_form.html b/temii/templates/talks/talk_form.html index fe757261..d4973a2a 100644 --- a/temii/templates/talks/talk_form.html +++ b/temii/templates/talks/talk_form.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% load crispy_forms_tags i18n %} -{% block title %}Create Talk{% endblock %} +{% block title %}{% translate "Create Talk" %}{% endblock %} {% block content %} -

    Proponer una charla

    +

    {% translate "Propose a talk" %}

    -

    Aquí puedes proponer una futura charla.

    -

    Si deseas hacer más de una propuesta debes diligenciar nuevamente el formulario.

    +

    {% translate "Here you can propose a future talk" %}.

    +

    {% translate "If you wish to make more than one proposal, you must fill out the form again" %}.

    {% csrf_token %} diff --git a/temii/templates/talks/talk_thanks.html b/temii/templates/talks/talk_thanks.html index 8e34e605..87a3d3e0 100644 --- a/temii/templates/talks/talk_thanks.html +++ b/temii/templates/talks/talk_thanks.html @@ -1,21 +1,22 @@ {% extends "base.html" %} {% load i18n %} -{% block title %}Thanks for your proposal{% endblock %} +{% block title %}{% translate "Thanks for your proposal" %}{% endblock %} {% block content %}
    -
    -
    -

    Muchas gracias por tu propuesta

    -

    - Tu aporte contribuye enormemente a la comunidad. -

    -

    - Si deseas, puedes volver a proponer otra charla. -

    -
    +
    +
    +

    {% translate "Thanks for your proposal" %}

    +

    + {% translate "Your contribution greatly contributes to the community" %}. +

    +

    + {% translate "If you wish, you can" %} + {% translate "propose another talk again" %}. +

    +
    {% endblock content %} From c9e0959f422322f21e1798674a50373de985fca8 Mon Sep 17 00:00:00 2001 From: Javier Daza Date: Mon, 30 Oct 2023 21:07:31 -0500 Subject: [PATCH 5/7] chore: internacionalizacion help text de modelo Talk --- locale/es/LC_MESSAGES/django.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 47d3b6d6..3f79502f 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -100,7 +100,8 @@ msgstr "Zona horaria" msgid "" "Timezone of the place you are located. E.g., Colombia (UTC-5), Argentina or " "Chile (UTC-3), Mexico (UTC-6), etc." -msgstr "" +msgstr "ona horaria del lugar donde se encuentra. Por ejemplo," +"Colombia (UTC-5), Argentina o Chile (UTC-3), México (UTC-6), etc." #: temii/talks/models.py:34 msgid "Comments" @@ -118,7 +119,8 @@ msgstr "Meses" msgid "" "Please write your time availability in months.The more specific, the better. " "E.g., October and November, any day after 6pm." -msgstr "" +msgstr "Por favor escribe tu disponibilidad de tiempo en meses. Cuanto más específico, mejor." +"Por ejemplo, octubre y noviembre, cualquier día después de las 6 p.m." #: temii/talks/models.py:47 msgid "Talk" From 661e65864d1b0b326ffe4954a303ce358a6bf005 Mon Sep 17 00:00:00 2001 From: Javier Daza Date: Mon, 30 Oct 2023 21:08:21 -0500 Subject: [PATCH 6/7] chore: migraciones del modelo Talk sobre los help text --- ...2_alter_talk_months_alter_talk_timezone.py | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 temii/talks/migrations/0002_alter_talk_months_alter_talk_timezone.py diff --git a/temii/talks/migrations/0002_alter_talk_months_alter_talk_timezone.py b/temii/talks/migrations/0002_alter_talk_months_alter_talk_timezone.py new file mode 100644 index 00000000..483480a5 --- /dev/null +++ b/temii/talks/migrations/0002_alter_talk_months_alter_talk_timezone.py @@ -0,0 +1,31 @@ +# Generated by Django 4.2.1 on 2023-10-31 01:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("talks", "0001_initial"), + ] + + operations = [ + migrations.AlterField( + model_name="talk", + name="months", + field=models.CharField( + blank=True, + help_text="Please write your time availability in months.The more specific, the better. E.g., October and November, any day after 6pm.", + max_length=100, + verbose_name="Months", + ), + ), + migrations.AlterField( + model_name="talk", + name="timezone", + field=models.CharField( + help_text="Timezone of the place you are located. E.g., Colombia (UTC-5), Argentina or Chile (UTC-3), Mexico (UTC-6), etc.", + max_length=60, + verbose_name="Timezone", + ), + ), + ] From 07165a7d10b5b981445531502ece9e556e43473c Mon Sep 17 00:00:00 2001 From: Javier Daza Date: Tue, 31 Oct 2023 21:28:39 -0500 Subject: [PATCH 7/7] chore: arreglo typo en traduccion --- locale/es/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 3f79502f..9843bcc0 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -100,7 +100,7 @@ msgstr "Zona horaria" msgid "" "Timezone of the place you are located. E.g., Colombia (UTC-5), Argentina or " "Chile (UTC-3), Mexico (UTC-6), etc." -msgstr "ona horaria del lugar donde se encuentra. Por ejemplo," +msgstr "Zona horaria del lugar donde se encuentra. Por ejemplo," "Colombia (UTC-5), Argentina o Chile (UTC-3), México (UTC-6), etc." #: temii/talks/models.py:34