Hide section/subsections from task list

app/models/form/sales/subsections/household_needs.rb

@@ -7,7 +7,7 @@ class Form::Sales::Subsections::HouseholdNeeds < ::Form::Subsection
 
   def depends_on
     if form.start_year_2025_or_later?
-      [{ "setup_completed?" => true, "is_staircase?" => true }]
+      [{ "setup_completed?" => true, "is_staircase?" => false }]
     else
       [{ "setup_completed?" => true }]
     end
@@ -24,4 +24,11 @@ class Form::Sales::Subsections::HouseholdNeeds < ::Form::Subsection
       Form::Sales::Pages::HouseholdWheelchairCheck.new("wheelchair_check", nil, self),
     ]
   end
+
+  def displayed_in_tasklist?(log)
+    return true unless form.start_year_2025_or_later?
+
+    log.staircase != 1
+  end
+
 end

app/models/form/sales/subsections/household_situation.rb

@@ -7,7 +7,7 @@ class Form::Sales::Subsections::HouseholdSituation < ::Form::Subsection
 
   def depends_on
     if form.start_year_2025_or_later?
-      [{ "setup_completed?" => true, "is_staircase?" => true }]
+      [{ "setup_completed?" => true, "is_staircase?" => false }]
     else
       [{ "setup_completed?" => true }]
     end
@@ -23,4 +23,11 @@ class Form::Sales::Subsections::HouseholdSituation < ::Form::Subsection
       Form::Sales::Pages::Buyer2PreviousHousingSituation.new(nil, nil, self),
     ].flatten.compact
   end
+
+  def displayed_in_tasklist?(log)
+    return true unless form.start_year_2025_or_later?
+
+    log.staircase != 1
+  end
+
 end

app/models/form/sales/subsections/income_benefits_and_savings.rb

@@ -7,7 +7,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection
 
   def depends_on
     if form.start_year_2025_or_later?
-      [{ "setup_completed?" => true, "is_staircase?" => true }]
+      [{ "setup_completed?" => true, "is_staircase?" => false }]
     else
       [{ "setup_completed?" => true }]
     end
@@ -43,6 +43,12 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection
     ].compact
   end
 
+  def displayed_in_tasklist?(log)
+    return true unless form.start_year_2025_or_later?
+
+    log.staircase != 1
+  end
+
 private
 
   def previous_shared_page

app/views/logs/_tasklist.html.erb

@@ -1,5 +1,6 @@
 <ol class="app-task-list govuk-!-margin-top-8">
-  <% @log.form.sections.map do |section| %>
+  <% @log.form.sections.each do |section| %>
+    <% next if section.subsections.none? { |subsection| subsection.displayed_in_tasklist?(@log) } %>
     <li>
       <h2 class="app-task-list__section-heading">
         <%= section.label %>
@@ -8,7 +9,7 @@
         <p class="govuk-body"><%= section.description.html_safe %></p>
       <% end %>
       <ul class="app-task-list__items">
-        <% section.subsections.map do |subsection| %>
+        <% section.subsections.each do |subsection| %>
           <% if subsection.displayed_in_tasklist?(@log) && (subsection.applicable_questions(@log).count > 0 || !subsection.enabled?(@log)) %>
             <% subsection_status = subsection.status(@log) %>
             <li class="app-task-list__item">