집합교육 1차본

list.txt

@@ -24,3 +24,4 @@ src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff2
 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff
 src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.otf
 src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml
+src\main\resources\egovframework\spring\context-mybatis.xml

src/main/webapp/WEB-INF/views/homeEducationApplication/inquiry/homeEducationApplicationInquiry.jsp

@@ -39,6 +39,11 @@
 			myEle.style.display = display;
 		}
 	}
+	
+	function closePopup(e) {
+		location.reload(true);
+	}
+	
 	function onClickOpenPopupLink(e) {
 		let dataSeq = e.getAttribute('data-seq');
 		if( dataSeq ) {
@@ -135,7 +140,7 @@
 				homeVisitListHTML =
 					`
 	        <tr>
-	            <td calspan='6'>등록된 집합교육이 없습니다.</td>
+	            <td colspan='6'>등록된 집합교육이 없습니다.</td>
 	        </tr>
 	        		`;
 			}
@@ -146,8 +151,8 @@
 				closeOnBgClick: false,
 				preloader: false,
 				fixedContentPos: false,
-				closeBtnInside: true,
+				closeBtnInside: false,
-				showCloseBtn: true,
+				showCloseBtn: false,
 				items: {
 				    src: '#input-data'
 				},
@@ -164,11 +169,12 @@
 					},
 					close: function () {
 						if (!isMobile) {
-							$('body').removeClass('overflow-hidden login-popup-wrapper');
+							$('body').removeClass('overflow-hidden');
 							document.onmousewheel = ScrollStart;
 						} else {
 							$('body, html').unbind('touchmove');
 						}
+						return false;
 					}
 				}
 			});
@@ -183,9 +189,7 @@
 	}
 	
 	
