CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Contract columns in event list table

Browse Source
This commit is contained in:
Raphael Michel
2017-10-04 10:12:46 +02:00
parent b920efc955
commit 217ed905d4
3 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/pretix/base/models/event.py
View File

@@ -38,6 +38,31 @@ class EventMixin:
raise ValidationError({'date_to': _('The end of the event has to be later than its start.')})
super().clean()
def get_short_date_from_display(self, tz=None, show_times=True) -> str:
"""
Returns a shorter formatted string containing the start date of the event with respect
to the current locale and to the ``show_times`` setting.
"""
tz = tz or pytz.timezone(self.settings.timezone)
return _date(
self.date_from.astimezone(tz),
"SHORT_DATETIME_FORMAT" if self.settings.show_times and show_times else "DATE_FORMAT"
)
def get_short_date_to_display(self, tz=None) -> str:
"""
Returns a shorter formatted string containing the start date of the event with respect
to the current locale and to the ``show_times`` setting. Returns an empty string
if ``show_date_to`` is ``False``.
"""
tz = tz or pytz.timezone(self.settings.timezone)
if not self.settings.show_date_to or not self.date_to:
return ""
return _date(
self.date_to.astimezone(tz),
"SHORT_DATETIME_FORMAT" if self.settings.show_times else "DATE_FORMAT"
)
def get_date_from_display(self, tz=None, show_times=True) -> str:
"""
Returns a formatted string containing the start date of the event with respect

31
src/pretix/control/templates/pretixcontrol/events/index.html
View File

@@ -51,11 +51,6 @@
<th>
{% trans "Event name" %}
</th>
<th>
{% trans "Short form" %}
<a href="?{% url_replace request 'ordering' '-slug' %}"><i class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'slug' %}"><i class="fa fa-caret-up"></i></a>
</th>
{% if not hide_orga %}
<th>
{% trans "Organizer" %}
@@ -67,8 +62,7 @@
{% trans "Start date" %}
<a href="?{% url_replace request 'ordering' '-date_from' %}"><i class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'date_from' %}"><i class="fa fa-caret-up"></i></a>
</th>
<th>
/
{% trans "End date" %}
<a href="?{% url_replace request 'ordering' '-date_to' %}"><i class="fa fa-caret-down"></i></a>
<a href="?{% url_replace request 'ordering' 'date_to' %}"><i class="fa fa-caret-up"></i></a>
@@ -83,26 +77,27 @@
<tbody>
{% for e in events %}
<tr>
<td>
<td class="event-name-col">
<strong><a href="{% url "control:event.index" organizer=e.organizer.slug event=e.slug %}">{{ e.name }}</a></strong>
{% if e.has_subevents %}
<span class="label label-default">{% trans "Series" %}</span>
{% endif %}
<br><small>{{ e.slug }}</small>
</td>
<td>{{ e.slug }}</td>
{% if not hide_orga %}<td>{{ e.organizer }}</td>{% endif %}
<td>
<td class="event-date-col">
{% if e.has_subevents %}
{{ e.min_from|default_if_none:"" }}
{{ e.min_from|default_if_none:""|date:"SHORT_DATETIME_FORMAT" }}
{% else %}
{{ e.get_date_from_display }}
{{ e.get_short_date_from_display }}
{% endif %}
</td>
<td>
{% if e.has_subevents %}
{{ e.max_fromto|default_if_none:e.max_from|default_if_none:e.max_to|default_if_none:"" }}
{% else %}
{{ e.get_date_from_display }}
{% if e.settings.show_date_to and e.date_to %}
<br> –
{% if e.has_subevents %}
{{ e.max_fromto|default_if_none:e.max_from|default_if_none:e.max_to|default_if_none:""|date:"SHORT_DATETIME_FORMAT" }}
{% else %}
{{ e.get_short_date_to_display }}
{% endif %}
{% endif %}
</td>
<td class="text-right">

4
src/pretix/static/pretixcontrol/scss/main.scss
View File

@@ -399,3 +399,7 @@ body.loading #wrapper {
.fa.disabled {
color: $text-muted;
}
.event-name-col {
width: 30%;
}