Merge pull request #2944 from bitzesty/fy-end

Removes conditional for latest year end question
bitzesty · May 23, 2024 · 2aedf4e · 2aedf4e
2 parents 5308de8 + 45bd3fe
commit 2aedf4e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/forms/award_years/v2025/innovation/innovation_step4.rb b/forms/award_years/v2025/innovation/innovation_step4.rb
@@ -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

diff --git a/forms/award_years/v2025/international_trade/international_trade_step4.rb b/forms/award_years/v2025/international_trade/international_trade_step4.rb
@@ -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
-Original file 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 @@