From b0365ca58b4fe1852b47459362235647e6b31648 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 13 Jan 2022 18:11:25 +0000
Subject: [PATCH] .

---
 generic/models.py                            |  3 +++
 generic/templates/generic/group_emailed.html |  4 +++-
 generic/templates/generic/group_view.html    |  2 ++
 generic/urls.py                              |  5 +++++
 generic/views.py                             | 11 +++++++++--
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/generic/models.py b/generic/models.py
index d5873ac6..29c12083 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -438,6 +438,9 @@ class CidUser(models.Model):
     def get_email_results_url(self):
         return reverse("generic:candidate_email_results", kwargs={"cid": self.cid})
 
+    def get_email_results_resend_url(self):
+        return reverse("generic:candidate_email_results_resend", kwargs={"cid": self.cid})
+
 
 class CidUserExam(models.Model):
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
diff --git a/generic/templates/generic/group_emailed.html b/generic/templates/generic/group_emailed.html
index 1f3c4ea0..3efebb30 100755
--- a/generic/templates/generic/group_emailed.html
+++ b/generic/templates/generic/group_emailed.html
@@ -7,7 +7,9 @@
     <div class="sending"><div class="lds-ripple"><div></div><div></div></div> Emailing <span id="active-email"></span></div>
     <ul id="user-list">
         {% for user in  users %}
-            <li data-email={{user.email}} data-posturl='{{user.get_email_results_url}}'>{{user.cid}}/{{user.name}}: {{user.email}} [{{user.supervisor_email}}] </li>
+            <li data-email={{user.email}} 
+            data-posturl='{{user.get_email_results_url}}'
+            >{{user.cid}}/{{user.name}}: {{user.email}} [{{user.supervisor_email}}] </li>
         {% endfor %}
     </ul>
 
diff --git a/generic/templates/generic/group_view.html b/generic/templates/generic/group_view.html
index e3f33f5c..fa1f8933 100755
--- a/generic/templates/generic/group_view.html
+++ b/generic/templates/generic/group_view.html
@@ -10,6 +10,8 @@
                 ">Resend candidate details</button>
             <button class="email-button" data-emailurl="{% url 'generic:group_email_results' pk=group.pk %}
             ">Email candidate results</button>
+            <button class="email-button" data-emailurl="{% url 'generic:group_email_results_resend' pk=group.pk %}
+            ">Resend candidate results</button>
         </p>
     {% endfor %}
 
diff --git a/generic/urls.py b/generic/urls.py
index d605c3a5..1c62b6c5 100755
--- a/generic/urls.py
+++ b/generic/urls.py
@@ -43,6 +43,11 @@ urlpatterns = [
         views.group_email_results,
         name="group_email_results",
     ),
+    path(
+        "cids/group/<int:pk>/email_results/resend",
+        views.group_email_results_resend,
+        name="group_email_results_resend",
+    ),
     path(
         "cids/group/<int:pk>/email/resend",
         views.group_email_resend,
diff --git a/generic/views.py b/generic/views.py
index 3eaba739..8adfa891 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -1388,6 +1388,11 @@ def group_view(request):
 def group_email_resend(request, pk):
     return group_email(request, pk, resend=True)
 
+@login_required
+@user_is_cid_user_manager
+def group_email_results_resend(request, pk):
+    return group_email_results(request, pk, resend=True)
+
 
 @login_required
 @user_is_cid_user_manager
@@ -1444,13 +1449,15 @@ def group_email_results(request, pk, resend=False):
 def candidate_email_results(request, cid, resend=False):
     user = CidUser.objects.get(cid=cid)
 
-    email_sent, comment = user.email_results()
+    email_sent, comment = user.email_results(additional_emails=["priya.suresh@nhs.net"], resend=True)
 
     return JsonResponse({"sent": email_sent, "comment": comment})
 
+@user_is_cid_user_manager
+def candidate_email_results_resend(request, cid, resend=True):
+    return candidate_email_results(request, cid, resend=True)
 
 
-@login_required
 @user_is_cid_user_manager
 def manage_cid_users(request):
     if request.is_ajax() and request.method == "POST":