symposion_app Changeset - fcbacc82e68c

Changeset - fcbacc82e68c

Parent rev.

Child rev.

[Not reviewed]

0 3 0

James Polley - 7 years ago 2017-12-26 12:10:21
jp@jamezpolley.com

Add views to allow for PNG rendering of badge

3 files changed with 20 insertions and 9 deletions:

requirements.txt

vendor/registrasion/registrasion/urls.py

vendor/registrasion/registrasion/views.py

0 comments (0 inline, 0 general)

requirements.txt

➞

Show inline comments

@@ ... / @@ -27,17 +27,18 @@ django-sitetree>=1.8.0 @@
 django-taggit==0.18.0
 django-timezone-field>=2.0
 easy-thumbnails>=2.4.1
 bleach
 pytz==2015.7
 django-ical==1.4
-# registratoin reqs
+# registrasion reqs
 django-nested-admin==2.2.6
+CairoSVG==2.1.2
 # Registripe
 django-countries>=4.3
 pinax-stripe==3.2.1
 requests>=2.11.1
 stripe==1.38.0

vendor/registrasion/registrasion/urls.py

➞

Show inline comments

@@ ... / @@ -22,17 +22,19 @@ from .views import ( @@
     review,
     voucher_code,
+)
 public = [
     url(r"^amend/([0-9]+)$", amend_registration, name="amend_registration"),
     url(r"^mybadge$", user_badge, name="user_badge"),
     url(r"^mybadge/(png|svg)", user_badge, name="user_badge"),
     url(r"^badge/([0-9]+)$", badge, name="badge"),
     url(r"^badge/([0-9]+).(png|svg)$", badge, name="badge"),
     url(r"^badger/([A-Za-z0-9]+)$", badger, name="badger"),
     url(r"^badger/", badger, name="badger"),
     url(r"^category/([0-9]+)$", product_category, name="product_category"),
     url(r"^checkout$", checkout, name="checkout"),
     url(r"^checkout/([0-9]+)$", checkout, name="checkout"),
     url(r"^credit_note/([0-9]+)$", credit_note, name="credit_note"),
     url(r"^extend/([0-9]+)$", extend_reservation, name="extend_reservation"),
     url(r"^invoice/([0-9]+)$", invoice, name="invoice"),

vendor/registrasion/registrasion/views.py

➞

Show inline comments

@@ ... / @@ -33,16 +33,17 @@ from django.core.exceptions import ValidationError @@
 from django.core.mail import send_mass_mail
 from django.http import Http404, HttpResponse
 from django.shortcuts import redirect
 from django.shortcuts import render
 from django.template import Context, Template, loader
 from lxml import etree
 from copy import deepcopy
 from cairosvg import svg2png
 from registrasion.forms import BadgeForm, ticket_selection
 from registrasion.contrib.badger import (
                                          collate,
                                          svg_badge,
                                          InvalidTicketChoiceError
+                                         )
@@ ... / @@ -1108,36 +1109,43 @@ def invoice_mailout(request): @@
+    }
     return render(request, "registrasion/invoice_mailout.html", data)
 def _get_badge_template_name():
     return os.path.join(settings.PROJECT_ROOT, 'pinaxcon', 'templates',
                         settings.BADGER_DEFAULT_SVG)
 @login_required
 def user_badge(request):
+def user_badge(request, format="png"):
     '''Shows the logged-in user their badge'''
     return render_badge(request.user)
+    return render_badge(request.user, format)
 @user_passes_test(_staff_only)
 def badge(request, user_id):
+def badge(request, user_id, format="svg"):
     ''' Renders a single user's badge (SVG). '''
     user_id = int(user_id)
     user = User.objects.get(pk=user_id)
     return render_badge(user)
+    return render_badge(user, format)
 def render_badge(user):
+def render_badge(user, format="svg"):
     rendered = render_badge_svg(user)
     if format == "png":
         rendered = svg2png(bytestring=svg, dpi=72, scale=3)
     response = HttpResponse(rendered)
     response["Content-Type"] = "image/svg+xml;charset=utf-8"
     response["Content-Disposition"] = 'inline; filename="badge.svg"'
     if format == "svg":
         response["Content-Type"] = "image/svg+xml;charset=utf-8"
         response["Content-Disposition"] = 'inline; filename="badge.svg"'
     elif format == "png":
         response["Content-Type"] = "image/png"
         response["Content-Disposition"] = 'inline; filename="badge.png"'
     return response
 def render_badge_svg(user):
     ''' Renders a single user's badge as SVG. '''
     data = {
         "user": user,
+    }

0 comments (0 inline, 0 general)