diff --git a/src/components/statistics/StatisticsSearch.js b/src/components/statistics/StatisticsSearch.js
index 9781284..32bbe6a 100644
--- a/src/components/statistics/StatisticsSearch.js
+++ b/src/components/statistics/StatisticsSearch.js
@@ -58,10 +58,10 @@ export default function StatisticsSearch({
const distanceTop = searchData.topData.map(i => i.value).filter(i => i);
const totalValue = distanceTotal.map(distance => {
- return parseInt(distance);
+ return distance.toFixed(1);
});
const topValue = distanceTop.map(distance => {
- return parseInt(distance);
+ return distance.toFixed(1);
});
setTotal(totalValue);
@@ -168,6 +168,7 @@ export default function StatisticsSearch({
const dateValue = parseTimeToDate(value);
return (output = ` ${label} : ${dateValue}`);
} else if (searchType.category === 'DISTANCE') {
+ return (output = ` ${label} : ${value} m`);
}
return output;
diff --git a/src/components/statistics/StatisticsTotal.js b/src/components/statistics/StatisticsTotal.js
index f60fe61..66b958a 100644
--- a/src/components/statistics/StatisticsTotal.js
+++ b/src/components/statistics/StatisticsTotal.js
@@ -6,7 +6,8 @@ export default function StatisticsTotal({
titleName,
totalTitle,
parseTimeToSeconds,
- addCommasToNumber
+ formatNumber,
+ formatDistance
}) {
const renderIcon = idx => {
if (idx === 0) return ;
@@ -17,10 +18,10 @@ export default function StatisticsTotal({
const renderData = (data, titleName, idx) => {
if (titleName) {
if (idx === 0) return parseTimeToSeconds(data);
- if (idx === 1) return <>{addCommasToNumber(data)}m>;
- return <>{addCommasToNumber(data)}건>;
+ if (idx === 1) return <>{formatDistance(data)}m>;
+ return <>{formatNumber(data)}건>;
} else {
- return <>{addCommasToNumber(data)}건>;
+ return <>{formatNumber(data)}건>;
}
};
diff --git a/src/containers/statistics/AbnormalSituationContainer.js b/src/containers/statistics/AbnormalSituationContainer.js
index 2c80953..056e16b 100644
--- a/src/containers/statistics/AbnormalSituationContainer.js
+++ b/src/containers/statistics/AbnormalSituationContainer.js
@@ -92,7 +92,7 @@ export default function AbnormalSituationContainer() {
};
// 123456789 -> 123,456,789
- const addCommasToNumber = number => {
+ const formatNumber = number => {
if (number === 'noData') return 0;
return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
};
@@ -103,7 +103,7 @@ export default function AbnormalSituationContainer() {
123,456,789
- const addCommasToNumber = number => {
- if (number === 'noData') return 0;
+ // 1234.2345 -> 1,234.2
+ const formatDistance = number => {
+ if (number === 'noData' || number === 0.0) return '0';
- return parseInt(number)
+ const [integer, decimal] = number.toFixed(1).split('.');
+ const formatInteger = parseInt(integer)
.toString()
.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+
+ return `${formatInteger}.${decimal}`;
+ };
+
+ // 12345678 -> 12,345,678
+ const formatNumber = number => {
+ if (number === 'noData') return '0';
+ return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
};
// '24:35:12' -> '1일 35분 12초'
@@ -148,7 +157,8 @@ export default function FlightContainer() {
totalTitle={totalTitle}
totalData={flight}
parseTimeToSeconds={parseTimeToSeconds}
- addCommasToNumber={addCommasToNumber}
+ formatDistance={formatDistance}
+ formatNumber={formatNumber}
/>
123,456,789
- const addCommasToNumber = number => {
+ const formatNumber = number => {
if (number === 'NoData') return 0;
return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
};
@@ -102,7 +102,7 @@ export default function ResultContainer() {