Browse Source

비행계획서 groupId 추가

feature/flight-plan
노승철 2 years ago
parent
commit
aaca772b46
  1. 2
      src/components/basis/flight/plan/FlightPlanArcrft.js
  2. 9
      src/components/basis/flight/plan/FlightPlanForm.js
  3. 8
      src/containers/basis/flight/plan/FlightPlanArcrftContainer.js
  4. 9
      src/containers/basis/flight/plan/FlightPlanPilotContainer.js

2
src/components/basis/flight/plan/FlightPlanArcrft.js

@ -94,7 +94,7 @@ const FlightPlanArcrft = ({ arcrftList, handleSelectArcrft }) => {
<GridDatabase
title={'조종사목록'}
data={arcrftList}
// count={0}
count={arcrftList ? arcrftList.length : 0}
columns={columns}
// pagination={props.pagination}
/>

9
src/components/basis/flight/plan/FlightPlanForm.js

@ -21,7 +21,7 @@ import { X } from 'react-feather';
const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDelete, modal, handleDeleteArray }) => {
const {areaList, pilotList, arcrftList} = data;
const {groupId ,areaList, pilotList, arcrftList} = data;
return (
<Row>
@ -336,6 +336,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
<SelectModal
modal={modal}
handleModal={handleModal}
groupId={groupId}
/>
</Row>
)
@ -343,7 +344,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
export default FlightPlanForm;
const SelectModal = ({handleModal, modal}) => {
const SelectModal = ({handleModal, modal, groupId}) => {
let title = '';
let description = '';
let type = '';
@ -353,14 +354,14 @@ const SelectModal = ({handleModal, modal}) => {
isOpen = modal.pilot;
title = '조종사 조회';
type = 'pilot';
description = <FlightPlanPilotContainer handleModal={handleModal} type={type} />
description = <FlightPlanPilotContainer handleModal={handleModal} type={type} groupId={groupId} />
}
if(modal.arcrft) {
isOpen = modal.arcrft;
title = '기체 조회';
type = 'arcrft';
description = <FlightPlanArcrftContainer handleModal={handleModal} type={type} />;
description = <FlightPlanArcrftContainer handleModal={handleModal} type={type} groupId={groupId} />;
}
if(modal.area) {

8
src/containers/basis/flight/plan/FlightPlanArcrftContainer.js

@ -4,15 +4,17 @@ import FlightPlanArcrft from '../../../../components/basis/flight/plan/FlightPla
import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction';
// import FlightPlanPilot from '../../../../components/basis/flight/plan/FlightPlanPilot';
const FlightPlanArcrftContainer = ({handleModal, type}) => {
const FlightPlanArcrftContainer = ({handleModal, type, groupId}) => {
const dispatch = useDispatch();
const { arcrftList } = useSelector(state => state.flightState);
/* 기체 조회 */
const handleSearch = () => {
// group id 하드코딩
dispatch(Actions.FLIGHT_PLAN_ARCRFT_LIST.request("D1682A"));
if(groupId) {
dispatch(Actions.FLIGHT_PLAN_ARCRFT_LIST.request(groupId));
}
}
/* 기체 선택 */

9
src/containers/basis/flight/plan/FlightPlanPilotContainer.js

@ -3,15 +3,16 @@ import {useDispatch, useSelector} from 'react-redux';
import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction';
import FlightPlanPilot from '../../../../components/basis/flight/plan/FlightPlanPilot';
const FlightPlanPilotContainer = ({handleModal, type}) => {
const FlightPlanPilotContainer = ({handleModal, type, groupId}) => {
const dispatch = useDispatch();
const { pilotList } = useSelector(state => state.flightState);
const { pilotList, selectGroup } = useSelector(state => state.flightState);
/* 조종사 조회 */
const handleSearch = () => {
// group id 하드코딩
dispatch(Actions.FLIGHT_PLAN_PILOT_LIST.request("D1682A"));
if(groupId) {
dispatch(Actions.FLIGHT_PLAN_PILOT_LIST.request(groupId));
}
}
/* 조종사 선택 */

Loading…
Cancel
Save