diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js | 7 | ||||
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 4 |
2 files changed, 3 insertions, 8 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 80b62c6b4..cd065e362 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js @@ -53,10 +53,9 @@ 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, - // 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 + '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 eebcbb922..10f0dc324 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -92,10 +92,6 @@ class VehicleJourneysController < ChouetteController @q = scope.search filtered_ransack_params - # Fixme 3358 - # grouping = ransack_periode_filter - # @q.build_grouping(grouping) if grouping - @ppage = 20 @vehicle_journeys = @q.result.paginate(:page => params[:page], :per_page => @ppage) @footnotes = route.line.footnotes.to_json |