Update/dsc 3

api/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-12 11:10+0000\n"
+"POT-Creation-Date: 2023-07-24 12:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

api/locale/nl/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-12 11:10+0000\n"
+"POT-Creation-Date: 2023-07-24 12:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

api/templates/api/mail/cancel_token.html

@@ -1,6 +1,10 @@
-{% extends 'mail/base.html' %}
+{% extends 'cdh.mail/mail_template.html' %}
 
-{% block subtitle %}
+{% block sender %}
+    Taal-experimenten
+{% endblock %}
+
+{% block banner %}
     Afspraak afzeggen
 {% endblock %}
 

api/templates/api/mail/cancelled_appointment.html

@@ -1,6 +1,10 @@
-{% extends 'mail/base.html' %}
+{% extends 'cdh.mail/mail_template.html' %}
 
-{% block subtitle %}
+{% block sender %}
+    Taal-experimenten
+{% endblock %}
+
+{% block banner %}
     Uitgeschreven voor experiment: <strong>{{ experiment.name }}</strong>
 {% endblock %}
 
@@ -35,4 +39,4 @@
         </a>
         {% endif %}
     </p>
-{% endblock %}
+{% endblock %}

api/templates/api/mail/existing_leader_new_participant.html

@@ -1,6 +1,10 @@
-{% extends 'mail/base.html' %}
+{% extends 'cdh.mail/mail_template.html' %}
 
-{% block subtitle %}
+{% block sender %}
+    Taal-experimenten
+{% endblock %}
+
+{% block banner %}
    Account aangemaakt
 {% endblock %}
 

api/templates/api/mail/new_account.html

@@ -1,6 +1,10 @@
-{% extends 'mail/base.html' %}
+{% extends 'cdh.mail/mail_template.html' %}
 
-{% block subtitle %}
+{% block sender %}
+    Taal-experimenten
+{% endblock %}
+
+{% block banner %}
    Account aangemaakt
 {% endblock %}
 

api/templates/api/mail/participant_cancelled.html

@@ -1,6 +1,10 @@
-{% extends 'mail/base.html' %}
+{% extends 'cdh.mail/mail_template.html' %}
 
-{% block subtitle %}
+{% block sender %}
+    Taal-experimenten
+{% endblock %}
+
+{% block banner %}
     Participant deregistered for experiment: <strong>{{ experiment.name }}</strong>
 {% endblock %}
 
@@ -29,4 +33,4 @@
     <p>
         This email was generated automatically because you are listed as the leader for experiment {{ experiment.name }}.
     </p>
-{% endblock %}
+{% endblock %}

api/templates/api/mail/password_reset.html

@@ -1,6 +1,7 @@
-{% extends 'mail/base.html' %}
+{% extends 'cdh.mail/mail_template.html' %}
 
-{% block subtitle %}
+{% block sender %}
+    Taal-experimenten
 {% endblock %}
 
 {% block content %}
@@ -30,4 +31,4 @@
 
 
 {% block footer %}
-{% endblock %}
+{% endblock %}

api/utils/appointment_mail.py

@@ -1,132 +1,68 @@
-import re
-
 from django.conf import settings
 from django.template import defaultfilters
-from django.utils.html import strip_tags
-from django.utils.safestring import mark_safe
 from django.utils.timezone import localtime
 import urllib.parse as parse
 
-from uil.core.utils.mail import send_template_email
+from experiments.emails import ConfirmationEmail
 
 from experiments.models import Experiment, TimeSlot
-from main.utils import get_supreme_admin
 from participants.models import Participant
 
 CANCEL_LINK_REGEX = r'{cancel_link(?::\"(.*)\")?}'
 
 
+def get_initial_confirmation_context(experiment: Experiment) -> dict:
+    context = {
+        'experiment_name': experiment.name,
+        'experiment_location': '',
+        'leader_name': experiment.leader.name,
+        'leader_email': experiment.leader.api_user.email,
+        'leader_phonenumber': experiment.leader.phonenumber,
+        'all_leaders_name_list': experiment.all_leaders_str,
+        'cancel_link': parse.urljoin(
+            settings.FRONTEND_URI,
+            'participant/cancel/'
+        ),
+    }
+
+    if experiment.location:
+        context['experiment_location'] = experiment.location.name
+
+    return context
+
+
 def send_appointment_mail(
         experiment: Experiment,
         participant: Participant,
         time_slot: TimeSlot,
 ) -> None:
