From d2b7c79d0ee0a450637a6891763366793e07c369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?sanguu=28=EB=B0=95=EC=83=81=ED=98=84=29?=
 <sanguu516@naver.com>
Date: Thu, 6 Oct 2022 19:09:30 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC(=EB=A1=9C=EB=94=A9=EC=B0=BD=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basis/flight/aprv/FlightPlanAprvGrid.js          | 12 +++++++++++-
 src/components/basis/flight/plan/FlightPlanGrid.js   | 12 +++++++++++-
 .../basis/flight/plan/FlightPlanContainer.js         |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js
index 2ef5152..a69ff1a 100644
--- a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js
+++ b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js
@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Card, Col, Row, CustomInput } from 'reactstrap';
+import { Button, Card, Col, Row, Spinner } from 'reactstrap';
 import { GridDatabase } from '../../../crud/grid/GridDatatable';
 import { Link } from 'react-router-dom';
 import { selectableRowsComponent } from '../../../crud/grid/selectableRowsComponent';
+import { useSelector } from 'react-redux';
 
 const FlightPlanAprvGrid = ({
   data,
@@ -17,6 +18,7 @@ const FlightPlanAprvGrid = ({
   paginationRowsPerPageOptions
 }) => {
   const [aprvAuth, setAprvAuth] = useState('');
+  const { loading } = useSelector(state => state.loadingReducer);
 
   useEffect(() => {
     joinList.forEach(c => {
@@ -126,6 +128,14 @@ const FlightPlanAprvGrid = ({
           <div className='invoice-list-wrapper'>
             <Card>
               <div className='invoice-list-dataTable'>
+                {loading ? (
+                  <div className='grid-loading'>
+                    <div>
+                      <Spinner color='primary' />
+                      <span>Loading...</span>
+                    </div>
+                  </div>
+                ) : null}
                 <GridDatabase
                   title={'비행이력'}
                   data={data}
diff --git a/src/components/basis/flight/plan/FlightPlanGrid.js b/src/components/basis/flight/plan/FlightPlanGrid.js
index 6fbfb37..0418c36 100644
--- a/src/components/basis/flight/plan/FlightPlanGrid.js
+++ b/src/components/basis/flight/plan/FlightPlanGrid.js
@@ -1,10 +1,12 @@
 import React from 'react';
-import { Button, Card, Col, Row } from 'reactstrap';
+import { Button, Card, Col, Row, Spinner } from 'reactstrap';
 import { GridDatabase } from '../../../crud/grid/GridDatatable';
 import { Redirect } from 'react-router-dom';
 import { Link, useHistory } from 'react-router-dom';
+import { useSelector } from 'react-redux';
 
 const FlightPlanGrid = ({ movePage, planListData, pagination, paginationPerPage, paginationRowsPerPageOptions }) => {
+  const { loading } = useSelector(state => state.loadingReducer);
   const columns = [
     { id: 'planSno', name: '번호', cell: (row, i) => <div>{i + 1}</div> },
     {
@@ -64,6 +66,14 @@ const FlightPlanGrid = ({ movePage, planListData, pagination, paginationPerPage,
           <div className='invoice-list-wrapper'>
             <Card>
               <div className='invoice-list-dataTable'>
+                {loading ? (
+                  <div className='grid-loading'>
+                    <div>
+                      <Spinner color='primary' />
+                      <span>Loading...</span>
+                    </div>
+                  </div>
+                ) : null}
                 <GridDatabase
                   title={'비행이력'}
                   data={planListData}
diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js
index d9e87cb..96e150d 100644
--- a/src/containers/basis/flight/plan/FlightPlanContainer.js
+++ b/src/containers/basis/flight/plan/FlightPlanContainer.js
@@ -173,6 +173,7 @@ const FlightPlanContainer = () => {
                   pagination={true}
                   paginationPerPage={10}
                   paginationRowsPerPageOptions={[10, 20, 30, 40]}
+                // handlerPageChange={handlerPageChange}
                 // columns={columns}
                 />
               </>

From 3f0b4080c56a94c29a6cf8973cf42ad2d5f57440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= <kjh@palnet.co.kr>
Date: Fri, 7 Oct 2022 10:55:17 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=8B=9C=EB=AE=AC?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=9E=AC=EC=83=9D=EB=B0=94=20?=
 =?UTF-8?q?=EB=93=9C=EB=9E=98=EA=B7=B8=20=EB=B0=8F=20=EC=9D=BC=EC=8B=9C?=
 =?UTF-8?q?=EC=A0=95=EC=A7=80=EC=8B=9C=EC=A0=90=20=EB=B6=80=ED=84=B0=20?=
 =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=EC=9E=AC=EC=83=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/simulation/AnalysisSimulationDetail.js |  3 ++-
 .../analysis/simulation/AnalysisSimulatorSlider.js  |  4 ++--
 .../simulator/AnalysisSimulationContainer.js        | 13 +++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/analysis/simulation/AnalysisSimulationDetail.js b/src/components/analysis/simulation/AnalysisSimulationDetail.js
index b9c3b33..b4df82f 100644
--- a/src/components/analysis/simulation/AnalysisSimulationDetail.js
+++ b/src/components/analysis/simulation/AnalysisSimulationDetail.js
@@ -210,7 +210,8 @@ export const AnalysisSimulationDetail = props => {
                 </div> */}
                 {props.stcsList?.map(item => {
                   return (
-                    <div key={item.timeCd}
+                    <div
+                      key={item.timeCd}
                       className={
                         props.timeCd === item.timeCd
                           ? 'simulation-date-num date-num-focus'
diff --git a/src/components/analysis/simulation/AnalysisSimulatorSlider.js b/src/components/analysis/simulation/AnalysisSimulatorSlider.js
index 2e81af8..c5bb421 100644
--- a/src/components/analysis/simulation/AnalysisSimulatorSlider.js
+++ b/src/components/analysis/simulation/AnalysisSimulatorSlider.js
@@ -39,12 +39,12 @@ const AnalysisSimulatorSlider = ({
     direction
   };
 
-  useEffect(() => {
-  }, [playCount]);
+  useEffect(() => {}, [playCount]);
   return (
     <div className='simulation-slider'>
       {/* <h5 className='my-2'>Default / Primary Color Slider</h5> */}
       {/* <Nouislider className='mt-md-1 mt-3 mb-4' {...colorOptions} behaviour={'tap'}/> */}
+
       <Nouislider
         className='mt-md-1 mt-3 mb-1'
         {...colorOptions}
diff --git a/src/containers/analysis/simulator/AnalysisSimulationContainer.js b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
index 9f68af3..ed6ae50 100644
--- a/src/containers/analysis/simulator/AnalysisSimulationContainer.js
+++ b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
@@ -10,6 +10,9 @@ import { NMapMarker } from '../../../components/map/nhn/NMapMarker';
 import { NMapPolyline } from '../../../components/map/nhn/NMapPolyline';
 import * as Actions from '../../../modules/analysis/simulation/actions/analysisSimulatorAction';
 import * as Action from '../../../modules/account/login/actions/authAction';
+
+let playCount = 0;
+
 export const AnalysisSimulationContainer = props => {
   const { list, count, detail, searchParams, log, stcsList, stcsCount } =
     useSelector(state => state.analysisSimulatorState);
@@ -34,8 +37,6 @@ export const AnalysisSimulationContainer = props => {
 
   const [searchText, setSearchText] = useState('');
 
-  let playCount = 0;
-
   const [sliderVal, setSliderVal] = useState({
     maxVal: 0,
     minVal: 0
@@ -59,7 +60,6 @@ export const AnalysisSimulationContainer = props => {
         }
 
         playCount++;
-
         if (playCount == log.length) {
           playCount = 0;
           clearInterval(timer);
@@ -76,7 +76,7 @@ export const AnalysisSimulationContainer = props => {
       setInfo({ ...log[playCount], playCount: playCount });
       setIsPlay(false);
     }
-  }, [stcsList])
+  }, [stcsList]);
 
   useEffect(() => {
     if (oepnReportList) {
@@ -100,6 +100,11 @@ export const AnalysisSimulationContainer = props => {
   }, [sliderCount]);
 
   useEffect(() => {
+    playCount = 0;
+    if (log) {
+      setInfo({ ...log[playCount], playCount: 0 });
+    }
+
     // let arrDate = log?.map(date => {
     //   const dateval = date.srvrRcvDt;
     //   if (dateval) {