diff --git a/components/helpers/cycle-day.js b/components/helpers/cycle-day.js index ce5cd68..98cbea7 100644 --- a/components/helpers/cycle-day.js +++ b/components/helpers/cycle-day.js @@ -34,6 +34,10 @@ export const formatTemperature = (temperature) => ? temperature : Number.parseFloat(temperature.toString()).toFixed(2) +//maximum of precision digits after decimal point, but no x.0 +export const formatDecimal = (num, precision) => + +parseFloat(Number.parseFloat(num).toFixed(precision)) + export const getPreviousTemperature = (date) => { const previousTemperature = getPreviousTemperatureForDate(date) return formatTemperature(previousTemperature) diff --git a/components/stats/StatsOverview.js b/components/stats/StatsOverview.js index 6eb1081..5973938 100644 --- a/components/stats/StatsOverview.js +++ b/components/stats/StatsOverview.js @@ -3,7 +3,7 @@ import { StyleSheet, View } from 'react-native' import PropTypes from 'prop-types' import AppText from '../common/app-text' - +import { formatDecimal } from '../helpers/cycle-day' import { Sizes, Spacing, Typography } from '../../styles' const StatsOverview = ({ data }) => { @@ -16,7 +16,9 @@ StatsOverview.propTypes = { const Row = ({ rowContent }) => { const isStandardDeviation = rowContent[1].includes('deviation') - + if (isStandardDeviation && rowContent[0] !== '—') { + rowContent[0] = formatDecimal(rowContent[0], 1) + } return ( diff --git a/components/stats/index.js b/components/stats/index.js index 2f4a2c2..68101a3 100644 --- a/components/stats/index.js +++ b/components/stats/index.js @@ -11,6 +11,7 @@ import PeriodDetailsModal from './PeriodDetailsModal' import cycleModule from '../../lib/cycle' import { getCycleLengthStats as getCycleInfo } from '../../lib/cycle-length' +import { formatDecimal } from '../helpers/cycle-day' import { Containers, Sizes, Spacing, Typography } from '../../styles' @@ -27,6 +28,7 @@ const Stats = () => { numberOfCycles > 0 ? getCycleInfo(cycleLengths) : { minimum: '—', maximum: '—', stdDeviation: '—' } + const standardDeviation = cycleData.stdDeviation ? cycleData.stdDeviation : '—' @@ -37,6 +39,10 @@ const Stats = () => { [numberOfCycles, t('overview.completedCycles')], ] + if (cycleData.mean) { + cycleData.mean = formatDecimal(cycleData.mean, 1) + } + return (