Wip VehicleJourneysController#index filter, format ransack params

2 files changed, 6 insertions, 2 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 ca1e92603..c2deaf019 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js
@@ -52,8 +52,8 @@ 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[range_start]': (state.query.interval.start.hour + ':' + state.query.interval.start.minute),
-        'q[range_end]': (state.query.interval.end.hour + ': '+ state.query.interval.end.minute)
+        '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)
       }
       let esc = encodeURIComponent
       let queryString = Object.keys(params).map((k) => esc(k) + '=' + esc(params[k])).join('&')
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 1fdd3c069..96828cfa8 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -116,6 +116,10 @@ class VehicleJourneysController < ChouetteController
   def ransack_params
     if params[:q]
       params[:q] = params[:q].reject{|k| params[:q][k] == 'undefined'}
+      [:departure_time_gteq, :departure_time_lteq].each do |filter|
+        time = params[:q]["vehicle_journey_at_stops_#{filter}"]
+        params[:q]["vehicle_journey_at_stops_#{filter}"] = "2000-01-01 #{time}:00 UTC"
+      end
     end
   end