From 9669fae5d5e7d2b5e3cf3092866763f904d23613 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 21 Mar 2024 16:01:53 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-21=2016:00=20=EC=84=B1=EC=9D=B8=20?=
 =?UTF-8?q?=EC=B0=BE=EA=B5=90=20=EC=84=A4=EB=AC=B8=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oprtn/adultVisitEdu/eduRsltMngDetail.jsp  |  4 +-
 .../adultVisitEdu/eduEnd/eduEndDetail.jsp     |  4 +-
 .../popup/qustnrAdultPrintPopList.jsp         |  2 +
 .../popup/qustnrQRPrintPopList.jsp            |  8 ++-
 .../jsp/web/ve/aplct/sspnIdtmt/main.jsp       | 20 ++++++-
 .../web/ve/comm/eduEndQustnrNoLoginDetail.jsp | 11 ++--
 .../tngrVisitEdu/instrInfo/instrDashboard.jsp | 60 ++++++++++++++++++-
 7 files changed, 94 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp
index ce0937f5..940944d9 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp
@@ -903,10 +903,12 @@
 			</c:choose>			
 
 			<!-- 문항리스트_상세 -->
+			<!-- 
 			<div class="tb_tit01">
 				<p>개인별 만족도 등록자 리스트</p>
 			</div>
-			<c:if test="${!empty chasiSrvyEAList}">
+			 -->
+			<c:if test="${false}">
 			<div class="tb_type01 list2">
 				<table>
 					<colgroup>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
index eca69a86..ba05cab4 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
@@ -1332,7 +1332,7 @@
 	</div>
 	<div class="tb_type02">
 		<table>
-			<caption>교육일정 정보 : 교육희망일, 시간, 배정강사, 설문조사(학생), 설문조사(신청인) 등의 정보제공</caption>
+			<caption>교육일정 정보 : 교육희망일, 시간, 배정강사, 설문조사, 설문조사(신청인) 등의 정보제공</caption>
 			<colgroup>
 				<col style="width: 130px;">
 				<col style="width: auto;">
@@ -1351,7 +1351,7 @@
 				<!-- <th scope="col">인원</th> -->
 <!-- 				<th scope="col">만족도조사(학생)</th> -->
 <!-- 				<th scope="col">만족도조사(신청인)</th> -->
-				<th scope="col">설문조사(학생)</th>
+				<th scope="col">설문조사</th>
 				<th scope="col">설문조사(신청인)</th>
 			</tr>
 			</thead>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp
