From 35e9cc3e6f5e1b51a94bff0bbd01029103443402 Mon Sep 17 00:00:00 2001 From: j-corry Date: Wed, 18 Sep 2024 14:02:32 +0100 Subject: [PATCH] - 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 --- app/helpers/application_helper.rb | 3 ++- app/helpers/date_helper.rb | 10 +++++++++- app/views/search/results/_bill.html.erb | 9 +++++++++ .../results/_church_of_england_measure.html.erb | 9 ++++++--- .../search/results/_command_paper.html.erb | 9 +++++++++ .../results/_committee_proceeding.html.erb | 9 +++++++++ .../search/results/_deposited_paper.html.erb | 9 +++++++++ .../search/results/_early_day_motion.html.erb | 9 +++++++++ .../_european_deposited_document.html.erb | 9 +++++++++ .../search/results/_european_material.html.erb | 9 +++++++++ ...ean_scrutiny_explanatory_memorandum.html.erb | 9 +++++++++ ...scrutiny_ministerial_correspondence.html.erb | 6 ++++++ .../_european_scrutiny_recommendation.html.erb | 6 ++++++ .../search/results/_formal_proceeding.html.erb | 9 +++++++++ .../_grand_committee_proceeding.html.erb | 9 +++++++++ .../results/_house_of_commons_paper.html.erb | 9 +++++++++ .../search/results/_impact_assessment.html.erb | 9 +++++++++ .../results/_ministerial_correction.html.erb | 9 +++++++++ .../results/_observation_on_a_petition.html.erb | 9 +++++++++ .../results/_oral_answer_to_question.html.erb | 17 ++++++++++++++++- .../search/results/_oral_question.html.erb | 17 ++++++++++++++++- .../_oral_question_time_intervention.html.erb | 17 ++++++++++++++++- .../_paper_ordered_to_be_printed.html.erb | 9 +++++++++ .../search/results/_paper_petition.html.erb | 9 +++++++++ .../search/results/_parliamentary_committee.erb | 9 +++++++++ .../results/_parliamentary_paper_laid.html.erb | 9 +++++++++ .../results/_parliamentary_proceeding.html.erb | 17 ++++++++++++++++- app/views/search/results/_private_act.html.erb | 9 +++++++++ .../results/_proceeding_contribution.html.erb | 17 ++++++++++++++++- app/views/search/results/_public_act.html.erb | 9 +++++++++ .../search/results/_research_briefing.html.erb | 9 +++++++++ .../search/results/_research_material.html.erb | 9 +++++++++ .../results/_statutory_instrument.html.erb | 9 +++++++++ app/views/search/results/_template.html.erb | 9 +++++++++ ...ort_and_works_act_order_application.html.erb | 9 +++++++++ .../results/_unprinted_command_paper.html.erb | 9 +++++++++ .../search/results/_unprinted_paper.html.erb | 9 +++++++++ .../search/results/_written_question.html.erb | 9 +++++++++ .../search/results/_written_statement.html.erb | 9 +++++++++ .../results/item_details/_amended_on.html.erb | 2 +- .../item_details/_coming_into_force.html.erb | 2 +- .../_commitment_to_deposit_date.html.erb | 2 +- .../search/results/item_details/_date.html.erb | 2 +- .../item_details/_date_approved.html.erb | 2 +- .../results/item_details/_date_debated.html.erb | 2 +- .../item_details/_date_deposited.html.erb | 2 +- .../item_details/_date_for_answer.html.erb | 2 +- .../results/item_details/_date_laid.html.erb | 2 +- .../results/item_details/_date_made.html.erb | 2 +- .../item_details/_date_of_answer.html.erb | 2 +- .../_date_of_holding_answer.html.erb | 2 +- .../_date_of_order_to_print.html.erb | 2 +- .../item_details/_date_originated.html.erb | 2 +- .../item_details/_date_reported.html.erb | 2 +- .../results/item_details/_date_tabled.html.erb | 2 +- .../item_details/_date_withdrawn.html.erb | 2 +- .../results/item_details/_debate_date.html.erb | 2 +- .../item_details/_deposited_date.html.erb | 2 +- .../item_details/_published_date.html.erb | 2 +- .../results/item_details/_report_date.html.erb | 2 +- 60 files changed, 391 insertions(+), 31 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index fb7c8f24..e51085f7 100644 --- 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 index 8cd19855..c7b0a872 100644 --- 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 \ No newline at end of file diff --git a/app/views/search/results/_bill.html.erb b/app/views/search/results/_bill.html.erb index 05e6ebf1..37083f13 100644 --- a/app/views/search/results/_bill.html.erb +++ b/app/views/search/results/_bill.html.erb @@ -115,12 +115,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_church_of_england_measure.html.erb b/app/views/search/results/_church_of_england_measure.html.erb index 1b50ffaf..9897551e 100644 --- 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? %>
@@ -102,13 +100,18 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
- <%#= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_command_paper.html.erb b/app/views/search/results/_command_paper.html.erb index 894102ae..30d68ea8 100644 --- a/app/views/search/results/_command_paper.html.erb +++ b/app/views/search/results/_command_paper.html.erb @@ -121,12 +121,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_committee_proceeding.html.erb b/app/views/search/results/_committee_proceeding.html.erb index 4cdf5a9f..be039c6a 100644 --- a/app/views/search/results/_committee_proceeding.html.erb +++ b/app/views/search/results/_committee_proceeding.html.erb @@ -125,12 +125,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_deposited_paper.html.erb b/app/views/search/results/_deposited_paper.html.erb index 6222d8d3..a57aec52 100644 --- a/app/views/search/results/_deposited_paper.html.erb +++ b/app/views/search/results/_deposited_paper.html.erb @@ -124,12 +124,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_early_day_motion.html.erb b/app/views/search/results/_early_day_motion.html.erb index 0dac3e2d..665b64bc 100644 --- a/app/views/search/results/_early_day_motion.html.erb +++ b/app/views/search/results/_early_day_motion.html.erb @@ -112,12 +112,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_european_deposited_document.html.erb b/app/views/search/results/_european_deposited_document.html.erb index 1eec1d1b..5b935134 100644 --- a/app/views/search/results/_european_deposited_document.html.erb +++ b/app/views/search/results/_european_deposited_document.html.erb @@ -106,12 +106,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_european_material.html.erb b/app/views/search/results/_european_material.html.erb index 3712bd16..d3e2c394 100644 --- a/app/views/search/results/_european_material.html.erb +++ b/app/views/search/results/_european_material.html.erb @@ -108,12 +108,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_european_scrutiny_explanatory_memorandum.html.erb b/app/views/search/results/_european_scrutiny_explanatory_memorandum.html.erb index f8213b1e..2e830fa6 100644 --- 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 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_european_scrutiny_ministerial_correspondence.html.erb b/app/views/search/results/_european_scrutiny_ministerial_correspondence.html.erb index 8de32c31..080df69f 100644 --- 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 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
diff --git a/app/views/search/results/_european_scrutiny_recommendation.html.erb b/app/views/search/results/_european_scrutiny_recommendation.html.erb index 4649ae27..c216e52c 100644 --- a/app/views/search/results/_european_scrutiny_recommendation.html.erb +++ b/app/views/search/results/_european_scrutiny_recommendation.html.erb @@ -102,9 +102,15 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
diff --git a/app/views/search/results/_formal_proceeding.html.erb b/app/views/search/results/_formal_proceeding.html.erb index c5996954..fc0fb966 100644 --- a/app/views/search/results/_formal_proceeding.html.erb +++ b/app/views/search/results/_formal_proceeding.html.erb @@ -117,12 +117,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_grand_committee_proceeding.html.erb b/app/views/search/results/_grand_committee_proceeding.html.erb index 56816bae..ff623731 100644 --- a/app/views/search/results/_grand_committee_proceeding.html.erb +++ b/app/views/search/results/_grand_committee_proceeding.html.erb @@ -116,12 +116,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_house_of_commons_paper.html.erb b/app/views/search/results/_house_of_commons_paper.html.erb index fd67ab33..2ae19b10 100644 --- 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 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_impact_assessment.html.erb b/app/views/search/results/_impact_assessment.html.erb index e07c5b7a..88d8ad98 100644 --- a/app/views/search/results/_impact_assessment.html.erb +++ b/app/views/search/results/_impact_assessment.html.erb @@ -110,12 +110,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_ministerial_correction.html.erb b/app/views/search/results/_ministerial_correction.html.erb index 5a39318b..bbea013d 100644 --- a/app/views/search/results/_ministerial_correction.html.erb +++ b/app/views/search/results/_ministerial_correction.html.erb @@ -115,12 +115,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_observation_on_a_petition.html.erb b/app/views/search/results/_observation_on_a_petition.html.erb index aebed53e..83472203 100644 --- 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 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_oral_answer_to_question.html.erb b/app/views/search/results/_oral_answer_to_question.html.erb index a5e52ee2..ac9c4728 100644 --- a/app/views/search/results/_oral_answer_to_question.html.erb +++ b/app/views/search/results/_oral_answer_to_question.html.erb @@ -119,13 +119,28 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
data-detailed-results-target="toggleHidden"> +
+ Chamber / Committee +
+ <%= render 'search/results/item_details/place', place: object.place %> +
- <%= render 'search/results/item_details/place_and_house', place: object.place, house: object.legislature %> +
+ House +
+ <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_oral_question.html.erb b/app/views/search/results/_oral_question.html.erb index 2c7cfc4e..68694c71 100644 --- a/app/views/search/results/_oral_question.html.erb +++ b/app/views/search/results/_oral_question.html.erb @@ -123,13 +123,28 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
data-detailed-results-target="toggleHidden"> +
+ Chamber / Committee +
+ <%= render 'search/results/item_details/place', place: object.place %> +
- <%= render 'search/results/item_details/place_and_house', place: object.place, house: object.legislature %> +
+ House +
+ <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_oral_question_time_intervention.html.erb b/app/views/search/results/_oral_question_time_intervention.html.erb index ad7cd068..04f9d427 100644 --- a/app/views/search/results/_oral_question_time_intervention.html.erb +++ b/app/views/search/results/_oral_question_time_intervention.html.erb @@ -115,13 +115,28 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
data-detailed-results-target="toggleHidden"> +
+ Chamber / Committee +
+ <%= render 'search/results/item_details/place', place: object.place %> +
- <%= render 'search/results/item_details/place_and_house', place: object.place, house: object.legislature %> +
+ House +
+ <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_paper_ordered_to_be_printed.html.erb b/app/views/search/results/_paper_ordered_to_be_printed.html.erb index 5d5f9b82..083d36f4 100644 --- a/app/views/search/results/_paper_ordered_to_be_printed.html.erb +++ b/app/views/search/results/_paper_ordered_to_be_printed.html.erb @@ -116,12 +116,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_paper_petition.html.erb b/app/views/search/results/_paper_petition.html.erb index 842ace4a..ee7f9b42 100644 --- a/app/views/search/results/_paper_petition.html.erb +++ b/app/views/search/results/_paper_petition.html.erb @@ -114,12 +114,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_parliamentary_committee.erb b/app/views/search/results/_parliamentary_committee.erb index 08ee7ff7..b3830302 100644 --- a/app/views/search/results/_parliamentary_committee.erb +++ b/app/views/search/results/_parliamentary_committee.erb @@ -108,12 +108,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_parliamentary_paper_laid.html.erb b/app/views/search/results/_parliamentary_paper_laid.html.erb index e9ae6e1f..75390831 100644 --- a/app/views/search/results/_parliamentary_paper_laid.html.erb +++ b/app/views/search/results/_parliamentary_paper_laid.html.erb @@ -116,12 +116,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_parliamentary_proceeding.html.erb b/app/views/search/results/_parliamentary_proceeding.html.erb index bed93fa2..ba8b935e 100644 --- a/app/views/search/results/_parliamentary_proceeding.html.erb +++ b/app/views/search/results/_parliamentary_proceeding.html.erb @@ -118,13 +118,28 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
data-detailed-results-target="toggleHidden"> +
+ Chamber / Committee +
+ <%= render 'search/results/item_details/place', place: object.place %> +
- <%= render 'search/results/item_details/place_and_house', place: object.place, house: object.legislature %> +
+ House +
+ <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_private_act.html.erb b/app/views/search/results/_private_act.html.erb index 3d73d403..902416dd 100644 --- a/app/views/search/results/_private_act.html.erb +++ b/app/views/search/results/_private_act.html.erb @@ -108,12 +108,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_proceeding_contribution.html.erb b/app/views/search/results/_proceeding_contribution.html.erb index ad7cd068..04f9d427 100644 --- a/app/views/search/results/_proceeding_contribution.html.erb +++ b/app/views/search/results/_proceeding_contribution.html.erb @@ -115,13 +115,28 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
data-detailed-results-target="toggleHidden"> +
+ Chamber / Committee +
+ <%= render 'search/results/item_details/place', place: object.place %> +
- <%= render 'search/results/item_details/place_and_house', place: object.place, house: object.legislature %> +
+ House +
+ <%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_public_act.html.erb b/app/views/search/results/_public_act.html.erb index f8505bce..176f7342 100644 --- a/app/views/search/results/_public_act.html.erb +++ b/app/views/search/results/_public_act.html.erb @@ -110,12 +110,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_research_briefing.html.erb b/app/views/search/results/_research_briefing.html.erb index 73d694ea..35542fdc 100644 --- a/app/views/search/results/_research_briefing.html.erb +++ b/app/views/search/results/_research_briefing.html.erb @@ -119,12 +119,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_research_material.html.erb b/app/views/search/results/_research_material.html.erb index 80aeff10..60b4c63e 100644 --- a/app/views/search/results/_research_material.html.erb +++ b/app/views/search/results/_research_material.html.erb @@ -117,12 +117,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_statutory_instrument.html.erb b/app/views/search/results/_statutory_instrument.html.erb index 94557b10..c803e620 100644 --- a/app/views/search/results/_statutory_instrument.html.erb +++ b/app/views/search/results/_statutory_instrument.html.erb @@ -120,12 +120,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_template.html.erb b/app/views/search/results/_template.html.erb index 6b731936..0a968a96 100644 --- a/app/views/search/results/_template.html.erb +++ b/app/views/search/results/_template.html.erb @@ -117,12 +117,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_transport_and_works_act_order_application.html.erb b/app/views/search/results/_transport_and_works_act_order_application.html.erb index bf21909c..94205133 100644 --- a/app/views/search/results/_transport_and_works_act_order_application.html.erb +++ b/app/views/search/results/_transport_and_works_act_order_application.html.erb @@ -115,12 +115,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_unprinted_command_paper.html.erb b/app/views/search/results/_unprinted_command_paper.html.erb index bf2e53be..3f94dd1f 100644 --- a/app/views/search/results/_unprinted_command_paper.html.erb +++ b/app/views/search/results/_unprinted_command_paper.html.erb @@ -115,12 +115,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_unprinted_paper.html.erb b/app/views/search/results/_unprinted_paper.html.erb index 330c5f28..569d61ba 100644 --- a/app/views/search/results/_unprinted_paper.html.erb +++ b/app/views/search/results/_unprinted_paper.html.erb @@ -123,12 +123,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_written_question.html.erb b/app/views/search/results/_written_question.html.erb index c2823d63..1da5fb43 100644 --- a/app/views/search/results/_written_question.html.erb +++ b/app/views/search/results/_written_question.html.erb @@ -124,12 +124,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/_written_statement.html.erb b/app/views/search/results/_written_statement.html.erb index cf057fb1..6cf85921 100644 --- a/app/views/search/results/_written_statement.html.erb +++ b/app/views/search/results/_written_statement.html.erb @@ -115,12 +115,21 @@
+
+ Date +
<%= render 'search/results/item_details/date', date: object.standard_date %>
+
+ Reference +
<%= render 'search/results/item_details/reference', reference: object.standard_reference %>
+
+ House +
<%= render 'search/results/item_details/legislature', legislature: object.legislature %>
diff --git a/app/views/search/results/item_details/_amended_on.html.erb b/app/views/search/results/item_details/_amended_on.html.erb index faf10986..1b2c4267 100644 --- a/app/views/search/results/item_details/_amended_on.html.erb +++ b/app/views/search/results/item_details/_amended_on.html.erb @@ -4,7 +4,7 @@ Amended on
- <%= format_date(date_tabled) %> + <%= format_date_without_day(date_tabled) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_coming_into_force.html.erb b/app/views/search/results/item_details/_coming_into_force.html.erb index 104e3cc6..ba53f55b 100644 --- a/app/views/search/results/item_details/_coming_into_force.html.erb +++ b/app/views/search/results/item_details/_coming_into_force.html.erb @@ -4,7 +4,7 @@ Coming into force
<% unless date.blank? %> - <%= format_date(date) %> + <%= format_date_without_day(date) %> <% end %> <% unless date.blank? || notes.blank? %> , diff --git a/app/views/search/results/item_details/_commitment_to_deposit_date.html.erb b/app/views/search/results/item_details/_commitment_to_deposit_date.html.erb index fe2456eb..4b11cd19 100644 --- a/app/views/search/results/item_details/_commitment_to_deposit_date.html.erb +++ b/app/views/search/results/item_details/_commitment_to_deposit_date.html.erb @@ -4,7 +4,7 @@ Committed on
- <%= format_date(commitment_to_deposit_date) %> + <%= format_date_without_day(commitment_to_deposit_date) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date.html.erb b/app/views/search/results/item_details/_date.html.erb index 7f4bc05d..6d5bfcac 100644 --- a/app/views/search/results/item_details/_date.html.erb +++ b/app/views/search/results/item_details/_date.html.erb @@ -1,5 +1,5 @@ <% unless date.blank? %>
- <%= format_date(date) %> + <%= format_date_without_day(date) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_approved.html.erb b/app/views/search/results/item_details/_date_approved.html.erb index 83bd1480..a6f8be63 100644 --- a/app/views/search/results/item_details/_date_approved.html.erb +++ b/app/views/search/results/item_details/_date_approved.html.erb @@ -6,7 +6,7 @@
<% end %> - <%= format_date(date_approved) %> + <%= format_date_without_day(date_approved) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_debated.html.erb b/app/views/search/results/item_details/_date_debated.html.erb index ca425d9c..a365abbe 100644 --- a/app/views/search/results/item_details/_date_debated.html.erb +++ b/app/views/search/results/item_details/_date_debated.html.erb @@ -4,7 +4,7 @@ Debated on
- <%= format_date(date_debated) %> + <%= format_date_without_day(date_debated) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_deposited.html.erb b/app/views/search/results/item_details/_date_deposited.html.erb index ae1c3726..09f50ce8 100644 --- a/app/views/search/results/item_details/_date_deposited.html.erb +++ b/app/views/search/results/item_details/_date_deposited.html.erb @@ -4,7 +4,7 @@ <%= label %>
- <%= format_date(date_deposited) %> + <%= format_date_without_day(date_deposited) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_for_answer.html.erb b/app/views/search/results/item_details/_date_for_answer.html.erb index e4bd2f4d..625b0796 100644 --- a/app/views/search/results/item_details/_date_for_answer.html.erb +++ b/app/views/search/results/item_details/_date_for_answer.html.erb @@ -4,7 +4,7 @@
<%= label %>
<% end %> - <%= format_date(date_for_answer) %> + <%= format_date_without_day(date_for_answer) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_laid.html.erb b/app/views/search/results/item_details/_date_laid.html.erb index beaffe00..458c1db1 100644 --- a/app/views/search/results/item_details/_date_laid.html.erb +++ b/app/views/search/results/item_details/_date_laid.html.erb @@ -4,7 +4,7 @@ Laid on
- <%= format_date(date_laid) %> + <%= format_date_without_day(date_laid) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_made.html.erb b/app/views/search/results/item_details/_date_made.html.erb index 2e7bf7ec..c3809337 100644 --- a/app/views/search/results/item_details/_date_made.html.erb +++ b/app/views/search/results/item_details/_date_made.html.erb @@ -6,7 +6,7 @@
<% end %> - <%= format_date(date_made) %> + <%= format_date_without_day(date_made) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_of_answer.html.erb b/app/views/search/results/item_details/_date_of_answer.html.erb index fb3693bf..c0604613 100644 --- a/app/views/search/results/item_details/_date_of_answer.html.erb +++ b/app/views/search/results/item_details/_date_of_answer.html.erb @@ -6,7 +6,7 @@
<% end %> - <%= format_date(date_of_answer) %> + <%= format_date_without_day(date_of_answer) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_of_holding_answer.html.erb b/app/views/search/results/item_details/_date_of_holding_answer.html.erb index efbfa299..7356bd20 100644 --- a/app/views/search/results/item_details/_date_of_holding_answer.html.erb +++ b/app/views/search/results/item_details/_date_of_holding_answer.html.erb @@ -4,7 +4,7 @@ Holding answer on
- <%= format_date(date_of_holding_answer) %> + <%= format_date_without_day(date_of_holding_answer) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_of_order_to_print.html.erb b/app/views/search/results/item_details/_date_of_order_to_print.html.erb index 36ed2241..fae43cf0 100644 --- a/app/views/search/results/item_details/_date_of_order_to_print.html.erb +++ b/app/views/search/results/item_details/_date_of_order_to_print.html.erb @@ -4,7 +4,7 @@ Ordered to be printed on
- <%= format_date(date_of_order_to_print) %> + <%= format_date_without_day(date_of_order_to_print) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_originated.html.erb b/app/views/search/results/item_details/_date_originated.html.erb index 29dc0f17..19b8904f 100644 --- a/app/views/search/results/item_details/_date_originated.html.erb +++ b/app/views/search/results/item_details/_date_originated.html.erb @@ -4,7 +4,7 @@ <%= label %>
- <%= format_date(date_originated) %> + <%= format_date_without_day(date_originated) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_reported.html.erb b/app/views/search/results/item_details/_date_reported.html.erb index bb81022d..0cbdbe73 100644 --- a/app/views/search/results/item_details/_date_reported.html.erb +++ b/app/views/search/results/item_details/_date_reported.html.erb @@ -4,7 +4,7 @@ Reported on
- <%= format_date(date_reported) %> + <%= format_date_without_day(date_reported) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_tabled.html.erb b/app/views/search/results/item_details/_date_tabled.html.erb index 0beeb027..cb03c6c3 100644 --- a/app/views/search/results/item_details/_date_tabled.html.erb +++ b/app/views/search/results/item_details/_date_tabled.html.erb @@ -4,7 +4,7 @@
<%= label %>
<% end %> - <%= format_date(date_tabled) %> + <%= format_date_without_day(date_tabled) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_date_withdrawn.html.erb b/app/views/search/results/item_details/_date_withdrawn.html.erb index 15b192cb..db3608ec 100644 --- a/app/views/search/results/item_details/_date_withdrawn.html.erb +++ b/app/views/search/results/item_details/_date_withdrawn.html.erb @@ -4,7 +4,7 @@ Withdrawn on
- <%= format_date(date_withdrawn) %> + <%= format_date_without_day(date_withdrawn) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_debate_date.html.erb b/app/views/search/results/item_details/_debate_date.html.erb index 9636d76f..8f805067 100644 --- a/app/views/search/results/item_details/_debate_date.html.erb +++ b/app/views/search/results/item_details/_debate_date.html.erb @@ -1,5 +1,5 @@ <% unless debate_date.blank? %>
- <%= format_date(debate_date) %> + <%= format_date_without_day(debate_date) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_deposited_date.html.erb b/app/views/search/results/item_details/_deposited_date.html.erb index e7785865..9112f3ec 100644 --- a/app/views/search/results/item_details/_deposited_date.html.erb +++ b/app/views/search/results/item_details/_deposited_date.html.erb @@ -1,5 +1,5 @@ <% unless deposited_date.blank? %>
- <%= format_date(deposited_date) %> + <%= format_date_without_day(deposited_date) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_published_date.html.erb b/app/views/search/results/item_details/_published_date.html.erb index 54f4de16..6d063f1a 100644 --- a/app/views/search/results/item_details/_published_date.html.erb +++ b/app/views/search/results/item_details/_published_date.html.erb @@ -1,5 +1,5 @@ <% unless published_date.blank? %>
- <%= format_date(published_date) %> + <%= format_date_without_day(published_date) %>
<% end %> \ No newline at end of file diff --git a/app/views/search/results/item_details/_report_date.html.erb b/app/views/search/results/item_details/_report_date.html.erb index 527c2c45..f74c9ae2 100644 --- a/app/views/search/results/item_details/_report_date.html.erb +++ b/app/views/search/results/item_details/_report_date.html.erb @@ -1,5 +1,5 @@ <% unless report_date.blank? %>
- <%= format_date(report_date) %> + <%= format_date_without_day(report_date) %>
<% end %> \ No newline at end of file