Bring back previous logic when displaying C section

app/assets/javascripts/application.js.coffee

@@ -169,19 +169,18 @@ jQuery ->
     fy_latest_changed_input.find("input.js-fy-day").val(fy_day)
     fy_latest_changed_input.find("input.js-fy-month").val(fy_month)
 
-    # disabled for 2021
     # Auto fill the year for previous years
-    # $(".js-financial-year-changed-dates .js-fy-entries").each ->
-    #  if $(this).find("input.js-fy-year").val() == ""
-    #    parent_fy = $(this).parent().find(".js-fy-entries")
-    #    this_year = fy_year - (parent_fy.size() - parent_fy.index($(this)) - 1)
-    #    $(this).find("input.js-fy-year").val(this_year)
+    $(".js-financial-year-changed-dates .js-fy-entries").each ->
+     if $(this).find("input.js-fy-year").val() == ""
+       parent_fy = $(this).parent().find(".js-fy-entries")
+       this_year = fy_year - (parent_fy.size() - parent_fy.index($(this)) - 1)
+       $(this).find("input.js-fy-year").val(this_year)
 
-    # fy_latest_changed_input.find("input").attr("disabled", "disabled")
-    # $(".js-financial-year-changed-dates").attr("data-year", fy_year)
+    fy_latest_changed_input.find("input").attr("disabled", "disabled")
+    $(".js-financial-year-changed-dates").attr("data-year", fy_year)
 
     # We should change the last year date regardless if it's present or not
-    # fy_latest_changed_input.find("input.js-fy-year").val(fy_year)
+    fy_latest_changed_input.find("input.js-fy-year").val(fy_year)
 
     updateYearEnd()
 

app/assets/javascripts/frontend/form-validation.js.coffee

@@ -457,17 +457,11 @@ window.FormValidation =
       else
         complexDateString = day + "/" + month + "/" + year
         date = @toDate(complexDateString)
-        currentDate = new Date()
 
         if not date.isValid()
           @logThis(question, "validateDateByYears", "Not a valid date")
           @appendMessage(qParent, "Not a valid date")
           @addErrorClass(question)
-        # temporary condition
-        else if parseInt(year) > 2022 || parseInt(year) < 2014
-          @logThis(question, "validateDateByYears", "the year must be from 2014 to 2022")
-          @appendMessage(qParent, "the year must be from 2014 to 2022")
-          @addErrorClass(question)
 
   validateInnovationFinancialDate: (question) ->
 
@@ -613,7 +607,7 @@ window.FormValidation =
       @validateMoneyByYears(question)
 
     if question.hasClass("question-date-by-years") &&
-       (question.hasClass("one-option-by-years") || question.find(".show-question").length == (question.find(".js-conditional-question").length - 1))
+       question.find(".show-question").length == (question.find(".js-conditional-question").length - 1)
       @validateDateByYears(question)
 
     if question.find(".match").length

app/form_pointers/financial_table.rb

@@ -7,23 +7,11 @@ def get_audit_data(key)
     res.present? ? res[key.to_sym] : financial_empty_values
   end
 
-  # pre COVID logic
-  # def financial_table_headers
-  #   if financial_year_changed_dates?
-  #     financial_table_changed_dates_headers
-  #   elsif (financial_date_day.to_i > 0 && financial_date_month.to_i > 0)
-  #     financial_table_pointer_headers
-  #   else
-  #     financial_table_default_headers
-  #   end
-  # end
-
-  # COVID period logic:
-  # If all the dates are present just render them
-  # Instead of making any changes to years
   def financial_table_headers
-    if financial_year_dates_filled_in?
+    if financial_year_changed_dates?
       financial_table_changed_dates_headers
+    elsif (financial_date_day.to_i > 0 && financial_date_month.to_i > 0)
+      financial_table_pointer_headers
     else
       financial_table_default_headers
     end
@@ -42,18 +30,6 @@ def financial_table_changed_dates_headers
     end
   end
 
-  def financial_year_dates_filled_in?
-    res = financial_data(
-      :financial_year_changed_dates,
-      get_audit_data(:financial_year_changed_dates)
-    )
-
-    res.any? && res.all? do |entry|
-      date_array = entry.to_s.split("/")
-      date_array.any? && date_array.all?(&:present?)
-    end
-  end
-
   def correct_date_headers(res)
     corrected_result = []
     last_year = res.last.split("/")[2].to_i

app/forms/award_years/v2024/innovation/innovation_step3.rb

@@ -117,6 +117,7 @@ def innovation_step3
           by_year_condition :innovation_performance_years, "2 to 4", 2
           by_year_condition :innovation_performance_years, "5 plus", 5
           conditional :innovation_performance_years, :true
