Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/components/basis/group/BasisGroupGrid.js

@@ -1,5 +1,5 @@
 import { GridDatabase } from '../../crud/grid/GridDatatable';
-import { Card } from 'reactstrap';
+import { Card, Row, Col, Button } from 'reactstrap';
 
 export const BasisGroupGrid = props => {
   return (

src/components/basis/group/BasisGroupMyGrid.js

@@ -0,0 +1,46 @@
+import { GridDatabase } from '../../crud/grid/GridDatatable';
+import { Card, Row, Col, Button } from 'reactstrap';
+
+export const BasisGroupMyGrid = props => {
+  return (
+    <div className='pal-card-box'>
+      <Row>
+        <Col>
+          <>
+            <div className='cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
+              <div>
+                <h4>{props.title} 목록</h4>
+                <span className='search-case'>검색결과 총 {props.count}건</span>
+              </div>
+              <div className='d-flex align-items-center'>
+                <Button.Ripple
+                  color='primary'
+                  size='sm'
+                  onClick={props.handlerGroupCreate}
+                >
+                  그룹생성
+                </Button.Ripple>
+              </div>
+            </div>
+            <div className='invoice-list-wrapper'>
+              <Card>
+                {/* <div className='grid-loading'>
+                <div><Spinner color='primary' /><span>Loading...</span></div>
+              </div> */}
+                <div className='invoice-list-dataTable'>
+                  <GridDatabase
+                    title={'비행이력'}
+                    data={props.data}
+                    count={props.count}
+                    columns={props.columns}
+                    pagination={props.pagination}
+                  />
+                </div>
+              </Card>
+            </div>
+          </>
+        </Col>
+      </Row>
+    </div>
+  );
+};

src/containers/analysis/simulator/AnalysisSimulationContainer.js

@@ -57,13 +57,11 @@ export const AnalysisSimulationContainer = props => {
         if (log[playCount]?.srvrRcvDt) {
           setTimeCd(moment(log[playCount]?.srvrRcvDt).format('HH:mm'));
         }
-
         playCount++;
-
         if (playCount == log.length) {
           playCount = 0;
-          setIsPlay(false);
           clearInterval(timer);
+          setIsPlay(false);
         }
       }, 1000);
 

src/containers/basis/dron/BasisDronContainer.js

@@ -6,7 +6,7 @@ import { Button, Col, Row } from 'reactstrap';
 import { BasisDronGrid } from '../../../components/basis/dron/BasisDronGrid';
 import { BasisGroupDronGrid } from '../../../components/basis/dron/BasisGroupDronGrid';
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
-import { InfoModal } from '../../../components/modal/InfoModal';
+// import { InfoModal } from '../../../components/modal/InfoModal';
 import * as Actions from '../../../modules/basis/dron/actions/basisDronAction';
 import * as GroupActions from '../../../modules/basis/group/actions/basisGroupAction';
 import { GET_ARCTFT_TYPE_CD } from '../../../utility/CondeUtil';
@@ -126,13 +126,7 @@ export const BasisDronContainer = props => {
       // minWidth: '102px',
       sortable: true,
       cell: row => {
-        return (
-          <Link
-            to={`/basis/dron/detail/${row.arcrftSno}`}
-          >
-            상세보기
-          </Link>
-        );
+        return <Link to={`/basis/dron/detail/${row.arcrftSno}`}>상세보기</Link>;
       }
     }
   ];
@@ -170,13 +164,6 @@ export const BasisDronContainer = props => {
   };
 
   const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => {
-
-    if (
-      // groupAuthCd === 'CREATER' ||
-      groupAuthCd === 'MASTER' || user.authId ==='SUPER' ||
-      // (aprvlYn === 'Y' && groupAuthCd === 'ADMIN')
-      (aprvlYn === 'Y' && groupAuthCd === 'LEADER')
-    ) {
     dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm }));
     setParams({
       ...params,
@@ -184,15 +171,28 @@ export const BasisDronContainer = props => {
       groupNm: groupNm
     });
     dispatch(Actions.LIST.request({ groupId: groupId }));
-    } else {
-      setModal({
-        isOpen: true,
-        title: '권한 확인',
-        desc: '기체정보 확인을 위해서는 운영자 권한이 필요합니다. 운영자에게 권한을 부여받고 다시 시도해 주세요.'
-      });
-    }
-  };
 
