diff options
| -rw-r--r-- | postgresqleu/confreg/views.py | 7 | ||||
| -rw-r--r-- | postgresqleu/transferwise/api.py | 2 | ||||
| -rw-r--r-- | template.jinja/confreg/session_feedback.html | 14 |
3 files changed, 21 insertions, 2 deletions
diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py index eac66272..9bbe30e1 100644 --- a/postgresqleu/confreg/views.py +++ b/postgresqleu/confreg/views.py @@ -1939,6 +1939,12 @@ def callforpapers_edit(request, confname, sessionid): slidesurlform = SessionSlidesUrlForm() slidesfileform = SessionSlidesFileForm() + feedbackqrcode = None + if session.status in (1, 4): + # 1 = confirmed, so render + # 4 = reserve, so render + feedbackqrcode = generate_base64_qr('{0}/events/{1}/feedback/{2}/'.format(settings.SITEBASE, confname, session.id), None, 300) + return render_conference_response(request, conference, 'cfp', 'confreg/session_feedback.html', { 'session': session, 'feedbackcount': feedbackcount, @@ -1949,6 +1955,7 @@ def callforpapers_edit(request, confname, sessionid): 'slidesurlform': slidesurlform, 'slidesfileform': slidesfileform, 'slides': ConferenceSessionSlides.objects.filter(session=session), + 'feedbackqrcode': feedbackqrcode, }) if session.id: diff --git a/postgresqleu/transferwise/api.py b/postgresqleu/transferwise/api.py index 86661953..6be5834e 100644 --- a/postgresqleu/transferwise/api.py +++ b/postgresqleu/transferwise/api.py @@ -259,7 +259,7 @@ class TransferwiseApi(object): raise Exception("Failed to parse transferwise amount from '{}'".format(amount)) def strip_tw_tags(self, s): - return re.subn('</?(strong|positive|negative|strikethrough)>', '', s) + return re.subn('</?(strong|positive|negative|strikethrough)>', '', s)[0] def validate_iban(self, iban): try: diff --git a/template.jinja/confreg/session_feedback.html b/template.jinja/confreg/session_feedback.html index 25f14023..b657bac8 100644 --- a/template.jinja/confreg/session_feedback.html +++ b/template.jinja/confreg/session_feedback.html @@ -50,8 +50,19 @@ <input type="submit" name="submit" value="Upload slides"> </form> -{%if feedbackcount%} +{% if feedbackcount or feedbackqrcode %} <h2>Feedback</h2> + +{% if feedbackqrcode %} +<h3>Feedback link</h3> +<p> +Attendees will be able to leave <a href="/events/{{conference.urlname}}/feedback/{{session.id}}/">feedback</a> on your talk. +This link will work once your talk has started. You can include the below QR code in your slides to increase the response rate. +</p> +<p class="feedback-qrcode"><img src="data:image/png;base64,{{ feedbackqrcode }}"></p> +{%endif%} + +{%if feedbackcount%} {%if conference.feedbackopen%} <h3>Preliminary feedback!</h3> <p> @@ -106,5 +117,6 @@ The following feedback has been given on this presentation by {%endif%} {%endif%} +{%endif%} {%endblock%} |