wip make column work with referentiel headers

demarches-simplifiees · Dec 17, 2024 · b12ac7c · b12ac7c
1 parent e00e9d8
commit b12ac7c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/app/controllers/administrateurs/types_de_champ_controller.rb b/app/controllers/administrateurs/types_de_champ_controller.rb
@@ -153,7 +153,12 @@ def import_referentiel
 
         ActiveRecord::Base.transaction do
           # Create referentiel
-          referentiel = type_de_champ.create_referentiel!(name: referentiel_file.original_filename)
+          headers = ACSV::CSV.new_for_ruby3(file.encode("UTF-8", base_encoding[:encoding], invalid: :replace, replace: ""), headers: true)
+            .map { |row| row.to_h }
+            .first
+            .keys
+
+          referentiel = type_de_champ.create_referentiel!(name: referentiel_file.original_filename, headers:)
 
           csv_to_code = ACSV::CSV.new_for_ruby3(file.encode("UTF-8", base_encoding[:encoding], invalid: :replace, replace: ""), headers: true, header_converters: [:downcase, :symbol])
             .map { |row| row.to_h }

diff --git a/app/models/types_de_champ/drop_down_list_type_de_champ.rb b/app/models/types_de_champ/drop_down_list_type_de_champ.rb
@@ -1,31 +1,31 @@
 # frozen_string_literal: true
 
 class TypesDeChamp::DropDownListTypeDeChamp < TypesDeChamp::TypeDeChampBase
-
   def columns(procedure:, displayable: true, prefix: nil)
     if referentiel?
-      referentiel.data_header_columns.map do |header|
-          Columns::JSONPathColumn.new(
-            procedure_id: procedure.id,
-            stable_id:,
-            tdc_type: type_champ,
-            label: "#{libelle_with_prefix(prefix)} – Référentiel #{header.humanize}",
-            type: :text,
-            jsonpath: "$.referentiel.data.#{header}",
-            displayable:
-          )
-      end
-      .concat(
-        [Columns::JSONPathColumn.new(
+      referentiel.headers.map do |header|
+        Columns::JSONPathColumn.new(
           procedure_id: procedure.id,
           stable_id:,
           tdc_type: type_champ,
-          label: "#{libelle_with_prefix(prefix)} – Référentiel #{referentiel.option_header_column.humanize}",
+          label: "#{libelle_with_prefix(prefix)} – Référentiel #{header}",
           type: :text,
-          jsonpath: "$.referentiel.option.#{referentiel.option_header_column}",
+          jsonpath: "$.referentiel.data.#{header.parameterize.underscore}",
           displayable:
         )
-      ]
+      end
+        .concat(
+        [
+          Columns::JSONPathColumn.new(
+                    procedure_id: procedure.id,
+                    stable_id:,
+                    tdc_type: type_champ,
+                    label: "#{libelle_with_prefix(prefix)} – Référentiel #{referentiel.option_header_column.humanize}",
+                    type: :text,
+                    jsonpath: "$.referentiel.option.#{referentiel.option_header_column}",
+                    displayable:
+                  )
+        ]
       )
     else
       super