From d3e6ed74838dc047388515d9be5c176ec1676cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?sanguu516=28=EB=B0=95=EC=83=81=ED=98=84=29?= Date: Mon, 25 Sep 2023 17:47:26 +0900 Subject: [PATCH] =?UTF-8?q?laanc=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC=EC=A1=B0?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20const=20->=20function=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight => }/laanc/LaancContainer.js | 20 +++--- .../flight => }/laanc/LaancPlanContainer.js | 19 +++--- .../laanc/{FlightPlan.js => LaancStep1.js} | 67 ++++++++++++------- src/views/laanc/{Apply.js => LaancStep2.js} | 7 +- src/views/laanc/LaancView.js | 8 +-- src/views/laanc/LeftMenu.js | 4 +- 6 files changed, 69 insertions(+), 56 deletions(-) rename src/containers/{basis/flight => }/laanc/LaancContainer.js (97%) rename src/containers/{basis/flight => }/laanc/LaancPlanContainer.js (93%) rename src/views/laanc/{FlightPlan.js => LaancStep1.js} (86%) rename src/views/laanc/{Apply.js => LaancStep2.js} (99%) diff --git a/src/containers/basis/flight/laanc/LaancContainer.js b/src/containers/laanc/LaancContainer.js similarity index 97% rename from src/containers/basis/flight/laanc/LaancContainer.js rename to src/containers/laanc/LaancContainer.js index e4a181e..8458255 100644 --- a/src/containers/basis/flight/laanc/LaancContainer.js +++ b/src/containers/laanc/LaancContainer.js @@ -1,18 +1,18 @@ import React, { useEffect, useState } from 'react'; import moment from 'moment'; import { useHistory } from 'react-router-dom'; -import FlightPlanGrid from '../../../../components/basis/flight/plan/FlightPlanGrid'; -import { CustomMainLayout } from '../../../../components/layout/CustomMainLayout'; -import FlightPlanSearch from '../../../../components/basis/flight/plan/FlightPlanSearch'; +import FlightPlanGrid from '../../components/basis/flight/plan/FlightPlanGrid'; +import { CustomMainLayout } from '../../components/layout/CustomMainLayout'; +import FlightPlanSearch from '../../components/basis/flight/plan/FlightPlanSearch'; import { useDispatch, useSelector, shallowEqual } from 'react-redux'; -import * as FlightAction from '../../../../modules/basis/flight/actions/basisFlightAction'; +import * as FlightAction from '../../modules/basis/flight/actions/basisFlightAction'; import { Row, Col, Button } from 'reactstrap'; import { JOIN_LIST, GROUP_LIST -} from '../../../../modules/basis/group/actions/basisGroupAction'; -import FlightPlanGroupGrid from '../../../../components/basis/flight/plan/FlightPlanGroupGrid'; -import LaancPlanContainer from '../laanc/LaancPlanContainer'; +} from '../../modules/basis/group/actions/basisGroupAction'; +import FlightPlanGroupGrid from '../../components/basis/flight/plan/FlightPlanGroupGrid'; +import LaancPlanContainer from './LaancPlanContainer'; const initSearchData = { schFltStDt: moment() .set({ date: 1, h: 0, m: 0, s: 0 }) @@ -25,7 +25,7 @@ const initSearchData = { cstmrSno: 0 }; // const columns = [{}]; -const LaancContainer = () => { +export default function LaancContainer() { const dispatch = useDispatch(); const history = useHistory(); const [open, setOpen] = useState(false); @@ -551,6 +551,4 @@ const LaancContainer = () => { ); -}; - -export default LaancContainer; +} diff --git a/src/containers/basis/flight/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js similarity index 93% rename from src/containers/basis/flight/laanc/LaancPlanContainer.js rename to src/containers/laanc/LaancPlanContainer.js index 5d2b309..0dfcf63 100644 --- a/src/containers/basis/flight/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -1,13 +1,13 @@ -import FlightPlan from '../../../../views/laanc/FlightPlan'; -import Apply from '../../../../views/laanc/Apply'; +import LaancStep1 from '../../views/laanc/LaancStep1'; // laanc step 1 +import LaancStep2 from '../../views/laanc/LaancStep2'; // laanc step 2 import { useEffect, useState } from 'react'; import moment from 'moment'; -import { WeatherContainer } from '../plan/WeatherContainer'; -import { ErrorModal } from '../../../../components/modal/ErrorModal'; +import { WeatherContainer } from '../basis/flight/plan/WeatherContainer'; +import { ErrorModal } from '../../components/modal/ErrorModal'; import { initFlight, initFlightBas -} from '../../../../modules/basis/flight/models/basisFlightModel'; +} from '../../modules/basis/flight/models/basisFlightModel'; import { Row, Col, @@ -22,7 +22,7 @@ import { Input } from 'reactstrap'; -const LaancPlanContainer = () => { +export default function LaancPlanContainer() { const [step, setStep] = useState(1); const [detailData, setDetailData] = useState(initFlightBas.initDetail); const [centeredModal, setCenteredModal] = useState(false); @@ -204,7 +204,7 @@ const LaancPlanContainer = () => { > {step === 1 && ( <> - { )} {step === 2 && ( - { ); -}; -export default LaancPlanContainer; +} diff --git a/src/views/laanc/FlightPlan.js b/src/views/laanc/LaancStep1.js similarity index 86% rename from src/views/laanc/FlightPlan.js rename to src/views/laanc/LaancStep1.js index d6ac496..249e121 100644 --- a/src/views/laanc/FlightPlan.js +++ b/src/views/laanc/LaancStep1.js @@ -41,7 +41,7 @@ import { import { useHistory } from 'react-router-dom'; import FlightArea from './FlightArea'; -const FlightPlan = ({ +export default function LaancStep1({ handleChange, handlerNext, data, @@ -50,7 +50,7 @@ const FlightPlan = ({ setDisabledAnimation, centeredModal, setCenteredModal -}) => { +}) { const { user } = useSelector(state => state.authState); const history = useHistory(); @@ -120,7 +120,8 @@ const FlightPlan = ({ defaultValue={data.schFltStDt} value={data.schFltStDt} options={{ - minDate: moment().format('YYYY-MM-DD') + minDate: moment().format('YYYY-MM-DD'), + maxDate: moment().add(1, 'year').format('YYYY-MM-DD') }} onChange={date => { const value = @@ -148,7 +149,8 @@ const FlightPlan = ({ defaultValue={data.schFltEndDt} value={data.schFltEndDt} options={{ - minDate: moment().format('YYYY-MM-DD') + minDate: moment().format('YYYY-MM-DD'), + maxDate: moment().add(1, 'year').format('YYYY-MM-DD') }} onChange={date => { const value = @@ -159,7 +161,6 @@ const FlightPlan = ({ }); }} placeholder='비행 종료일자 선택(클릭)' - // {...{options:{minDate: "today"}}} /> @@ -182,19 +183,24 @@ const FlightPlan = ({ value }); }} - // innerRef={data} - // className={classnames({ - // 'is-invalid': errors.arcrftTypeCd - // })} > - {/* TODO CDNOT 코드연동 필요 */} - + + + + + - + + + + + + + @@ -278,15 +284,14 @@ const FlightPlan = ({ placeholder='' > - - + + - - - - - - 비행방식 + + + + + @@ -298,6 +303,7 @@ const FlightPlan = ({ *기체 중량 - + + + + + + + + @@ -384,7 +405,6 @@ const FlightPlan = ({
- 여기가 지도 영역 ); -}; -export default FlightPlan; +} diff --git a/src/views/laanc/Apply.js b/src/views/laanc/LaancStep2.js similarity index 99% rename from src/views/laanc/Apply.js rename to src/views/laanc/LaancStep2.js index 82b97b0..aa4a895 100644 --- a/src/views/laanc/Apply.js +++ b/src/views/laanc/LaancStep2.js @@ -40,14 +40,14 @@ import { sensorClickAction } from '../../modules/control/map/actions/controlMapActions'; -const Apply = ({ +export default function LaancStep2({ data, handlerStep, disabledAnimation, setDisabledAnimation, centeredModal, setCenteredModal -}) => { +}) { const [detailData, setDetailData] = useState(initFlightBas.initDetail); const { user } = useSelector(state => state.authState); @@ -363,5 +363,4 @@ const Apply = ({ ); -}; -export default Apply; +} diff --git a/src/views/laanc/LaancView.js b/src/views/laanc/LaancView.js index 2bc0a81..ae6a553 100644 --- a/src/views/laanc/LaancView.js +++ b/src/views/laanc/LaancView.js @@ -1,10 +1,8 @@ import '@styles/react/libs/flatpickr/flatpickr.scss'; import '@styles/react/libs/tables/react-dataTable-component.scss'; import React from 'react'; -import LaancContainer from '../../containers/basis/flight/laanc/LaancContainer'; +import LaancContainer from '../../containers/laanc/LaancContainer'; import '../../assets/css/custom.css'; -const LaancView = props => { +export default function LaancView() { return ; -}; - -export default LaancView; +} diff --git a/src/views/laanc/LeftMenu.js b/src/views/laanc/LeftMenu.js index 237195f..fc4327f 100644 --- a/src/views/laanc/LeftMenu.js +++ b/src/views/laanc/LeftMenu.js @@ -1,8 +1,8 @@ import logo from '../../assets/images/pal_logo.png'; import tp_logo from '../../assets/images/tplogo_wh.png'; import kac_logo from '../../assets/images/kac_logo_wh.png'; -import FlightPlan from './FlightPlan'; -import Apply from './Apply'; +import FlightPlan from './LaancStep1'; +import Apply from './LaancStep2'; import { useEffect, useState } from 'react'; import { AiOutlinePoweroff, AiOutlineExclamation } from 'react-icons/ai'; import WebsocketClient from '../../components/websocket/WebsocketClient';