index eae1d829..5f789ae0 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrAdultPrintPopList.jsp
@@ -344,6 +344,7 @@ $(document).ready(function(){
 							</tbody>
 						</table>
 						
+						<!-- 
 						<br/>			
 						<br/>
 			
@@ -377,6 +378,7 @@ $(document).ready(function(){
 								</tr>
 							</tbody>
 						</table>
+						 -->
 						
 						<br/>
 						<br/>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
index 438131fb..f2778813 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/qustnrQRPrintPopList.jsp
@@ -473,15 +473,17 @@ $(document).ready(function(){
 						}else{					//개발
 							url += "${pageContext.request.scheme}";							
 							url += "://${pageContext.request.serverName}";
+
+							if("${pageContext.request.serverPort}" != '80' || "${pageContext.request.serverPort}" != '443' ){
+								url += ":${pageContext.request.serverPort}";
+							}
 						}		
 		
 						
 						//url += "${pageContext.request.scheme}";
 						//url += "://${pageContext.request.serverName}";
 						
-						if("${pageContext.request.serverPort}" != '80' || "${pageContext.request.serverPort}" != '443' ){
-							url += ":${pageContext.request.serverPort}";
-						}
+
 						url += "${pageContext.request.contextPath}";
 						url += "/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndQustnrNoLoginDetail.do";
 						url += "?qustnrTmplatId=${vEEduChasiVO.qustnrTmplatId}";
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
index 152bbbac..0dc0a206 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
@@ -223,7 +223,15 @@
 								<c:otherwise>
 									<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
 								</c:otherwise>
-							</c:choose>						
+							</c:choose>		
+							
+							<c:if test="${(list.aprvlCd eq '10' or list.aprvlCd eq '20') and list.ddlnCd ne '20'}">
+								<button type="button" class="btnType02" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">취소</button>
+							</c:if>							
+							<c:if test="${list.aprvlCd eq '60' and list.ddlnCd eq '20'}">
+								<button type="button" class="btnType02" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">취소</button>
+							</c:if>							
+											
 						</td>
 						<td>
 								<!-- 신청 승인상태 20 and 현재가 교육종료보다 이후 체크 1 -->
@@ -334,7 +342,15 @@
 								<c:otherwise>
 									<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
 								</c:otherwise>
-							</c:choose>	
+							</c:choose>
+							
+							<c:if test="${(list.aprvlCd eq '10' or list.aprvlCd eq '20') and list.ddlnCd ne '20'}">
+								<button type="button" class="btnType02" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">취소</button>
+							</c:if>							
+							<c:if test="${list.aprvlCd eq '60' and list.ddlnCd eq '20'}">
+								<button type="button" class="btnType02" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">취소</button>
+							</c:if>									
+							
                         </span>
                     </li>
                     <li>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/comm/eduEndQustnrNoLoginDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/comm/eduEndQustnrNoLoginDetail.jsp
index d7612902..5389bba2 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/comm/eduEndQustnrNoLoginDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/comm/eduEndQustnrNoLoginDetail.jsp
@@ -252,7 +252,7 @@
 
 		var qustnrNm			= $("#qustnrNm").val(); 		//설문자명
 		var qustnrBirth		 	= $("#qustnrBirth").val(); 		//설문자생년월일
-		
+/*		
 		if(qustnrNm == null || qustnrNm == ""){
 			alert("설문자 명을 넣어주세요");
 			$("#qustnrNm").focus();
@@ -264,7 +264,7 @@
 			$("#qustnrBirth").focus();
 			return
 		}
-				
+*/				
 		if(confirm("설문결과를 등록 하시겠습니까?")){
 // 			var frm = document.newSrvyPopupForm;
 			var data = new FormData(document.getElementById("listForm"));
@@ -383,6 +383,7 @@
 							</tbody>
 						</table>
 						
+						<!-- 
 						<br/>			
 						<br/>
 			
@@ -410,10 +411,7 @@
 									</th>
 									<td>
 										<label for="qustnrBirth" class="label">설문자명생년월일 입력</label>
-										<!-- 
-										<input type="text" numberOnly class="popupInput" style="width: 50%;" 
-										id="qestnrRespondent" name="qestnrRespondent" value="<c:out value="${qestnrRespondent}" />" onblur="replyCalculation(); return false;">
-										 -->
+
 										
 										<div class="calendar_wrap">
 											<duet-date-picker identifier="date" class="startDate" name="qustnrBirth" id="qustnrBirth" onblur="_chkChasiDate(this); return false;"></duet-date-picker>
@@ -423,6 +421,7 @@
 								</tr>
 							</tbody>
 						</table>
+						 -->
 						
 						<br/>
 						<br/>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp
index 2cde8b0e..9b44ca43 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp
@@ -387,4 +387,62 @@
 <form:form id="listForm" name="listForm" commandName="vEInstrAsgnmVO">
 		<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="" />
 		<input type="hidden" name="eduChasiOrd" id="eduChasiOrd" value="" />
-</form:form>		
\ No newline at end of file
+</form:form>
+
+				<script type="text/javaScript" language="javascript">
+					$(document).ready(function (){
+						var url = "";
+
+				 		var isLocal = '${isLocal}';
+				 		var v_userId	=	$('#userId').val();
+
+						if(isLocal == 'real'){	//운영
+					 		
+					 		//var viewer = new m2soft.crownix.Viewer('https://www.edu-copyright.or.kr/offedu/ReportingServer/service');
+					 		/*
+							url += "${pageContext.request.scheme}";
+							alert(url);
+							url += "://${pageContext.request.serverName}";
+							alert(url);
+							*/
+							url	=	"https://www.edu-copyright.or.kr";
+						}else{					//개발
+							url += "${pageContext.request.scheme}";							
+							url += "://${pageContext.request.serverName}";
+
+							if("${pageContext.request.serverPort}" != '80' || "${pageContext.request.serverPort}" != '443' ){
+								url += ":${pageContext.request.serverPort}";
+							}
+						}		
+		
+						
+						//url += "${pageContext.request.scheme}";
+						//url += "://${pageContext.request.serverName}";
+						
+
+						url += "${pageContext.request.contextPath}";
+						url += "/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndQustnrNoLoginDetail.do";
+						url += "?qustnrTmplatId=${vEEduChasiVO.qustnrTmplatId}";
+						url += "&qestnrId=${vEEduChasiVO.qestnrId}";
+						url += "&qustnrRespondId=${vEEduChasiVO.qustnrRespondId}";
+
+						url += "&siteIdCd=${vEEduChasiVO.siteIdCd}";
+						url += "&eduAplctOrd=${vEEduChasiVO.eduAplctOrd}";
+						url += "&eduChasiOrd=${vEEduChasiVO.eduChasiOrd}";
+						url += "&instrDiv=${vEEduChasiVO.instrDiv}";
+						
+
+						console.log("url====");
+						console.log("${vEEduChasiVO.qustnrTmplatId}");
+						console.log("${vEEduChasiVO.qestnrId}");
+						console.log("${vEEduChasiVO.qustnrRespondId}");
+						console.log(url);
+						console.log("${vEEduChasiVO.siteIdCd}");
+						console.log("${vEEduChasiVO.eduAplctOrd}");
+						console.log("${vEEduChasiVO.eduChasiOrd}");						
+						console.log(url);
+						console.log("url====");
+
+						
+					});
+				</script>		
\ No newline at end of file