Merge pull request #442 from pythoncanarias/issue#441

Añade nuevo filtro as_short_date, modifica as_date

Author: sdelquin

Makefile

@@ -2,32 +2,36 @@
 
 help:
 	@echo "Opciones disponibles:\n"
-	@echo " - clean    : Borrar ficheros temporales y espurios"
 	@echo " - check    : Ejecutar varias comprobaciones"
+	@echo " - clean    : Borrar ficheros temporales y espurios"
+	@echo " - migrate  : Ejecuta las migraciones pendientes"
 	@echo " - run      : Ejecutar el servidor en modo producción"
 	@echo " - rundev   : Ejecutar el servidor en modo desarrollo"
+	@echo " - shell    : Abre una shell python con el entorno de Django cargado"
 	@echo " - static   : Actualiza contenidos estáticos"
-	@echo " - migrate  : Ejecuta las migraciones pendientes"
+
+check:
+	python manage.py check
+	flake8 --count **/*.py
 
 clean:
 	find . -type f -name "*.pyc" -delete
 	find . -type d -name "__pycache__" -exec rm -r "{}" \;
 	find . -type d -name ".sass-cache" -exec rm -r "{}" \;
 
-check:
-	python manage.py check
-	flake8 --count **/*.py
-
-static:
-	python manage.py collectstatic --no-input
-	#sass --sourcemap=none bulma/custom.scss:commons/static/commons/vendor.min.css
-	#sass --sourcemap=none about/static/about/css/main.scss:about/static/about/custom.min.css
+migrate:
+	python manage.py migrate
 
 run: check static
 	python manage.py runserver
 
 rundev: static
 	DEBUG=yes python manage.py runserver_plus
 
-migrate:
-	python manage.py migrate
+shell:
+	python manage.py shell_plus
+
+static:
+	python manage.py collectstatic --no-input
+	#sass --sourcemap=none bulma/custom.scss:commons/static/commons/vendor.min.css
+	#sass --sourcemap=none about/static/about/css/main.scss:about/static/about/custom.min.css

apps/commons/filters.py

@@ -2,6 +2,7 @@
 
 import datetime
 import os
+from typing import Union
 
 from django.conf import settings
 from markdown2 import markdown
@@ -42,18 +43,46 @@ def as_month(f, num_letters=0):
         return _months[n]
 
 
-def as_date(f):
-    if not isinstance(f, datetime.date):
-        return f
+def as_date(f: Union[datetime.date, datetime.datetime]) -> str:
+    """Fecha o timestamp en formato día/mes/año.
 
-    today = datetime.date.today()
-    if f.year == today.year:
-        return '{}/{}'.format(f.day, as_month(f, 3))
-    else:
-        return '{}/{}/{}'.format(f.day, as_month(f, 3), f.year)
+    Ver también: `as_short_date`.
+
+    Ejemplo de uso:
+
+        >>> import datetime
+        >>> print(as_date(datetime.date(1992, 1, 2)))
+        2/ene/1992
+    """
+    if isinstance(f, (datetime.date, datetime.datetime)):
+        return f'{f.day}/{as_month(f, 3)}/{f.year}'
+    return str(f)
+
+
+def as_short_date(f: Union[datetime.date, datetime.datetime]) -> str:
+    """Fecha o timestamp en formato día/mes/año, omitiendo el
+    año si es el mismo del año actual.
+
+    Ver también: `as_date`.
+
+    Ejemplo de uso:
+
+        >>> import datetime
+        >>> current_year = datetime.date.today().year
+        >>> print(as_short_date(datetime.date(current_year, 1, 2)))
+        2/ene
+        >>> print(as_short_date(datetime.date(1992, 1, 2)))
+        2/ene/1992
+    """
+    if isinstance(f, (datetime.date, datetime.datetime)):
+        today = datetime.date.today()
+        if f.year == today.year:
+            return f'{f.day}/{as_month(f, 3)}'
+        return f'{f.day}/{as_month(f, 3)}/{f.year}'
+    return str(f)
 
 
-def date_from_now(days=1):
+def date_from_now(days=1) -> datetime.date:
     today = datetime.date.today()
     delta = datetime.timedelta(days=days)
     return today + delta

