Merge pull request #9267 from mfo/US/fix-show-champs
correctif(demande): ETQ usager, instructeur, je ne souhaite pas voir les champs conditionné et non visible dans un bloc repetable
This commit is contained in:
commit
87237896c5
3 changed files with 7 additions and 5 deletions
|
@ -30,7 +30,7 @@ class Dossiers::ChampRowShowComponent < ApplicationComponent
|
|||
end
|
||||
|
||||
def each_champ(&block)
|
||||
@champs.filter { show_champ?(_1) }.each(&block)
|
||||
@champs.filter { show_champ?(_1) && _1.visible? && !_1.exclude_from_view? }.each(&block)
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
- each_champ do |champ|
|
||||
.fr-px-4v.fr-my-2v
|
||||
- if champ.repetition?
|
||||
%p.champ-label= "#{champ.libelle} :"
|
||||
- champ.rows.each do |row|
|
||||
= render Dossiers::ChampRowShowComponent.new(champs: row, demande_seen_at: @demande_seen_at, profile: @profile, repetition: true)
|
||||
- champ.rows.each.with_index do |row, i|
|
||||
.fr-background-alt--grey.fr-p-3v.fr-my-3w
|
||||
%p.champ-label= "#{champ.libelle} #{i +1}:"
|
||||
|
||||
= render Dossiers::ChampRowShowComponent.new(champs: row, demande_seen_at: @demande_seen_at, profile: @profile, repetition: true)
|
||||
|
||||
- elsif !champ.header_section?
|
||||
.flex.d-block-sm
|
||||
|
|
|
@ -19,7 +19,7 @@ class ViewableChamp::SectionComponent < ApplicationComponent
|
|||
end
|
||||
|
||||
def champs
|
||||
tail.filter { _1.is_a?(Champ) && _1.visible? && !_1.exclude_from_view? }
|
||||
tail.filter { _1.is_a?(Champ) }
|
||||
end
|
||||
|
||||
def sections
|
||||
|
|
Loading…
Reference in a new issue