Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java

@@ -57,7 +57,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	
 	private String mergeStatus;			//excel 등록시 병합상태	null or 병합
 	
-	
+	private String cmptntAthrtNm;			// 관할청이름 - 의뢰통지서 첨부파일에 사용
 	
 	
 
@@ -288,5 +288,11 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	            + ", rmrks=[" + rmrks + "] // 비고\n"
 	            ;
 	}
+	public String getCmptntAthrtNm() {
+		return cmptntAthrtNm;
+	}
+	public void setCmptntAthrtNm(String cmptntAthrtNm) {
+		this.cmptntAthrtNm = cmptntAthrtNm;
+	}
 	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java

@@ -648,6 +648,21 @@ public class CndtnTrgtMngController {
 	        modelAndView.addObject("sspnIdtmtTrgtOrd", cndtnTrgtInfoMngVO.getSspnIdtmtTrgtOrd());
 	        modelAndView.addObject("result", "success");
 	        
+	        //첨부파일 이름 변경하기
+	        List<FileVO> result = new ArrayList<>();
+    		FileVO fileCheck = new FileVO(); 
+    		fileCheck.setAtchFileId(s_scholSealAtchFileId);
+			result = fileService.selectFileInfs(fileCheck);
+			
+			for(int i=0; i < result.size(); i++) {
+				cndtnTrgtInfoMngVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO);
+				String orignlFileNm = cndtnTrgtInfoMngVO.getTrgtNm() + "_"+cndtnTrgtInfoMngVO.getDBirth()+"_"+cndtnTrgtInfoMngVO.getCmptntAthrtNm();
+				orignlFileNm = orignlFileNm+"_"+(i+1);
+				orignlFileNm = orignlFileNm +"."+ result.get(i).getFileExtsn();
+				result.get(i).setOrignlFileNm(orignlFileNm);
+				fileService.updateFileName(result.get(i));
+			}
+			
 		}catch(Exception ex) {
 			ex.printStackTrace();
 	        modelAndView.addObject("result", "fail");
@@ -1118,7 +1133,23 @@ public class CndtnTrgtMngController {
 		//수정
 		cndtnTrgtInfoMngService.update(cndtnTrgtInfoMngVO);
 		
+		try {
+	        //첨부파일 이름 변경하기
+    		FileVO fileCheck = new FileVO(); 
+    		fileCheck.setAtchFileId(s_scholSealAtchFileId);
+			result = fileService.selectFileInfs(fileCheck);
 			
+			for(int i=0; i < result.size(); i++) {
+				cndtnTrgtInfoMngVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO);
+				String orignlFileNm = cndtnTrgtInfoMngVO.getTrgtNm() + "_"+cndtnTrgtInfoMngVO.getdBirth()+"_"+cndtnTrgtInfoMngVO.getCmptntAthrtNm();
+				orignlFileNm = orignlFileNm+"_"+(i+1);
+				orignlFileNm = orignlFileNm +"."+ result.get(i).getFileExtsn();
+				result.get(i).setOrignlFileNm(orignlFileNm);
+				fileService.updateFileName(result.get(i));
+			}
+		}catch(Exception ex){
+			System.out.println("error");
+		}
 		modelAndView.addObject("result", "success");
 		
 		return modelAndView;

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp

@@ -96,7 +96,7 @@
 				}
 			});
 			
-			
+			searchOptions = $("#searchSelStatusTemp").html();
 		});
 		
 		function searchInit(){
@@ -316,13 +316,18 @@
 			form.target = "_duplChkPopup";
 			form.submit();  
 		}		
-		
+		//기본  select2 option 세팅. 값은 document.ready에서 세팅
-/* 		function srchCndt2Chg(){
+		var searchOptions;
-			alert("1234");
+ 		function srchCndt2Chg(value){
-			$(".select2-results__option").each(function(index, item){
+			if(value != ''){
-			 	alert("1234");
+				$(".select2-search").click()
-			})	
+				$(".select2-results__option").each(function(index, item){
-		} */
+					if($(this).html().indexOf(value) == -1 ){
+						$(this).hide();
+					}
+				})	
+			}
+		}
 	</script>
 	<title>교육과정관리</title>
 </head>
