diff --git a/pinaxcon/templates/symposion/schedule/_grid.html b/pinaxcon/templates/symposion/schedule/_grid.html
index 1020dbe9..bef26463 100644
--- a/pinaxcon/templates/symposion/schedule/_grid.html
+++ b/pinaxcon/templates/symposion/schedule/_grid.html
@@ -16,7 +16,7 @@
{% for room in timetable.rooms %}
{% with room|trackname:timetable.day as track_name %}
{% if track_name %} {{ track_name }}{% endif %} |
- {% endwith %}
+ {% endwith %}
{% endfor %}
{% endif %}
@@ -44,6 +44,8 @@
Session chair:
{% if not session.chair %}
Volunteer! 🙋
+ {% else %}
+ {{ session.chair.user.attendee.attendeeprofilebase.attendeeprofile.name }}
{% endif %}
{% endfor %}
diff --git a/vendor/regidesk/regidesk/models.py b/vendor/regidesk/regidesk/models.py
index d36bb301..0bb590f6 100644
--- a/vendor/regidesk/regidesk/models.py
+++ b/vendor/regidesk/regidesk/models.py
@@ -98,12 +98,16 @@ class CheckIn(models.Model):
self.badge_printed = True
self.save()
+ def unset_badge(self):
+ self.badge_printed = False
+ self.save()
+
def mark_schwag_given(self):
self.schwag_given = True
self.save()
def bulk_mark_given(self):
- self.badge_printed = True
+ self.checked_in_bool = True
self.schwag_given = True
self.save()
diff --git a/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html b/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html
index b29d8eb2..e54d8d8f 100644
--- a/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html
+++ b/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html
@@ -68,7 +68,8 @@
{{ attendee.attendeeprofilebase.attendeeprofile.name }} |
{{ attendee.ticket_type }} |
{{ attendee.user.email }} |
- {{ attendee.user.checkin.code }} |
+ {% if attendee.user.checkin.code %}
+ {{ attendee.user.checkin.code }}{% endif %} |
{% if attendee.user.checkin %}
{% if attendee.user.checkin.boardingpass %}
diff --git a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html
index e77e8387..5a239e52 100644
--- a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html
+++ b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html
@@ -31,6 +31,7 @@
Spearker Dinner Tickets{{ speakers_dinner_count }}
PDNS Tickets{{ pdns_count }}
Over 18 years{% if user.attendee.attendeeprofilebase.attendeeprofile.of_legal_age %}yes{% else %}NO{% endif %}
+ Username{{ user.username }}
@@ -71,11 +72,15 @@
- Status
- {% if check_in.badge_printed %}Marked{% else %}Not marked{% endif %} as printed
-
+
@@ -103,15 +108,16 @@
-
+
Bulk actions
+ Mark attendee as checked in and schwag given
- - Status
- {% if check_in.badge_printed or check_in.schwag_given %}One of the items in bulk action is marked as given already{% else %}Both items are marked as unrecived{% endif %}
+ - Status
- {% if check_in.checked_in_bool or check_in.schwag_given %}One of the items in bulk action is marked as given already{% else %}Both items are marked as unrecived{% endif %}
diff --git a/vendor/regidesk/regidesk/views.py b/vendor/regidesk/regidesk/views.py
index 62f1ab96..c045e321 100644
--- a/vendor/regidesk/regidesk/views.py
+++ b/vendor/regidesk/regidesk/views.py
@@ -52,7 +52,8 @@ def boardingpass(request):
'default template to use. This page has similar information to '
'the boarding pass - please check back later.')
return redirect('/tickets/review')
- prepare_boarding_pass(request, templates[0])
+ prepare_boarding_pass(request.user, templates[0])
+ checkin = CheckIn.objects.get_or_create(user=user)[0]
boardingpass = checkin.boardingpass
qrcode_url = request.build_absolute_uri(reverse("regidesk:checkin_png", args=[checkin.code]))
@@ -81,7 +82,9 @@ def boarding_overview(request, boarding_state="pending"):
price__gte=0
)
- ticketholders = { ticket.invoice.user: ticket.product.name for ticket in tickets }
+ print(datetime.now())
+ ticketholders = ( ticket.invoice.user for ticket in tickets )
+ print(datetime.now())
attendees = people.Attendee.objects.select_related(
"attendeeprofilebase",
@@ -194,7 +197,7 @@ def prepare_boarding_pass(user, template, attendee=None):
if attendee:
user = attendee.user
else:
- user = request.user
+ user = user
attendee=user.attendee
checkin = CheckIn.objects.get_or_create(user=user)
ctx = {
@@ -312,6 +315,8 @@ def check_in_overview(request, access_code):
check_in.bulk_mark_given()
elif 'exception' in request.POST:
check_in.set_exception(request.POST['exception'])
+ elif 'unbadge' in request.POST:
+ check_in.unset_badge()
return redirect(request.path)
ctx = {
'check_in': check_in,
|