From e41326dad53b9683c51f985003ae8fdf08f89c90 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Wed, 9 Oct 2024 09:52:37 +0200 Subject: [PATCH] tech(clean): remove sva_columns(for_filters) Co-authored-by: mfo --- app/models/concerns/columns_concern.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/models/concerns/columns_concern.rb b/app/models/concerns/columns_concern.rb index e71cff289..0d1b9a984 100644 --- a/app/models/concerns/columns_concern.rb +++ b/app/models/concerns/columns_concern.rb @@ -52,23 +52,21 @@ module ColumnsConcern states = [dossier_state_column] - [common, dates, sva_svr_columns(for_filters: true), non_displayable_dates, states].flatten.compact + [common, dates, sva_svr_columns, non_displayable_dates, states].flatten.compact end - def sva_svr_columns(for_filters: false) + def sva_svr_columns return if !sva_svr_enabled? scope = [:activerecord, :attributes, :procedure_presentation, :fields, :self] columns = [ Column.new(procedure_id: id, table: 'self', column: 'sva_svr_decision_on', type: :date, - label: I18n.t("#{sva_svr_decision}_decision_on", scope:), classname: for_filters ? '' : 'sva-col') + label: I18n.t("#{sva_svr_decision}_decision_on", scope:)) ] - if for_filters - columns << Column.new(procedure_id: id, table: 'self', column: 'sva_svr_decision_before', type: :date, displayable: false, - label: I18n.t("#{sva_svr_decision}_decision_before", scope:)) - end + columns << Column.new(procedure_id: id, table: 'self', column: 'sva_svr_decision_before', type: :date, displayable: false, + label: I18n.t("#{sva_svr_decision}_decision_before", scope:)) columns end