ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Ross
2022-04-26 22:48:56 +01:00
parent ca669b0808
commit 206a0c0213
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generic/models.py
+3
View File
@@ -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})
generic/templates/generic/group_emailed.html
+38 -34
View File
@@ -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>
generic/views.py
+2 -2
View File
@@ -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},
)