From a69d4aa297f034b489c5500413cf762e6f373e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?=
 <junheee@palnet.co.kr>
Date: Tue, 8 Nov 2022 15:56:20 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EB=B2=84=ED=8A=BC=20=EB=B9=84=ED=99=9C?=
 =?UTF-8?q?=EC=84=B1=ED=99=94=20=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basis/flight/aprv/FlightPlanAprvContainer.js  | 15 +++++++++++++++
 .../basis/flight/plan/FlightPlanContainer.js      | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
index 368f4068..cc882d31 100644
--- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
+++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
@@ -193,6 +193,21 @@ const FlightPlanAprvContainer = () => {
   useEffect(() => {
     if (searchData?.groupId) {
       handleSearch(searchData);
+
+      //승인/미승인버튼 활성/비활성 제어
+      let my = false;
+      if (user.authId === 'SUPER') {
+        my = true;
+      } else if (user.authId === 'ADMIN') {
+        if (myGroupAuthCd) {
+          my = true;
+        }
+      } else if (user.authId === 'USER') {
+        if (groupAuthCd) {
+          my = true;
+        }
+      }
+      setIsMyGroup(my);
     }
   }, [searchData]);
 
diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js
index c1c6a5bb..dbc9e7a6 100644
--- a/src/containers/basis/flight/plan/FlightPlanContainer.js
+++ b/src/containers/basis/flight/plan/FlightPlanContainer.js
@@ -136,6 +136,21 @@ const FlightPlanContainer = () => {
   useEffect(() => {
     if (searchData?.groupId) {
       handleSearch(searchData);
+
+      //비행계획서 신청 버튼 활성/비활성 제어
+      let my = false;
+      if (user.authId === 'SUPER') {
+        my = true;
+      } else if (user.authId === 'ADMIN') {
+        if (myGroupAuthCd) {
+          my = true;
+        }
+      } else if (user.authId === 'USER') {
+        if (groupAuthCd) {
+          my = true;
+        }
+      }
+      setIsMyGroup(my);
     }
   }, [searchData]);
 

From 987ce1071a2e6e5296bdc8c71c1214b6c2ae684e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?=
 <junheee@palnet.co.kr>
Date: Tue, 8 Nov 2022 16:42:45 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EB=A1=9C=EA=B3=A0=20=ED=83=80=EC=9D=B4?=
 =?UTF-8?q?=ED=8B=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/configs/themeConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/configs/themeConfig.js b/src/configs/themeConfig.js
index 93b819d6..44147d7c 100644
--- a/src/configs/themeConfig.js
+++ b/src/configs/themeConfig.js
@@ -3,7 +3,7 @@
 //Template config options
 const themeConfig = {
   app: {
-    appName: 'DRONSYS',
+    appName: 'DRONESYS',
     // appLogoImage: require('@src/assets/images/logo/logo.svg').default,
     appLogoImage: require('../assets/images/pal_logo.png').default
   },

From 4c926d176a730c6e4e100941fe51adaf64605bad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?=
 <junheee@palnet.co.kr>
Date: Tue, 8 Nov 2022 17:38:58 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?=
 =?UTF-8?q?=EA=B5=AC=EC=97=AD=20polyline=20=EC=A4=91=EB=B3=B5=20=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=88=20=EC=98=A4=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map/naver/draw/FlightPlanDraw.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/map/naver/draw/FlightPlanDraw.js b/src/components/map/naver/draw/FlightPlanDraw.js
index 758ed6ee..68a30c95 100644
--- a/src/components/map/naver/draw/FlightPlanDraw.js
+++ b/src/components/map/naver/draw/FlightPlanDraw.js
@@ -74,8 +74,8 @@ export const FlightPlanDraw_init = props => {
 
   useEffect(() => {
     if (figure) {
-      props.handleConfirm(props.areaCoordList);
       setAreaDetail(props.areaCoordList);
+      props.handleConfirm(props.areaCoordList);
     }
   }, [figure]);
 
@@ -491,14 +491,14 @@ export const FlightPlanDraw_init = props => {
 
     if (polyline) {
       var path = polyline.getPath()._array;
-      setPolyline(polyline);
+      // setPolyline(polyline);
       setAreaInfo(path);
       setFigure(polyline);
     }
 
     if (polygon) {
       var path = polygon.getPath()._array;
-      setPolygon(polygon);
+      // setPolygon(polygon);
       setAreaInfo(path);
       setFigure(polygon);
     }
@@ -512,7 +512,7 @@ export const FlightPlanDraw_init = props => {
       });
       setClickEve(Eve.clickEve);
 
-      setCircle(prev => [...prev, circle]);
+      // setCircle(prev => [...prev, circle]);
       setAreaInfo('');
       setFigure(circle);
     }
@@ -603,10 +603,10 @@ export const FlightPlanDraw_init = props => {
 
       if (areas.areaType && areas.areaType === 'LINE') {
         //polyline 생성
-        if (pastPolyline) {
-          pastPolyline.setMap(null);
-          pastDragCircle.forEach(c => c.setMap(null));
-        }
+        // if (pastPolyline) {
+        pastPolyline?.setMap(null);
+        pastDragCircle?.forEach(c => c.setMap(null));
+        // }
         polyline = new naver.maps.Polyline({
           strokeLineCap: 'round',
           strokeLineJoin: 'round',