From 206a0c0213e0c5fcac69b9e406ba21087ce48981 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Tue, 26 Apr 2022 22:48:56 +0100
Subject: [PATCH] .

---
 generic/models.py                            |  3 +
 generic/templates/generic/group_emailed.html | 72 +++++++++++---------
 generic/views.py                             |  4 +-
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/generic/models.py b/generic/models.py
index ee06f8f1..96bf18c8 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -450,6 +450,9 @@ class CidUser(models.Model):
         self.save()
         return True, ""
 
+    def get_email_details_url(self):
+        return reverse("generic:candidate_email_details", kwargs={"cid": self.cid})
+
     def get_email_results_url(self):
         return reverse("generic:candidate_email_results", kwargs={"cid": self.cid})
 
diff --git a/generic/templates/generic/group_emailed.html b/generic/templates/generic/group_emailed.html
index 3efebb30..3274c610 100755
--- a/generic/templates/generic/group_emailed.html
+++ b/generic/templates/generic/group_emailed.html
@@ -7,8 +7,12 @@
     <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}}'
+            <li data-email={{user.email}}
+                {% if results %}
+                    data-posturl='{{user.get_email_results_url}}'
+                {% else %}
+                    data-posturl='{{user.get_email_details_url}}'
+                {% endif %}
             >{{user.cid}}/{{user.name}}: {{user.email}} [{{user.supervisor_email}}] </li>
         {% endfor %}
     </ul>
@@ -86,38 +90,38 @@
 
         }
 
-.lds-ripple {
-  display: inline-block;
-  position: relative;
-  width: 80px;
-  height: 80px;
-}
-.lds-ripple div {
-  position: absolute;
-  border: 4px solid blue;
-  opacity: 1;
-  border-radius: 50%;
-  animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
-}
-.lds-ripple div:nth-child(2) {
-  animation-delay: -0.5s;
-}
-@keyframes lds-ripple {
-  0% {
-    top: 36px;
-    left: 36px;
-    width: 0;
-    height: 0;
-    opacity: 1;
-  }
-  100% {
-    top: 0px;
-    left: 0px;
-    width: 72px;
-    height: 72px;
-    opacity: 0;
-  }
-}
+        .lds-ripple {
+            display: inline-block;
+            position: relative;
+            width: 80px;
+            height: 80px;
+        }
+        .lds-ripple div {
+            position: absolute;
+            border: 4px solid blue;
+            opacity: 1;
+            border-radius: 50%;
+            animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
+        }
+        .lds-ripple div:nth-child(2) {
+            animation-delay: -0.5s;
+        }
+        @keyframes lds-ripple {
+            0% {
+                top: 36px;
+                left: 36px;
+                width: 0;
+                height: 0;
+                opacity: 1;
+            }
+            100% {
+                top: 0px;
+                left: 0px;
+                width: 72px;
+                height: 72px;
+                opacity: 0;
+            }
+        }
 
 
     </style>
diff --git a/generic/views.py b/generic/views.py
index cd9cb1b2..727402bb 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -1527,7 +1527,7 @@ def group_email(request, pk, resend=False):
         request,
         "generic/group_emailed.html",
         # {"sent": sent, "not_sent": not_sent, "users_count": users.count()},
-        {"users": users, "users_count": users.count()},
+        {"users": users, "users_count": users.count(), "results": False},
     )
 
     # sent = []
@@ -1570,7 +1570,7 @@ def group_email_results(request, pk, resend=False):
         request,
         "generic/group_emailed.html",
         # {"sent": sent, "not_sent": not_sent, "users_count": users.count()},
-        {"users": users, "users_count": users.count()},
+        {"users": users, "users_count": users.count(), "results": True},
     )