Update app/models/champs/header_section_champ.rb

Co-authored-by: Pierre de La Morinerie <kemenaran@gmail.com>

app/models/champ.rb

@@ -45,6 +45,7 @@ class Champ < ApplicationRecord
     :repetition?,
     :dossier_link?,
     :titre_identite?,
+    :header_section?,
     to: :type_de_champ
 
   scope :updated_since?, -> (date) { where('champs.updated_at > ?', date) }
@@ -86,6 +87,10 @@ class Champ < ApplicationRecord
     end
   end
 
+  def sections
+    siblings.filter(&:header_section?)
+  end
+
   def mandatory_and_blank?
     mandatory? && blank?
   end

app/models/champs/header_section_champ.rb

@@ -23,22 +23,18 @@ class Champs::HeaderSectionChamp < Champ
   end
 
   def libelle_with_section_index
-    if libelle_with_section_index? || siblings.any?(&:libelle_with_section_index?)
-      libelle
-    else
+    if sections.none?(&:libelle_with_section_index?)
       "#{section_index}. #{libelle}"
+    else
+      libelle
     end
   end
 
-  private
-
   def libelle_with_section_index?
     libelle =~ /^\d/
   end
 
   def section_index
-    siblings
-      .filter { |c| c.type_champ == TypeDeChamp.type_champs.fetch(:header_section) }
-      .index(self) + 1
+    sections.index(self) + 1
   end
 end

app/models/type_de_champ.rb

@@ -174,6 +174,10 @@ class TypeDeChamp < ApplicationRecord
     ])
   end
 
+  def header_section?
+    type_champ == TypeDeChamp.type_champs.fetch(:header_section)
+  end
+
   def linked_drop_down_list?
     type_champ == TypeDeChamp.type_champs.fetch(:linked_drop_down_list)
   end