Resolve "Afficher l'adresse de la station" #7

Merged
dbroqua merged 1 commit from 4-afficher-l-adresse-de-la-station into master 2020-03-21 16:46:33 +01:00

View file

@ -2,6 +2,7 @@ import React from 'react';
import { Modal, Button, ListGroup } from "react-bootstrap"; import { Modal, Button, ListGroup } from "react-bootstrap";
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { FaWaze } from "react-icons/fa"; import { FaWaze } from "react-icons/fa";
import { GiPositionMarker } from "react-icons/gi";
import { gasTypes } from "../config"; import { gasTypes } from "../config";
import { capitalizeFirstLetter, lowerCaseString } from "../helpers"; import { capitalizeFirstLetter, lowerCaseString } from "../helpers";
@ -37,7 +38,7 @@ class GasStation extends React.Component {
{station.prices ? station.prices.map(price => { {station.prices ? station.prices.map(price => {
return ( return (
<ListGroup.Item key={price._id} className={gasType === price.gasType ? "selected-gasType" : ""}> <ListGroup.Item key={price._id} className={gasType === price.gasType ? "selected-gasType" : ""}>
{`${this.renderGasType(price.gasType)} : ${price.price}`} {`${this.renderGasType(price.gasType)} : ${price.price.toString().replace('.', ',')}`}
</ListGroup.Item> </ListGroup.Item>
); );
}) : (null)} }) : (null)}
@ -60,6 +61,21 @@ class GasStation extends React.Component {
return `${lowerCaseString(station.address)} - ${capitalizeFirstLetter(station.city)}`; return `${lowerCaseString(station.address)} - ${capitalizeFirstLetter(station.city)}`;
} }
renderAddress = () => {
const {
station,
} = this.props;
return (
<p>
<GiPositionMarker />
{lowerCaseString(station.address)}
{' - '}
{capitalizeFirstLetter(station.city)}
</p>
);
}
render () { render () {
const { const {
showModal, showModal,
@ -80,6 +96,7 @@ class GasStation extends React.Component {
</Modal.Title> </Modal.Title>
</Modal.Header> </Modal.Header>
<Modal.Body> <Modal.Body>
{this.renderAddress()}
{this.renderPrices()} {this.renderPrices()}
</Modal.Body> </Modal.Body>
<Modal.Footer> <Modal.Footer>