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

simplify negation and alert

Browse source
This commit is contained in:
simon lehericey 2022-07-07 10:38:14 +02:00
parent 3fc3bb6d54
commit 4ac66f2b99
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/components/types_de_champ/conditions_component.rb
View file

@ -85,17 +85,17 @@ class TypesDeChamp::ConditionsComponent < ApplicationComponent
def operator_tag(operator_name, targeted_champ, row_index) def operator_tag(operator_name, targeted_champ, row_index)
operators_for_select = compatibles_operators_for_select(targeted_champ) operators_for_select = compatibles_operators_for_select(targeted_champ)
current_operator_valid = operators_for_select.map(&:second).include?(operator_name) current_operator_invalid = !operators_for_select.map(&:second).include?(operator_name)
if !current_operator_valid if current_operator_invalid
operators_for_select.unshift([t('.select'), EmptyOperator.name]) operators_for_select = [[t('.select'), EmptyOperator.name]] + operators_for_select
end end
select_tag( select_tag(
input_name_for('operator_name'), input_name_for('operator_name'),
options_for_select(operators_for_select, selected: operator_name), options_for_select(operators_for_select, selected: operator_name),
id: input_id_for('operator_name', row_index), id: input_id_for('operator_name', row_index),
class: { alert: !current_operator_valid } class: { alert: current_operator_invalid }
) )
end end
@ -123,13 +123,13 @@ class TypesDeChamp::ConditionsComponent < ApplicationComponent
end end
def right_operand_tag(left, right, row_index) def right_operand_tag(left, right, row_index)
right_valid = current_right_valid?(left, right) right_invalid = !current_right_valid?(left, right)
case left.type case left.type
when :boolean when :boolean
options = [[t('utils.yes'), constant(true).to_json], [t('utils.no'), constant(false).to_json]] options = [[t('utils.yes'), constant(true).to_json], [t('utils.no'), constant(false).to_json]]
if !right_valid if right_invalid
options.unshift([t('.select'), empty]) options.unshift([t('.select'), empty])
end end
@ -137,7 +137,7 @@ class TypesDeChamp::ConditionsComponent < ApplicationComponent
input_name_for('value'), input_name_for('value'),
options_for_select(options, right.to_json), options_for_select(options, right.to_json),
id: input_id_for('value', row_index), id: input_id_for('value', row_index),
class: right_valid ? nil : 'alert' class: { alert: right_invalid }
) )
when :empty when :empty
select_tag( select_tag(
@ -148,7 +148,7 @@ class TypesDeChamp::ConditionsComponent < ApplicationComponent
when :enum when :enum
options = left.options options = left.options
if !right_valid if right_invalid
options.unshift([t('.select'), empty]) options.unshift([t('.select'), empty])
end end
@ -156,7 +156,7 @@ class TypesDeChamp::ConditionsComponent < ApplicationComponent
input_name_for('value'), input_name_for('value'),
options_for_select(options, right.value), options_for_select(options, right.value),
id: input_id_for('value', row_index), id: input_id_for('value', row_index),
class: right_valid ? nil : 'alert' class: { alert: right_invalid }
) )
when :number when :number
number_field_tag( number_field_tag(
@ -164,7 +164,7 @@ class TypesDeChamp::ConditionsComponent < ApplicationComponent
right.value, right.value,
required: true, required: true,
id: input_id_for('value', row_index), id: input_id_for('value', row_index),
class: right_valid ? nil : 'alert' class: { alert: right_invalid }
) )
else else
number_field_tag(input_name_for('value'), '', id: input_id_for('value', row_index)) number_field_tag(input_name_for('value'), '', id: input_id_for('value', row_index))