review(pull/10591#discussion_r1818744664): extract some column builder
This commit is contained in:
parent
df71c6a689
commit
8afe4374c7
1 changed files with 8 additions and 4 deletions
|
@ -42,8 +42,8 @@ module ColumnsConcern
|
||||||
def all_usager_columns_for_export
|
def all_usager_columns_for_export
|
||||||
common = [
|
common = [
|
||||||
dossier_id_column,
|
dossier_id_column,
|
||||||
Column.new(procedure_id: id, table: 'self', column: 'user_email_for_display', filterable: false, displayable: false),
|
email_for_display_column,
|
||||||
Column.new(procedure_id: id, table: 'self', column: 'user_from_france_connect?', filterable: false, displayable: false)
|
france_connected_column
|
||||||
]
|
]
|
||||||
|
|
||||||
individual_or_moral_columns = for_individual? ? individual_columns : moral_columns
|
individual_or_moral_columns = for_individual? ? individual_columns : moral_columns
|
||||||
|
@ -78,6 +78,10 @@ module ColumnsConcern
|
||||||
Column.new(procedure_id: id, table: 'self', column: 'state', label: I18n.t('activerecord.attributes.procedure_presentation.fields.self.state'), type: :enum, scope: 'instructeurs.dossiers.filterable_state', displayable: false)
|
Column.new(procedure_id: id, table: 'self', column: 'state', label: I18n.t('activerecord.attributes.procedure_presentation.fields.self.state'), type: :enum, scope: 'instructeurs.dossiers.filterable_state', displayable: false)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def email_for_display_column = Column.new(procedure_id: id, table: 'self', column: 'user_email_for_display', filterable: false, displayable: false)
|
||||||
|
|
||||||
|
def france_connected_column = Column.new(procedure_id: id, table: 'self', column: 'user_from_france_connect?', filterable: false, displayable: false)
|
||||||
|
|
||||||
def notifications_column
|
def notifications_column
|
||||||
Column.new(procedure_id: id, table: 'notifications', column: 'notifications', label: "notifications", filterable: false)
|
Column.new(procedure_id: id, table: 'notifications', column: 'notifications', label: "notifications", filterable: false)
|
||||||
end
|
end
|
||||||
|
@ -134,12 +138,12 @@ module ColumnsConcern
|
||||||
def standard_columns
|
def standard_columns
|
||||||
[
|
[
|
||||||
email_column,
|
email_column,
|
||||||
Column.new(procedure_id: id, table: 'self', column: 'user_email_for_display', filterable: false, displayable: false),
|
email_for_display_column,
|
||||||
Column.new(procedure_id: id, table: 'followers_instructeurs', column: 'email'),
|
Column.new(procedure_id: id, table: 'followers_instructeurs', column: 'email'),
|
||||||
Column.new(procedure_id: id, table: 'groupe_instructeur', column: 'id', type: :enum),
|
Column.new(procedure_id: id, table: 'groupe_instructeur', column: 'id', type: :enum),
|
||||||
Column.new(procedure_id: id, table: 'avis', column: 'question_answer', filterable: false),
|
Column.new(procedure_id: id, table: 'avis', column: 'question_answer', filterable: false),
|
||||||
Column.new(procedure_id: id, table: 'user', column: 'id', filterable: false, displayable: false),
|
Column.new(procedure_id: id, table: 'user', column: 'id', filterable: false, displayable: false),
|
||||||
Column.new(procedure_id: id, table: 'self', column: 'user_from_france_connect?', filterable: false, displayable: false)
|
france_connected_column
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue