Ordered piece justificative

app/facades/dossier_facades.rb

@@ -23,7 +23,7 @@ class DossierFacades
   end
 
   def pieces_justificatives
-    @dossier.pieces_justificatives
+    @dossier.ordered_pieces_justificatives
   end
 
   def commentaires

app/models/dossier.rb

@@ -84,6 +84,10 @@ class Dossier < ActiveRecord::Base
     champs_private.joins(', types_de_champ').where("champs.type_de_champ_id = types_de_champ.id AND types_de_champ.procedure_id = #{procedure.id}").order('order_place')
   end
 
+  def ordered_pieces_justificatives
+    champs.joins(', types_de_piece_justificative').where("pieces_justificatives.type_de_piece_justificative_id = types_de_piece_justificative.id AND types_de_piece_justificative.procedure_id = #{procedure.id}").order('order_place ASC')
+  end
+
   def ordered_commentaires
     commentaires.order(created_at: :desc)
   end

app/views/dossiers/_pieces_justificatives.html.haml

@@ -19,7 +19,7 @@
           - else
             = 'Pièce non fournie'
 
-    - @facade.dossier.types_de_piece_justificative.each do |type_de_piece_justificative|
+    - @facade.dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative|
       %tr{ id: "piece_justificative_#{type_de_piece_justificative.id}" }
         %th.col-lg-6
           = type_de_piece_justificative.libelle

app/views/users/description/_pieces_justificatives.html.haml

@@ -12,7 +12,7 @@
         -else
           %input{type: 'file', name:'cerfa_pdf', id:'cerfa_pdf', accept:  PieceJustificative.accept_format, :max_file_size => 3.megabytes }
 
-  - @dossier.types_de_piece_justificative.each do |type_de_piece_justificative|
+  - @dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative|
     %tr
       %th.col-lg-6
         = type_de_piece_justificative.libelle