diff options
| author | Zog | 2018-02-21 16:42:04 +0100 |
|---|---|---|
| committer | Zog | 2018-02-21 16:42:04 +0100 |
| commit | 020c42f3e5046377c71daab0e57abdbb1809bf0f (patch) | |
| tree | 83b7015f3d78c83636dcef2277d4199b1b502045 /app | |
| parent | d718159ff008c25ab7d51c6714444bd7bd24a77d (diff) | |
| download | chouette-core-020c42f3e5046377c71daab0e57abdbb1809bf0f.tar.bz2 | |
Refs #5942; Apply users TZ when computing a schedule5942-apply-user-tz
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/vehicle_journeys/components/tools/CreateModal.js | 5 | ||||
| -rw-r--r-- | app/javascript/vehicle_journeys/reducers/vehicleJourneys.js | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/javascript/vehicle_journeys/components/tools/CreateModal.js b/app/javascript/vehicle_journeys/components/tools/CreateModal.js index 8536f66e6..24d9a23c2 100644 --- a/app/javascript/vehicle_journeys/components/tools/CreateModal.js +++ b/app/javascript/vehicle_journeys/components/tools/CreateModal.js @@ -117,6 +117,11 @@ export default class CreateModal extends Component { className='form-control' onKeyDown={(e) => actions.resetValidation(e.currentTarget)} /> + <input + type='hidden' + ref='tz_offset' + value={new Date().getTimezoneOffset()} + /> </div> </div> </div> diff --git a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js index 507e0ea91..8705b3cf2 100644 --- a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js +++ b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js @@ -15,10 +15,15 @@ const vehicleJourney= (state = {}, action, keep) => { minute: 0 } let computeSchedule = false + let userTZOffet = 0 if(action.data["start_time.hour"] && action.data["start_time.hour"].value && action.data["start_time.hour"].value.length > 0 && action.data["start_time.minute"] && action.selectedJourneyPattern.full_schedule && action.selectedJourneyPattern.costs){ computeSchedule = true - current_time.hour = parseInt(action.data["start_time.hour"].value) - current_time.minute = parseInt(action.data["start_time.minute"].value) || 0 + userTZOffet = action.data["tz_offset"] && parseInt(action.data["tz_offset"].value) || 0 + current_time.hour = parseInt(action.data["start_time.hour"].value) + parseInt(userTZOffet / 60) + current_time.minute = 0 + if(action.data["start_time.minute"].value){ + current_time.minute = parseInt(action.data["start_time.minute"].value) + (userTZOffet - 60 * parseInt(userTZOffet / 60)) + } } _.each(action.stopPointsList, (sp) =>{ let inJourney = false |