From 1c7166f005a6a8581c56bc62efd438c181e2fc25 Mon Sep 17 00:00:00 2001
From: Catherine Pitt <cen1001@cam.ac.uk>
Date: Thu, 27 Oct 2022 08:52:52 +0100
Subject: [PATCH] Put incomplete tasks first on navigation page
Some people are still filling in the personal details form but
apparently not noticing the instruction that they also need to complete
their safety checklist. They are then surprised when their registration
doesn't go through because they thought it was complete. This causes
extra work for the admin team and delay for the starter.
This change moves the list of incomplete tasks to the top of the
navigation page in the hope that they will be easier to notice there.
The header text for incomplete tasks is updated to be in <em> tags to
match other sections containing things that need action.
---
.../templates/navigation/index.html | 53 ++++++++++---------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/chemistry_starters/templates/navigation/index.html b/chemistry_starters/templates/navigation/index.html
index bbcba3c..475ff68 100644
--- a/chemistry_starters/templates/navigation/index.html
+++ b/chemistry_starters/templates/navigation/index.html
@@ -5,22 +5,9 @@
<h1>Chemistry Starters Registration</h1>
<p>Welcome to the Yusuf Hamied Department of Chemistry online registration system.</p>
-{# Things the starter has completed #}
-{% if person_role_form_complete or safety_checklist_complete %}
-<p>You have already completed and submitted:</p>
-<ul>
- {% if person_role_form_complete %}
- <li>Personal details form</li>
- {% endif %}
- {% if safety_checklist_complete %}
- <li>Safety checklist</li>
- {% endif %}
-</ul>
-{% endif %}
-
{# Things the starter still needs to complete #}
{% if not (person_role_form_complete and safety_checklist_complete) %}
-<p>You still need to carry out the following tasks:</p>
+<p><em>You still need to carry out the following tasks:</em></p>
<ul>
{% if not person_role_form_complete %}
<li>
@@ -36,6 +23,32 @@
</ul>
{% endif %}
+{# things third parties still need to do #}
+{% if (safety_training_signoff_needed and not safety_training_signed) or (safety_checklist_complete and not safety_checklist_signed) %}
+<p><em>Before your registration can be processed other people must carry out the following tasks</em>:</p>
+<ul>
+ {% if not safety_checklist_signed %}
+ <li>Once you have submitted the safety checklist it needs to be signed off as correct by {% if safety_checklist_checker is not none %}{{ safety_checklist_checker }}{% else %}the person who carried out your safety induction{% endif %}.{% if safety_checklist_complete %} They have been emailed with a copy and asked to do this. If you think the email has been missed you can ask {{ safety_checklist_checker }} to visit <a href="{{ url_for("safety_checklist.safety_checklist_signoff",_external=True,token=safety_check_token) }}">{{ url_for("safety_checklist.safety_checklist_signoff",_external=True,token=safety_check_token) }}</a> to do this instead.{% endif %}</li>
+ {% endif %}
+ {% if safety_training_signoff_needed and not safety_training_signed %}
+ <li>Once you have submitted the safety checklist, the Graduate Education Office will check you have successfully completed the safety training at <a target="_blank" rel="noopener noreferer" href="{{ safety_training_url }}">{{ safety_training_url }}</a>.</li>
+ {% endif %}
+</ul>
+{% endif %}
+
+{# Things the starter has completed #}
+{% if person_role_form_complete or safety_checklist_complete %}
+<p>You have already completed these tasks:</p>
+<ul>
+ {% if person_role_form_complete %}
+ <li>Personal details form</li>
+ {% endif %}
+ {% if safety_checklist_complete %}
+ <li>Safety checklist</li>
+ {% endif %}
+</ul>
+{% endif %}
+
{# Things 3rd parties have completed #}
{% if (safety_training_signoff_needed and safety_training_signed) or (safety_checklist_complete and safety_checklist_signed) %}
<p>Other people have completed the following tasks:</p>
@@ -49,18 +62,6 @@
</ul>
{% endif %}
-{# things third parties still need to do #}
-{% if (safety_training_signoff_needed and not safety_training_signed) or (safety_checklist_complete and not safety_checklist_signed) %}
-<p><em>Before your registration can be processed other people must carry out the following tasks</em>:</p>
-<ul>
- {% if not safety_checklist_signed %}
- <li>Once you have submitted the safety checklist it needs to be signed off as correct by {% if safety_checklist_checker is not none %}{{ safety_checklist_checker }}{% else %}the person who carried out your safety induction{% endif %}.{% if safety_checklist_complete %} They have been emailed with a copy and asked to do this. If you think the email has been missed you can ask {{ safety_checklist_checker }} to visit <a href="{{ url_for("safety_checklist.safety_checklist_signoff",_external=True,token=safety_check_token) }}">{{ url_for("safety_checklist.safety_checklist_signoff",_external=True,token=safety_check_token) }}</a> to do this instead.{% endif %}</li>
- {% endif %}
- {% if safety_training_signoff_needed and not safety_training_signed %}
- <li>Once you have submitted the safety checklist, the Graduate Education Office will check you have successfully completed the safety training at <a target="_blank" rel="noopener noreferer" href="{{ safety_training_url }}">{{ safety_training_url }}</a>.</li>
- {% endif %}
-</ul>
-{% endif %}
{% if process_complete %}
<p>Everything required for registration has been completed and your forms have been sent to the admin team for processing.</p>
{% endif %}
--
GitLab