Fix sort line transport mode alphabetically

Refs #3109

2 files changed, 13 insertions, 5 deletions

diff --git a/app/helpers/lines_helper.rb b/app/helpers/lines_helper.rb
index 80073af62..45e6cd939 100644
--- a/app/helpers/lines_helper.rb
+++ b/app/helpers/lines_helper.rb
@@ -5,6 +5,14 @@ module LinesHelper
     line.number
   end
 
+  def sorted_transport_submode
+    Chouette::Line.transport_submode.values.sort_by{|m| t("enumerize.line.transport_submode.#{m}") }
+  end
+
+  def sorted_transport_mode
+    Chouette::Line.transport_mode.values.sort_by{|m| t("enumerize.line.transport_mode.#{m}") }
+  end
+
   def colors?(line)
     line.text_color.present? || line.color.present?
   end
@@ -12,15 +20,15 @@ module LinesHelper
   def text_color(line)
     line.text_color.blank? ? "black" : "##{line.text_color}"
   end
-  
+
   def background_color(line)
     line.color.blank? ? "white" : "#"+line.color
   end
-  
+
   def number_style(line)
     if colors?(line)
       number_style = "color: #{text_color(line)}; background-color: #{background_color(line)};"
-    else 
+    else
       number_style = ""
     end
 
diff --git a/app/views/lines/_filters.html.slim b/app/views/lines/_filters.html.slim
index b52aa73e9..a0188f562 100644
--- a/app/views/lines/_filters.html.slim
+++ b/app/views/lines/_filters.html.slim
@@ -17,11 +17,11 @@
 
     .form-group.togglable
       = f.label @lines.human_attribute_name(:transport_mode), required: false, class: 'control-label'
-      = f.input :transport_mode_eq_any, collection: Chouette::Line.transport_mode.values, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.line.transport_mode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
+      = f.input :transport_mode_eq_any, collection: sorted_transport_mode, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.line.transport_mode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
 
     .form-group.togglable
       = f.label @lines.human_attribute_name(:transport_submode), required: false, class: 'control-label'
-      = f.input :transport_submode_eq_any, collection: Chouette::Line.transport_submode.values, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.line.transport_submode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
+      = f.input :transport_submode_eq_any, collection: sorted_transport_submode, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.line.transport_submode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
 
   .actions
     = link_to 'Effacer', @workbench, class: 'btn btn-link'