@@ -436,21 +441,23 @@
 						</div>
 						<div class="util_right">
 							<p>관할청&nbsp;&nbsp;</p>
-							<!-- <select name="srchCndt2" id="srchCndt2" class="sel_type1" onchange="srchCndt2Chg();">
+							<select name="srchCndt2" id="srchCndt2" class="sel_type1" onchange="srchCndt2Chg(this.value);">
 								<option value="">지역</option>
 								<option value="광주">광주</option>
 								<option value="대구">대구</option>
-								<option value="대전">부산</option>
+								<option value="대전">대전</option>
-								<option value="서울">수원</option>
+								<option value="부산">부산</option>
+								<option value="서울">서울</option>
+								<option value="수원">수원</option>
 								<option value="울산">울산</option>
-								<option value="의정">의정부</option>
+								<option value="의정">의정</option>
 								<option value="인천">인천</option>
 								<option value="전주">전주</option>
 								<option value="제주">제주</option>
 								<option value="창원">창원</option>
 								<option value="청주">청주</option>
 								<option value="춘천">춘천</option>
-							</select> -->
+							</select>
 							
 							<select name="searchSelStatusTemp" id="searchSelStatusTemp" class="sel_type1" multiple="multiple" style="width: 75%">
 								<c:forEach var="list" items="${CmmnDetailCodeList}" varStatus="status">

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp

@@ -159,7 +159,7 @@
 		{
 			return false;
 		}
-		
+		document.getElementById("cmptntAthrtNm").value = $("#cmptntAthrt option:selected").text();
 		var data = new FormData(document.getElementById("createForm"));
 
 		//첨부파일 등록 처리-step2
@@ -326,6 +326,7 @@
 <input type="hidden" name="sspnIdtmtTrgtOrd" value="<c:out value='${info.sspnIdtmtTrgtOrd}' />"/>
 <input type="hidden" name="atchFileId" value="<c:out value='${info.atchFileId}' />" />
 <input type="hidden" name="reqNmbr" value="<c:out value="${info.reqNmbr }" />" />
+<input type="hidden" name="cmptntAthrtNm" id="cmptntAthrtNm" value="" />
 <!-- cont -->
 <div class="cont_wrap">
 	<div class="box">

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp

@@ -57,8 +57,8 @@
 			return false;
 		}
 
+		document.getElementById("cmptntAthrtNm").value = $("#cmptntAthrt option:selected").text();
 		var data = new FormData(document.getElementById("createForm"));
