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

always show user choice even if no more in enum in columns

Browse source
This commit is contained in:
simon lehericey 2024-12-12 09:46:59 +01:00
parent 6e5aa90bc7
commit c578c88f48
No known key found for this signature in database
GPG key ID: CDE670D827C7B3C5
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/columns/champ_column.rb
View file

@ -70,7 +70,7 @@ class Columns::ChampColumn < Column
when :date when :date
parse_datetime(value)&.to_date parse_datetime(value)&.to_date
when :enum when :enum
parse_enum(value) value
when :enums when :enums
parse_enums(value) parse_enums(value)
else else
@ -91,9 +91,9 @@ class Columns::ChampColumn < Column
when ['integer_number', 'text'], ['decimal_number', 'text'] # number to text when ['integer_number', 'text'], ['decimal_number', 'text'] # number to text
value value
when ['drop_down_list', 'multiple_drop_down_list'] # single list can become multi when ['drop_down_list', 'multiple_drop_down_list'] # single list can become multi
[parse_enum(value)].compact_blank [value]
when ['drop_down_list', 'text'] # single list can become text when ['drop_down_list', 'text'] # single list can become text
parse_enum(value) value
when ['multiple_drop_down_list', 'drop_down_list'] # multi list can become single when ['multiple_drop_down_list', 'drop_down_list'] # multi list can become single
parse_enums(value)&.first parse_enums(value)&.first
when ['multiple_drop_down_list', 'text'] # multi list can become text when ['multiple_drop_down_list', 'text'] # multi list can become text
@ -116,11 +116,6 @@ class Columns::ChampColumn < Column
end end
end end
def parse_enum(value)
return value if options_for_select.blank?
value if options_for_select.to_set(&:second).member?(value)
end
def parse_enums(value) def parse_enums(value)
values = JSON.parse(value) values = JSON.parse(value)
return values if options_for_select.blank? return values if options_for_select.blank?

8
spec/models/columns/champ_column_spec.rb
View file

@ -121,14 +121,6 @@ describe Columns::ChampColumn do
expect(column('multiple_drop_down_list').value(champ)).to eq(['val1']) expect(column('multiple_drop_down_list').value(champ)).to eq(['val1'])
expect(column('text').value(champ)).to eq('val1') expect(column('text').value(champ)).to eq('val1')
end end
context 'value not in options' do
let(:value) { 'toto' }
it do
expect(column('simple_drop_down_list').value(champ)).to eq(nil)
end
end
end end
context 'from a multiple_drop_down_list' do context 'from a multiple_drop_down_list' do