aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorThomas Haddad2017-04-13 11:26:20 +0200
committerThomas Haddad2017-04-13 11:26:20 +0200
commitf72dc55a17c0f01bb610bd295038d19bdf95dd3e (patch)
treefbe5dab498f2295736fb137bb6da45fca24bd9f9 /app/assets/javascripts
parent8635de27b6d49331b6acc59b258e1b6cf1d84d06 (diff)
downloadchouette-core-f72dc55a17c0f01bb610bd295038d19bdf95dd3e.tar.bz2
Refs #2892: Retrieve day_types from json and store it via redux
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/time_tables/actions/index.js10
-rw-r--r--app/assets/javascripts/es6_browserified/time_tables/index.js15
-rw-r--r--app/assets/javascripts/es6_browserified/time_tables/reducers/day_types.js12
-rw-r--r--app/assets/javascripts/es6_browserified/time_tables/reducers/index.js2
-rw-r--r--app/assets/javascripts/es6_browserified/time_tables/reducers/status.js2
5 files changed, 33 insertions, 8 deletions
diff --git a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
index 7c9a5be08..d06eaecff 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js
@@ -1,4 +1,14 @@
const actions = {
+ strToArrayDayTypes: (str) =>{
+ let weekDays = ['Di', 'Lu', 'Ma', 'Me', 'Je', 'Ve', 'Sa']
+ let array = []
+ weekDays.map((day, i) =>{
+ array[i] = (str.indexOf(day) != -1) ? true: false
+ })
+
+ return array
+ },
+
fetchingApi: () =>({
type: 'FETCH_API'
}),
diff --git a/app/assets/javascripts/es6_browserified/time_tables/index.js b/app/assets/javascripts/es6_browserified/time_tables/index.js
index 4e44e49ba..adcf30130 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/index.js
@@ -6,10 +6,10 @@ var timeTablesApp = require('./reducers')
var App = require('./containers/App')
// logger, DO NOT REMOVE
-// var applyMiddleware = require('redux').applyMiddleware
-// var createLogger = require('redux-logger')
-// var thunkMiddleware = require('redux-thunk').default
-// var promise = require('redux-promise')
+var applyMiddleware = require('redux').applyMiddleware
+var createLogger = require('redux-logger')
+var thunkMiddleware = require('redux-thunk').default
+var promise = require('redux-promise')
var initialState = {
status: {
@@ -20,6 +20,7 @@ var initialState = {
current_month: [],
time_table_periods: [],
periode_range: [],
+ day_types: [],
pagination: {
page : 1,
totalCount: window.journeyPatternLength,
@@ -32,12 +33,12 @@ var initialState = {
confirmModal: {}
}
}
-// const loggerMiddleware = createLogger()
+const loggerMiddleware = createLogger()
let store = createStore(
timeTablesApp,
- initialState
- // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+ initialState,
+ applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
)
render(
diff --git a/app/assets/javascripts/es6_browserified/time_tables/reducers/day_types.js b/app/assets/javascripts/es6_browserified/time_tables/reducers/day_types.js
new file mode 100644
index 000000000..c511f8dbe
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/time_tables/reducers/day_types.js
@@ -0,0 +1,12 @@
+const actions = require('../actions')
+
+const dayTypes = (state = "", action) => {
+ switch (action.type) {
+ case 'RECEIVE_TIME_TABLES':
+ return actions.strToArrayDayTypes(action.json.day_types)
+ default:
+ return state
+ }
+}
+
+module.exports = dayTypes
diff --git a/app/assets/javascripts/es6_browserified/time_tables/reducers/index.js b/app/assets/javascripts/es6_browserified/time_tables/reducers/index.js
index 4308c0104..55ece38c4 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/reducers/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/reducers/index.js
@@ -5,11 +5,13 @@ var modal = require('./modal')
var current_month = require('./current_month')
var periode_range = require('./periode_range')
var time_table_periods = require('./time_table_periods')
+var day_types = require('./day_types')
const timeTablesApp = combineReducers({
current_month,
periode_range,
time_table_periods,
+ day_types,
status,
pagination,
modal
diff --git a/app/assets/javascripts/es6_browserified/time_tables/reducers/status.js b/app/assets/javascripts/es6_browserified/time_tables/reducers/status.js
index aaedff4c1..07c5db8d1 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/reducers/status.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/reducers/status.js
@@ -6,7 +6,7 @@ const status = (state = {}, action) => {
return _.assign({}, state, {fetchSuccess: false})
case 'FETCH_API':
return _.assign({}, state, {isFetching: true})
- case 'RECEIVE_JOURNEY_PATTERNS':
+ case 'RECEIVE_TIME_TABLES':
return _.assign({}, state, {fetchSuccess: true, isFetching: false})
default:
return state