-	document.addEventListener('DOMContentLoaded', function () {
+	function init() {
-		debugger;
-		
 		const rows = document.querySelectorAll('#Table_contents tbody tr td:nth-child(7)');
 		
 	    rows.forEach(function (cell) {
@@ -249,9 +253,6 @@
 					jsonData.push(jsonItem);
 		    	}
 	
-		    	console.log('%o', jsonData);
-		    	
-	
 		    	
 		    	xhr.open('POST', 'training/home/attend.do', true);
 		    	xhr.setRequestHeader('Content-type', 'application/json');
@@ -259,13 +260,15 @@
 		    	xhr.onreadystatechange = function() {
 		    	  if (xhr.readyState === 4 && xhr.status === 200) {
 		    	    // 요청 성공 시 처리
-		    	    console.log(xhr.responseText);
 		    	    const obj = JSON.parse(xhr.responseText);
 					updateList();					    	    
 					alert(obj.message);
 					if( obj.resultCode === 401 ) {
 						window.location.href="./";
 					}
+					if( obj.resultCode === 100 ) {
+						closePopup();
+					}
 		    	  } else if (xhr.readyState === 4) {
 		    	    // 요청 실패 시 처리			
 		    	    console.error('요청 실패:', xhr.status);
@@ -323,9 +326,6 @@
 					jsonData.push(jsonItem);
 		    	}
 	
-		    	console.log('%o', jsonData);
-		    	
-	
 		    	
 		    	xhr.open('POST', 'training/home/update.do', true);
 		    	xhr.setRequestHeader('Content-type', 'application/json');
@@ -333,13 +333,15 @@
 		    	xhr.onreadystatechange = function() {
 		    	  if (xhr.readyState === 4 && xhr.status === 200) {
 		    	    // 요청 성공 시 처리
-		    	    console.log(xhr.responseText);
 		    	    const obj = JSON.parse(xhr.responseText);
 					updateList();					    	    
 					alert(obj.message);
 					if( obj.resultCode === 401 ) {
 						window.location.href="./";
 					}
+					if( obj.resultCode === 100 ) {
+						closePopup();
+					}
 		    	  } else if (xhr.readyState === 4) {
 		    	    // 요청 실패 시 처리			
 		    	    console.error('요청 실패:', xhr.status);
@@ -365,8 +367,6 @@
 					jsonData.push(jsonItem);
 		    	}
 		    	
-		    	console.log('%o', jsonData);
-		    	
 	
 		    	
 		    	xhr.open('POST', 'training/home/cancel.do', true);
@@ -375,13 +375,15 @@
 		    	xhr.onreadystatechange = function() {
 		    	  if (xhr.readyState === 4 && xhr.status === 200) {
 		    	    // 요청 성공 시 처리
-		    	    console.log(xhr.responseText);
 		    	    const obj = JSON.parse(xhr.responseText);
 					updateList();					    	    
 					alert(obj.message);
 					if( obj.resultCode === 401 ) {
 						window.location.href="./";
 					}
+					if( obj.resultCode === 100 ) {
+						closePopup();
+					}
 		    	  } else if (xhr.readyState === 4) {
 		    	    // 요청 실패 시 처리			
 		    	    console.error('요청 실패:', xhr.status);
@@ -395,6 +397,11 @@
 		
 
 		updateList();
+	}
+	
+	
+	document.addEventListener('DOMContentLoaded', function () {		
+	    init();
 	});
 
 	
@@ -492,7 +499,7 @@
 
 	<!-- 입력 및 수정 modal 시작 -->
 	<div id="input-data" class="input-data-modal mfp-hide">
-		<button id="mfp-close" class="mfp-close">X</button>
+		<button id="mfp-close-button" class="mfp-close-button" onClick="closePopup(this)"></button>		
 		<div class="input-data-modal-content">
 			<div class="input-data-modal-title">집합교육 신청 내용 작성</div>
 			<div class="input-data-modal-body">
@@ -517,12 +524,21 @@
 					</thead>
 					<tbody class="input-data-modal-tbody" id="input-data-modal-tbody">
 						<tr>
-		                    <td><input type="hidden" id="wht-reg-id" name="wht-reg-id" class="wht-reg-id" alt="집합교육 일련번호" /><input type="hidden" id="mode" name="mode" class="mode" alt="data-mode 신청 or 수정" /><input type="text" id="req-name" name="req-name" class="req-name" value="${username}" alt="성명"/></td>
+							<td><input type="hidden" id="wht-reg-id" name="wht-reg-id"
-		                    <td><input type="text" id="company-name" name="company-name" class="company-name" value="${companyname}" alt="기관명"/></td>
+								class="wht-reg-id" alt="집합교육 일련번호" /><input type="hidden"
-		                    <td><input type="text" id="req-dept" name="req-dept" class="req-dept" value="${partname}" alt="부서명" /></td>
+								id="mode" name="mode" class="mode" alt="data-mode 신청 or 수정" /><input
-		                    <td><input type="text" id="req-position" name="req-position" class="req-position" value="" alt="직급" /></td>
+								type="text" id="req-name" name="req-name" class="req-name"
-		                    <td><input type="text" id="req-tel" name="req-tel" class="req-tel" value="${phone}" alt="연락처"/></td>
+								value="${username}" alt="성명" /></td>
-		                    <td><input type="text" id="req-email" name="req-email" class="req-email" value="${email}" alt="이메일" /></td>
+							<td><input type="text" id="company-name" name="company-name"
+								class="company-name" value="${companyname}" alt="기관명" /></td>
+							<td><input type="text" id="req-dept" name="req-dept"
+								class="req-dept" value="${partname}" alt="부서명" /></td>
+							<td><input type="text" id="req-position" name="req-position"
+								class="req-position" value="" alt="직급" /></td>
+							<td><input type="text" id="req-tel" name="req-tel"
+								class="req-tel" value="${phone}" alt="연락처" /></td>
+							<td><input type="text" id="req-email" name="req-email"
+								class="req-email" value="${email}" alt="이메일" /></td>
 						</tr>
 					</tbody>
 				</table>
@@ -531,9 +547,11 @@
 				<div class="buttons">
 					<button type="button" class="apply-button" id="apply-button">신청하기</button>
 					&nbsp; &nbsp;
-					<button type="button" class="modification-button" id="modification-button">수정하기</button>
+					<button type="button" class="modification-button"
+						id="modification-button">수정하기</button>
 					&nbsp; &nbsp;
-					<button type="button" class="apply-cancel-button" id="apply-cancel-button">신청 취소하기</button>
+					<button type="button" class="apply-cancel-button"
+						id="apply-cancel-button">신청 취소하기</button>
 				</div>
 			</div>
 		</div>

src/main/webapp/WEB-INF/views/visitEducationApplication/inquiry/visitEducationApplicationInquiry.jsp

@@ -3,20 +3,8 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <script type="text/javascript" >
-function doSave(){
+alert('방문교육 서비스 준비중입니다.');
-	var name = document.jusangdoForm.name.value;
+window.location.href="./";
-	var data = document.jusangdoForm.data.value;
-	if(confirm('주상도를 만드시겠습니까?')) {
-		var jusangdo = window.open("/ClipReport4/export/exportForPDF_Jusangdo_Server.jsp?name=" +name + "&data=" +data, "jusangdo", "directories=no,toolbar=no");
-	}
-}
-function doSave2(){
-	var name = document.jusangdoForm.name.value;
-	var data = document.jusangdoForm.data.value;
-	if(confirm('주상도를 만드시겠습니까?')) {
-		var jusangdo = window.open("/ClipReport4/export/exportForPDF_Jusangdo_Server2.jsp?name=" +name + "&data=" +data, "jusangdo", "directories=no,toolbar=no");
-	}
-}
 </script>
 <form name="jusangdoForm" method="post">
 		<!-- 그리드 시작 -->

src/main/webapp/com/css/common.v2.0.css

@@ -3852,6 +3852,47 @@ ul.faq-q > li textarea {
   border: 1px solid #000000;
   box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
 }
+.input-data-modal-content .input-data-modal button.mfp-close-button {
+  position: absolute;
+  right: 0px;
+  top: 0px;
+  width: 60px;
+  height: 60px;
+  background-color: #000;
+  color: #333333;
+}
+.input-data-modal-content .input-data-modal button.mfp-close-button::after {
+  background: #fff;
+  left: 9px;
+  top: 28px;
+  content: "";
+  display: block;
+  background: #fff;
+  height: 2px;
+  width: 40px;
+  position: absolute;
+  transform: rotate(45deg);
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+}
+.input-data-modal-content .input-data-modal button.mfp-close-button::before {
+  background: #fff;
+  left: 9px;
+  top: 28px;
+  content: "";
+  display: block;
+  background: #fff;
+  height: 2px;
+  width: 40px;
+  position: absolute;
+  transform: rotate(-45deg);
+  -webkit-transform: rotate(-45deg);
+  -moz-transform: rotate(-45deg);
+  -ms-transform: rotate(-45deg);
+  -o-transform: rotate(-45deg);
+}
 .input-data-modal-content .input-data-modal .input-data-modal-content .input-data-modal-title {
   font-size: 34px;
   margin-bottom: 45px;

src/main/webapp/com/css/sass/common.v2.0.scss

@@ -3520,6 +3520,53 @@ ul.faq-q > li textarea {
         background-color: #fff;
         border: 1px solid #000000;
         box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+        
+        button.mfp-close-button {
+            position: absolute;
+            right: 0px;
+            top: 0px;
+            width: 60px;
+            height: 60px;
+            background-color: #000;
+            color: #333333;
+            &::after {
+                background: #fff;
+                left: 9px;
+                top: 28px;
+                content: "";
+                display: block;
+                background: #fff;
+                height: 2px;
+                width: 40px;
+                position: absolute;
+                
+                transform: rotate(45deg);
+                -webkit-transform: rotate(45deg);
+                -moz-transform: rotate(45deg);
+                -ms-transform: rotate(45deg);
+                -o-transform: rotate(45deg);    
+            }
+            &::before {
+                background: #fff;
+                left: 9px;
+                top: 28px;
+                content: "";
+                display: block;
+                background: #fff;
+                height: 2px;
+                width: 40px;
+                position: absolute;
+                
+                transform: rotate(-45deg);
+                -webkit-transform: rotate(-45deg);
+                -moz-transform: rotate(-45deg);
+                -ms-transform: rotate(-45deg);
+                -o-transform: rotate(-45deg);
+            }
+        }
+        
+        
+        
         .input-data-modal-content {
             .input-data-modal-title {
                 font-size: 34px;