This commit is contained in:
Ross
2021-12-31 22:21:21 +00:00
parent a5aaa89591
commit 400f6548e8
2 changed files with 22 additions and 9 deletions
+20 -5
View File
@@ -18,6 +18,8 @@ from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelatio
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.core.mail import send_mail from django.core.mail import send_mail
from django.core.mail import EmailMessage
class Plane(models.Model): class Plane(models.Model):
@@ -347,21 +349,26 @@ class CidUser(models.Model):
html_msg = f"""""" html_msg = f""""""
def email_results(self, resend=False): def email_results(self, resend=False, additional_emails=[]):
if self.results_email_sent and not resend: if self.results_email_sent and not resend:
return False, "Already sent." return False, "Already sent."
# Get a list of taken exams # Get a list of taken exams
msg = self.generate_exam_report() msg = self.generate_exam_report()
emails = [self.email, self.supervisor_email]
if additional_emails:
emails.extend(additional_emails)
try: try:
send_mail( send_mail(
f"{self.group} results", f"{self.group} results",
msg, msg,
"test@xkjq.uk", "test@xkjq.uk",
[self.email, self.supervisor_email], emails,
fail_silently=False, fail_silently=False,
html_message=html_msg, #html_message=html_msg,
) )
except SMTPException as e: except SMTPException as e:
return False, e return False, e
@@ -395,13 +402,21 @@ class CidUser(models.Model):
""" """
try: try:
send_mail( #send_mail(
# "Candidate Details",
# msg,
# "test@xkjq.uk",
# [self.email],
# fail_silently=False,
#)
email = EmailMessage(
"Candidate Details", "Candidate Details",
msg, msg,
"test@xkjq.uk", "test@xkjq.uk",
[self.email], [self.email],
fail_silently=False, ["ross.kruger@nhs.net"],
) )
email.send(fail_silently=False)
except SMTPException as e: except SMTPException as e:
return False, e return False, e
+2 -4
View File
@@ -1,10 +1,8 @@
{% extends 'base.html' %} {% extends 'generic/base.html' %}
{% block content %} {% block content %}
<div class=""> <div class="">
<pre> <pre>{{report}}</pre>
{{report}}
</pre>
</div> </div>
{% endblock %} {% endblock %}