DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9267 from mfo/US/fix-show-champs

Browse source 
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:
mfo 2023-06-29 14:11:17 +00:00 committed by GitHub
commit 87237896c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/components/dossiers/champ_row_show_component.rb
View file

@ -30,7 +30,7 @@ class Dossiers::ChampRowShowComponent < ApplicationComponent
end end
def each_champ(&block) 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 end
private private

6
app/components/dossiers/champ_row_show_component/champ_row_show_component.html.haml
View file

@ -1,8 +1,10 @@
- each_champ do |champ| - each_champ do |champ|
.fr-px-4v.fr-my-2v .fr-px-4v.fr-my-2v
- if champ.repetition? - if champ.repetition?
%p.champ-label= "#{champ.libelle} :" - champ.rows.each.with_index do |row, i|
- champ.rows.each do |row| .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) = render Dossiers::ChampRowShowComponent.new(champs: row, demande_seen_at: @demande_seen_at, profile: @profile, repetition: true)
- elsif !champ.header_section? - elsif !champ.header_section?

2
app/components/viewable_champ/section_component.rb
View file

@ -19,7 +19,7 @@ class ViewableChamp::SectionComponent < ApplicationComponent
end end
def champs def champs
tail.filter { _1.is_a?(Champ) && _1.visible? && !_1.exclude_from_view? } tail.filter { _1.is_a?(Champ) }
end end
def sections def sections