Merge branch '231-templates' into 'devel_0.11.x'

Resolve "templates with flying team name containing unicode characters crash"

See merge request NCER-PD/scheduling-system!154

smash/web/models/mail_template.py

@@ -185,10 +185,10 @@ class MailTemplate(models.Model):
                 "##A_DATE_FULL##": appointment_date_full,
                 "##A_DATE_SHORT##": appointment_date_short,
                 "##A_TIME##": appointment_date_time,
-                "##A_FLYING_TEAM##": str(appointment.flying_team),
+                "##A_FLYING_TEAM##": unicode(appointment.flying_team),
                 "##A_STATUS##": appointment.get_status_display(),
                 "##A_LOCATION##": appointment.location.name,
-                "##A_LOCATION_OR_FLYINGTEAM##": str(appointment.flying_team) or appointment.location.name,
+                "##A_LOCATION_OR_FLYINGTEAM##": unicode(appointment.flying_team) or appointment.location.name,
                 "##A_WORKER##": unicode(appointment.worker_assigned),
                 '##A_WORKER_PHONE##': worker_phone_number,
                 '##A_WORKER_EMAIL##': worker_email_address,

smash/web/redcap_connector.py

@@ -222,7 +222,7 @@ class RedcapConnector(object):
         return result
 
     def create_redcap_link(self, pid, redcap_version, subject):
-        return self.base_url + "/redcap_v" + redcap_version + "/DataEntry/index.php?pid=" + pid + "&id=" + \
+        return self.base_url + "/redcap_v" + redcap_version + "/DataEntry/index.php?pid=" + str(pid) + "&id=" + \
                subject.nd_number + "&page=demographics"
 
     def get_red_cap_subjects(self):

smash/web/templates/_base.html

@@ -267,7 +267,7 @@ desired effect
         {% block footer %}
             <!-- To the right -->
             <div class="pull-right hidden-xs">
-                Version: <strong>0.11.2</strong> (4 May 2018)
+                Version: <strong>0.11.3</strong> (3 Sep 2018)
             </div>
 
             <!-- Default to the left -->

smash/web/tests/models/test_mail_template.py

+# coding=utf-8
 import StringIO
 
 from django.test import TestCase
@@ -9,7 +10,7 @@ from web.models.constants import MAIL_TEMPLATE_CONTEXT_APPOINTMENT, MAIL_TEMPLAT
 from web.models.mail_template import DATE_FORMAT_SHORT
 from web.tests.functions import create_language, get_resource_path, create_appointment, create_user, \
     create_study_subject, \
-    create_visit
+    create_visit, create_flying_team
 
 
 class MailTemplateModelTests(TestCase):
@@ -79,6 +80,20 @@ class MailTemplateModelTests(TestCase):
         location = appointment.location.name
         self.check_doc_contains(doc, [worker_name, location])
 
+    def test_appointment_with_unicode_flying_team(self):
+        template_name_french = "test_fr"
+        appointment = create_appointment()
+        # noinspection PyNonAsciiChar
+        flying_team_name = u"Liège"
+        appointment.flying_team = create_flying_team(flying_team_name)
+        appointment_template_french = MailTemplate(name=template_name_french, language=self.french_language,
+                                                   context=MAIL_TEMPLATE_CONTEXT_APPOINTMENT,
+                                                   template_file=self.template_file)
+        stream = StringIO.StringIO()
+        appointment_template_french.apply(appointment, self.user, stream)
+        doc = Document(stream)
+        self.check_doc_contains(doc, [flying_team_name])
+
     def test_apply_subject(self):
         template_name_french = "test_fr"
         subject = create_study_subject()