This commit is contained in:
Ross
2022-01-13 18:11:25 +00:00
parent 5c7fd1e1c6
commit b0365ca58b
5 changed files with 22 additions and 3 deletions
+3
View File
@@ -438,6 +438,9 @@ class CidUser(models.Model):
def get_email_results_url(self): def get_email_results_url(self):
return reverse("generic:candidate_email_results", kwargs={"cid": self.cid}) 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): class CidUserExam(models.Model):
content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+3 -1
View File
@@ -7,7 +7,9 @@
<div class="sending"><div class="lds-ripple"><div></div><div></div></div> Emailing <span id="active-email"></span></div> <div class="sending"><div class="lds-ripple"><div></div><div></div></div> Emailing <span id="active-email"></span></div>
<ul id="user-list"> <ul id="user-list">
{% for user in users %} {% 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 %} {% endfor %}
</ul> </ul>
@@ -10,6 +10,8 @@
">Resend candidate details</button> ">Resend candidate details</button>
<button class="email-button" data-emailurl="{% url 'generic:group_email_results' pk=group.pk %} <button class="email-button" data-emailurl="{% url 'generic:group_email_results' pk=group.pk %}
">Email candidate results</button> ">Email candidate results</button>
<button class="email-button" data-emailurl="{% url 'generic:group_email_results_resend' pk=group.pk %}
">Resend candidate results</button>
</p> </p>
{% endfor %} {% endfor %}
+5
View File
@@ -43,6 +43,11 @@ urlpatterns = [
views.group_email_results, views.group_email_results,
name="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( path(
"cids/group/<int:pk>/email/resend", "cids/group/<int:pk>/email/resend",
views.group_email_resend, views.group_email_resend,
+9 -2
View File
@@ -1388,6 +1388,11 @@ def group_view(request):
def group_email_resend(request, pk): def group_email_resend(request, pk):
return group_email(request, pk, resend=True) 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 @login_required
@user_is_cid_user_manager @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): def candidate_email_results(request, cid, resend=False):
user = CidUser.objects.get(cid=cid) 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}) 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 @user_is_cid_user_manager
def manage_cid_users(request): def manage_cid_users(request):
if request.is_ajax() and request.method == "POST": if request.is_ajax() and request.method == "POST":