aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorXinhui2017-04-10 12:32:58 +0200
committerXinhui2017-04-10 14:44:27 +0200
commit14ba8e73fea3a1fb26d1d714d1291e710f95f984 (patch)
treee5d093f01dfff6e0fd16f72c5418b9d43ee50810 /app
parent54b0dd9698576611792992e34bcdca04d8533d91 (diff)
downloadchouette-core-14ba8e73fea3a1fb26d1d714d1291e710f95f984.tar.bz2
Vehicle_journeys toggle with or without departure time filter
Refs #2507
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js2
-rw-r--r--app/controllers/vehicle_journeys_controller.rb4
2 files changed, 5 insertions, 1 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 342400ba4..cd065e362 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js
@@ -55,7 +55,7 @@ const filters = (state = {}, action) => {
'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_u2]' : state.query.withoutSchedule
+ '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 5199d8632..5382b1d4c 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -128,6 +128,10 @@ class VehicleJourneysController < ChouetteController
time = params[:q]["vehicle_journey_at_stops_#{filter}"]
params[:q]["vehicle_journey_at_stops_#{filter}"] = "2000-01-01 #{time}:00 UTC"
end
+
+ if params[:q]['vehicle_journey_without_departure_time'] == 'false'
+ params[:q]["vehicle_journey_at_stops_departure_time_not_eq"] = '2000-01-01 00:00 UTC'
+ end
end
end