Refs #2500: get journey_pattern_id if present in params

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>

5 files changed, 27 insertions, 5 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
index 66d6a6052..6caed1834 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
@@ -11,7 +11,17 @@ var createLogger = require('redux-logger')
 var thunkMiddleware = require('redux-thunk').default
 var promise = require('redux-promise')
 
+var selectedJP = []
+
+if (window.journeyPatternId)
+  selectedJP.push(window.journeyPatternId)
+
 var initialState = {
+  filters: {
+    selectedJourneyPatterns : selectedJP,
+    // TODO retrieve policy from controller
+    policy: true
+  },
   status: {
     fetchSuccess: true,
     isFetching: false
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js
new file mode 100644
index 000000000..7b9c4418a
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js
@@ -0,0 +1,10 @@
+var actions = require("../actions")
+
+const filters = (state = {}, action) => {
+  switch (action.type) {
+    default:
+      return state
+  }
+}
+
+module.exports = filters
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/index.js
index 613f46cc5..e31cc139a 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/index.js
@@ -3,12 +3,14 @@ var vehicleJourneys = require('./vehicleJourneys')
 var pagination = require('./pagination')
 var modal = require('./modal')
 var status = require('./status')
+var filters = require('./filters')
 
 const vehicleJourneysApp = combineReducers({
   vehicleJourneys,
   pagination,
   modal,
-  status
+  status,
+  filters
 })
 
 module.exports = vehicleJourneysApp
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
index 313706a0c..7d7db9930 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -1,6 +1,6 @@
 var actions = require("../actions")
 
-const status = (state = [], action) => {
+const vehicleJourneys = (state = [], action) => {
   switch (action.type) {
     case 'RECEIVE_VEHICLE_JOURNEYS':
       return [...action.json]
@@ -19,4 +19,4 @@ const status = (state = [], action) => {
   }
 }
 
-module.exports = status
+module.exports = vehicleJourneys
diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim
index b70c7c54e..38e65282a 100644
--- a/app/views/vehicle_journeys/index.html.slim
+++ b/app/views/vehicle_journeys/index.html.slim
@@ -44,10 +44,10 @@
   == render "sidebar"
 
 #vehicle_journeys_wip
-
 = javascript_tag do
+  | window.journeyPatternId = #{params[:q].present? ? params[:q].values[0].to_s : false};
   | window.vehicleJourneysLength = #{@vehicle_journeys.total_entries()};
-  | window.vehicleJourneysPerPage = 20
+  | window.vehicleJourneysPerPage = 20;
 
 = javascript_include_tag 'es6_browserified/vehicle_journeys/index.js'