From 3c6f17186e1a8e19a35292584adc090acc7508e2 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Mon, 28 May 2018 18:35:30 +0200 Subject: [PATCH] round time on vreate visit page --- .../visit/components/VerticalNonLinear.js | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/routes/app/routes/forms/routes/visit/components/VerticalNonLinear.js b/src/routes/app/routes/forms/routes/visit/components/VerticalNonLinear.js index 938fd7b..db84974 100644 --- a/src/routes/app/routes/forms/routes/visit/components/VerticalNonLinear.js +++ b/src/routes/app/routes/forms/routes/visit/components/VerticalNonLinear.js @@ -35,7 +35,7 @@ import Popover from 'material-ui/Popover'; import ValidationErrorsInfoDialog from '../../../../../../../components/Shared/ValidationErrorsInfoDialog'; let DateTimeFormat; - +const roundingTime = 1000 * 60 * 5; //5 minutes DateTimeFormat = global.Intl.DateTimeFormat; @@ -564,16 +564,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: 'Adding Visit', @@ -638,10 +640,12 @@ 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)); + let date = new Date(); + + 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, @@ -768,10 +772,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,