Compare commits

..

1 Commits

Author SHA1 Message Date
GotPPay
830313d9e3 changed font path to point on existing font 2018-05-15 12:13:14 +02:00
2 changed files with 21 additions and 85 deletions

View File

@@ -33,10 +33,7 @@ import Instance from '../../../../../../../components/Connection';
import Checkbox from 'material-ui/Checkbox'; import Checkbox from 'material-ui/Checkbox';
import Popover from 'material-ui/Popover'; import Popover from 'material-ui/Popover';
const ADDRESS_TYPE_HOME = "home";
let DateTimeFormat; let DateTimeFormat;
const roundingTime = 1000 * 60 * 5; //5 minutes
DateTimeFormat = global.Intl.DateTimeFormat; DateTimeFormat = global.Intl.DateTimeFormat;
@@ -419,18 +416,16 @@ class VerticalNonLinear extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
let dateNow = new Date();
this.state = { this.state = {
stepIndex: 0, stepIndex: 0,
rideTypeValue: 0, rideTypeValue: 0,
providerID: 0, providerID: 0,
providerName: '', providerName: '',
visitDate: new Date(), visitDate: new Date(),
visitTime: new Date(Math.round(dateNow.getTime() / roundingTime) * roundingTime), visitTime: new Date(),
pickupLocation: null, pickupLocation: null,
pickupTime: new Date(Math.round(dateNow.getTime() / roundingTime) * roundingTime), pickupTime: new Date(),
pickupTimeReturn: new Date(Math.round(dateNow.getTime() / roundingTime) * roundingTime), pickupTimeReturn: new Date(),
pickupTimeReturnDisplayMode: 'none', pickupTimeReturnDisplayMode: 'none',
open: false, open: false,
message: 'Booking Ride', message: 'Booking Ride',
@@ -474,16 +469,6 @@ class VerticalNonLinear extends React.Component {
if (user.useruuid !== loggedUser.useruuid) { if (user.useruuid !== loggedUser.useruuid) {
Instance.getRawConn().get(`/v1/nemt/users/member/${user.useruuid}`) Instance.getRawConn().get(`/v1/nemt/users/member/${user.useruuid}`)
.then(function (res) { .then(function (res) {
let userHomeAddress = null;
res.data.addresses.forEach(address => {
if (address.address_type === ADDRESS_TYPE_HOME) {
userHomeAddress = address;
}
});
if (userHomeAddress != null) {
userHomeAddress.name = "Home";
state.handlePickupChanged(userHomeAddress, state);
}
state.setState(Object.assign(state.state, { user: res.data, showUserSelection: true, userSelectionText: `${res.data.member} - ${res.data.name}` })); state.setState(Object.assign(state.state, { user: res.data, showUserSelection: true, userSelectionText: `${res.data.member} - ${res.data.name}` }));
}) })
.catch(err => { .catch(err => {
@@ -504,19 +489,17 @@ class VerticalNonLinear extends React.Component {
} }
}); });
let date = new Date(); 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 visitTime = new Date(Math.round((date.getTime() + (1 * 60 * 60 * 1000)) / roundingTime) * roundingTime); this.setState(Object.assign(this.state, {
let visitDate = date; visitDate: visitDate,
let pickupTime = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime); visitTime: visitTime,
let pickupTimeReturn = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime); pickupTime: pickupTime,
pickupTimeReturn: pickupTimeReturn,
this.setState(Object.assign(this.state, { }));
visitDate: visitDate,
visitTime: visitTime,
pickupTime: pickupTime,
pickupTimeReturn: pickupTimeReturn,
}));
} }
//for snackbar //for snackbar
handleTouchTap() { handleTouchTap() {
@@ -540,8 +523,7 @@ class VerticalNonLinear extends React.Component {
if (stepIndex === 3) { if (stepIndex === 3) {
self.handleTouchTap(); self.handleTouchTap();
var requestRide = { var requestRide = {
user_uuid: state.state.user ? state.state.user.useruuid : '', user_uuid: state.state.user.useruuid,
user_consent: state.state.checked,
ride_type: "lyft", ride_type: "lyft",
origin: state.state.origin, origin: state.state.origin,
destination: state.state.destination, destination: state.state.destination,
@@ -618,10 +600,10 @@ class VerticalNonLinear extends React.Component {
handleDate(event, date, state) { handleDate(event, date, state) {
let self = state let self = state
let visitTime = new Date(Math.round((date.getTime() + (1 * 60 * 60 * 1000)) / roundingTime) * roundingTime); let visitTime = new Date(date.getTime() + (1 * 60 * 60 * 1000));
let visitDate = date; let visitDate = date;
let pickupTime = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime); let pickupTime = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000));
let pickupTimeReturn = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime); let pickupTimeReturn = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000));
self.setState(Object.assign(self.state, { self.setState(Object.assign(self.state, {
visitDate: visitDate, visitDate: visitDate,
@@ -822,7 +804,7 @@ class VerticalNonLinear extends React.Component {
handlePickupChanged = (res, state) => { handlePickupChanged = (res, state) => {
let origin = { let origin = {
id: res.address_uuid ? res.address_uuid : res.id, id: res.id,
name: res.name, name: res.name,
lat: res.lat, lat: res.lat,
lng: res.lng, lng: res.lng,
@@ -912,17 +894,7 @@ class VerticalNonLinear extends React.Component {
if (this.state.showUserSelection && this.state.users.length > 0) { if (this.state.showUserSelection && this.state.users.length > 0) {
const handleAutocomplete = (u) => { const handleAutocomplete = (u) => {
let userHomeAddress = null; state.setState(Object.assign(state.state, { user: u, userSelectionText: u.userdata }));
u.addresses.forEach(address => {
if (address.address_type === ADDRESS_TYPE_HOME) {
userHomeAddress = address;
}
});
if (userHomeAddress != null) {
userHomeAddress.name = "Home";
state.handlePickupChanged(userHomeAddress,state);
}
state.setState(Object.assign(state.state, { user: u, userSelectionText: u.userdata }));
} }
const datasourceConfig = { text: 'userdata', value: 'useruuid' } const datasourceConfig = { text: 'userdata', value: 'useruuid' }
userSelection = ( userSelection = (

View File

@@ -47,9 +47,7 @@ class SignUp extends React.Component {
"role": { name: "", key: "SP", desc: "" }, "role": { name: "", key: "SP", desc: "" },
"profiles": [], "profiles": [],
"types": [], "types": [],
"organizations": [], "organizations": []
showValidationErrors : false,
validationErrors: []
} }
this.buttonValidated = this.buttonValidated.bind(this); this.buttonValidated = this.buttonValidated.bind(this);
@@ -228,42 +226,12 @@ class SignUp extends React.Component {
localStorage.removeItem('loggedUser'); localStorage.removeItem('loggedUser');
location.href = '/#/login'; location.href = '/#/login';
}).catch(function (err) { }).catch(function (err) {
if (err.response.status === 422){ alert('Error to log in: ' + err.message);
//Unprocessable Entity (validation failed)
state.setState(Object.assign(state.state, {
showValidationErrors:true,
validationErrors:err.response.data.data
}));
}else{
alert('Error to log in: ' + err.message);
}
console.error(err); console.error(err);
}); });
} }
handleDismiss(){
this.setState(Object.assign(this.state, { showErrorMessage: false }));
}
render() { render() {
let validationErrors = null;
if (this.state.showValidationErrors){
validationErrors = (
<ul>
{this.state.validationErrors.map(errorMessage=>{
const oneValidationMessage = (<li>{errorMessage.message}</li>);
const oneValidationMessageWithTab = (<span><li style={{marginLeft:2 + "em"}}>{errorMessage.message}</li></span>);
if (errorMessage.field_name === "password-tab"){
return oneValidationMessageWithTab;
} else{
return oneValidationMessage;
}
})}
</ul>
);
}
return ( return (
<div className="body-inner"> <div className="body-inner">
@@ -366,10 +334,6 @@ class SignUp extends React.Component {
<div className="form-group"> <div className="form-group">
<p className="text-small">By clicking on sign up, you agree to <a href="javascript:;"><i>terms</i></a> and <a href="javascript:;"><i>privacy policy</i></a></p> <p className="text-small">By clicking on sign up, you agree to <a href="javascript:;"><i>terms</i></a> and <a href="javascript:;"><i>privacy policy</i></a></p>
</div> </div>
<div className="divider" />
<div className="form-group">
{validationErrors}
</div>
</fieldset> </fieldset>
</form> </form>
</div> </div>