Add start date sorting

uktrade · Sep 6, 2023 · c14c9ea · c14c9ea
1 parent 43b7902
commit c14c9ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/measures/jinja2/includes/measures/list.jinja b/measures/jinja2/includes/measures/list.jinja
@@ -39,6 +39,10 @@
   {{ sort_by(request, "geo_area", "Geographical area", base_url, query_params) }}
 {% endset %}
 
+{% set start_date %}
+  {{ sort_by(request, "start_date", "Start date", base_url, query_params) }}
+{% endset %}
+
 
 {# sets out form #}
 <form method="post">
@@ -85,7 +89,7 @@
             {"text": sid},
             {"text": measure_type},
             {"text": "Commodity"},
-            {"text": "Start date"},
+            {"text": start_date},
             {"text": "End date"},
             {"text": "Duties"},
             {"text": "Additional code"},

diff --git a/measures/views.py b/measures/views.py
@@ -142,10 +142,11 @@ class MeasureList(
     template_name = "measures/list.jinja"
     filterset_class = MeasureFilter
     form_class = SelectableObjectsForm
-    sort_by_fields = ["sid", "measure_type", "geo_area"]
+    sort_by_fields = ["sid", "measure_type", "geo_area", "start_date"]
     custom_sorting = {
         "measure_type": "measure_type__sid",
         "geo_area": "geographical_area__area_id",
+        "start_date": "valid_between",
     }
 
     def dispatch(self, *args, **kwargs):