Add date to ballot and election detail pages

DemocracyClub · Aug 24, 2023 · 28a713d · 28a713d
1 parent 2b76489
commit 28a713d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/ynr/apps/elections/templates/elections/ballot_view.html b/ynr/apps/elections/templates/elections/ballot_view.html
@@ -31,10 +31,10 @@
 
 {% block body_class %}constituency{% endblock %}
 
-{% block title %}Candidates for {{ ballot.post.label }} in the {{ ballot.election.name }}{% endblock %}
+{% block title %}Candidates for {{ ballot.post.label }} in the {{ ballot.election.name }} on {{ ballot.election.election_date|date:"j F Y" }}{% endblock %}
 
 {% block hero %}
-  <h1>Candidates for {{ ballot.post.label }}</h1>
+  <h1>Candidates for {{ ballot.post.label }} on <br>{{ ballot.election.election_date|date:"j F Y" }}</h1>
 {% endblock %}
 
 

diff --git a/ynr/apps/elections/templates/elections/election_detail.html b/ynr/apps/elections/templates/elections/election_detail.html
@@ -2,9 +2,9 @@
 
 {% block title %}
 {% if ballot.candidates_locked %}
-  Candidates for each ballot in the {{ object.name }}
+  Candidates for each ballot in the {{ object.name }} on {{ object.election_date|date:"j F Y" }}
 {% else %}
-  Known candidates for each ballot in the {{ object.name }}
+  Known candidates for each ballot in the {{ object.name }} on {{ object.election_date|date:"j F Y" }}
 {% endif %}
 {% endblock %}
 
@@ -33,7 +33,7 @@ <h1>{{ object.name }}</h1>
 
   {% for ballot in ballots %}
   <h3>
-    <a href="{{ ballot.get_absolute_url }}">{{ ballot.post.label }}</a>
+    <a href="{{ ballot.get_absolute_url }}">{{ ballot.post.label }} on {{ object.election_date|date:"j F Y" }}</a>
     {{ ballot.cancelled_status_html }}
     {{ ballot.locked_status_html }}
   </h3>

diff --git a/ynr/apps/elections/templates/elections/party_for_ballot.html b/ynr/apps/elections/templates/elections/party_for_ballot.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block body_class %}constituency{% endblock %}
-{% block title %}Candidates for {{ object.post.label }} in the {{ object.election.name }}{% endblock %}
+{% block title %}Candidates for {{ object.post.label }} in the {{ object.election.name }} on {{ ballot.election.election_date|date:"j F Y" }}{% endblock %}
 
 {% block hero %}
   <h1>

diff --git a/ynr/apps/elections/tests/test_ballot_view.py b/ynr/apps/elections/tests/test_ballot_view.py
@@ -130,7 +130,9 @@ def test_ballot_with_candidates_no_sopn(self):
 
         self.assertEqual(response.context["candidates"].count(), 9)
         self.assertDataTimelineCandidateAddingInProgress(response)
-        self.assertInHTML("<h1>Candidates for Bar Ward</h1>", response.text)
+        self.assertInHTML(
+            "<h1>Candidates for Bar Ward on <br>7 Sept 2023</h1>", response.text
+        )
         self.assertInHTML(
             """
             <p>