From a1f7a72f013483df683f57aa9d8c4d38fcb347bc Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Tue, 2 May 2017 15:22:17 +0200 Subject: Refs #3267: Fix fetch vehicle_journey properly (company/idenfitier) Signed-off-by: Thomas Shawarma Haddad --- .../javascripts/es6_browserified/vehicle_journeys/actions/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js index 21aff1080..444d290ee 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js @@ -315,8 +315,8 @@ const actions = { deletable: false, selected: false, published_journey_name: val.published_journey_name || 'non renseigné', - published_journey_identifier: val.published_journey_name || 'non renseigné', - company_id: val.published_journey_name || 'non renseigné', + published_journey_identifier: val.published_journey_identifier || 'non renseigné', + company: val.company || 'non renseigné', transport_mode: val.route.line.transport_mode || 'non renseigné', transport_submode: val.route.line.transport_submode || 'non renseigné' }) -- cgit v1.2.3 From b8b4a59fdb1b6550c86d32fb7445ff83ab3e6d80 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Tue, 2 May 2017 15:43:18 +0200 Subject: Refs #3269: Fix required filed in create modal for jp Signed-off-by: Thomas Shawarma Haddad --- .../vehicle_journeys/components/tools/CreateModal.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js index 1273921e7..3d2251753 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js @@ -49,19 +49,18 @@ class CreateModal extends Component {
- + actions.resetValidation(e.currentTarget)} - required />
- + this.props.onSelect2Company(e)} -- cgit v1.2.3 From e4880ded62ee261a25a464073add6e202d62216c Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 3 May 2017 10:57:35 +0200 Subject: Remove timetables logger Signed-off-by: Thomas Shawarma Haddad --- .../javascripts/es6_browserified/time_tables/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/time_tables/index.js b/app/assets/javascripts/es6_browserified/time_tables/index.js index 3bf5a3b99..1fe6ee84b 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: { @@ -57,12 +57,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( -- cgit v1.2.3 From 534bc4065c4b3a2ed0a10527f27bac4e7b5aa472 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 3 May 2017 11:45:45 +0200 Subject: Refs #3096: Add/store comment when olmap is toggled Signed-off-by: Thomas Shawarma Haddad --- .../javascripts/es6_browserified/itineraries/components/BSelect2.js | 3 ++- .../javascripts/es6_browserified/itineraries/components/OlMap.js | 4 ++++ app/assets/javascripts/es6_browserified/itineraries/index.js | 1 + .../javascripts/es6_browserified/itineraries/reducers/stopPoints.js | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js index dae62d3e1..64c6d3ac7 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js +++ b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js @@ -24,7 +24,8 @@ class BSelect3 extends React.Component{ short_name: e.params.data.short_name, city_name: e.params.data.city_name, area_type: e.params.data.area_type, - zip_code: e.params.data.zip_code + zip_code: e.params.data.zip_code, + comment: e.params.data.comment }) } diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js index 0eca5f3ff..b9e106c1a 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js +++ b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js @@ -142,6 +142,10 @@ class OlMap extends Component{ Commune : {this.props.value.olMap.json.city_name}

+

+ Commentaire : + {this.props.value.olMap.json.comment} +

{(this.props.value.stoparea_id != this.props.value.olMap.json.stoparea_id) &&(
{this.props.onUpdateViaOlMap(this.props.index, this.props.value.olMap.json)}} diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js index 57c63a97b..12a44e376 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/index.js +++ b/app/assets/javascripts/es6_browserified/itineraries/index.js @@ -38,6 +38,7 @@ const getInitialState = () => { for_alighting: v.for_alighting || "normal", longitude: v.longitude || 0, latitude: v.latitude || 0, + comment: v.comment, olMap: { isOpened: false, json: {} diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js index 79b9648a6..a1be73cd9 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js +++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js @@ -75,6 +75,7 @@ const stopPoints = (state = [], action) => { short_name: action.text.short_name, area_type: action.text.area_type, city_name: action.text.city_name, + comment: action.text.comment, registration_number: action.text.registration_number } ) -- cgit v1.2.3 From e665b02375e9b3a9c028a7b8b43c6cb61ad4fca6 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 3 May 2017 15:15:45 +0200 Subject: Refs #3269: Fix fields not being required anymore + wording Signed-off-by: Thomas Shawarma Haddad --- .../vehicle_journeys/components/tools/CreateModal.js | 2 +- .../vehicle_journeys/components/tools/EditVehicleJourney.js | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js index 3d2251753..1e121b473 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js @@ -69,7 +69,7 @@ class CreateModal extends Component {
- +
- + actions.resetValidation(e.currentTarget)} - required />
@@ -81,14 +80,13 @@ class EditVehicleJourney extends Component {
- + actions.resetValidation(e.currentTarget)} - required />
-- cgit v1.2.3 From fdff8db191dbda598406392ccfdde251318d7140 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 3 May 2017 17:28:42 +0200 Subject: Refs #3284: use I18n for transport_(sub)mode in vj edit Signed-off-by: Thomas Shawarma Haddad --- .../javascripts/es6_browserified/vehicle_journeys/actions/index.js | 4 ++-- .../vehicle_journeys/components/tools/EditVehicleJourney.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js index 444d290ee..ea03694bd 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js @@ -317,8 +317,8 @@ const actions = { published_journey_name: val.published_journey_name || 'non renseigné', published_journey_identifier: val.published_journey_identifier || 'non renseigné', company: val.company || 'non renseigné', - transport_mode: val.route.line.transport_mode || 'non renseigné', - transport_submode: val.route.line.transport_submode || 'non renseigné' + transport_mode: val.route.line.transport_mode || 'undefined', + transport_submode: val.route.line.transport_submode || 'undefined' }) } window.currentItemsLength = vehicleJourneys.length diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js index 3ccc8b4d8..932c56532 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js @@ -108,7 +108,7 @@ class EditVehicleJourney extends Component {
@@ -119,7 +119,7 @@ class EditVehicleJourney extends Component {
-- cgit v1.2.3 From 990cc5b907076793ce52c956a57e294b9730c379 Mon Sep 17 00:00:00 2001 From: jpl Date: Thu, 4 May 2017 14:52:27 +0200 Subject: Refs #3271: adding periods correct dates display on tt#edit --- .../es6_browserified/time_tables/actions/index.js | 4 ++++ .../time_tables/components/PeriodManager.js | 22 +++++++++++++++++++++- .../time_tables/components/PeriodsInDay.js | 3 ++- 3 files changed, 27 insertions(+), 2 deletions(-) (limited to 'app/assets/javascripts') 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 cef9bc75d..69ee0661b 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js +++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js @@ -140,6 +140,10 @@ const actions = { return (D + ' ' + M + ' ' + Y) }, + getLocaleDate(strDate) { + let date = new Date(strDate) + return date.toLocaleDateString() + }, updateSynthesis: (state, daytypes) => { let periods = state.time_table_periods diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js index de3f31ee0..cf4cbfb32 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodManager.js @@ -8,14 +8,33 @@ class PeriodManager extends Component { super(props) } + toEndPeriod(curr, end) { + let diff + + let startCurrM = curr.split('-')[1] + let endPeriodM = end.split('-')[1] + + let lastDayInM = new Date(curr.split('-')[2], startCurrM + 1, 0) + lastDayInM = lastDayInM.toJSON().substr(0, 10).split('-')[2] + + if(startCurrM === endPeriodM) { + diff = (end.split('-')[2] - curr.split('-')[2]) + } else { + diff = (lastDayInM - curr.split('-')[2]) + } + + return diff + } + render() { return (

- {actions.getHumanDate(this.props.value.period_start, 3).substr(0, 7) + ' > ' + actions.getHumanDate(this.props.value.period_end, 3)} + {actions.getLocaleDate(this.props.value.period_start) + ' > ' + actions.getLocaleDate(this.props.value.period_end)}

@@ -58,6 +77,7 @@ class PeriodManager extends Component { PeriodManager.propTypes = { value: PropTypes.object.isRequired, + currentDate: PropTypes.object.isRequired, onDeletePeriod: PropTypes.func.isRequired, onOpenEditPeriodForm: PropTypes.func.isRequired } diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js index 93a8fe433..ca44d3a07 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/PeriodsInDay.js @@ -50,9 +50,10 @@ class PeriodsInDay extends Component { key={i} index={i} value={p} + metas={this.props.metas} + currentDate={this.props.currentDate} onDeletePeriod={this.props.onDeletePeriod} onOpenEditPeriodForm={this.props.onOpenEditPeriodForm} - metas={this.props.metas} /> ) } else { -- cgit v1.2.3 From ce845b8053d4fc665ca700c064cbd6f276bc4e1d Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Thu, 4 May 2017 15:04:36 +0200 Subject: Add specs for redux timetable actions Signed-off-by: Thomas Shawarma Haddad --- app/assets/javascripts/es6_browserified/time_tables/actions/index.js | 2 +- .../javascripts/es6_browserified/time_tables/components/Navigate.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/assets/javascripts') 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 69ee0661b..48d3a585f 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js +++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js @@ -45,7 +45,7 @@ const actions = { pagination, nextPage : true }), - changePage : (dispatch, pagination, val) => ({ + changePage : (dispatch, val) => ({ type: 'CHANGE_PAGE', dispatch, page: val diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Navigate.js b/app/assets/javascripts/es6_browserified/time_tables/components/Navigate.js index c43cd025a..74ca36ea6 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/Navigate.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/Navigate.js @@ -39,7 +39,7 @@ let Navigate = ({ dispatch, metas, timetable, pagination, status, filters}) => { value={month} onClick={e => { e.preventDefault() - dispatch(actions.checkConfirmModal(e, actions.changePage(dispatch, pagination, e.currentTarget.value), pagination.stateChanged, dispatch)) + dispatch(actions.checkConfirmModal(e, actions.changePage(dispatch, e.currentTarget.value), pagination.stateChanged, dispatch)) }} > {actions.monthName(month) + ' ' + new Date(month).getFullYear()} -- cgit v1.2.3 From ef13c897645ed2397db3fede5257a41f62ca9c39 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Fri, 5 May 2017 15:33:40 +0200 Subject: Js gardening in timetable actions & action specs Signed-off-by: Thomas Shawarma Haddad --- .../javascripts/es6_browserified/time_tables/actions/index.js | 6 ++---- .../es6_browserified/time_tables/components/ExceptionsInDay.js | 4 ++-- .../es6_browserified/time_tables/containers/Timetable.js | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'app/assets/javascripts') 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 48d3a585f..3f15b7f01 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js +++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js @@ -104,16 +104,14 @@ const actions = { timeTablePeriods, metas }), - includeDateInPeriod: (index, day, dayTypes) => ({ + includeDateInPeriod: (index, dayTypes) => ({ type: 'INCLUDE_DATE_IN_PERIOD', index, - day, dayTypes }), - excludeDateFromPeriod: (index, day, dayTypes) => ({ + excludeDateFromPeriod: (index, dayTypes) => ({ type: 'EXCLUDE_DATE_FROM_PERIOD', index, - day, dayTypes }), openConfirmModal : (callback) => ({ diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js b/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js index 13615a6ef..e90099283 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/ExceptionsInDay.js @@ -21,7 +21,7 @@ class ExceptionsInDay extends Component { data-actiontype='remove' onClick={(e) => { $(e.currentTarget).toggleClass('active') - this.props.onExcludeDateFromPeriod(this.props.index, this.props.value.current_month[this.props.index], this.props.metas.day_types) + this.props.onExcludeDateFromPeriod(this.props.index, this.props.metas.day_types) }} > @@ -37,7 +37,7 @@ class ExceptionsInDay extends Component { data-actiontype='add' onClick={(e) => { $(e.currentTarget).toggleClass('active') - this.props.onIncludeDateInPeriod(this.props.index, this.props.value.current_month[this.props.index], this.props.metas.day_types) + this.props.onIncludeDateInPeriod(this.props.index, this.props.metas.day_types) }} > diff --git a/app/assets/javascripts/es6_browserified/time_tables/containers/Timetable.js b/app/assets/javascripts/es6_browserified/time_tables/containers/Timetable.js index 2a17d3dea..c6b5fcc6b 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/containers/Timetable.js +++ b/app/assets/javascripts/es6_browserified/time_tables/containers/Timetable.js @@ -15,11 +15,11 @@ const mapDispatchToProps = (dispatch) => { onDeletePeriod: (index, dayTypes) =>{ dispatch(actions.deletePeriod(index, dayTypes)) }, - onExcludeDateFromPeriod: (index, day, dayTypes) => { - dispatch(actions.excludeDateFromPeriod(index, day, dayTypes)) + onExcludeDateFromPeriod: (index, dayTypes) => { + dispatch(actions.excludeDateFromPeriod(index, dayTypes)) }, - onIncludeDateInPeriod: (index, day, dayTypes) => { - dispatch(actions.includeDateInPeriod(index, day, dayTypes)) + onIncludeDateInPeriod: (index, dayTypes) => { + dispatch(actions.includeDateInPeriod(index, dayTypes)) }, onOpenEditPeriodForm: (period, index) => { dispatch(actions.openEditPeriodForm(period, index)) -- cgit v1.2.3 From 68143d532ec98f1f7518a2b567193bcdd50ea1b7 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Tue, 9 May 2017 15:40:26 +0200 Subject: Refs #3327: Fix no data attr for turbolinks not used Signed-off-by: Thomas Shawarma Haddad --- .../es6_browserified/journey_patterns/components/JourneyPattern.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js index d9f6d5550..dcc044c56 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js @@ -14,7 +14,7 @@ class JourneyPattern extends Component{ let vjURL = routeURL + '/vehicle_journeys?jp=' + jpOid return ( - Horaires des courses + Horaires des courses ) } -- cgit v1.2.3 From c5b39e62fc79fa2fb4d57904273dbc75d9cb698e Mon Sep 17 00:00:00 2001 From: jpl Date: Tue, 9 May 2017 15:53:09 +0200 Subject: Refs #3328: updating objectid with shorten version on VJ and JP --- .../javascripts/es6_browserified/journey_patterns/actions/index.js | 4 ++++ .../es6_browserified/journey_patterns/components/JourneyPattern.js | 2 +- .../javascripts/es6_browserified/vehicle_journeys/actions/index.js | 4 ++++ .../es6_browserified/vehicle_journeys/components/VehicleJourney.js | 5 +++-- 4 files changed, 12 insertions(+), 3 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js index 54d62f999..0ed961f44 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js @@ -84,6 +84,10 @@ const actions = { resetValidation: (target) => { $(target).parent().removeClass('has-error').children('.help-block').remove() }, + humanOID : (oid) => { + var a = oid.split(':') + return a[a.length - 1] + }, validateFields : (fields) => { const test = [] diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js index dcc044c56..14ddf2b99 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js @@ -62,7 +62,7 @@ class JourneyPattern extends Component{ )}
-
{this.props.value.object_id ? this.props.value.object_id : '-'}
+
{this.props.value.object_id ? actions.humanOID(this.props.value.object_id) : '-'}
{this.props.value.registration_number}
{actions.getChecked(this.props.value.stop_points).length} arrêt(s)
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js index ea03694bd..0e6f5ed12 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js @@ -248,6 +248,10 @@ const actions = { type: 'RECEIVE_TOTAL_COUNT', total }), + humanOID : (oid) => { + var a = oid.split(':') + return a[a.length - 1] + }, fetchVehicleJourneys : (dispatch, currentPage, nextPage, queryString) => { if(currentPage == undefined){ currentPage = 1 diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js index d795d76e3..6f338f747 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js @@ -1,6 +1,7 @@ var React = require('react') var Component = require('react').Component var PropTypes = require('react').PropTypes +var actions = require('../actions') class VehicleJourney extends Component { constructor(props) { @@ -48,8 +49,8 @@ class VehicleJourney extends Component { return (
-
{this.props.value.objectid ? this.props.value.objectid : '-'}
-
{this.props.value.journey_pattern.objectid}
+
{this.props.value.objectid ? actions.humanOID(this.props.value.objectid) : '-'}
+
{actions.humanOID(this.props.value.journey_pattern.objectid)}
{this.props.value.time_tables.map((tt, i)=>
{this.timeTableURL(tt)}
)} -- cgit v1.2.3