From 254f0282c8e5597c6e4280b5f92340acccdea319 Mon Sep 17 00:00:00 2001
From: minuk926 <minuk926@gmail.com>
Date: Tue, 18 Oct 2022 13:00:02 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20tiles=20fims-popup=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/fims/biz/rt/rt0200/rtRt0200Sel.jsp    |   6 +-
 .../biz/mng/menu/mngProgramMgtFrom.jsp        |  48 ++--
 .../biz/mng/menu/mngProgramMgt_edit.jsp       | 205 +++++++++---------
 3 files changed, 128 insertions(+), 131 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rt0200/rtRt0200Sel.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rt0200/rtRt0200Sel.jsp
index 201d89fa..99524c7a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rt0200/rtRt0200Sel.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rt0200/rtRt0200Sel.jsp
@@ -362,11 +362,12 @@
         },
 
         clickRegBtn: function(props){
-            let rowData = props.grid.getRow(props.rowKey);
+            const rowData = props.grid.getRow(props.rowKey);
+            <%--
             let params = '';
             params += "selectedId=" + rowData.reglt_id;
             this.pagePopup('detail', '<c:url value="/cmm/fimsPopup/fimsTotalPopup.do"/>', params);
-            <%--
+            --%>
             CmmPopup.open('<c:url value="/cmm/fimsPopup/fimsTotalPopup.do"/>',
                 {
                     tilesDef: 'popup',
@@ -378,7 +379,6 @@
                 },
                 '단속자료 상세 현황'
             )
-            --%>
         },
 
         pagePopup: function(flag, url, params){
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtFrom.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtFrom.jsp
index 34e65108..f4fd4893 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtFrom.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtFrom.jsp
@@ -63,10 +63,18 @@
 <script type="text/javaScript" language="javascript">
 	let GRID = null;
 
+
+	/* ========================
+     * 데이터 조회 : popup에서 사용
+     ======================== */
+	var findPrograms = function(){
+		GRID.reloadData();
+	};
+
 	/* *******************************
 	 * 프로그램 목록관리 Functions
 	 ******************************* */
-	var mngProgramMgtForm = {
+	const mngProgramMgtForm = {
 		init : function(){
 
 			/* ******************************
@@ -158,10 +166,6 @@
 				//GRID.refreshLayout();
 			});
 
-
-
-
-
 			/**
 			* Elements EventListener Settings
 			*/
@@ -183,12 +187,7 @@
 
 
 		},
-		/* ========================
-		* 데이터 조회
-		======================== */
-		findData : function(){
-			GRID.reloadData();
-		},
+
 		/* ========================
 		* 데이터 등록
 		======================== */
@@ -208,11 +207,11 @@
 
 
 			//Parameter Get
-		    var arrKey = [];
-			instance.getCheckedRows().forEach(function(row){
+		    const arrKey = [];
+			GRID.getCheckedRows().forEach(function(row){
 				arrKey.push(row.progrmFileNm);
 			});
-		    var checkProgrmFileNms = arrKey.join(',');
+		    const checkProgrmFileNms = arrKey.join(',');
 
 
 			//Call
@@ -225,7 +224,7 @@
 				dataType : "json",
 				success : function(data) {
 					alert(data.resp.message);
-					this.findData();
+					findPrograms();
 				},
 				error: function(){
 
@@ -277,7 +276,6 @@
 				default:
 					break;
 			}
-
 		    window.open(popUrl, popTitle ,popOption);
 		},
 		/* ========================
@@ -286,26 +284,24 @@
 		======================== */
 		fnClickProgramBtn: function(props){
 
-			var rowData = props.grid.getRow(props.rowKey);
-			var params  = "";
-				params += "progrmFileNm=" + rowData.progrmFileNm;
-			mngProgramMgtForm.pagePopup('detail', "<c:url value='/framework/biz/mng/menu/program_edit.do'/>", params);
-
-
+			const rowData = props.grid.getRow(props.rowKey);
 <%--
-			let rowData = props.grid.getRow(props.rowKey);
+			let params  = "";
+			params += "progrmFileNm=" + rowData.progrmFileNm;
+			this.pagePopup('detail', "<c:url value='/framework/biz/mng/menu/program_edit.do'/>", params);
+--%>
 			CmmPopup.open('<c:url value="/framework/biz/mng/menu/program_edit.do"/>',
 					{
 					    tilesDef: 'popup',
 						progrmFileNm: rowData.progrmFileNm
 					},
 					{
-						width: 655,
-						height: 720
+						width: 720,
+						height: 655
 					},
 					'프로그램 상세'
 			)
---%>
+
 		}
 	}
 
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgt_edit.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgt_edit.jsp
index da21309a..8534c2e7 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgt_edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgt_edit.jsp
@@ -75,113 +75,114 @@
 
 <script type="text/javaScript" language="javascript">
 
-$(document).ready(function(){
-	XitProgramMng_edit.init();
-});
-/* ******************************* 
- * 프로그램 목록관리 수정화면 Functions
- ******************************* */
- var XitProgramMng_edit = {
-		init : function(){
-			//닫기 버튼 Event
-			$("#btnClose").click(function() {
-				window.close();
-			});
-			//저장 버튼 Event 설정
-			$('#btnSave').on({
-				click: function(){
-					this.addData();
-		   		}
-		  	});
-			$('#btnUpdate').on({
-				click: function(){
-					XitProgramMng_edit.modifyData();
-		   		}
-		  	});
-			$('#delete_btn').on({
-				click: function(){
-					XitProgramMng_edit.removeData();
-		   		}
-		  	});
-			$(".popup").css("position","absolute");
-			$(".content_header").css("display","none");
-			$("#cur_loc").css("display","none");
-		},
-		/* ========================
-		* 데이터 등록
-		======================== */
-		addData : function(){
-	        if(!validateProgrmManageVO(document.getElementById("progrmMngVO")))
-	            return;
-	            
-			var varFrom = document.getElementById("progrmMngVO");
-			if(confirm("저장 하시겠습니까?")){
-				var param = $(varFrom).serialize();
-				$.ajax({
-					url : "<c:url value='/'/>_mng_/menu/program/ProgramMng_insert_proc.do",
-					data : param,
-					type : "post",
-					dataType : "json",
-					success : function(data) {
-						console.log('~~~~~~~~~~~~~~~~',data);
-						alert(data.message);
-						window.opener.mngProgramMgtForm.findData();
-						window.close();
-					},
-					error: function(){
-						
+	/* *******************************
+	 * 프로그램 목록관리 수정화면 Functions
+	 ******************************* */
+	 var XitProgramMng_edit = {
+			init : function(){
+				//닫기 버튼 Event
+				$("#btnClose").click(function() {
+					window.close();
+				});
+				//저장 버튼 Event 설정
+				$('#btnSave').on({
+					click: function(){
+						this.addData();
 					}
 				});
-			}
-		}
-		/* ========================
-		* 데이터 수정
-		======================== */
-		,modifyData : function(){
-	        //if(!validateProgrmManageVO(document.getElementById("progrmMngVO")))
-	        //    return;
-	        
-			var varFrom = document.getElementById("progrmMngVO");
-			if(confirm("변경 하시겠습니까?")){
-				var param = $(varFrom).serialize();
-				$.ajax({
-					<%--url : "<c:url value='/'/>framework/biz/mng/menu/program_update_proc.do",--%>
-					url : "<c:url value='/'/>framework/biz/mng/menu/updateProgram.do",
-					data : param,
-					type : "post",
-					dataType : "json",
-					success : function(data) {
-						alert(data.message);
-						window.opener.mngProgramMgtForm.findData();
-						window.close();
+				$('#btnUpdate').on({
+					click: function(){
+						XitProgramMng_edit.modifyData();
 					}
 				});
-			}
-		}
-		/* ========================
-		* 데이터 삭제
-		======================== */
-		,removeData : function(){
-			var varFrom = document.getElementById("progrmMngVO");
-			if(confirm("삭제 하시겠습니까?")){
-				var param = $(varFrom).serialize();
-				$.ajax({
-					url : "<c:url value='/'/>_mng_/menu/program/ProgramMng_delete_proc.do",
-					data : param,
-					type : "post",
-					dataType : "json",
-					success : function(data) {
-						alert(data.resp.message);
-						console.log(data)
-						window.opener.findData();//.mngProgramMgtForm.findData();
-						window.close();
-					},
-					error: function(){
-						
+				$('#delete_btn').on({
+					click: function(){
+						XitProgramMng_edit.removeData();
 					}
 				});
+				$(".popup").css("position","absolute");
+				$(".content_header").css("display","none");
+				$("#cur_loc").css("display","none");
+			},
+			/* ========================
+			* 데이터 등록
+			======================== */
+			addData : function(){
+				if(!validateProgrmManageVO(document.getElementById("progrmMngVO")))
+					return;
+
+				var varFrom = document.getElementById("progrmMngVO");
+				if(confirm("저장 하시겠습니까?")){
+					var param = $(varFrom).serialize();
+					$.ajax({
+						url : "<c:url value='/'/>_mng_/menu/program/ProgramMng_insert_proc.do",
+						data : param,
+						type : "post",
+						dataType : "json",
+						success : function(data) {
+							console.log('~~~~~~~~~~~~~~~~',data);
+							alert(data.message);
+							window.opener.findPrograms();
+							window.close();
+						},
+						error: function(){
+
+						}
+					});
+				}
 			}
-		}
-		
-}
+			/* ========================
+			* 데이터 수정
+			======================== */
+			,modifyData : function(){
+				//if(!validateProgrmManageVO(document.getElementById("progrmMngVO")))
+				//    return;
+
+				var varFrom = document.getElementById("progrmMngVO");
+				if(confirm("변경 하시겠습니까?")){
+					var param = $(varFrom).serialize();
+					$.ajax({
+						<%--url : "<c:url value='/'/>framework/biz/mng/menu/program_update_proc.do",--%>
+						url : "<c:url value='/'/>framework/biz/mng/menu/updateProgram.do",
+						data : param,
+						type : "post",
+						dataType : "json",
+						success : function(data) {
+							alert(data.message);
+							window.opener.findPrograms();
+							window.close();
+						}
+					});
+				}
+			}
+			/* ========================
+			* 데이터 삭제
+			======================== */
+			,removeData : function(){
+				var varFrom = document.getElementById("progrmMngVO");
+				if(confirm("삭제 하시겠습니까?")){
+					var param = $(varFrom).serialize();
+					$.ajax({
+						url : "<c:url value='/'/>_mng_/menu/program/ProgramMng_delete_proc.do",
+						data : param,
+						type : "post",
+						dataType : "json",
+						success : function(data) {
+							alert(data.resp.message);
+							console.log(data)
+							window.opener.findData();//.mngProgramMgtForm.findData();
+							window.close();
+						},
+						error: function(){
+
+						}
+					});
+				}
+			}
+
+	}
+
+	$(document).ready(function(){
+		XitProgramMng_edit.init();
+	});
 </script>