Merge branch 'deployment-issues' into 'master'

Deployment issues

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

smash/web/api_views/subject.py

@@ -356,7 +356,7 @@ def serialize_subject(study_subject):
     contact_attempts = ContactAttempt.objects.filter(subject=study_subject).order_by("-datetime_when")
     if len(contact_attempts) > 0:
         last_contact_attempt = contact_attempts[0]
-        last_contact_attempt_string = serialize_datetime(last_contact_attempt.datetime_when) + "<br/>" + str(
+        last_contact_attempt_string = serialize_datetime(last_contact_attempt.datetime_when) + "<br/>" + unicode(
             last_contact_attempt.worker) + "<br/> Success: " + bool_to_yes_no(
             last_contact_attempt.success) + "<br/>" + last_contact_attempt.comment
 

smash/web/templates/appointments/index.html

@@ -85,7 +85,7 @@
                 columns: [
                     {"data": "subject"},
                     {"data": "title"},
-                    {"data": "type"},
+                    {"data": "appointment_types"},
                     {"data": "datetime_when"},
                     {"data": null}
                 ],

smash/web/tests/api_views/test_subject.py

@@ -104,6 +104,14 @@ class TestSubjectApi(LoggedInWithWorkerTestCase):
         response = self.client.get(reverse('web.api.subjects', kwargs={'type': SUBJECT_LIST_GENERIC}))
         self.assertEqual(response.status_code, 200)
 
+    def test_subjects_general_with_special_characters(self):
+        contact_attempt = create_contact_attempt(subject=self.study_subject)
+        contact_attempt.worker.first_name = "à special character"
+        contact_attempt.worker.save()
+        response = self.client.get(reverse('web.api.subjects', kwargs={'type': SUBJECT_LIST_GENERIC}))
+        self.assertEqual(response.status_code, 200)
+        logger.debug(response.content)
+
     def test_subjects_voucher_almost_expired(self):
         response = self.client.get(reverse('web.api.subjects', kwargs={'type': SUBJECT_LIST_VOUCHER_EXPIRY}))
         self.assertEqual(response.status_code, 200)