Merge branch 'master' into staging

5 files changed, 19 insertions, 11 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js
index cd065e362..80b62c6b4 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js
@@ -53,9 +53,10 @@ const filters = (state = {}, action) => {
       let params = {
         'q[journey_pattern_id_eq]': state.query.journeyPattern.id || undefined,
         'q[time_tables_id_eq]': state.query.timetable.id || undefined,
-        'q[vehicle_journey_at_stops_departure_time_gteq]': (state.query.interval.start.hour + ':' + state.query.interval.start.minute),
-        'q[vehicle_journey_at_stops_departure_time_lteq]': (state.query.interval.end.hour + ':' + state.query.interval.end.minute),
-        'q[vehicle_journey_without_departure_time]' : state.query.withoutSchedule
+        // Fixme 3358
+        // 'q[vehicle_journey_at_stops_departure_time_gteq]': (state.query.interval.start.hour + ':' + state.query.interval.start.minute),
+        // 'q[vehicle_journey_at_stops_departure_time_lteq]': (state.query.interval.end.hour + ':' + state.query.interval.end.minute),
+        // 'q[vehicle_journey_without_departure_time]' : state.query.withoutSchedule
       }
       let queryString = actions.encodeParams(params)
       return _.assign({}, state, {queryString: queryString})
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index a44a03886..cca75af5b 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -78,7 +78,6 @@ class VehicleJourneysController < ChouetteController
   protected
   def collection
     scope = route.vehicle_journeys.with_stops
-
     @q = scope.search filtered_ransack_params
 
     # Fixme 3358
@@ -94,7 +93,6 @@ class VehicleJourneysController < ChouetteController
 
   def ransack_periode_filter
     if params[:q] && params[:q][:vehicle_journey_at_stops_departure_time_gteq]
-      params[:q] = params[:q].reject{|k| params[:q][k] == 'undefined'}
       between = [:departure_time_gteq, :departure_time_lteq].map do |filter|
         "2000-01-01 #{params[:q]["vehicle_journey_at_stops_#{filter}"]}:00 UTC"
       end
@@ -108,6 +106,7 @@ class VehicleJourneysController < ChouetteController
 
   def filtered_ransack_params
     if params[:q]
+      params[:q] = params[:q].reject{|k| params[:q][k] == 'undefined'}
       params[:q].except(:vehicle_journey_at_stops_departure_time_gteq, :vehicle_journey_at_stops_departure_time_lteq)
     end
   end
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'
diff --git a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js
index d5cdff430..1dea403cb 100644
--- a/spec/javascripts/vehicle_journeys/reducers/filters_spec.js
+++ b/spec/javascripts/vehicle_journeys/reducers/filters_spec.js
@@ -144,7 +144,7 @@ describe('filters reducer', () => {
   })
 
   it('should handle CREATE_QUERY_STRING', () => {
-    let strResult = "q%5Bjourney_pattern_id_eq%5D=undefined&q%5Btime_tables_id_eq%5D=undefined&q%5Bvehicle_journey_at_stops_departure_time_gteq%5D=11%3A11&q%5Bvehicle_journey_at_stops_departure_time_lteq%5D=22%3A22&q%5Bvehicle_journey_without_departure_time%5D=true"
+    let strResult = 'q%5Bjourney_pattern_id_eq%5D=undefined&q%5Btime_tables_id_eq%5D=undefined'
     expect(
       statusReducer(state, {
         type: 'CREATE_QUERY_STRING',