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

src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp

@@ -88,7 +88,7 @@ function jstreeInit() {
 		]
 	})
 	.bind('loaded.jstree', function(e, data) {
-		//console.log("jstree loaded");
+		console.log("jstree loaded");
 		//$(this).jstree(true).open_all();
 		$('#kopost_organization').jstree('open_node' , $('#0') )
 	})

src/main/webapp/WEB-INF/jsp/oprtn/otsdCprtnPrcs/eduPrcsMngDetail.jsp

@@ -93,13 +93,19 @@
 					<tr>
 						<th scope="row">종류</th>
 						<td>
-							1<ve:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${info.prcsKind}" warp="span" css="disabled"/>2
+							<input type="checkbox" id="prcsKind01" name="prcsKind" value="01" disabled="disabled"; <c:if test="${fn:contains(info.prcsKind, '01')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind01">신규</label>
+							<input type="checkbox" id="prcsKind012" name="prcsKind" value="02" disabled="disabled"; <c:if test="${fn:contains(info.prcsKind, '02')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind012">갱신</label>
+							<input type="checkbox" id="prcsKind0123" name="prcsKind" value="03" disabled="disabled"; <c:if test="${fn:contains(info.prcsKind, '03')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind0123">의무</label>	
+							<%-- 1<ve:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${info.prcsKind}" warp="span" css="disabled"/>2
 							<br/>
 							3<ve:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${info.prcsKind}" warp="span"/>4
 							<br/>
 							5<ve:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${info.prcsKind}" css="disabled"/>6
 							<br/>
-							7<ve:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${info.prcsKind}"/>8
+							7<ve:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${info.prcsKind}"/>8 --%>
 						</td>
 					</tr>
 					<tr>

src/main/webapp/WEB-INF/jsp/oprtn/otsdCprtnPrcs/eduPrcsMngList.jsp

@@ -175,23 +175,15 @@
 							<p>이름</p>
 						</div>
 						<div class="util_right">
-							<%-- <kc:select codeId="VE0015" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" selectedValue="${vEPrcsDetailVO.prcsDiv}" defaultText="전체" defaultValue=''/> --%>
 							<kc:select codeId="VE0015" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" selectedValue="${vEPrcsDetailVO.prcsDiv}"/>
-							1<kc:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${vEPrcsDetailVO.prcsKind}" warp="span"/>2
-							3<kc:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${vEPrcsDetailVO.prcsKind}"/>4
 					
-							&nbsp;&nbsp;aaaaaaaaaaaaaaa
+							<input type="checkbox" id="prcsKind01" name="prcsKind" value="01" <c:if test="${fn:contains(vEPrcsDetailVO.prcsKind, '01')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind01">신규</label>
+							<input type="checkbox" id="prcsKind012" name="prcsKind" value="02" <c:if test="${fn:contains(vEPrcsDetailVO.prcsKind, '02')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind012">갱신</label>
+							<input type="checkbox" id="prcsKind0123" name="prcsKind" value="03" <c:if test="${fn:contains(vEPrcsDetailVO.prcsKind, '03')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind0123">의무</label>							
 							
-							1<span>
-		<input type="checkbox" id="prcsKind01" name="prcsKind" value="01"> <label class="" for="prcsKind01">신규</label></span><span>
-		<input type="checkbox" id="prcsKind012" name="prcsKind" value="02"> <label class="" for="prcsKind012">갱신</label></span><span>
-		<input type="checkbox" id="prcsKind0123" name="prcsKind" value="03"> <label class="" for="prcsKind0123">의무</label></span>2
-							3
-		<input type="checkbox" id="prcsKind01" name="prcsKind" value="01"> <label class="" for="prcsKind01">신규</label>
-		<input type="checkbox" id="prcsKind012" name="prcsKind" value="02"> <label class="" for="prcsKind012">갱신</label>
-		<input type="checkbox" id="prcsKind0123" name="prcsKind" value="03"> <label class="" for="prcsKind0123">의무</label>4							
-							
-							&nbsp;&nbsp;bbbbbbbbbbbbbbbbbb
 							<input type="text" id="searchKeyword" name="searchKeyword" placeholder="검색어를 입력하세요." title="검색어 입력" class="search_input" value="<c:out value='${vEPrcsDetailVO.searchKeyword}'/>">
 							<button type="button" class="btn_type08" onclick="fncGoList(); return false;">검색</button>
 						</div>
@@ -242,8 +234,9 @@
 									<kc:code codeId="VE0015" code="${list.prcsDiv}"/>
 								</td>
 								<td onclick="fncGoDetail('<c:out value="${list.prcsOrd}"/>');" style="cursor:pointer;">
-									<kc:code codeId="VE0033" joinCode="${list.prcsKind}"/>
+									<c:if test="${fn:contains(list.prcsKind, '01')}">신규</c:if>
-									//${list.prcsKind}///
+									<c:if test="${fn:contains(list.prcsKind, '02')}">갱신</c:if>
+									<c:if test="${fn:contains(list.prcsKind, '03')}">의무</c:if>
 								</td>
 								<td onclick="fncGoDetail('<c:out value="${list.prcsOrd}"/>');" style="cursor:pointer;">
 									<c:out value='${list.prcsNm}'/>									

src/main/webapp/WEB-INF/jsp/oprtn/otsdCprtnPrcs/eduPrcsMngMdfy.jsp

@@ -181,9 +181,13 @@
 					<tr>
 						<th scope="row">종류</th>
 						<td>
