Upstream sync

This commit is contained in:
Senad Uka
2018-05-25 09:10:32 +02:00
parent 659160676c
commit 11fe5f1c61
14 changed files with 2296 additions and 121 deletions

View File

@@ -202,28 +202,30 @@ export class NEMTLocation extends React.Component {
Instance.getRawConn().get(`/v1/nemt/provider/participating?sort=distance&lat=${lat}&long=${long}`).then(res => {
let nearByPlaces = [];
let providers = res.data.map(p => {
const streetNumber = p.address.street_address_1.split(' ')[0]
let clickResult = {
id: p.muk_id,
address: `${p.address.street_address_1}, ${p.address.city}, ${p.address.state} (${p.address.zipcode})`,
lat: p.address.lat,
lng: p.address.long,
name: p.name,
type: "provider",
raw: p,
street_number: streetNumber,
street: p.address.street_address_1.replace(streetNumber, '').trim(),
city: p.address.city,
state: p.address.state,
zipcode: p.address.zipcode.substring(0, 5),
country: p.address.country,
saved: false,
}
clickResult.address = `${clickResult.street_number} ${clickResult.street}, ${clickResult.city}`
if (p.address.street_address_1) {
const streetNumber = p.address.street_address_1.split(' ')[0]
let clickResult = {
id: p.muk_id,
address: `${p.address.street_address_1}, ${p.address.city}, ${p.address.state} (${p.address.zipcode})`,
lat: p.address.lat,
lng: p.address.long,
name: p.name,
type: "provider",
raw: p,
street_number: streetNumber,
street: p.address.street_address_1.replace(streetNumber, '').trim(),
city: p.address.city,
state: p.address.state,
zipcode: p.address.zipcode.substring(0, 5),
country: p.address.country,
saved: false,
}
clickResult.address = `${clickResult.street_number} ${clickResult.street}, ${clickResult.city}`
var listItem = (<ListItem primaryText={p.name} secondaryText={clickResult.address} key={p.muk_id} rightIcon={<MapsLocalHospital />} onClick={(event) => this.handlePlaceChanged(clickResult)} />)
nearByPlaces.push(listItem);
p.providerText = `${p.name} - ${p.address.street_address_1}, ${p.address.city}, ${p.address.state} (${p.address.zipcode}) (${p.address.phone_number})`
var listItem = (<ListItem primaryText={p.name} secondaryText={clickResult.address} key={p.muk_id} rightIcon={<MapsLocalHospital />} onClick={(event) => this.handlePlaceChanged(clickResult)} />)
nearByPlaces.push(listItem);
p.providerText = `${p.name} - ${p.address.street_address_1}, ${p.address.city}, ${p.address.state} (${p.address.zipcode}) (${p.address.phone_number})`
}
return p;
});
@@ -461,7 +463,7 @@ export class NEMTLocation extends React.Component {
this.setState(Object.assign(this.state, { open: true }));
if (this.state.user.useruuid === '' || this.state.user.useruuid !== this.props.data.user.useruuid) {
if (this.props.data.user && this.props.data.user !== null && this.props.data.user.useruuid !== '') {
if (this.props.data.user && this.props.data.user.useruuid !== undefined && this.props.data.user !== null && this.props.data.user.useruuid !== '') {
let url = `/v1/nemt/users/member/` + this.props.data.user.useruuid
Instance.getRawConn().get(url).then(res => {
let user = res.data;