-    admin = get_supreme_admin()
-    template = 'api/mail/new_appointment'
 
-    subject = 'Bevestiging inschrijving experiment ILS Labs: {}'.format(
-        experiment.name
-    )
+    # Should not happen, but as that field technically now can be none we make
+    # sure to handle it.
+    if participant.email is None:
+        return
 
-    replacements = {
-        '{experiment_name}': experiment.name,
-        '{experiment_location}': '',
-        '{participant_name}': participant.name,
-        '{leader_name}': experiment.leader.name,
-        '{leader_email}': experiment.leader.api_user.email,
-        '{leader_phonenumber}': experiment.leader.phonenumber,
-        '{all_leaders_name_list}': experiment.leader.name,
-    }
-
-    num_additional_leaders = experiment.additional_leaders.count()
-
-    if num_additional_leaders > 0:
-        last_leader = experiment.additional_leaders.last()
-        others = experiment.additional_leaders.exclude(pk=last_leader.pk)
-
-        # If there's one additional, don't add the comma as it looks weird
-        if num_additional_leaders > 1:
-            replacements['{all_leaders_name_list}'] += ", "
-
-        replacements['{all_leaders_name_list}'] += ", ".join(
-            [x.name for x in others]
-        )
-        replacements['{all_leaders_name_list}'] += f" en {last_leader.name}"
-
-    if experiment.location:
-        replacements['{experiment_location}'] = experiment.location.name
+    context = get_initial_confirmation_context(experiment)
+    context.update({
+        'name': participant.mail_name,
+    })
 
     if experiment.use_timeslots:
         # We don't use strftime because that's not _always_ timezone aware
         # Also, using the template filter is a neat hack to have the same format
         # string syntax everywhere
-        replacements.update({
-            '{date}': defaultfilters.date(localtime(time_slot.datetime), 'l d-m-Y'),
-            '{time}': defaultfilters.date(localtime(time_slot.datetime), 'H:i'),
+        context.update({
+            'date': defaultfilters.date(localtime(time_slot.datetime), 'l d-m-Y'),
+            'time': defaultfilters.date(localtime(time_slot.datetime), 'H:i'),
         })
 
-    send_template_email(
-        [participant.email],
-        subject,
-        template,
-        {
-            'experiment': experiment,
-            'html_content': _parse_contents_html(
-                experiment.confirmation_email,
-                replacements
-            ),
-            'plain_content': _parse_contents_plain(
-                experiment.confirmation_email,
-                replacements
-            )
-        },
-        settings.EMAIL_FROM
+    email = ConfirmationEmail(
+        to=[participant.email],
+        subject='Bevestiging inschrijving experiment ILS Labs: {}'.format(
+            experiment.name
+        ),
+        contents=experiment.confirmation_email,
+        context=context,
     )
-
-
-def _parse_contents_html(
-        content: str,
-        replacements: dict,
-) -> str:
-    match = re.search(CANCEL_LINK_REGEX, content)
-
-    if match:
-        replacement = "<a href=\"{}\">{}</a>".format(
-            parse.urljoin(settings.FRONTEND_URI, 'participant/cancel/'),
-            match.group(1)
-        )
-        content = content.replace(match.group(0), replacement)
-
-    content = _apply_replacements(content, replacements)
-
-    return mark_safe(content)
-
-
-def _parse_contents_plain(
-        content: str,
-        replacements: dict,
-) -> str:
-    # Remove all HTML
-    content = strip_tags(content)
-
-    match = re.search(CANCEL_LINK_REGEX, content)
-
-    if match:
-        replacement = "{} ({})".format(
-            match.group(1),
-            parse.urljoin(settings.FRONTEND_URI, 'participant/cancel/'),
-        )
-        content = content.replace(match.group(0), replacement)
-
-    content = _apply_replacements(content, replacements)
-
-    return mark_safe(content)
-
-
-def _apply_replacements(content: str, replacements: dict) -> str:
-
-    for key, value in replacements.items():
-        content = content.replace(key, value)
-
-    return content
+    email.send()