From 68fd09017c834250826d9a1532f182d8823fdbeb Mon Sep 17 00:00:00 2001
From: hhjk00 <eunyu0604@gmail.com>
Date: Fri, 17 Nov 2023 15:34:38 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B1=B0=EB=A6=AC=20?=
 =?UTF-8?q?=EA=B7=B8=EB=9E=98=ED=94=84=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EB=8B=A8=EC=9C=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/statistics/StatisticsSearch.js |  5 +++--
 src/components/statistics/StatisticsTotal.js  |  9 +++++----
 .../statistics/AbnormalSituationContainer.js  |  4 ++--
 src/containers/statistics/FlightContainer.js  | 20 ++++++++++++++-----
 .../statistics/FlightResultContainer.js       |  4 ++--
 5 files changed, 27 insertions(+), 15 deletions(-)

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 <FcAlarmClock />;
@@ -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() {
         <StatisticsTotal
           totalTitle={totalTitle}
           totalData={abnormal}
-          addCommasToNumber={addCommasToNumber}
+          formatNumber={formatNumber}
         />
         <StatisticsSearch
           searchData={abnormalSearch}
diff --git a/src/containers/statistics/FlightContainer.js b/src/containers/statistics/FlightContainer.js
index 8730ed6..3b0e8fb 100644
--- a/src/containers/statistics/FlightContainer.js
+++ b/src/containers/statistics/FlightContainer.js
@@ -90,13 +90,22 @@ export default function FlightContainer() {
     return 10 ** (exponent - 1);
   };
 
-  // 123456789 -> 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}
         />
         <StatisticsSearch
           parseTimeToDate={parseTimeToDate}
diff --git a/src/containers/statistics/FlightResultContainer.js b/src/containers/statistics/FlightResultContainer.js
index ea2457a..63e56a2 100644
--- a/src/containers/statistics/FlightResultContainer.js
+++ b/src/containers/statistics/FlightResultContainer.js
@@ -91,7 +91,7 @@ export default function ResultContainer() {
   };
 
   // 123456789 -> 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() {
         <StatisticsTotal
           totalTitle={totalTitle}
           totalData={result}
-          addCommasToNumber={addCommasToNumber}
+          formatNumber={formatNumber}
         />
         <StatisticsSearch
           searchData={resultSearch}