+    // if (
+    //   // groupAuthCd === 'CREATER' ||
+    //   groupAuthCd === 'MASTER' || user.authId ==='SUPER' ||
+    //   // (aprvlYn === 'Y' && groupAuthCd === 'ADMIN')
+    //   (aprvlYn === 'Y' && groupAuthCd === 'LEADER')
+    // ) {
+    //   dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm }));
+    //   setParams({
+    //     ...params,
+    //     groupId: groupId,
+    //     groupNm: groupNm
+    //   });
+    //   dispatch(Actions.LIST.request({ groupId: groupId }));
+    // } else {
+    //   setModal({
+    //     isOpen: true,
+    //     title: '권한 확인',
+    //     desc: '기체정보 확인을 위해서는 운영자 권한이 필요합니다. 운영자에게 권한을 부여받고 다시 시도해 주세요.'
+    //   });
+    // }
+  };
 
   const handlerGroupCreate = () => {
     dispatch(Actions.RESET_IDNTF()); // 초기화 진행
@@ -247,7 +247,7 @@ export const BasisDronContainer = props => {
           </Col>
         </Row>
       </div>
-      <InfoModal modal={modal} setModal={setModal} />
+      {/* <InfoModal modal={modal} setModal={setModal} /> */}
     </CustomMainLayout>
   );
 };

src/containers/basis/group/BasisGroupApprovalContainer.js

@@ -6,8 +6,8 @@ import { BasisGroupApprovalSearch } from '../../../components/basis/group/BasisG
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';
 import * as Actions from '../../../modules/basis/group/actions/basisGroupAction';
-import * as GroupActions from '../../../modules/basis/group/actions/basisGroupAction';
-import { BasisGroupDronGrid } from '../../../components/basis/dron/BasisGroupDronGrid';
+import { InfoModal } from '../../../components/modal/InfoModal';
+import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 
 export const BasisGroupApprovalContainer = props => {
   const { aprvList, aprvCount } = useSelector(state => state.groupState);
@@ -76,10 +76,17 @@ export const BasisGroupApprovalContainer = props => {
       }
     }
   ];
-  const handlerDetail = (groupId, groupNm) => {
+  const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => {
     // 권한 상관 없이 모두 조회 가능
     // param.cstmrSno = user.cstmrSno;
+    if (
+      groupAuthCd === 'MASTER' ||
+      user.authId === 'SUPER' ||
+      user.authId == 'ADMIN' ||
+      (aprvlYn === 'Y' && groupAuthCd === 'LEADER')
+    ) {
       dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm }));
+
       if (user?.cstmrSno) {
         setParams({
           ...params,
@@ -98,6 +105,14 @@ export const BasisGroupApprovalContainer = props => {
           })
         );
       }