apps/commons/templatetags/utils.py

@@ -14,6 +14,7 @@ def compose2(f, g):
 register = template.Library()
 
 register.filter('as_month', filters.as_month)
+register.filter('as_short_date', filters.as_short_date)
 register.filter('as_date', filters.as_date)
 register.filter('date_from_now', filters.date_from_now)
 register.filter('get_key', filters.get_key)

apps/commons/test_filters.py

@@ -4,18 +4,29 @@
 
 from . import filters
 
+
 # as_date
 
 
 def test_as_date():
-    d = datetime.date(2016, 4, 18)
-    assert filters.as_date(d) == '18/abr/2016'
+    assert filters.as_date(datetime.date(2016, 4, 18)) == '18/abr/2016'
 
 
 def test_as_date_current_year():
-    today = datetime.date.today()
-    d = datetime.date(today.year, 4, 18)
-    assert filters.as_date(d) == '18/abr'
+    year = datetime.date.today().year
+    assert filters.as_date(datetime.date(year, 4, 18)) == f'18/abr/{year}'
+
+
+# as_short_date
+
+
+def test_as_short_date_current_year():
+    year = datetime.date.today().year
+    assert filters.as_short_date(datetime.date(year, 4, 18)) == '18/abr'
+
+
+def test_as_short_date_other_year():
+    assert filters.as_short_date(datetime.date(1992, 4, 18)) == '18/abr/1992'
 
 
 # as_month

apps/events/templates/events/event.html

@@ -17,7 +17,7 @@
       <h1 class="title is-1">{{ event.name }}</h1>
       <div class="subtitle is-4">
         <span class="event-header-date">
-          <i class="far fa-calendar-alt"></i> {{ event.start_date|as_date }}
+          <i class="far fa-calendar-alt"></i> {{ event.start_date|as_short_date }}
         </span>
         {% if event.venue %}
           <span class="event-header-venue">
@@ -127,7 +127,7 @@ <h1 class="title section-title dyn-anchor-heading">
           Agenda
           <a class="dyn-anchor-link" href="#schedule"><i class="fas fa-link"></i></a>
         </p>
-        <p class="section-detail"><i class="far fa-calendar-alt"></i> {{ event.start_date|as_date }}</p>
+        <p class="section-detail"><i class="far fa-calendar-alt"></i> {{ event.start_date|as_short_date }}</p>
         <a target="_blank" href="{{ event.get_google_calendar_url }}">Añadir a Google Calendar</a>
         {% if event.schedule_for_display and not event.closed_schedule %}
           <span class="tag is-warning is-medium not-closed-schedule">

apps/events/templates/events/raffle.html

@@ -53,7 +53,7 @@
     <div class="closed-raffle">
       <span class="tag is-warning is-medium">
         <i class="fas fa-lock"></i>
-        Este sorteo está cerrado! Se realizó el {{ raffle.closed_at|as_date }}
+        Este sorteo está cerrado! Se realizó el {{ raffle.closed_at|as_short_date }}
       </span>
       <a class="view-results" href="{% url 'events:raffle_results' event.slug %}">
         <i class="fas fa-table"></i>

apps/quotes/migrations/0004_change_meta_options_for_models_author_and_quote.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.13 on 2022-05-18 20:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('quotes', '0003_auto_20220510_2236'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='author',
+            options={'ordering': ['name', 'surname'], 'verbose_name': 'Autor', 'verbose_name_plural': 'Autores'},
+        ),
+        migrations.AlterModelOptions(
+            name='quote',
+            options={'verbose_name': 'Cita', 'verbose_name_plural': 'Citas'},
+        ),
+    ]