Browse Source

CLDC-3076: Make example dates consistent (#2107)

* CLDC-3076: Make example dates consistent

* Use example date even when some hint text provided already

* Temp remove some date restrictions

* Update to 2 line breaks

* Revert "Temp remove some date restrictions"

This reverts commit cd7f18f9f1.
pull/2121/head
Rachael Booth 12 months ago committed by natdeanlewissoftwire
parent
commit
70cefd7d82
  1. 3
      app/helpers/collection_time_helper.rb
  2. 2
      app/views/form/_date_question.html.erb
  3. 14
      spec/helpers/collection_time_helper_spec.rb

3
app/helpers/collection_time_helper.rb

@ -13,7 +13,8 @@ module CollectionTimeHelper
end
def date_mid_collection_year_formatted(date)
example_date = date.nil? ? Time.zone.today : collection_start_date(date).to_date + 5.months
relevant_year = date.nil? ? current_collection_start_year : collection_start_year_for_date(date)
example_date = Date.new(relevant_year, 9, 13)
example_date.to_formatted_s(:govuk_date_number_month)
end

2
app/views/form/_date_question.html.erb

@ -3,7 +3,7 @@
<%= f.govuk_date_field question.id.to_sym,
caption: caption(caption_text, page_header, conditional),
legend: legend(question, page_header, conditional),
hint: { text: question.hint_text&.html_safe || "For example, #{date_mid_collection_year_formatted(lettings_log.startdate)}" },
hint: { text: (question.hint_text.nil? ? "" : (question.hint_text.html_safe + "</br></br>".html_safe)) + "For example, #{date_mid_collection_year_formatted(lettings_log.startdate)}" },
width: 20,
**stimulus_html_attributes(question) do %>
<%= govuk_inset_text(text: question.unresolved_hint_text) if question.unresolved_hint_text.present? && @log.unresolved %>

14
spec/helpers/collection_time_helper_spec.rb

@ -85,9 +85,9 @@ RSpec.describe CollectionTimeHelper do
context "when called with nil" do
let(:input) { nil }
it "returns the current date" do
today = Time.zone.today
expect(result).to eq("#{today.day} #{today.month} #{today.year}")
it "returns the 13th of September in the current collection year" do
year = current_collection_start_year
expect(result).to eq("13 9 #{year}")
end
end
@ -95,8 +95,8 @@ RSpec.describe CollectionTimeHelper do
calendar_year = 2030
let(:input) { Date.new(calendar_year, 7, 7) }
it "returns the first of September from that year" do
expect(result).to eq("1 9 #{calendar_year}")
it "returns the 13th of September from that year" do
expect(result).to eq("13 9 #{calendar_year}")
end
end
@ -104,8 +104,8 @@ RSpec.describe CollectionTimeHelper do
calendar_year = 2040
let(:input) { Date.new(calendar_year, 2, 7) }
it "returns the first of September from the previous year" do
expect(result).to eq("1 9 #{calendar_year - 1}")
it "returns the 13th of September from the previous year" do
expect(result).to eq("13 9 #{calendar_year - 1}")
end
end
end

Loading…
Cancel
Save