+    } else {
+      setInfoModal({
+        isOpen: true,
+        title: '권한 확인',
+        desc: '승인관리 확인을 위해서는 운영자 권한이 필요합니다. 운영자에게 권한을 부여받고 다시 시도해 주세요.'
+      });
+      return;
+    }
   };
 
   const handlerCancel = () => {
@@ -119,7 +134,8 @@ export const BasisGroupApprovalContainer = props => {
         aprvYn: 'A'
       });
       dispatch(
-        GroupActions.JOIN_LIST.request({
+        // GroupActions.JOIN_LIST.request({
+        Actions.JOIN_LIST.request({
           cstmrSno: user?.cstmrSno,
           groupId: selectData?.groupId
         })
@@ -193,6 +209,12 @@ export const BasisGroupApprovalContainer = props => {
     desc: ''
   });
 
+  const [infoModal, setInfoModal] = useState({
+    isOpen: false,
+    title: '',
+    desc: ''
+  });
+
   const columns = [
     {
       name: '그룹명',
@@ -334,7 +356,8 @@ export const BasisGroupApprovalContainer = props => {
       <div className='pal-card-box'>
         <Row>
           <Col sm='4'>
-            <BasisGroupDronGrid
+            {/* <BasisGroupDronGrid */}
+            <BasisGroupGrid
               data={joinList}
               title={'그룹'}
               columns={column}
@@ -386,6 +409,7 @@ export const BasisGroupApprovalContainer = props => {
         handlerConfirm={handlerAprvSave}
         color='primary'
       />
+      <InfoModal modal={infoModal} setModal={setInfoModal} />
     </CustomMainLayout>
   );
 };

src/containers/basis/group/BasisGroupContainer.js

@@ -2,8 +2,8 @@ import { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Link, useHistory } from 'react-router-dom';
 import { Button } from 'reactstrap';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
+import { BasisGroupMyGrid } from '../../../components/basis/group/BasisGroupMyGrid';
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';
 import * as Actions from '../../../modules/basis/group/actions/basisGroupAction';
@@ -197,7 +197,7 @@ export const BasisGroupContainer = props => {
         params={params}
         setParams={setParams}
       /> */}
-      <BasisGroupGrid
+      <BasisGroupMyGrid
         data={myList}
         title={'그룹'}
         columns={columns}

src/containers/basis/group/BasisGroupUsersContainer.js

@@ -50,7 +50,6 @@ export const BasisGroupUsersContainer = props => {
       sortable: true,
       cell: row => {
         return row?.groupNm;
-        // return selectData;
       }
     },
     {
@@ -178,11 +177,7 @@ export const BasisGroupUsersContainer = props => {
               n_disabled = true;
             }
           } else if (my.groupAuthCd === 'LEADER') {
-            if (row.groupAuthCd === 'MASTER') {
-              m_disabled = true;
-              l_disabled = true;
-              n_disabled = true;
-            } else if (row.groupAuthCd === 'LEADER') {
+            if (row.groupAuthCd === 'MASTER' || row.groupAuthCd === 'LEADER') {
               m_disabled = true;
               l_disabled = true;
               n_disabled = true;
@@ -196,7 +191,8 @@ export const BasisGroupUsersContainer = props => {
             l_disabled = true;
             n_disabled = true;
           }
-        } else if (user.authId === 'ROLE_USER') {
+          // } else if (user.authId === 'ROLE_USER') {
+        } else if (user.authId === 'USER') {
           if (my.groupAuthCd === 'MASTER') {
             if (row.groupAuthCd === 'LEADER') {
               l_disabled = true;
@@ -205,11 +201,7 @@ export const BasisGroupUsersContainer = props => {
               n_disabled = true;
             }
           } else if (my.groupAuthCd === 'LEADER') {
-            if (row.groupAuthCd === 'MASTER') {
-              m_disabled = true;
-              l_disabled = true;
-              n_disabled = true;
-            } else if (row.groupAuthCd === 'LEADER') {
+            if (row.groupAuthCd === 'MASTER' || row.groupAuthCd === 'LEADER') {
               m_disabled = true;
               l_disabled = true;
               n_disabled = true;
@@ -495,7 +487,7 @@ export const BasisGroupUsersContainer = props => {
               title={'그룹'}
               columns={columns}
               count={joinListCount}
-              pagination={true}
+              // pagination={true}
             />
           </Col>
           <Col sm='8'>

src/containers/system/auth/SystemAuthContainer.js

@@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom';
 
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
 import { Badge, Button } from 'reactstrap';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';

src/containers/system/code/SystemCodeContainer.js

@@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom';
 
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
 import { Row, Badge, Button } from 'reactstrap';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';

src/containers/system/menu/SystemMenuContainer.js

@@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom';
 
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
 import { Row, Badge, Button } from 'reactstrap';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';

src/containers/system/user/SystemUserContainer.js

@@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom';
 
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
 import { Badge, Button } from 'reactstrap';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';