Browse Source

비행 거리 그래프 데이터 단위 수정

pull/2/head
hhjk00 10 months ago
parent
commit
68fd09017c
  1. 5
      src/components/statistics/StatisticsSearch.js
  2. 9
      src/components/statistics/StatisticsTotal.js
  3. 4
      src/containers/statistics/AbnormalSituationContainer.js
  4. 20
      src/containers/statistics/FlightContainer.js
  5. 4
      src/containers/statistics/FlightResultContainer.js

5
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 distanceTop = searchData.topData.map(i => i.value).filter(i => i);
const totalValue = distanceTotal.map(distance => { const totalValue = distanceTotal.map(distance => {
return parseInt(distance); return distance.toFixed(1);
}); });
const topValue = distanceTop.map(distance => { const topValue = distanceTop.map(distance => {
return parseInt(distance); return distance.toFixed(1);
}); });
setTotal(totalValue); setTotal(totalValue);
@ -168,6 +168,7 @@ export default function StatisticsSearch({
const dateValue = parseTimeToDate(value); const dateValue = parseTimeToDate(value);
return (output = ` ${label} : ${dateValue}`); return (output = ` ${label} : ${dateValue}`);
} else if (searchType.category === 'DISTANCE') { } else if (searchType.category === 'DISTANCE') {
return (output = ` ${label} : ${value} m`);
} }
return output; return output;

9
src/components/statistics/StatisticsTotal.js

@ -6,7 +6,8 @@ export default function StatisticsTotal({
titleName, titleName,
totalTitle, totalTitle,
parseTimeToSeconds, parseTimeToSeconds,
addCommasToNumber formatNumber,
formatDistance
}) { }) {
const renderIcon = idx => { const renderIcon = idx => {
if (idx === 0) return <FcAlarmClock />; if (idx === 0) return <FcAlarmClock />;
@ -17,10 +18,10 @@ export default function StatisticsTotal({
const renderData = (data, titleName, idx) => { const renderData = (data, titleName, idx) => {
if (titleName) { if (titleName) {
if (idx === 0) return parseTimeToSeconds(data); if (idx === 0) return parseTimeToSeconds(data);
if (idx === 1) return <>{addCommasToNumber(data)}m</>; if (idx === 1) return <>{formatDistance(data)}m</>;
return <>{addCommasToNumber(data)}</>; return <>{formatNumber(data)}</>;
} else { } else {
return <>{addCommasToNumber(data)}</>; return <>{formatNumber(data)}</>;
} }
}; };

4
src/containers/statistics/AbnormalSituationContainer.js

@ -92,7 +92,7 @@ export default function AbnormalSituationContainer() {
}; };
// 123456789 -> 123,456,789 // 123456789 -> 123,456,789
const addCommasToNumber = number => { const formatNumber = number => {
if (number === 'noData') return 0; if (number === 'noData') return 0;
return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
}; };
@ -103,7 +103,7 @@ export default function AbnormalSituationContainer() {
<StatisticsTotal <StatisticsTotal
totalTitle={totalTitle} totalTitle={totalTitle}
totalData={abnormal} totalData={abnormal}
addCommasToNumber={addCommasToNumber} formatNumber={formatNumber}
/> />
<StatisticsSearch <StatisticsSearch
searchData={abnormalSearch} searchData={abnormalSearch}

20
src/containers/statistics/FlightContainer.js

@ -90,13 +90,22 @@ export default function FlightContainer() {
return 10 ** (exponent - 1); return 10 ** (exponent - 1);
}; };
// 123456789 -> 123,456,789 // 1234.2345 -> 1,234.2
const addCommasToNumber = number => { const formatDistance = number => {
if (number === 'noData') return 0; if (number === 'noData' || number === 0.0) return '0';
return parseInt(number) const [integer, decimal] = number.toFixed(1).split('.');
const formatInteger = parseInt(integer)
.toString() .toString()
.replace(/\B(?=(\d{3})+(?!\d))/g, ','); .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초' // '24:35:12' -> '1일 35분 12초'
@ -148,7 +157,8 @@ export default function FlightContainer() {
totalTitle={totalTitle} totalTitle={totalTitle}
totalData={flight} totalData={flight}
parseTimeToSeconds={parseTimeToSeconds} parseTimeToSeconds={parseTimeToSeconds}
addCommasToNumber={addCommasToNumber} formatDistance={formatDistance}
formatNumber={formatNumber}
/> />
<StatisticsSearch <StatisticsSearch
parseTimeToDate={parseTimeToDate} parseTimeToDate={parseTimeToDate}

4
src/containers/statistics/FlightResultContainer.js

@ -91,7 +91,7 @@ export default function ResultContainer() {
}; };
// 123456789 -> 123,456,789 // 123456789 -> 123,456,789
const addCommasToNumber = number => { const formatNumber = number => {
if (number === 'NoData') return 0; if (number === 'NoData') return 0;
return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
}; };
@ -102,7 +102,7 @@ export default function ResultContainer() {
<StatisticsTotal <StatisticsTotal
totalTitle={totalTitle} totalTitle={totalTitle}
totalData={result} totalData={result}
addCommasToNumber={addCommasToNumber} formatNumber={formatNumber}
/> />
<StatisticsSearch <StatisticsSearch
searchData={resultSearch} searchData={resultSearch}

Loading…
Cancel
Save