Admission date and time in editor

This commit is contained in:
Raphael Michel
2017-05-10 13:16:39 +02:00
parent aac05727ed
commit f451977a04
3 changed files with 19 additions and 2 deletions

View File

@@ -162,6 +162,9 @@ var editor = {
"event_name": gettext("Sample event name"),
"event_date": gettext("May 31st, 2017"),
"event_begin_time": gettext("20:00"),
"event_admission_time": gettext("19:00"),
"event_begin": gettext("2017-05-31 20:00"),
"event_admission": gettext("2017-05-31 19:00"),
"event_location": gettext("Random City")
},

View File

@@ -267,7 +267,10 @@
<option value="attendee_name">{% trans "Attendee name" %}</option>
<option value="event_name">{% trans "Event name" %}</option>
<option value="event_date">{% trans "Event date" %}</option>
<option value="event_begin">{% trans "Event begin date and time" %}</option>
<option value="event_begin_time">{% trans "Event begin time" %}</option>
<option value="event_admission">{% trans "Event admission date and time" %}</option>
<option value="event_admission_time">{% trans "Event admission time" %}</option>
<option value="event_location">{% trans "Event location" %}</option>
<option value="other">{% trans "Other…" %}</option>
</select>

View File

@@ -8,8 +8,9 @@ from django.core.files import File
from django.core.files.storage import default_storage
from django.http import HttpRequest
from django.template.loader import get_template
from django.utils.formats import localize
from django.utils.formats import date_format, localize
from django.utils.translation import ugettext_lazy as _
from pytz import timezone
from reportlab.graphics import renderPDF
from reportlab.graphics.barcode.qr import QrCodeWidget
from reportlab.graphics.shapes import Drawing
@@ -85,8 +86,18 @@ class PdfTicketOutput(BaseTicketOutput):
return str(order.event.location).replace("\n", "<br/>\n")
elif o['content'] == 'event_date':
return order.event.get_date_from_display(show_times=False)
elif o['content'] == 'event_begin':
return order.event.get_date_from_display(show_times=True)
elif o['content'] == 'event_begin_time':
return order.event.get_date_from_display(show_times=False)
return order.event.get_time_from_display()
elif o['content'] == 'event_admission':
if order.event.date_admission:
tz = timezone(order.event.settings.timezone)
return date_format(order.event.date_admission.astimezone(tz), "SHORT_DATETIME_FORMAT")
elif o['content'] == 'event_admission_time':
if order.event.date_admission:
tz = timezone(order.event.settings.timezone)
return date_format(order.event.date_admission.astimezone(tz), "TIME_FORMAT")
return ''
def _draw_textarea(self, canvas: Canvas, op: OrderPosition, order: Order, o: dict):