From 394cb870d353a2c91c14d105154ba683307019d0 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sun, 21 Jan 2018 14:00:23 +1100 Subject: [PATCH 1/7] Fix overview --- .../regidesk/templates/regidesk/boardingpass_overview.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html b/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html index b29d8eb2..3b6624f0 100644 --- a/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html +++ b/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html @@ -69,6 +69,8 @@ {{ 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 %} From ab7aaa95c3da720e1345f648bd59ff16f8384591 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sun, 21 Jan 2018 14:19:42 +1100 Subject: [PATCH 2/7] Remove old code line --- .../regidesk/templates/regidesk/boardingpass_overview.html | 1 - 1 file changed, 1 deletion(-) diff --git a/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html b/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html index 3b6624f0..e54d8d8f 100644 --- a/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html +++ b/vendor/regidesk/regidesk/templates/regidesk/boardingpass_overview.html @@ -68,7 +68,6 @@ {{ attendee.attendeeprofilebase.attendeeprofile.name }} {{ attendee.ticket_type }} {{ attendee.user.email }} - {{ attendee.user.checkin.code }} {% if attendee.user.checkin.code %} {{ attendee.user.checkin.code }}{% endif %} From be00f257a1f83fe668952b679281056e722d30bd Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sun, 21 Jan 2018 15:01:55 +1100 Subject: [PATCH 3/7] Show username to assist finding user in admin list --- vendor/regidesk/regidesk/templates/regidesk/ci_overview.html | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html index e77e8387..277452fa 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 }}
From 568536532c91ff45a62308a542f0ebd11d234e5f Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sun, 21 Jan 2018 15:10:57 +1100 Subject: [PATCH 4/7] Force upnprint badge So automation can try again --- vendor/regidesk/regidesk/models.py | 4 ++++ .../regidesk/regidesk/templates/regidesk/ci_overview.html | 6 +++++- vendor/regidesk/regidesk/views.py | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/vendor/regidesk/regidesk/models.py b/vendor/regidesk/regidesk/models.py index d36bb301..35dadca6 100644 --- a/vendor/regidesk/regidesk/models.py +++ b/vendor/regidesk/regidesk/models.py @@ -98,6 +98,10 @@ 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() diff --git a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html index 277452fa..9b679265 100644 --- a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html +++ b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html @@ -72,11 +72,15 @@
Status
{% if check_in.badge_printed %}Marked{% else %}Not marked{% endif %} as printed
-
+ Show Badge +
+ + + diff --git a/vendor/regidesk/regidesk/views.py b/vendor/regidesk/regidesk/views.py index 62f1ab96..d134da42 100644 --- a/vendor/regidesk/regidesk/views.py +++ b/vendor/regidesk/regidesk/views.py @@ -312,6 +312,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, From 5a085535c0b40be4d5e29ff8b02a2a058615becf Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sun, 21 Jan 2018 16:14:22 +1100 Subject: [PATCH 5/7] Allow accessing URL to generate boarding pass Only needed some code fixups to function --- vendor/regidesk/regidesk/views.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vendor/regidesk/regidesk/views.py b/vendor/regidesk/regidesk/views.py index d134da42..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 = { From e41da66cace682661f95906c5747930e4b4fd326 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Tue, 23 Jan 2018 13:30:45 +1100 Subject: [PATCH 6/7] Fix bulk action Bulk action marks printed + schwag, but as print is automated and happens after checkin is flagged, we should only set checkin and schwag and print will happen. --- vendor/regidesk/regidesk/models.py | 2 +- .../regidesk/regidesk/templates/regidesk/ci_overview.html | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vendor/regidesk/regidesk/models.py b/vendor/regidesk/regidesk/models.py index 35dadca6..0bb590f6 100644 --- a/vendor/regidesk/regidesk/models.py +++ b/vendor/regidesk/regidesk/models.py @@ -107,7 +107,7 @@ class CheckIn(models.Model): 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/ci_overview.html b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html index 9b679265..5a239e52 100644 --- a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html +++ b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html @@ -108,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 %}
- +
From ce32fd69b67a5711e3e90e0c2f06331660e6cd34 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Wed, 24 Jan 2018 15:26:12 +1100 Subject: [PATCH 7/7] Show chair for session on main overview page Plus keep it a link so opt out is not impossible. --- pinaxcon/templates/symposion/schedule/_grid.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 %}
- {% 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 %}
{% if track_name %}

{{ track_name }}{% endif %}