Fixes dates on document page, removes unused pagination context

uktrade · Oct 18, 2024 · 9ea241e · 9ea241e
1 parent 567ec5b
commit 9ea241e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/orp/orp_search/legislation.py b/orp/orp_search/legislation.py
@@ -113,21 +113,21 @@ def search(self, config: SearchDocumentConfig):
     def finalise_results(
         self, config: SearchDocumentConfig, results, context
     ) -> dict:
-        title_search_terms = config.search_terms
-        search_terms = ",".join(title_search_terms)
-        params = {
-            "amendments": "include",
-            "query": search_terms,
-            # 'counting': 'documents',
-        }
-
-        # Get count of total results
-        count_data_html_page = _perform_request(
-            self.count_url, params, config.timeout
-        )
-        total_document_count = _extract_td_value(
-            count_data_html_page, "documents"
-        )
+        # title_search_terms = config.search_terms
+        # search_terms = ",".join(title_search_terms)
+        # params = {
+        #     "amendments": "include",
+        #     "query": search_terms,
+        #     # 'counting': 'documents',
+        # }
+
+        # # Get count of total results
+        # count_data_html_page = _perform_request(
+        #     self.count_url, params, config.timeout
+        # )
+        # total_document_count = _extract_td_value(
+        #     count_data_html_page, "documents"
+        # )
 
         paginated_documents = []
         exists = False
@@ -166,11 +166,11 @@ def finalise_results(
             except EmptyPage:
                 paginated_documents = paginator.page(paginator.num_pages)
 
+        context["current_page"] = config.offset
         context["paginator"] = paginator
         context["is_paginated"] = paginator.num_pages > 1
+        context["results_total_count"] = paginator.count
         context["results"] = paginated_documents
-        context["results_count"] = len(paginated_documents)
-        context["results_total_count"] = total_document_count
-        context["results_page_total"] = paginator.num_pages
-        context["current_page"] = config.offset
+        # context["start_index"] = paginated_documents.start_index()
+        # context["end_index"] = paginated_documents.end_index()
         return context
diff --git a/orp/orp_search/public_gateway.py b/orp/orp_search/public_gateway.py
@@ -84,13 +84,11 @@ def finalise_results(
                     ).split("\n")
 
         # Pass the paginated results to the template
+        context["current_page"] = config.offset
         context["paginator"] = paginator
         context["is_paginated"] = paginator.num_pages > 1
-        context["results"] = paginated_documents
-        context["results_count"] = len(paginated_documents)
         context["results_total_count"] = paginator.count
-        context["results_page_total"] = paginator.num_pages
-        context["current_page"] = config.offset
+        context["results"] = paginated_documents
         context["start_index"] = paginated_documents.start_index()
         context["end_index"] = paginated_documents.end_index()
         return context

diff --git a/orp/orp_search/templates/document.html b/orp/orp_search/templates/document.html
@@ -50,15 +50,15 @@ <h2 class="govuk-heading-m">Document details</h2>
               Date published
             </dt>
             <dd class="govuk-summary-list__value">
-              {{ result.date_issued }}
+              {{ result.date_issued | date:"j F Y" }}
             </dd>
           </div>
           <div class="govuk-summary-list__row">
             <dt class="govuk-summary-list__key">
               Last updated
             </dt>
             <dd class="govuk-summary-list__value">
-              {{ result.date_modified }}
+              {{ result.date_modified | date:"j F Y" }}
             </dd>
           </div>
           <div class="govuk-summary-list__row">

diff --git a/orp/orp_search/views.py b/orp/orp_search/views.py
@@ -65,6 +65,16 @@ def _decode_url(encoded_url):
                 search_result["related_legislation"]
             ).split("\n")
 
+        if "date_modified" in search_result:
+            search_result["date_modified"] = pd.to_datetime(
+                search_result["date_modified"], format="%d/%m/%Y"
+            )
+
+        if "date_issued" in search_result:
+            search_result["date_issued"] = pd.to_datetime(
+                search_result["date_issued"], format="%d/%m/%Y"
+            )
+
         context["result"] = search_result
         return render(request, template_name="document.html", context=context)
     except Exception as e: