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

homogenize render? if not options

Browse source
This commit is contained in:
simon lehericey 2024-09-16 18:17:55 +02:00
parent f1a606da6d
commit 85684e3bea
No known key found for this signature in database
GPG key ID: CDE670D827C7B3C5
4 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/components/editable_champ/linked_drop_down_list_component.rb
View file

@ -5,6 +5,10 @@ class EditableChamp::LinkedDropDownListComponent < EditableChamp::EditableChampB
:fieldset :fieldset
end end
def render?
@champ.drop_down_options.any?
end
private private
def secondary_label def secondary_label

7
app/components/editable_champ/linked_drop_down_list_component/linked_drop_down_list_component.html.haml
View file

@ -1,11 +1,10 @@
- if @champ.drop_down_options.any? .fr-fieldset__element.fr-mb-0
.fr-fieldset__element.fr-mb-0
.fr-select-group .fr-select-group
= render EditableChamp::ChampLabelComponent.new form: @form, champ: @champ, seen_at: @seen_at = render EditableChamp::ChampLabelComponent.new form: @form, champ: @champ, seen_at: @seen_at
= @form.select :primary_value, @champ.primary_options, {}, required: @champ.required?, class: 'fr-select fr-mb-3v', id: @champ.input_id, aria: { describedby: @champ.describedby_id } = @form.select :primary_value, @champ.primary_options, {}, required: @champ.required?, class: 'fr-select fr-mb-3v', id: @champ.input_id, aria: { describedby: @champ.describedby_id }
- if @champ.has_secondary_options_for_primary? - if @champ.has_secondary_options_for_primary?
.secondary .secondary
.fr-fieldset__element .fr-fieldset__element
.fr-select-group .fr-select-group
@ -15,5 +14,5 @@
.notice{ id: "#{@champ.describedby_id}-secondary" } .notice{ id: "#{@champ.describedby_id}-secondary" }
= render SimpleFormatComponent.new(@champ.drop_down_secondary_description, allow_a: true) = render SimpleFormatComponent.new(@champ.drop_down_secondary_description, allow_a: true)
= @form.select :secondary_value, @champ.secondary_options[@champ.primary_value], {}, required: @champ.required?, class: 'fr-select', id: "#{@champ.input_id}-secondary", aria: { describedby: "#{@champ.describedby_id}-secondary" } = @form.select :secondary_value, @champ.secondary_options[@champ.primary_value], {}, required: @champ.required?, class: 'fr-select', id: "#{@champ.input_id}-secondary", aria: { describedby: "#{@champ.describedby_id}-secondary" }
- else - else
= @form.hidden_field :secondary_value, value: '' = @form.hidden_field :secondary_value, value: ''

5
app/components/editable_champ/multiple_drop_down_list_component/multiple_drop_down_list_component.html.haml
View file

@ -1,5 +1,4 @@
- if @champ.drop_down_options.any? - if @champ.render_as_checkboxes?
- if @champ.render_as_checkboxes?
= @form.collection_check_boxes :value, @champ.enabled_non_empty_options, :to_s, :to_s do |b| = @form.collection_check_boxes :value, @champ.enabled_non_empty_options, :to_s, :to_s do |b|
- capture do - capture do
.fr-fieldset__element .fr-fieldset__element
@ -8,6 +7,6 @@
%label.fr-label{ for: @champ.checkbox_id(b.value) } %label.fr-label{ for: @champ.checkbox_id(b.value) }
= b.text = b.text
- else - else
%react-fragment %react-fragment
= render ReactComponent.new "ComboBox/MultiComboBox", **react_props = render ReactComponent.new "ComboBox/MultiComboBox", **react_props

4
app/models/champs/multiple_drop_down_list_champ.rb
View file

@ -88,6 +88,10 @@ class Champs::MultipleDropDownListChamp < Champ
end end
end end
def render?
@champ.drop_down_options.any?
end
private private
def values_are_in_options def values_are_in_options