diff --git a/src/backoffice/templates/backoffice/event/components/list_content.html b/src/backoffice/templates/backoffice/event/components/list_content.html index 725a8ffd512136139afe8d4788b61bd29359ad8b..b43ba5382a133f5367a70f46f12cffafa676dd3e 100644 --- a/src/backoffice/templates/backoffice/event/components/list_content.html +++ b/src/backoffice/templates/backoffice/event/components/list_content.html @@ -36,8 +36,12 @@ <tbody> {% for event in events %} <tr class="{% if not event.is_public %}text-muted{% endif %}"> - <td>{{ event.schedule_start }}</td> - <td>{{ event.schedule_duration }}</td> + <td data-order="{{ event.schedule_start|date:"U" }}"> + <abbr title="{{ event.schedule_start|date:"c" }}">{{ event.schedule_start|conference_time:conference }}</abbr> + </td> + <td data-order="{{ event.schedule_duration.total_seconds|default:"0" }}"> + {{ event.schedule_duration|naturaltimespan }} + </td> <td> {% if user_list and event.kind == 'sos' %} <a href="{% url 'backoffice:sos-edit' pk=event.pk %}">{{ event.name }}</a> diff --git a/src/backoffice/templatetags/c3assemblies.py b/src/backoffice/templatetags/c3assemblies.py index 5539f5fcccb9e9e8faebc0e36a3687a9a089aa30..b18a74875547123857409042166018ec6e19ddd5 100644 --- a/src/backoffice/templatetags/c3assemblies.py +++ b/src/backoffice/templatetags/c3assemblies.py @@ -45,8 +45,11 @@ def get_language_item(dictionary): @register.filter -def naturaltimespan(x): - assert isinstance(x, timedelta), str.format('Expected a timedelta object: {0!r}', x) +def naturaltimespan(x: timedelta) -> str or None: + if x is None: + return '' + if not isinstance(x, timedelta): + raise ValueError('Expected a timedelta object.') seconds = x.total_seconds()