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

feat(routing): update method checking if routling rule match tdc

Browse source
This commit is contained in:
Eric Leroy-Terquem 2023-07-26 17:28:28 +02:00
parent 7680d5093e
commit 155a797aba
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/groupe_instructeur.rb
View file

@ -117,7 +117,8 @@ class GroupeInstructeur < ApplicationRecord
def routing_rule_matches_tdc? def routing_rule_matches_tdc?
routing_tdc = procedure.active_revision.types_de_champ.find_by(stable_id: routing_rule.left.stable_id) routing_tdc = procedure.active_revision.types_de_champ.find_by(stable_id: routing_rule.left.stable_id)
routing_rule.right.value.in?(routing_tdc.options['drop_down_options']) options = routing_tdc.options_with_drop_down_other
routing_rule.right.value.in?(options)
end end
serialize :routing_rule, LogicSerializer serialize :routing_rule, LogicSerializer

8
app/models/type_de_champ.rb
View file

@ -517,6 +517,14 @@ class TypeDeChamp < ApplicationRecord
(drop_down_list_options - drop_down_list_disabled_options).reject(&:empty?) (drop_down_list_options - drop_down_list_disabled_options).reject(&:empty?)
end end
def options_with_drop_down_other
if drop_down_other?
drop_down_options + [Champs::DropDownListChamp::OTHER]
else
drop_down_options
end
end
def layer_enabled?(layer) def layer_enabled?(layer)
options && options[layer] && options[layer] != '0' options && options[layer] && options[layer] != '0'
end end