-							1<ve:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${info.prcsKind}" warp="span"/>2
+							
-							<br/>3<ve:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${info.prcsKind}"/>4
+							<input type="checkbox" id="prcsKind01" name="prcsKind" value="01" <c:if test="${fn:contains(info.prcsKind, '01')}">checked="checked"</c:if>>
-							//${info.prcsKind}//
+							<label class="" for="prcsKind01">신규</label>
+							<input type="checkbox" id="prcsKind012" name="prcsKind" value="02" <c:if test="${fn:contains(info.prcsKind, '02')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind012">갱신</label>
+							<input type="checkbox" id="prcsKind0123" name="prcsKind" value="03" <c:if test="${fn:contains(info.prcsKind, '03')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind0123">의무</label>	
 						</td>
 					</tr>
 					<tr>

src/main/webapp/WEB-INF/jsp/oprtn/otsdCprtnPrcs/eduPrcsMngReg.jsp

@@ -180,7 +180,14 @@
 					<tr>
 						<th scope="row">종류</th>
 						<td>
-							<ve:checkbox codeId="VE0033" id="prcsKind" name="prcsKind" selectedJoinValue="${info.prcsKind}" warp="span" />
+							
+							<input type="checkbox" id="prcsKind01" name="prcsKind" value="01" <c:if test="${fn:contains(info.prcsKind, '01')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind01">신규</label>
+							<input type="checkbox" id="prcsKind012" name="prcsKind" value="02" <c:if test="${fn:contains(info.prcsKind, '02')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind012">갱신</label>
+							<input type="checkbox" id="prcsKind0123" name="prcsKind" value="03" <c:if test="${fn:contains(info.prcsKind, '03')}">checked="checked"</c:if>>
+							<label class="" for="prcsKind0123">의무</label>	
+							
 						</td>
 					</tr>
 					<tr>

src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp

@@ -100,13 +100,19 @@ function snsShare(snsName) {
 					<ul>
 					  <li>
 					  	<c:forEach var="myOneDepthMenu" items="${menuCurrentResultList}" varStatus="status" begin="0" end="0">
-					  		<button type="button" class="path_btn" title="하위메뉴 열기"><c:out value='${myOneDepthMenu.menuNm}' /></button> <!-- 현재 1뎁스 메뉴 -->
+					  		<button type="button" class="path_btn" title="하위메뉴 열기">
+					  			<c:out value='${myOneDepthMenu.menuNm}' />
+					  		</button> <!-- 현재 1뎁스 메뉴 -->
 					  		<c:set var ="myOneDepthMenuNo" value="${myOneDepthMenu.menuNo}" />
 					  	</c:forEach>
 					  	<ul class="depth oneDepthUl">
 					  		<c:forEach var="allMenu" items="${menuResultList}" varStatus="status">
 					  			<c:if test="${allMenu.depths eq '1' and allMenu.menuNo ne myOneDepthMenuNo}">
-					  				<li id="<c:out value='${allMenu.menuNo}' />"><a href="#"><c:out value='${allMenu.menuNm}' /></a></li><!-- 현재 1뎁스 메뉴가 아닌 1뎁스 메뉴들 -->
+					  				<li id="<c:out value='${allMenu.menuNo}' />">
+					  					<a href="#">
+					  						${allMenu.menuNm}
+					  					</a>
+				  					</li><!-- 현재 1뎁스 메뉴가 아닌 1뎁스 메뉴들 -->
 					  			</c:if>
 					  		</c:forEach>
 						</ul>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndDetail.jsp

@@ -455,6 +455,9 @@
 					</c:choose>
 					 --%>
 					<button type="button" class="btnType01" onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000015299&amp;fileSn=2'" title="거래선 양식 다운로드">거래선 양식 다운로드</button>
+					<p>
+						<span class="cf_text">※ 거래선 파일은 개인정보 수집 및 보호를 위해 반드시 메일(entt@copyright.or.kr)로 제출하시기 바랍니다.</span>
+					</p>
 				</td>
 			</tr>
 			<tr>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrAplctReg.jsp

@@ -535,21 +535,31 @@
 					</c:choose>
 					<td class="t_left">
 						<c:set var="prcsKindList" value="${fn:split(list.prcsKind,',')}" />
-						<c:forEach var="prcsKindInfo" items="${prcsKindList}">
+						<%-- <c:forEach var="prcsKindInfo" items="${prcsKindList}">
 							<c:choose>
-								<c:when test="${prcsKindInfo eq '01'}">
+								<c:when test="${fn:contains(list.prcsKind, '01')}">
 									<span class="tb_icons new">신규</span>
 								</c:when>
-								<c:when test="${prcsKindInfo eq '02'}">
+								<c:when test="${fn:contains(list.prcsKind, '02')'}">
 									<span class="tb_icons renewal">갱신</span>
 								</c:when>
-								<c:when test="${prcsKindInfo eq '03'}">
+								<c:when test="${fn:contains(list.prcsKind, '03')}">
 									<span class="tb_icons duty">의무</span>
 								</c:when>
 								<c:otherwise>
 								</c:otherwise>
 							</c:choose>
-						</c:forEach> 
+						</c:forEach>  --%>
+						
+						<c:if test="${fn:contains(list.prcsKind, '01')}">
+							<span class="tb_icons new">신규</span>
+						</c:if>
+						<c:if test="${fn:contains(list.prcsKind, '02')}">
+							<span class="tb_icons renewal">갱신</span>
+						</c:if>
+						<c:if test="${fn:contains(list.prcsKind, '03')}">
+							<span class="tb_icons duty">의무</span>
+						</c:if>
 						
 						${list.prcsNm}
 					</td>