Manualy sort type_de_champ by order_place

app/models/dossier.rb

@@ -297,8 +297,13 @@ class Dossier < ActiveRecord::Base
   def convert_specific_values_to_string(hash_to_convert)
     hash = {}
     hash_to_convert.each do |key, value|
-      value = value.to_s if !value.kind_of?(Time) && !value.nil?
-      hash.store(key, value)
+      if value.nil?
+        value = ""
+        hash.store(key, value)
+      else
+        value = value.to_s if !value.kind_of?(Time)
+        hash.store(key, value)
+      end
     end
     return hash
   end
@@ -325,34 +330,27 @@ class Dossier < ActiveRecord::Base
     self.export_default_columns.to_a
   end
 
-  def export_headers
-    serialized_dossier = DossierProcedureSerializer.new(self).as_json[:dossier_procedure]
-    champs = {}
-    serialized_dossier[:champs].each do |champ_hash|
-      champs[champ_hash[:type_de_champ]["libelle"].parameterize.underscore.to_sym] = champ_hash[:value]
-    end
-    dossier_data = serialized_dossier.except(:champs).merge(champs)
-    dossier_data = self.convert_specific_values_to_string(dossier_data)
-    return (dossier_data.keys << self.export_entreprise_data.keys).flatten
-  end
-
   def data_with_champs
+    data = []
     serialized_dossier = DossierProcedureSerializer.new(self).as_json[:dossier_procedure]
     champs = {}
     serialized_dossier[:champs].each do |champ_hash|
       champs[champ_hash[:type_de_champ]["libelle"].parameterize.underscore.to_sym] = champ_hash[:value]
     end
+    binding.pry
     dossier_data = serialized_dossier.except(:champs).merge(champs)
     dossier_data = self.convert_specific_values_to_string(dossier_data)
-    return (dossier_data.values << self.export_entreprise_data.values).flatten
+    return dossier_data.merge(self.export_entreprise_data)
   end
 
   def self.export_full_generation(dossiers, format)
     data = []
     headers = []
     dossiers.each do |dossier|
-      headers = dossier.export_headers if headers.empty?
-      data << dossier.data_with_champs
+      if dossier.id == 948 || dossier.id == 955
+        data << dossier.data_with_champs.values
+        headers = dossier.data_with_champs.keys if headers.empty?
+      end
     end
     if ["csv"].include?(format)
       return SpreadsheetArchitect.to_csv(data: data, headers: headers)

app/models/type_de_champ.rb

@@ -43,4 +43,4 @@ class TypeDeChamp < ActiveRecord::Base
     self.mandatory = false if self.type_champ == 'header_section'
     true
   end
-end
+end

app/serializers/dossier_procedure_serializer.rb

@@ -7,4 +7,9 @@ class DossierProcedureSerializer < ActiveModel::Serializer
              :state
 
   has_many :champs
+
+
+  def champs
+    object.champs.order("type_de_champ_id")
+  end
 end

app/services/dossiers_list_gestionnaire_service.rb

@@ -183,4 +183,4 @@ class DossiersListGestionnaireService
   def current_preference_smart_listing_page
     @current_devise_profil.preference_smart_listing_page
   end
-end
+end

spec/models/dossier_spec.rb

@@ -754,15 +754,6 @@ describe Dossier do
     end
   end
 
-  describe '#export_headers' do
-    let(:procedure) { create(:procedure) }
-    let(:dossier) { create(:dossier, :with_entreprise, user: user, procedure: procedure) }
-
-    subject { dossier.export_headers }
-    it do
-    end
-  end
-
   describe '#data_with_champs' do
   end