Merge pull request #8950 from mfo/US/conditional-header-section
correctif(usager.depot-dossier): ETQ usager, les titres de section conditionnés sont visible meme si la condition n'est pas remplie
This commit is contained in:
commit
29e9606b48
3 changed files with 9 additions and 5 deletions
|
@ -12,10 +12,11 @@ class EditableChamp::HeaderSectionComponent < ApplicationComponent
|
||||||
end
|
end
|
||||||
|
|
||||||
def header_section_classnames
|
def header_section_classnames
|
||||||
class_names = ["fr-h#{level}"]
|
class_names(
|
||||||
|
"fr-h#{level}": true,
|
||||||
class_names << 'header-section' if @champ.dossier.auto_numbering_section_headers_for?(@champ)
|
'header-section': @champ.dossier.auto_numbering_section_headers_for?(@champ),
|
||||||
class_names
|
'hidden': !@champ.visible?
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
def tag_for_depth
|
def tag_for_depth
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
= tag.send(tag_for_depth, class: header_section_classnames) do
|
= tag.send(tag_for_depth, class: header_section_classnames, id: @champ.input_group_id) do
|
||||||
= libelle
|
= libelle
|
||||||
|
|
|
@ -406,6 +406,7 @@ describe 'The user' do
|
||||||
types_de_champ_public: [
|
types_de_champ_public: [
|
||||||
{ type: :integer_number, libelle: 'age', stable_id: age_stable_id },
|
{ type: :integer_number, libelle: 'age', stable_id: age_stable_id },
|
||||||
{ type: :yes_no, libelle: 'permis de conduire', stable_id: permis_stable_id, condition: permis_condition },
|
{ type: :yes_no, libelle: 'permis de conduire', stable_id: permis_stable_id, condition: permis_condition },
|
||||||
|
{ type: :header_section, libelle: 'info voiture', condition: permis_condition },
|
||||||
{ type: :integer_number, libelle: 'tonnage', stable_id: tonnage_stable_id, condition: tonnage_condition },
|
{ type: :integer_number, libelle: 'tonnage', stable_id: tonnage_stable_id, condition: tonnage_condition },
|
||||||
{ type: :text, libelle: 'parking', condition: parking_condition }
|
{ type: :text, libelle: 'parking', condition: parking_condition }
|
||||||
])
|
])
|
||||||
|
@ -418,10 +419,12 @@ describe 'The user' do
|
||||||
|
|
||||||
expect(page).to have_css('label', text: 'age', visible: true)
|
expect(page).to have_css('label', text: 'age', visible: true)
|
||||||
expect(page).to have_no_css('label', text: 'permis de conduire', visible: true)
|
expect(page).to have_no_css('label', text: 'permis de conduire', visible: true)
|
||||||
|
expect(page).to have_no_css('legend h2', text: 'info voiture', visible: true)
|
||||||
expect(page).to have_no_css('label', text: 'tonnage', visible: true)
|
expect(page).to have_no_css('label', text: 'tonnage', visible: true)
|
||||||
|
|
||||||
fill_in('age', with: '18')
|
fill_in('age', with: '18')
|
||||||
expect(page).to have_css('label', text: 'permis de conduire', visible: true)
|
expect(page).to have_css('label', text: 'permis de conduire', visible: true)
|
||||||
|
expect(page).to have_css('legend h2', text: 'info voiture', visible: true)
|
||||||
expect(page).to have_no_css('label', text: 'tonnage', visible: true)
|
expect(page).to have_no_css('label', text: 'tonnage', visible: true)
|
||||||
|
|
||||||
choose('Oui')
|
choose('Oui')
|
||||||
|
|
Loading…
Reference in a new issue