- Add simplified date format & apply to search results partials

- Add labels to bottom row of search results (date/ref/house) - Expand bottom row of search results with 'place' as a fourth item in detailed view where necessary
ukparliament · Sep 18, 2024 · 35e9cc3 · 35e9cc3
1 parent 6b44f4f
commit 35e9cc3
Show file tree

Hide file tree

Showing 60 changed files with 391 additions and 31 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -4,7 +4,8 @@ module ApplicationHelper
   include ActiveSupport::NumberHelper
 
   # ## We set the date display format.
-  DATE_DISPLAY_FORMAT = '%A, %e %B %Y'
+  DATE_FORMAT_WITH_DAY = '%A, %e %B %Y'
+  DATE_FORMAT_WITHOUT_DAY = '%e %B %Y'
 
   def format_html(html, truncate_words)
     if truncate_words == false

diff --git a/app/helpers/date_helper.rb b/app/helpers/date_helper.rb
@@ -5,6 +5,14 @@ def format_date(data)
 
     return if data[:value].blank?
 
-    data[:value].to_date.strftime(ApplicationHelper::DATE_DISPLAY_FORMAT)
+    data[:value].to_date.strftime(ApplicationHelper::DATE_FORMAT_WITH_DAY)
+  end
+
+  def format_date_without_day(data)
+    return unless data
+
+    return if data[:value].blank?
+
+    data[:value].to_date.strftime(ApplicationHelper::DATE_FORMAT_WITHOUT_DAY)
   end
 end
diff --git a/app/views/search/results/_bill.html.erb b/app/views/search/results/_bill.html.erb
@@ -115,12 +115,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_church_of_england_measure.html.erb b/app/views/search/results/_church_of_england_measure.html.erb
@@ -81,9 +81,7 @@
     <% end %>
 
     <%= render 'search/results/item_details/legislation', legislation: object.legislation unless object.legislation.blank? %>
-    <%#= render 'search/results/item_details/witnesses', witnesses: object.witnesses unless object.witnesses.blank? %>
     <%= render 'search/results/item_details/subjects', subjects: object.subjects unless object.subjects.blank? %>
-    <%#= render 'search/results/item_details/topics', topics: object.topics unless object.topics.blank? %>
     <%= render 'search/results/item_details/notes', notes: object.notes unless object.notes.blank? %>
 
     <div class="row">
@@ -102,13 +100,18 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
-        <%#= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>
   </div>

diff --git a/app/views/search/results/_command_paper.html.erb b/app/views/search/results/_command_paper.html.erb
@@ -121,12 +121,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_committee_proceeding.html.erb b/app/views/search/results/_committee_proceeding.html.erb
@@ -125,12 +125,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_deposited_paper.html.erb b/app/views/search/results/_deposited_paper.html.erb
@@ -124,12 +124,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_early_day_motion.html.erb b/app/views/search/results/_early_day_motion.html.erb
@@ -112,12 +112,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_european_deposited_document.html.erb b/app/views/search/results/_european_deposited_document.html.erb
@@ -106,12 +106,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_european_material.html.erb b/app/views/search/results/_european_material.html.erb
@@ -108,12 +108,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_european_scrutiny_explanatory_memorandum.html.erb b/app/views/search/results/_european_scrutiny_explanatory_memorandum.html.erb
@@ -105,12 +105,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_european_scrutiny_ministerial_correspondence.html.erb b/app/views/search/results/_european_scrutiny_ministerial_correspondence.html.erb
@@ -108,9 +108,15 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">

diff --git a/app/views/search/results/_european_scrutiny_recommendation.html.erb b/app/views/search/results/_european_scrutiny_recommendation.html.erb
@@ -102,9 +102,15 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">

diff --git a/app/views/search/results/_formal_proceeding.html.erb b/app/views/search/results/_formal_proceeding.html.erb
@@ -117,12 +117,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_grand_committee_proceeding.html.erb b/app/views/search/results/_grand_committee_proceeding.html.erb
@@ -116,12 +116,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_house_of_commons_paper.html.erb b/app/views/search/results/_house_of_commons_paper.html.erb
@@ -116,12 +116,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_impact_assessment.html.erb b/app/views/search/results/_impact_assessment.html.erb
@@ -110,12 +110,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_ministerial_correction.html.erb b/app/views/search/results/_ministerial_correction.html.erb
@@ -115,12 +115,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>

diff --git a/app/views/search/results/_observation_on_a_petition.html.erb b/app/views/search/results/_observation_on_a_petition.html.erb
@@ -115,12 +115,21 @@
   <div class="row">
     <div class="result-panel">
       <div class="left" id="significant-date">
+        <div class="item-details-label">
+          Date
+        </div>
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>
       <div class="centre" id="reference">
+        <div class="item-details-label">
+          Reference
+        </div>
         <%= render 'search/results/item_details/reference', reference: object.standard_reference %>
       </div>
       <div class="right" id="house">
+        <div class="item-details-label">
+          House
+        </div>
         <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
       </div>
     </div>