-		
 		//첨부파일 등록 처리-step2
 		_fileForm2.forEach(function(obj, idx) {
 			if (obj) data.append("file"+idx, obj.fileObj);
@@ -332,6 +332,7 @@
 </form:form>
 <form:form id="createForm" name="createForm" commandName="adjustDeptManageVO" method="post">
 <input type="hidden" name="sspnIdtmtTrgtOrd" id="sspnIdtmtTrgtOrd" value="" />
+<input type="hidden" name="cmptntAthrtNm" id="cmptntAthrtNm" value="" />
 
 
 <!-- cont -->

src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp

@@ -245,7 +245,7 @@ function instrChk(){
 			<div class="slide_control">
 				<div class="inner">
 					<div class="swiper-pagination"></div>
-					<button type="button" class="slide_pause" title="슬라이드 일시정지"></button>
+					<button type="button" class="slide_pause slide_util" title="슬라이드 일시정지"></button>
 				</div>
 			</div>
 		</div>
@@ -401,7 +401,7 @@ function instrChk(){
 						<div class="swiper-button-prev"></div>
 						<p class="slide_number"><span class="cur_number">1</span>/ <span class="all_number">5</span></p>
 						<div class="swiper-button-next"></div>
-						<button type="button" class="slide_pause" title="슬라이드 일시정지"></button>
+						<button type="button" class="slide_pause notify_slide_util" title="슬라이드 일시정지"></button>
 					</div>
 				</div>
 				<div class="content">

src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp

@@ -1197,6 +1197,7 @@ function _chkChasiTime(p_this){
 				tr.find('select[name=divCd]').val(value.divCd);
 				tr.find('input[name=trgt]').val(value.trgt);
 				tr.find('input[name=prsnl]').val(value.prsnl);
+				
 			},1000)
 			
 // 			console.log('tr :: ', tr);

src/main/webapp/visitEdu/usr/publish/css/content.css

@@ -125,7 +125,7 @@
 .list_util:only-child{width: 100%;}
 .list_util select{width: 150px; height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding-left: 14px; font-size: 16px; color: #222; background-image: url(../../../adm/publish/image/icon_cont_select.png); background-repeat: no-repeat; background-position: calc(100% - 15px) center; margin-right: 3px; color: #555;}
 .list_util input{width: 280px; height: 38px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 0 0 14px; font-size: 16px; margin-right: 3px;}
-.list_util input::placeholder,.list_util input:-ms-input-placeholder{font-size: 16px; color: #999;}
+.list_util input::placeholder,.list_util input:-ms-input-placeholder{font-size: 16px; color: #666;}
 .list_util button{width: 80px; height: 40px; font-size: 18px; font-weight: 400; background-color: #ed5908; color: #fff; vertical-align: middle; border-radius: 5px; transition: all 0.1s linear;}/* background-color: #f48105 */
 .list_util button:hover{box-shadow: 0 0 5px rgba(0,0,0,0.3); background-color: #d62b09; transition: all 0.1s linear;}
 .list_util .btn_info{width: auto; background-color: #f5f5f5; color: #555; padding: 0 15px;}
@@ -175,7 +175,7 @@
 input {border: 1px solid #d5d5d5; border-radius: 5px;}
 input[type="text"] {height: 40px; padding: 0 15px; font-size: 16px; color: #222; box-sizing: border-box;}
 input[type="text"]:read-only {background-color: #f5f5f5; border: 1px solid #d5d5d5;}
-input[type="text"]::placeholder {color: #999;}
+input[type="text"]::placeholder {color: #666;}
 input[type="text"]:valid {color: #555;}
 input[type="checkbox"]+label {color: #555; font-size: 16px; font-weight: 400; line-height: 1; vertical-align: middle;}
 input[type="radio"]+label {color: #555; font-size: 16px; font-weight: 400; line-height: 1; vertical-align: middle;}
@@ -261,7 +261,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa
 .tb_type01>table>tbody>tr>td input[type="checkbox"]+label {margin-right: 10px;}
 .tb_type01>table>tbody>tr>td input[type="password"] {height: 40px;padding: 0 15px; border-radius: 5px; font-size: 16px;}
 .tb_type01>table>tbody>tr>td textarea {width: 100%; height: 90px; margin: 9px 0; font-size: 16px; padding: 10px 15px; box-sizing: border-box;}
-.tb_type01>table>tbody>tr>td textarea::placeholder {color: #999;}
+.tb_type01>table>tbody>tr>td textarea::placeholder {color: #666;}
 .tb_type01>table>tbody>tr>td>.btnType01 {height: 40px; padding: 0 20px; font-size: 17px; vertical-align: middle; margin-left: 3px; border-radius: 5px;}
 .tb_type01 table tbody tr td .responseItem {margin-bottom: 10px;}
 .tb_type01 table tbody tr td .responseItem:last-child {margin-bottom: 0;}

src/main/webapp/visitEdu/usr/publish/script/content.js

@@ -668,6 +668,12 @@ function addEduClassCopyTngr(target) {
 
 	cloneObj.find(".calendar_th").append('<div class="calendar_wrap"><duet-date-picker identifier="date" class="startDate' + duetdateleng + '" name="eduHopeDt"></duet-date-picker></div>');
 	
+	//웹접근성>달력 버튼 title추가
+	setTimeout(function(){
+		cloneObj.find(".duet-date__toggle").attr("title","달력팝업 열림");
+	},100)
+	
+
 	if (target == 'addClassRowClsrm') {
 		len = parent.find('tbody > tr').not('.calendar_wrap tr').length;
 		cloneObj.find(">td:first").text(len + 1);

src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js

@@ -46,6 +46,9 @@ $(window).on('load',function(){
 	setTimeout(function(){
 		$(".startDate .duet-date__input").attr("title","검색 시작날짜를 YYYY.MM.DD 형식으로 입력해주세요");
 		$(".endDate .duet-date__input").attr("title","검색 종료날짜를 YYYY.MM.DD 형식으로 입력해주세요");
+		
+		//웹접근성>달력 버튼 title추가
+		$(".duet-date__input-wrapper .duet-date__toggle").attr("title","달력팝업 열림");
 	},100)
 	
 	

src/main/webapp/visitEdu/usr/publish/script/duetdatepicker2.js

@@ -10,6 +10,10 @@ $(window).on('load',function(){
 			$(itm).attr("name","eduHopeDt"+idx);
 			$(itm).attr("id","eduHopeDt"+idx);
 		})
+		
+		//웹접근성>달력 버튼 title추가
+		$(".duet-date__input-wrapper .duet-date__toggle").attr("title","달력팝업 열림");
+		
 		/*$(".startDate .duet-date__input").attr("name","eduHopeDt1");
 		$(".startDate .duet-date__input").attr("id","eduHopeDt1");*/
 	},100);

src/main/webapp/visitEdu/usr/publish/script/main.js

@@ -59,7 +59,7 @@ $(document).ready(function () {
     }
   });
   
-  // 슬라이드 포커싱 시 멈춤/재생
+  /*슬라이드 포커싱 시 멈춤/재생 (백업)
   $('.visual_slide .swiper-slide a').focusin(function(){
 	  visualSlide.autoplay.stop();
   });
@@ -87,6 +87,49 @@ $(document).ready(function () {
     }
   });
 
+  $(".notify .slide_pause").click(function () { // 중지버튼 눌렀을때
+    if ($(this).hasClass('slide_play')) {
+      $(this).removeClass('slide_play').attr('title', '슬라이드 일시정지').addClass("slide_pause");
+      notifySlide.autoplay.start();
+    } else {
+     $(this).removeClass('slide_pause').attr('title', '슬라이드 재생').addClass("slide_play");
+      notifySlide.autoplay.stop();
+    }
+  });*/
+  
+  
+  // 웹접근성 슬라이드 포커싱 시 멈춤/재생 수정
+  $('.visual_slide .swiper-slide a').focusin(function(){
+	  visualSlide.autoplay.stop();
+	  $(".visual_slide .slide_util").addClass('slide_play').attr('title', '슬라이드 재생')
+  });
+  
+  /*$('.visual_slide .swiper-slide a').focusout(function(){
+	  visualSlide.autoplay.start();
+  })*/
+  
+  $('.notify_slide .swiper-slide').focusin(function(){
+	  notifySlide.autoplay.stop();
+	  $(".notify .notify_slide_util").addClass('slide_play').attr('title', '슬라이드 재생')
+  });
+  
+  /*$('.notify_slide .swiper-slide').focusout(function(){
+	  notifySlide.autoplay.start();				
+  })*/
+
+
+  $(".visual_slide .slide_pause").click(function (e) { // 중지버튼 눌렀을때
+    if ($(this).hasClass('slide_play')) {
+      $(this).removeClass('slide_play').attr('title', '슬라이드 일시정지').addClass("slide_pause");
+      visualSlide.autoplay.start();
+    } else {
+      $(this).removeClass('slide_pause').attr('title', '슬라이드 재생').addClass("slide_play");
+      visualSlide.autoplay.stop();
+     
+    }
+  });
+  
+  
   $(".notify .slide_pause").click(function () { // 중지버튼 눌렀을때
     if ($(this).hasClass('slide_play')) {
       $(this).removeClass('slide_play').attr('title', '슬라이드 일시정지').addClass("slide_pause");
@@ -96,5 +139,4 @@ $(document).ready(function () {
       notifySlide.autoplay.stop();
     }
   });
-
 })