+          conditional :financial_year_date_changed, :yes
         end
 
         by_years :employees, "Enter the number of people employed by your organisation in the UK in each year of your entry." do

app/forms/award_years/v2024/international_trade/international_trade_step3.rb

@@ -125,6 +125,7 @@ def trade_step3
           by_year_condition :trade_commercial_success, "3 to 5", 3
           by_year_condition :trade_commercial_success, "6 plus", 6
           conditional :trade_commercial_success, :true
+          conditional :financial_year_date_changed, "yes"
         end
 
         textarea :financial_year_date_changed_explaination, "Please explain why your year-end date changed." do

app/forms/award_years/v2024/social_mobility/social_mobility_step3.rb

@@ -94,6 +94,7 @@ def mobility_step3
           )
           type :date
           label ->(y) { "Financial year #{y}" }
+          conditional :financial_year_date_changed, :yes
         end
 
         upload :supporting_financials, "To support your figures, please upload your financial statements for the years entered in question C2.2." do

app/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb

@@ -91,7 +91,7 @@ def development_step3
         end
 
         one_option_by_years_label :financial_year_changed_dates, "Please enter your year-end dates for each financial year." do
-          classes "sub-question one-option-by-years"
+          classes "sub-question"
           sub_ref "C 2.2"
 
           context %(
@@ -106,6 +106,7 @@ def development_step3
           required
           type :date
           label ->(y) { "Financial year #{y}" }
+          conditional :financial_year_date_changed, :yes
         end
 
         upload :supporting_financials, "To support your figures, please upload your financial statements for the years entered in question C2.2." do

app/pdf_generators/qae_pdf_forms/custom_questions/by_year.rb

@@ -64,7 +64,7 @@ def financial_dates_changed_year_headers
 
     financial_table_headers.each_with_index do |item, placement|
       header_item = "#{FINANCIAL_YEAR_PREFIX} #{placement + 1}"
-      header_item += " (last)" if size == (placement + 1)
+      header_item += " (current)" if size == (placement + 1)
 
       res << header_item
     end
@@ -81,14 +81,14 @@ def financial_dates_not_changed_year_headers
 
     if form_pdf.pdf_blank_mode.present? # BLANK FOR MODE
       financial_table_default_headers.map.with_index do |item, index|
-        financial_table_default_headers.size == (index + 1) ? "#{item} (last)" : item
+        financial_table_default_headers.size == (index + 1) ? "#{item} (current)" : item
       end
     else
       size = financial_table_headers.size
 
       financial_table_headers.map.with_index do |item, index|
         item = "#{prefix} #{item}"
-        size == (index.to_i + 1) && item.include?(FINANCIAL_YEAR_PREFIX) ? "#{item} (last)" : item
+        size == (index.to_i + 1) && item.include?(FINANCIAL_YEAR_PREFIX) ? "#{item} (current)" : item
       end
     end
   end

app/views/qae_form/_by_years_label_question.html.slim

@@ -13,7 +13,7 @@ div role="group" id="q_#{question.key}"
                 span.js-year-default class="govuk-body govuk-!-font-size-19 govuk-!-margin-bottom-0 govuk-!-margin-top-5"
                   = question.format_label(y)
                   - if y == c.years
-                    '  (last)
+                    '  (current)
               span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
               .govuk-date-input
                 .govuk-date-input__item

app/views/qae_form/_by_years_question.html.slim

@@ -14,7 +14,7 @@
                   ' Financial year
                   = y
                   - if y == c.years
-                    '  (last)
+                    '  (current)
                 span.js-year-text
             span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
             span class="#{'govuk-input__wrapper' if question.type == :money}"

app/views/qae_form/_one_option_by_years_label_question.html.slim

@@ -1,5 +1,5 @@
 .js-financial-year-changed-dates role="group" id="q_#{question.key}"
-  .js-fy-entry-container.show-question
+  .js-fy-entry-container
     .if-js-hide
       label.govuk-label
         strong
@@ -11,7 +11,7 @@
             label.js-year-default.govuk-label class="govuk-!-margin-bottom-0 govuk-!-margin-top-5"
               = question.format_label(y)
               - if y == 3
-                '  (last)
+                '  (current)
           br
           span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
           .govuk-date-input

app/views/qae_form/_one_option_by_years_question.html.slim

@@ -13,7 +13,7 @@
                 ' Financial year
                 = y
                 - if y == 3
-                  '  (last)
+                  '  (current)
               span.js-year-text
           span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
           span class="#{'govuk-input__wrapper' if question.type == :money}"