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

introduce tdc_type

Browse source
This commit is contained in:
simon lehericey 2024-11-04 16:34:00 +01:00
parent 52aaff5ffc
commit ea57a97c06
No known key found for this signature in database
GPG key ID: CDE670D827C7B3C5
8 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,8 +3,9 @@
class Columns::ChampColumn < Column
attr_reader :stable_id
def initialize(procedure_id:, label:, stable_id:, displayable: true, filterable: true, type: :text, value_column: :value)
def initialize(procedure_id:, label:, stable_id:, tdc_type:, displayable: true, filterable: true, type: :text, value_column: :value)
@stable_id = stable_id
@tdc_type = tdc_type
super(
procedure_id:,

3
app/models/columns/json_path_column.rb
View file

@ -3,13 +3,14 @@
class Columns::JSONPathColumn < Columns::ChampColumn
attr_reader :jsonpath
def initialize(procedure_id:, label:, stable_id:, jsonpath:, displayable:, type: :text)
def initialize(procedure_id:, label:, stable_id:, tdc_type:, jsonpath:, displayable:, type: :text)
@jsonpath = quote_string(jsonpath)
super(
procedure_id:,
label:,
stable_id:,
tdc_type:,
displayable:,
type:
)

3
app/models/columns/linked_drop_down_column.rb
View file

@ -3,13 +3,14 @@
class Columns::LinkedDropDownColumn < Columns::ChampColumn
attr_reader :path
def initialize(procedure_id:, label:, stable_id:, path:, displayable:, type: :text)
def initialize(procedure_id:, label:, stable_id:, tdc_type:, path:, displayable:, type: :text)
@path = path
super(
procedure_id:,
label:,
stable_id:,
tdc_type:,
displayable:,
type:
)

1
app/models/concerns/addressable_column_concern.rb
View file

@ -14,6 +14,7 @@ module AddressableColumnConcern
Columns::JSONPathColumn.new(
procedure_id:,
stable_id:,
tdc_type: type_champ,
label: "#{libelle_with_prefix(prefix)} – #{label}",
jsonpath:,
displayable:,

5
app/models/types_de_champ/linked_drop_down_list_type_de_champ.rb
View file

@ -76,7 +76,8 @@ class TypesDeChamp::LinkedDropDownListTypeDeChamp < TypesDeChamp::TypeDeChampBas
Columns::LinkedDropDownColumn.new(
procedure_id:,
label: libelle_with_prefix(prefix),
stable_id: stable_id,
stable_id:,
tdc_type: type_champ,
type: :text,
path: :value,
displayable:
@ -84,6 +85,7 @@ class TypesDeChamp::LinkedDropDownListTypeDeChamp < TypesDeChamp::TypeDeChampBas
Columns::LinkedDropDownColumn.new(
procedure_id:,
stable_id:,
tdc_type: type_champ,
label: "#{libelle_with_prefix(prefix)} (Primaire)",
type: :enum,
path: :primary,
@ -92,6 +94,7 @@ class TypesDeChamp::LinkedDropDownListTypeDeChamp < TypesDeChamp::TypeDeChampBas
Columns::LinkedDropDownColumn.new(
procedure_id:,
stable_id:,
tdc_type: type_champ,
label: "#{libelle_with_prefix(prefix)} (Secondaire)",
type: :enum,
path: :secondary,

1
app/models/types_de_champ/titre_identite_type_de_champ.rb
View file

@ -29,6 +29,7 @@ class TypesDeChamp::TitreIdentiteTypeDeChamp < TypesDeChamp::TypeDeChampBase
Columns::TitreIdentiteColumn.new(
procedure_id:,
stable_id:,
tdc_type: type_champ,
label: libelle_with_prefix(prefix),
type: TypeDeChamp.column_type(type_champ),
value_column: TypeDeChamp.value_column(type_champ),

3
app/models/types_de_champ/type_de_champ_base.rb
View file

@ -100,7 +100,8 @@ class TypesDeChamp::TypeDeChampBase
[
Columns::ChampColumn.new(
procedure_id:,
stable_id: stable_id,
stable_id:,
tdc_type: type_champ,
label: libelle_with_prefix(prefix),
type: TypeDeChamp.column_type(type_champ),
value_column: TypeDeChamp.value_column(type_champ),

3
spec/models/columns/json_path_column_spec.rb
View file

@ -5,7 +5,8 @@ describe Columns::JSONPathColumn do
let(:dossier) { create(:dossier, procedure:) }
let(:champ) { dossier.champs.first }
let(:stable_id) { champ.stable_id }
let(:column) { described_class.new(procedure_id: procedure.id, label: 'label', stable_id:, jsonpath:, displayable: true) }
let(:tdc_type) { champ.type_champ }
let(:column) { described_class.new(procedure_id: procedure.id, label: 'label', stable_id:, tdc_type:, jsonpath:, displayable: true) }
describe '#value' do
let(:jsonpath) { '$.city_name' }