laanc 폴더 구조 변경 및 const -> function 변경

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 = () => {
       </div>
     </CustomMainLayout>
   );
-};
-
-export default LaancContainer;
+}

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 && (
             <>
-              <FlightPlan
+              <LaancStep1
                 //  handlerStep={handlerStep}
                 data={detailData}
                 handleChange={handleChange}
@@ -219,7 +219,7 @@ const LaancPlanContainer = () => {
           )}
 
           {step === 2 && (
-            <Apply
+            <LaancStep2
               handlerStep={handlerStep}
               data={detailData}
               disabledAnimation={disabledAnimation}
@@ -233,5 +233,4 @@ const LaancPlanContainer = () => {
       </div>
     </>
   );
-};
-export default LaancPlanContainer;
+}

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"}}}
                     />
                   </FormGroup>
                 </Col>
@@ -182,19 +183,24 @@ const FlightPlan = ({
                           value
                         });
                       }}
-                      // innerRef={data}
-                      // className={classnames({
-                      // 'is-invalid': errors.arcrftTypeCd
-                      // })}
                     >
-                      {/* TODO CDNOT 코드연동 필요 */}
                       <option value=''>= 선택 =</option>
-                      <option value='시험비행'>= 시험비행 =</option>
                       <option value='교육비행'>= 교육비행 =</option>
+                      <option value='교통관리'>= 교통관리 =</option>
+                      <option value='공중광고'>= 공중광고 =</option>
+                      <option value='계도비행'>= 계도비행 =</option>
+                      <option value='농약살포'>= 농약살포 =</option>
+                      <option value='레저비행'>= 레저비행 =</option>
                       <option value='사진/영상촬영'>= 사진/영상촬영 =</option>
-                      <option value='비행훈련'>= 비행훈련 =</option>
+                      <option value='수송'>= 수송 =</option>
+                      <option value='수색구조'>= 수색구조 =</option>
+                      <option value='시험비행'>= 시험비행 =</option>
+                      <option value='산림관측'>= 산림관측 =</option>
                       <option value='비행교육'>= 비행교육 =</option>
+                      <option value='비행시연'>= 비행시연 =</option>
                       <option value='비행실기시험'>= 비행실기시험 =</option>
+                      <option value='비행훈련'>= 비행훈련 =</option>
+                      <option value='항공측량'>= 항공측량 =</option>
                     </Input>
                   </FormGroup>
                 </Col>
@@ -278,15 +284,14 @@ const FlightPlan = ({
                       placeholder=''
                     >
                       <option value=''>= 선택 =</option>
-                      <option value='시험비행'>= 시계비행 =</option>
-                      <option value='교육비행'>= 선화비행 =</option>
+                      <option value='격자비행'>= 격자비행 =</option>
+                      <option value='군집비행'>= 군집비행 =</option>
                       <option value='사진/영상촬영'>= 계기비행 =</option>
-                      <option value='비행훈련'>= 격자비행 =</option>
-                      <option value='비행교육'>= 수직이착륙비행 =</option>
-                      <option value='비행실기시험'>= 수동조종비행 =</option>
-                      <option value='비행실기시험'>= 군집비행 =</option>
-                      <option value='비행실기시험'>= 직접입력 =</option>
-                      비행방식
+                      <option value='시계비행'>= 시계비행 =</option>
+                      <option value='선화비행'>= 선화비행 =</option>
+                      <option value='수동조종비행'>= 수동조종비행 =</option>
+                      <option value='수직이착륙비행'>= 수직이착륙비행 =</option>
+                      <option value='직접입력'>= 직접입력 =</option>
                     </Input>
                   </FormGroup>
                 </Col>
@@ -298,6 +303,7 @@ const FlightPlan = ({
                     <Input
                       type='text'
                       id='test'
+                      // value={}
                       bssize='sm'
                       placeholder='직접입력 선택 후 활성화'
                       disabled
@@ -314,7 +320,22 @@ const FlightPlan = ({
                     <Label for='test'>
                       <span className='necessary'>*</span>기체 중량
                     </Label>
-                    <Input type='text' id='test' bssize='sm' placeholder='' />
+                    <Input type='select' id='test' bssize='sm' placeholder=''>
+                      <option value=''>= 선택 =</option>
+                      <option value='최대이륙중량 250g 이하'>
+                        = 최대이륙중량 250g 이하 =
+                      </option>
+                      <option value='250g초과 ~ 2kg 이하'>
+                        = 250g초과 ~ 2kg 이하 =
+                      </option>
+                      <option value='2kg초과~7kg이하'>
+                        = 2kg초과~7kg이하 =
+                      </option>
+                      <option value='7kg초과~25kg이하'>
+                        = 7kg초과~25kg이하 =
+                      </option>
+                      <option value='25kg초과'>= 25kg초과 =</option>
+                    </Input>
                   </FormGroup>
                 </Col>
                 <Col className='list-input' md='4'>
@@ -384,7 +405,6 @@ const FlightPlan = ({
             </Button>
           </div>
           <div className='laanc-map-sm'>
-            여기가 지도 영역
             <FlightArea
               centeredModal={centeredModal}
               setCenteredModal={setCenteredModal}
@@ -442,5 +462,4 @@ const FlightPlan = ({
       </ModalFooter>
     </>
   );
-};
-export default FlightPlan;
+}

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 = ({
       </ModalFooter>
     </>
   );
-};
-export default Apply;
+}

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 <LaancContainer />;
-};
-
-export default LaancView;
+}

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';