From 400f6548e861b90cd8ad93d50a9a9cb861a35f9a Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Fri, 31 Dec 2021 22:21:21 +0000
Subject: [PATCH] .

---
 generic/models.py          | 25 ++++++++++++++++++++-----
 templates/cid_results.html |  6 ++----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/generic/models.py b/generic/models.py
index bf777948..5c8127f2 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -18,6 +18,8 @@ from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelatio
 from django.contrib.contenttypes.models import ContentType
 
 from django.core.mail import send_mail
+from django.core.mail import EmailMessage
+
 
 
 class Plane(models.Model):
@@ -347,21 +349,26 @@ class CidUser(models.Model):
 
         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:
             return False, "Already sent."
 
         # Get a list of taken exams
         msg = self.generate_exam_report()
 
+        emails = [self.email, self.supervisor_email]
+
+        if additional_emails:
+            emails.extend(additional_emails)
+
         try:
             send_mail(
                 f"{self.group} results",
                 msg,
                 "test@xkjq.uk",
-                [self.email, self.supervisor_email],
+                emails,
                 fail_silently=False,
-                html_message=html_msg,
+                #html_message=html_msg,
             )
         except SMTPException as e:
             return False, e
@@ -395,13 +402,21 @@ class CidUser(models.Model):
         """
 
         try:
-            send_mail(
+            #send_mail(
+            #    "Candidate Details",
+            #    msg,
+            #    "test@xkjq.uk",
+            #    [self.email],
+            #    fail_silently=False,
+            #)
+            email = EmailMessage(
                 "Candidate Details",
                 msg,
                 "test@xkjq.uk",
                 [self.email],
-                fail_silently=False,
+                ["ross.kruger@nhs.net"],
             )
+            email.send(fail_silently=False)
         except SMTPException as e:
             return False, e
 
diff --git a/templates/cid_results.html b/templates/cid_results.html
index c1b30b99..51e45c2e 100644
--- a/templates/cid_results.html
+++ b/templates/cid_results.html
@@ -1,10 +1,8 @@
-{% extends 'base.html' %}
+{% extends 'generic/base.html' %}
 
 {% block content %}
     <div class="">
-        <pre>
-        {{report}}
-        </pre>
+        <pre>{{report}}</pre>
     </div>
 
 {% endblock %}