Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes conditional for latest year end question #2944

Merged
merged 1 commit into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions forms/award_years/v2025/innovation/innovation_step4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ def innovation_step4
Answer this question if your dates in question D1 range between #{Settings.current_award_year_switch_date.decorate.formatted_trigger_date} to #{Settings.current_submission_deadline.decorate.formatted_trigger_date}.
</p>
)

conditional :financial_year_date, :day_month_range, range: AwardYear.fy_date_range_threshold(minmax: true), disable_pdf_conditional_hints: true, data: { value: AwardYear.fy_date_range_threshold(minmax: true, format: true), type: :range }
end

options :financial_year_date_changed, "Did your year-end date change during your <span class='js-entry-period-subtext'>five</span> most recent financial years that you will be providing figures for?" do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,12 @@ def trade_step4
option (AwardYear.current.year - 2).to_s, (AwardYear.current.year - 2).to_s
option (AwardYear.current.year - 1).to_s, (AwardYear.current.year - 1).to_s
default_option (AwardYear.current.year - 1).to_s

classes "js-most-recent-financial-year"
context %(
<p>
Answer this question if your dates in question D2 range between #{Settings.current_award_year_switch_date.decorate.formatted_trigger_date} to #{Settings.current_submission_deadline.decorate.formatted_trigger_date}.
</p>
)

conditional :financial_year_date, :day_month_range, range: AwardYear.fy_date_range_threshold(minmax: true), data: { value: AwardYear.fy_date_range_threshold(minmax: true, format: true), type: :range }
end

options :financial_year_date_changed, "Did your year-end date change during your <span class='js-entry-period-subtext'>three or six</span>-year entry period that you will be providing figures for?" do
Expand Down
Loading