diff --git a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js index bebc136..480b70d 100644 --- a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js +++ b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js @@ -36,6 +36,7 @@ import Popover from 'material-ui/Popover'; const ADDRESS_TYPE_HOME = "home"; let DateTimeFormat; +const roundingTime = 1000 * 60 * 5; //5 minutes DateTimeFormat = global.Intl.DateTimeFormat; @@ -418,16 +419,18 @@ class VerticalNonLinear extends React.Component { constructor(props) { super(props); + let dateNow = new Date(); + this.state = { stepIndex: 0, rideTypeValue: 0, providerID: 0, providerName: '', visitDate: new Date(), - visitTime: new Date(), + visitTime: new Date(Math.round(dateNow.getTime() / roundingTime) * roundingTime), pickupLocation: null, - pickupTime: new Date(), - pickupTimeReturn: new Date(), + pickupTime: new Date(Math.round(dateNow.getTime() / roundingTime) * roundingTime), + pickupTimeReturn: new Date(Math.round(dateNow.getTime() / roundingTime) * roundingTime), pickupTimeReturnDisplayMode: 'none', open: false, message: 'Booking Ride', @@ -501,17 +504,17 @@ class VerticalNonLinear extends React.Component { } }); - let visitTime = new Date(new Date().getTime() + (1 * 60 * 60 * 1000)); - let visitDate = visitTime; - let pickupTime = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000)); - let pickupTimeReturn = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000)); - - this.setState(Object.assign(this.state, { - visitDate: visitDate, - visitTime: visitTime, - pickupTime: pickupTime, - pickupTimeReturn: pickupTimeReturn, - })); + let visitTime = new Date(Math.round((date.getTime() + (1 * 60 * 60 * 1000)) / roundingTime) * roundingTime); + let visitDate = date; + let pickupTime = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime); + let pickupTimeReturn = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime); + + this.setState(Object.assign(this.state, { + visitDate: visitDate, + visitTime: visitTime, + pickupTime: pickupTime, + pickupTimeReturn: pickupTimeReturn, + })); } //for snackbar handleTouchTap() { @@ -535,7 +538,8 @@ class VerticalNonLinear extends React.Component { if (stepIndex === 3) { self.handleTouchTap(); var requestRide = { - user_uuid: state.state.user.useruuid, + user_uuid: state.state.user ? state.state.user.useruuid : '', + user_consent: state.state.checked, ride_type: "lyft", origin: state.state.origin, destination: state.state.destination, @@ -612,10 +616,10 @@ class VerticalNonLinear extends React.Component { handleDate(event, date, state) { let self = state - let visitTime = new Date(date.getTime() + (1 * 60 * 60 * 1000)); + let visitTime = new Date(Math.round((date.getTime() + (1 * 60 * 60 * 1000)) / roundingTime) * roundingTime); let visitDate = date; - let pickupTime = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000)); - let pickupTimeReturn = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000)); + let pickupTime = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime); + let pickupTimeReturn = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime); self.setState(Object.assign(self.state, { visitDate: visitDate,