Allow sorting by time and name

DemocracyClub · Jul 4, 2024 · d356c40 · d356c40
1 parent 0338bc5
commit d356c40
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/ynr/apps/uk_results/templates/uk_results/parl_mark_winners.html b/ynr/apps/uk_results/templates/uk_results/parl_mark_winners.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load order_by_custom %}
+{% load get_query %}
 {% block title %}
     2024 general election results
 {% endblock %}
@@ -172,11 +173,22 @@ <h1>2024 general election results</h1>
             </div>
         </details>
     </aside>
+    <p>Sort:
+    {% if sort_by == "name" %}
+    	<a href="{% query_string request.GET sort_by="time" %}">Time</a>
+    	| Name
+    {% else %}
+        Time |
+        <a href="{% query_string request.GET sort_by="name" %}">Name</a>
 
+
+    {% endif %}
+
+    </p>
     <hr>
 
     {% regroup memberships by ballot_paper_id as by_ballots %}
-    {% for ballot, ballot_memberships in by_ballots|order_groups:"d" %}
+    {% for ballot, ballot_memberships in by_ballots|order_groups:sort_by %}
         <div class="ballot" data-name="{{ ballot_memberships.0.division_name }}">
             <h2>{{ ballot_memberships.0.division_name }}
                 <a href="{% url "election_view" ballot %}">#</a>
@@ -228,7 +240,6 @@ <h2>{{ ballot_memberships.0.division_name }}
 
                                     </div>
                                     <div>
-                                        {{ membership.membership.suggested_winners.all }}
                                         <input type="hidden" name="membership_id" value="{{ membership.pk }}">
                                         <input type="hidden" name="unset" value="1">
                                         <button type="submit" class="btn secondary tiny">Unset winner</button>

diff --git a/ynr/apps/uk_results/views/parl_winners.py b/ynr/apps/uk_results/views/parl_winners.py
@@ -140,6 +140,7 @@ def get_context_data(self, **kwargs):
         context["filter"] = f
         context["memberships"] = f.qs
         context["shortcuts"] = filter_shortcuts(self.request)
+        context["sort_by"] = self.request.GET.get("sort_by", "time")
 
         return context