diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java index 433e68bb..7215f8d4 100644 --- a/src/main/java/nlib/cmm/web/MainController.java +++ b/src/main/java/nlib/cmm/web/MainController.java @@ -17,6 +17,9 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; +import nlib.bbs.service.ArticleVO; +import nlib.bbs.service.BoardService; +import nlib.bbs.service.QnaService; import nlib.cmm.NlibCommonController; import nlib.cmm.service.CodeService; import nlib.cmm.service.MainService; @@ -65,6 +68,12 @@ public class MainController extends NlibCommonController { @Resource(name = "mainService") private MainService mainService; + @Resource(name = "ancmntService") + private BoardService ancmntService; + + @Resource(name = "qnaService") + private QnaService qnaService; + @RequestMapping( {"/index.do"} ) public String setContent( HttpServletRequest request, @@ -78,6 +87,10 @@ public class MainController extends NlibCommonController { String mngOrgCd = getCurCouncilCd(request); + //------------------------------------------------ + // 추천 자료 관련 + //------------------------------------------------ + // 추천키워드 List> listKeywords = mainService.listKeywords(mngOrgCd); model.addAttribute("listKeywords", listKeywords); @@ -107,10 +120,27 @@ public class MainController extends NlibCommonController { model.addAttribute("listPops", listPops); model.addAttribute("listTypeDivCodes", listTypeDivCodes); - // 온라인자료관 model.addAttribute("listOnline", mainService.listOnline(mngOrgCd)); - + + //------------------------------------------------ + // 게시판관련 + //------------------------------------------------ + ArticleVO searchArticleVO = new ArticleVO(); + searchArticleVO.setPageIndex(1); + searchArticleVO.setPageSize(3); + searchArticleVO.setMngOrgCd(getCurCouncilCd(request)); + + // 공지사항 + List listAncmnt = ancmntService.listArticles(searchArticleVO); + model.addAttribute("listAncmnt", listAncmnt); + + // Q&A + String mbInfoId = getMbInfoId(request); + searchArticleVO.setLoginedMbInfoId(mbInfoId); + List listQna = qnaService.listArticles(searchArticleVO); + model.addAttribute("listQna", listQna); + return "nlib/cmm/home"; } diff --git a/src/main/java/nlib/col/service/ReadService.java b/src/main/java/nlib/col/service/ReadService.java index 4309af43..d536a404 100644 --- a/src/main/java/nlib/col/service/ReadService.java +++ b/src/main/java/nlib/col/service/ReadService.java @@ -47,7 +47,7 @@ public interface ReadService { * @param mngOrgCd * @return */ - public List insertReadItems(List list, String mbInfoId, CollectionVO readVO) throws Exception; + public List insertReadItems(List list, String mbInfoId, CollectionVO readVO, boolean fromCart) throws Exception; /** diff --git a/src/main/java/nlib/col/service/impl/ReadServiceImpl.java b/src/main/java/nlib/col/service/impl/ReadServiceImpl.java index b199e81b..572c3f02 100644 --- a/src/main/java/nlib/col/service/impl/ReadServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/ReadServiceImpl.java @@ -27,6 +27,9 @@ public class ReadServiceImpl implements ReadService { @Resource(name="readDAO") private ReadDAO readDAO; + @Resource(name="cartDAO") + private CartDAO cartDAO; + @Resource(name="informService") private InformService informService; @@ -53,7 +56,7 @@ public class ReadServiceImpl implements ReadService { * @param mngOrgCd * @return */ - public List insertReadItems(List list, String mbInfoId, CollectionVO readVO) throws Exception { + public List insertReadItems(List list, String mbInfoId, CollectionVO readVO, boolean fromCart) throws Exception { if(list == null || list.size() < 1) { log.error("insertReadItems > 열람 신청 대상 목록이 없습니다."); @@ -130,9 +133,26 @@ public class ReadServiceImpl implements ReadService { reqVO.putInfoItem("jsonMasterId", jsonMasterId); resVO = dataApi.request(reqVO); - CollectionVO rVO = null; cVO.setResult(resVO.getResultCode(), resVO.getResultMessage()); + // 카트에서 신청하여 성공한 경우, 카트 처리완료 변경 작업 + if(resVO != null && resVO.getResultCode() != null && resVO.getResultCode().startsWith("S") && fromCart) { + CollectionVO vVO = null; + for(int i=0; i changeCartProcDivCd=" + retUpdateProc); + } + } + } + readVO.setResultCode(resVO.getResultCode()); readVO.setResultMessage(resVO.getResultMessage()); @@ -140,8 +160,8 @@ public class ReadServiceImpl implements ReadService { if(StringUtil.startsWithIgnoreCase(resVO.getResultCode(), "S")) { readVO.setHopeReqPridDtmFrom(StringUtil.formatDateStr(resVO.getInfoItem("hopeReqPridDtmFrom", ""),"")); readVO.setHopeReqPridDtmTo(StringUtil.formatDateStr(resVO.getInfoItem("hopeReqPridDtmTo", ""),"")); - readVO.setRsrvId(resVO.getInfoItem("reqId", "")); // 열람신청번호 - readVO.setRsrvId(resVO.getInfoItem("reqDd", "")); // 열람신청일자 + readVO.setReqId(resVO.getInfoItem("reqId", "")); // 열람신청번호 + readVO.setReqDd(resVO.getInfoItem("reqDd", "")); // 열람신청일자 readVO.setSelItems(resVO.getInfoItem("masterId")); // 자료번호 } else { readVO.setRsrvId(null); // 열람신청번호 diff --git a/src/main/java/nlib/col/web/ReadController.java b/src/main/java/nlib/col/web/ReadController.java index 078215ff..95301fd7 100644 --- a/src/main/java/nlib/col/web/ReadController.java +++ b/src/main/java/nlib/col/web/ReadController.java @@ -149,7 +149,7 @@ public class ReadController extends NlibCommonController { List list = collectionService.makeListOfCollectionVO(selItems); - list = readService.insertReadItems(list, mbInfoId, readVO); + list = readService.insertReadItems(list, mbInfoId, readVO, fromCart); list = collectionService.setDetailInfoForList(list, mbInfoId, NlibProperty.getString("thumbnail.image.url.small")); model.addAttribute("readVO", readVO); @@ -267,15 +267,15 @@ public class ReadController extends NlibCommonController { resultMessage = "로그인하신 후, 이용바랍니다."; } - if(StringUtil.isEmpty(searchVO.getMngOrgCd())) { + if(resultMessage != null && StringUtil.isEmpty(searchVO.getMngOrgCd())) { resultMessage = "문화원정보가 부적합합니다. 다시 요청하여 주시기 바랍니다."; } - if(StringUtil.isEmpty(searchVO.getReqId())) { + if(resultMessage != null && StringUtil.isEmpty(searchVO.getReqId())) { resultMessage = "취소할 방문열람신청번호 정보가 부적합합니다. 다시 요청하여 주시기 바랍니다."; } - if(StringUtil.isEmpty(searchVO.getMasterId())) { + if(resultMessage != null && StringUtil.isEmpty(searchVO.getMasterId())) { resultMessage = "취소할 자료정보 정보가 부적합합니다. 다시 요청하여 주시기 바랍니다."; } diff --git a/src/main/java/nlib/util/StringUtil.java b/src/main/java/nlib/util/StringUtil.java index bc1f0065..46e1d564 100644 --- a/src/main/java/nlib/util/StringUtil.java +++ b/src/main/java/nlib/util/StringUtil.java @@ -273,11 +273,9 @@ public class StringUtil extends StringUtils { if(isEmpty(dateStr)) return defaultStr; String tmpDateStr = dateStr.trim(); - switch(tmpDateStr.length()) { - case 4 : return dateStr; // 연도만 있는 경우 - case 6 : return tmpDateStr.substring(0, 4) + "-" + tmpDateStr.substring(4); // YYYY-MM - case 8 : return tmpDateStr.substring(0, 4) + "-" + tmpDateStr.substring(4, 6) + "-" + tmpDateStr.substring(6); // YYYY-MM-DD - } + if(4 <= tmpDateStr.length() && tmpDateStr.length() < 6) return tmpDateStr.substring(0, 4); // 연도만 있는 경우 + else if(6 <= tmpDateStr.length() && tmpDateStr.length() < 8) return tmpDateStr.substring(0, 4) + "-" + tmpDateStr.substring(4, 6); // YYYY-MM + else if(8 <= tmpDateStr.length()) return tmpDateStr.substring(0, 4) + "-" + tmpDateStr.substring(4, 6) + "-" + tmpDateStr.substring(6, 8); // YYYY-MM-DD return defaultStr; } diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml index 764f59ad..63d35303 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -21,7 +21,6 @@ AND RM.REG_STATUS = 'REG_OK' AND RM.USE_FLAG = 'Y' AND RM.OPER_READ_RANGE_CD IN ('01','02') - AND IFNULL(RM.BOOKCASE_ID, '') != '' /* 서가배치자료 */ ) T GROUP BY T.KEY_NAME ORDER BY CNT DESC, T.KEY_NAME @@ -137,35 +136,31 @@ , M.DTLS_TYPE_DIV_CD , C2.S_CODE_NM DTLS_TYPE_DIV_NM , M.SUBJECT_CODE - , CONCAT( - NVL(( - SELECT CONCAT(CLSF_NM, ' > ') - FROM CT_CLSF - WHERE CLSF_ID = ( - SELECT UP_CLSF_ID FROM CT_CLSF - WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35)) ) - AND UP_CLSF_ID = '2') , '') - , (SELECT CLSF_NM FROM CT_CLSF WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35))) - ) AS SUBJECT_NM + , ( SELECT CLSF_NM + FROM CT_CLSF + WHERE CLSF_ID = ( + SELECT UP_CLSF_ID FROM CT_CLSF + WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35)) ) + AND UP_CLSF_ID = '2') AS SUBJECT_NM_UP + , (SELECT CLSF_NM FROM CT_CLSF WHERE CLSF_ID = CAST(M.SUBJECT_CODE AS CHAR(35))) AS SUBJECT_NM , M.MOD_DD , M.ORG_NM , M.CREAT_YYYY , M.RPRS_THUMB_URL - , IFNULL(M.M_INTERFACE_ID, IFNULL(M.INTERFACE_ID, '')) AS INTERFACE_ID + , IFNULL(M.M_INTERFACE_ID, '') AS INTERFACE_ID FROM RG_MASTER M LEFT OUTER JOIN SM_CODE_S C1 ON M.TYPE_DIV_CD = C1.S_CODE_ID AND C1.L_CODE_ID = 'MASTER_TYPE_DIV_CD' LEFT OUTER JOIN SM_CODE_S C2 ON M.DTLS_TYPE_DIV_CD = C2.S_CODE_ID AND C2.L_CODE_ID = 'DTLS_TYPE_DIV_CD' WHERE M.MNG_ORG_CD = #{mngOrgCd} AND M.OPEN_DIV_CD = '1' /* 공개구분 : 공개 */ - AND M.REG_STATUS = 'REG_OK' /* 등록상태 : 등록완료 */ + /* AND M.REG_STATUS = 'REG_OK' -- DDDDDDDDDDDDDDDDD 확인데이터 없어서 임시 주석 막음 */ /* 등록상태 : 등록완료 */ AND M.USE_FLAG = 'Y' AND IFNULL(M.PE_STATUS, '') = '' /* 보존상태 */ AND M.DIGITAL_READ_YN = 'Y' /* 디지탈열람여부 */ - /* AND IFNULL(M.RPRS_THUMB_URL, '') != '' */ /* 썸네일존재하는 건 */ - AND IFNULL(M.M_INTERFACE_ID, IFNULL(M.INTERFACE_ID, '')) != ''/* IF존재하는 건 */ + AND IFNULL(M.M_INTERFACE_ID, '') != ''/* IF존재하는 건 */ ORDER BY M.MOD_DD DESC LIMIT 10 ]]> - + \ No newline at end of file diff --git a/src/main/resources/egovframework/mapper/nlib/col/CartDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/col/CartDAO_SQL.xml index d906b72e..89de712f 100644 --- a/src/main/resources/egovframework/mapper/nlib/col/CartDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/col/CartDAO_SQL.xml @@ -57,6 +57,7 @@ WHERE MB_INFO_ID = #{mbInfoId} AND MASTER_ID = #{masterId} AND DELETE_YN = 'N' + AND IFNULL(A.CART_PROC_DIV_CD, 'N') = 'N' diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index a93818a3..96530c30 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -85,9 +85,9 @@ list.paging.page.size = 10 #---------------------------------------- # \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 # \ub85c\uceec LLLLLLLLLLLLLLL -fileupload.base.path = C:/iams/workspace/nlib/data/fileupload +#fileupload.base.path = C:/iams/workspace/nlib/data/fileupload # \uac1c\ubc1c\uc11c\ubc84 -#fileupload.base.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/data/fileupload +fileupload.base.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/data/fileupload # \uc784\uc2dc \uc800\uc7a5 \uc704\uce58 fileupload.temp.subpath = /temp @@ -98,13 +98,13 @@ fileupload.bbs.ancmnt.subpath = /bbs/ancmnt # \uba54\uc77c \uacbd\ub85c # \ub85c\uceec LLLLLLLLLLLLLLL -mailing.sender.membership.signUpTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html -mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html -mailing.sender.membership.certTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/cert_mail_template.html +#mailing.sender.membership.signUpTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html +#mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html +#mailing.sender.membership.certTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/cert_mail_template.html # \uac1c\ubc1c\uc11c\ubc84 -#mailing.sender.membership.signUpTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/signUp_mail_template.html -#mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html -#mailing.sender.membership.certTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/cert_mail_template.html +mailing.sender.membership.signUpTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/signUp_mail_template.html +mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html +mailing.sender.membership.certTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/cert_mail_template.html #\uba54\uc77c \uc774\ubbf8\uc9c0 \uacbd\ub85c # \ub85c\uceec diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/insertQnA.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/insertQnA.jsp deleted file mode 100644 index 0141de3f..00000000 --- a/src/main/webapp/WEB-INF/jsp/nlib/board/insertQnA.jsp +++ /dev/null @@ -1,83 +0,0 @@ -<% -/** - * 
- * @Class Name : getSampleInfo.jsp
- * 
- * @Description : RESTful API 호출 샘플
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 6. 15. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 6. 15. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> -QRCode 회원정보 - - - - -${pageTitle} - - - - - - - - - - - -
- - - - - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/insertQnAForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/insertQnAForm.jsp deleted file mode 100644 index 3630c36e..00000000 --- a/src/main/webapp/WEB-INF/jsp/nlib/board/insertQnAForm.jsp +++ /dev/null @@ -1,207 +0,0 @@ -<% -/** - * 
- * @Class Name : insertQnAForm.jsp
- * 
- * @Description : 묻고답하기 등록화면을 표출한다. 
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 7. 13. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 7. 13. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - -묻고답하기 - 등록 - - - - -${pageTitle} - - - - - - - - - - - - -

${pageTitle }

- -메시지 : ${message } -
- -
- - - - - - - - -  
-  
- - - - - - - - - - - - - - - - - - - - - - -
제목
작성자
비밀번호
- * 비밀번호 : SHA-256 암호화 처리 후, DB에 저장되며, 웹 화면에 표출될 때는 Aria로 AuthKey를 Salt값으로 하여 재암호화처리하고 BASE64로 다시한번 인코딩하여 표출함 -
이메일
질문내용
- -
- - - - -
- - 
- 
- 
- -
-
-
-
- 이곳에 파일을 끌어다 놓거나, 클릭하여 올릴 파일을 선택하세요. -
-
-
- - - diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/listFAQs.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/listFAQs.jsp deleted file mode 100644 index 1b540a8e..00000000 --- a/src/main/webapp/WEB-INF/jsp/nlib/board/listFAQs.jsp +++ /dev/null @@ -1,253 +0,0 @@ -<% -/** - * 
- * @Class Name : listFAQs.jsp
- * 
- * @Description : FAQ 목록 화면 
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 8. 3. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 8. 3. - * @version 1.0 - * - */ - %> - <%@ page language="java" contentType="text/html; charset=UTF-8" %> - <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> - <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> - <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - - FAQ - - - - - ${pageTitle} - - - - - - - - - - - -

${pageTitle }

- - 메시지 : ${message} -  
-
- - - - - - - - - -
- class="selected" >전체 - - ')" class="selected" > - - - -
- - - - -
- - - - diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/listNotices.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/listNotices.jsp deleted file mode 100644 index ff2f0702..00000000 --- a/src/main/webapp/WEB-INF/jsp/nlib/board/listNotices.jsp +++ /dev/null @@ -1,236 +0,0 @@ -<% -/** - * 
- * @Class Name : listNotices.jsp
- * 
- * @Description : 공지사항 목록을 조회한다.
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 6. 15. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 6. 15. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - -공지사항 - - - - -${pageTitle} - - - - - - - - - - - -

${pageTitle }

- -메시지 : ${message} - 
-
- - - - - - - - - -
- - - - -
- - - - diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/listQnAs.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/listQnAs.jsp deleted file mode 100644 index 7885b7bd..00000000 --- a/src/main/webapp/WEB-INF/jsp/nlib/board/listQnAs.jsp +++ /dev/null @@ -1,192 +0,0 @@ -<% -/** - * 
- * @Class Name : listQnAs.jsp
- * 
- * @Description : 묻고답하기 목록을 조회한다.
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 7. 13. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 7. 13. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - -묻고답하기 - - - - -${pageTitle} - - - - - - - - - - - -

${pageTitle }

- -메시지 : ${message} - 
-
- - - - - - - - -
- - - - - - -
- - - diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/selectNotice.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/selectNotice.jsp deleted file mode 100644 index f2718c43..00000000 --- a/src/main/webapp/WEB-INF/jsp/nlib/board/selectNotice.jsp +++ /dev/null @@ -1,197 +0,0 @@ -<% -/** - * 
- * @Class Name : selectNotice.jsp
- * 
- * @Description : 공지사항 상세내용을 조회한다.
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 7. 22. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 7. 22. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - -공지사항 - 상세조회 - - - - -${pageTitle} - - - - - - - -

${pageTitle }

- -메시지 : ${message } -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
유형${article.articleTypeName }작성일${article.regDate }
제목${article.title}
질문내용${article.contentNotice}
- <% - // 파일정보 : 저장파일ID=원파일명 - %> - - - - ${fInfo[1]}
- -
- -
- - - - - - - - - - - - - - -
이전글${preArticle.articleTypeName }${preArticle.title }작성일 : ${preArticle.regDate }
다음글${nextArticle.articleTypeName }${nextArticle.title }작성일 : ${nextArticle.regDate }
- - - - -
- -
- - -
- - - -
- - - diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/selectQnA.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/selectQnA.jsp deleted file mode 100644 index ee0f469b..00000000 --- a/src/main/webapp/WEB-INF/jsp/nlib/board/selectQnA.jsp +++ /dev/null @@ -1,217 +0,0 @@ -<% -/** - * 
- * @Class Name : selectQnA.jsp
- * 
- * @Description : 묻고답하기 상세내용을 조회한다.
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 7. 22. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 7. 22. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - -묻고답하기 - 상세조회 - - - - -${pageTitle} - - - - - - - -

${pageTitle }

- -메시지 : ${message } -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
유형${article.articleTypeName }작성자 : ${article.regUserName }작성일 : ${article.regDate }상태 : ${article.repStatus }
질문내용${article.contentQeust}
- <% - // 파일정보 : 저장파일ID=원파일명 - %> - - - - ${fInfo[1]}
- -
답변내용${article.contentReply}
- <% - // 파일정보 : 저장파일ID=원파일명 - %> - - - - ${fInfo[1]}
- - -
- -
- - - - - - - - - - - - - - - - - - -
이전글${preArticle.articleTypeName }${preArticle.title }작성자 : ${preArticle.regUserName }작성일 : ${preArticle.regDate }상태 : ${preArticle.repStatus }
다음글${nextArticle.articleTypeName }${nextArticle.title }작성자 : ${nextArticle.regUserName }작성일 : ${nextArticle.regDate }상태 : ${nextArticle.repStatus }
- - - - - - -
- -
- - -
- - - -
- - - diff --git a/src/main/webapp/WEB-INF/jsp/nlib/board/updateQnAForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/board/updateQnAForm.jsp deleted file mode 100644 index c98e6eb1..00000000 --- a/src/main/webapp/WEB-INF/jsp/nlib/board/updateQnAForm.jsp +++ /dev/null @@ -1,133 +0,0 @@ -<% -/** - * 
- * @Class Name : updateQnAForm.jsp
- * 
- * @Description : 묻고답하기 수정화면을 표출한다. 
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 7. 23. KNKIM 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP KNKIM - * @since 2021. 7. 23. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - -묻고답하기 - 수정 - - - - -${pageTitle} - - - - - - -

${pageTitle }

- -메시지 : ${message } -
- -
- - - - - - - -  
-  
- - - - - - - - - - - - - - - - - - - - - - - - - - -
제목
작성자
이메일
기존비밀번호
비밀번호
(변경시 입력)
-
질문내용
- -
- - - - -
- - - diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp index b72c4606..42f5a872 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp @@ -158,15 +158,6 @@ function fn_changeCartItems(cartTypeCd, cartTypeNm) { $("#frm").submit(); } - -function fn_changeInterest(masterId, onOff) { - alert("관심등록/삭제 준비중 : " + masterId + ", " + onOff); -} - -function fn_gotoDetail(masterId) { - alert("상세보기 준비중 : " + masterId); -} - // 대출신청으로 이동 function fn_appRent() { @@ -237,11 +228,10 @@ $(document).ready(function() {
- - - - - + + + +
@@ -311,17 +301,17 @@ $(document).ready(function() {
${cart.interestYn } - + - + 즐겨찾기 아이콘 즐겨찾기 아이콘 - + 즐겨찾기 아이콘 즐겨찾기 아이콘 @@ -342,7 +332,7 @@ $(document).ready(function() {
-
${cart.title }
+
${cart.title }
poss imposs">

${cart.useStatusNm }

${cart.rtnExpctDd }
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index 724a9708..14f90ded 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -29,6 +29,43 @@ function fn_search(keyword) { return; } + +function fn_viewAncmnt(articleId) { + var form = document.createElement("form"); + form.style.display = "none"; + $(form).attr("action", "/bbs/selectAncmntArticle.do"); + $(form).attr("method", "post"); + + var element = document.createElement("input"); + $(element).attr("name", "articleId"); + + $(element).attr("value", articleId); + form.appendChild(element); + document.body.appendChild(form); + form.submit(); + document.body.removeChild(form); + + return; +} + +function fn_viewQna(articleId) { + var form = document.createElement("form"); + form.style.display = "none"; + $(form).attr("action", "/bbs/selectQnaArticle.do"); + $(form).attr("method", "post"); + + var element = document.createElement("input"); + $(element).attr("name", "articleId"); + + $(element).attr("value", articleId); + form.appendChild(element); + document.body.appendChild(form); + form.submit(); + document.body.removeChild(form); + + return; +} + function fn_listPops(typeDivCd) { $("div.tab_content div.tabs_item").hide(); $("#listPops_" + typeDivCd).show(); @@ -204,14 +241,14 @@ function fn_listPops(typeDivCd) {
${itemOnline.title }
    -
  • 주제유형-${itemOnline.subjectNm }
    • -
  • 주제분야문화유산
    • +
  • 자료유형-${itemOnline.typeDivNm }
    • +
  • 주제분야-${itemOnline.subjectNmUp }
  • 생산기관-${itemOnline.orgNm }
  • 생산년도-${itemOnline.creatYyyy }
원문보기
-
RIS
+
RIS
@@ -236,68 +273,45 @@ function fn_listPops(typeDivCd) {
공지사항더보기 더보기 아이콘
+
- -

05

21.09

+ +

${fn:substring(itemAncmnt.regDd,8,10) }

${fn:substring(itemAncmnt.regDd,2,4) }.${fn:substring(itemAncmnt.regDd,5,7) }

-

[공지] 경주문화원에 오신걸 환영합니다.파일 아이콘

-
- -
-
- -

05

21.09

-
-

소장자료관 이용 시 주의사항 안내파일 아이콘

-
- -
-
- -

05

21.09

-
-

[공지] 2021 문화원 휴관일 안내 드립니다.

+

[공지]${itemAncmnt.title} + 파일 아이콘
+
Q&A더보기 더보기 아이콘
+
- -

05

21.09

+ +

${fn:substring(itemQna.regDd,8,10) }

${fn:substring(itemQna.regDd,2,4) }.${fn:substring(itemQna.regDd,5,7) }

-

[공지] 경주문화원에 오신걸 환영합니다.잠금 아이콘

-
-
-

답변대기

-
- -
-
- -

05

21.09

-
-

소장자료관 이용 시 주의사항 안내잠금 아이콘

-
-
-

답변대기

-
- -
-
- -

05

21.09

-
-

[공지] 2021 문화원 휴관일 안내 드립니다.

+

${itemQna.title} + 파일 아이콘 + 잠금 아이콘 +

+

답변완료

+ + +
+

답변대기

+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index 54d5c658..5fe62d0b 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -1,459 +1,459 @@ - -<% - /** - * 
-     * @Class Name : searchList.jsp
-     * 
-     * @Description : 소장 자료를 조회한다.
-     * 
-     * 
-     * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
-     *
-     *
- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 10. 13. JSYOO 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP JSYOO - * @since 2021. 10. 13. - * @version 1.0 - * - */ -%> -<%@ page language="java" contentType="text/html; charset=UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="validator" - uri="http://www.springmodules.org/tags/commons-validator"%> - -소장 자료 - - - - - - -${pageTitle} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

소장자료 섹션영역

-
-
-
-
    -
  • HOME
    • -
  • 소장자료
    • -
-
    -
  • 소장자료
    • -
-
-
화살표 아이콘
-
-
-
- -
-
-
-

검색필터

- -
-
-
    -
-
-
-
-
-

자료유형

-
-
-
    -
  • - -
  • -
    on"> -
    - checked="checked" /> - -
    -
    -
      - - -
    • -
      checked="checked" /> - -
      -
      • -       -       -
    -
    • - - -
-
- -
-
-
-

주제분야

- -
-
-
    - - - -
  • -
    on"> -
    checked="checked"/>
    -
    -
      - - -
    • checked="checked"/>
      • -       -       -
    -
    • - -     -     -
-
- -
- -
-
-

생산년도

-
-
-
    -
  • - -
    • -
  • - -
    • -
  • - 미상포함 -
    • -
-
- -
- -
-
-

생산기관

-
-
-
    - -
  • -
    -
    checked="checked"/>
    -
    -
    • -     -
-
- -
- -
-
-
- -
-
- - -
- - - ${searchVO.realQuery}에 대한 검색결과는 총 - 건 입니다. - - - - 총 건 - - -
-
- -
-
- -
-
- style="display:none;" placeholder="검색어를 입력하세요." value="${searchVO.query}" maxlength="50" /> - style="display:none;" placeholder="결과내재검색" value="${searchVO.reQuery}" maxlength="50" /> - -
-
-
- -
-
-
- -
-
-
-
자료정보
-
이용
-
- -
-
-
- - - - 즐겨찾기 아이콘 - 즐겨찾기 아이콘 - - - - - 즐겨찾기 아이콘 - 즐겨찾기 아이콘 - - - -
-
- - 온라인열람 - - - 대출 - - - 방문열람 - - - 기타 - - -
-
-
-
- - 자료유형 : ${result.typeCodeNm} > ${result.dtlsTypeDivNm} - - - 주제분야 : ${result.subjectNmUp} > ${result.subjectNm } - - - 생산기관 : ${result.orgNm } - - - 생산년도 : ${result.creatYyyy } - -
-
-
- - -

${result.operOutRangeNm}
${result.operReadRangeNm}

- - - -

${result.operOutRangeNm}${result.operReadRangeNm}

- - - - - - - -
-
- - -
  • - 검색결과가 없습니다. -
    • -     -
    -
    - -
      -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - - - + +<% + /** + * 
    +     * @Class Name : searchList.jsp
+     * 
+     * @Description : 소장 자료를 조회한다.
+     * 
+     * 
+     * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+     *
+     *
    + * + * @ ------------ -------- --------------------------- + * @ 수정일 수정자 수정내용 + * @ ------------ -------- --------------------------- + * @ 2021. 10. 13. JSYOO 최초 생성 + * + * + * @author 이씨플라자 * DIGITALSHIP JSYOO + * @since 2021. 10. 13. + * @version 1.0 + * + */ +%> +<%@ page language="java" contentType="text/html; charset=UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="validator" + uri="http://www.springmodules.org/tags/commons-validator"%> + +소장 자료 + + + + + + +${pageTitle} + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +
    +

    소장자료 섹션영역

    +
    +
    +
    +
      +
    • HOME
      • +
    • 소장자료
      • +
    +
      +
    • 소장자료
      • +
    +
    +
    화살표 아이콘
    +
    +
    +
    + +
    +
    +
    +

    검색필터

    + +
    +
    +
      +
    +
    +
    +
    +
    +

    자료유형

    +
    +
    +
      +
    • + +
    • +
      on"> +
      + checked="checked" /> + +
      +
      +
        + + +
      • +
        checked="checked" /> + +
        +
        • +         +         +
      +
      • + + +
    +
    + +
    +
    +
    +

    주제분야

    + +
    +
    +
      + + + +
    • +
      on"> +
      checked="checked"/>
      +
      +
        + + +
      • checked="checked"/>
        • +         +         +
      +
      • + +       +       +
    +
    + +
    + +
    +
    +

    생산년도

    +
    +
    +
      +
    • + +
      • +
    • + +
      • +
    • + 미상포함 +
      • +
    +
    + +
    + +
    +
    +

    생산기관

    +
    +
    +
      + +
    • +
      +
      checked="checked"/>
      +
      +
      • +       +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    + + + ${searchVO.realQuery}에 대한 검색결과는 총 + 건 입니다. + + + + 총 건 + + +
    +
    + +
    +
    + +
    +
    + style="display:none;" placeholder="검색어를 입력하세요." value="${searchVO.query}" maxlength="50" /> + style="display:none;" placeholder="결과내재검색" value="${searchVO.reQuery}" maxlength="50" /> + +
    +
    +
    + +
    +
    +
    + +
    +
    +
    +
    자료정보
    +
    이용
    +
    + +
    +
    +
    + + + + 즐겨찾기 아이콘 + 즐겨찾기 아이콘 + + + + + 즐겨찾기 아이콘 + 즐겨찾기 아이콘 + + + +
    +
    + + 온라인열람 + + + 대출 + + + 방문열람 + + + 기타 + + +
    +
    +
    +
    + + 자료유형 : ${result.typeCodeNm} > ${result.dtlsTypeDivNm} + + + 주제분야 : ${result.subjectNmUp} > ${result.subjectNm } + + + 생산기관 : ${result.orgNm } + + + 생산년도 : ${result.creatYyyy } + +
    +
    +
    + + +

    ${result.operOutRangeNm}
    ${result.operReadRangeNm}

    +     + + +

    ${result.operOutRangeNm}${result.operReadRangeNm}

    +     +     +     + + + + +
    +
    +     + +
  • + 검색결과가 없습니다. +
    • +     +
    +
    + +
      +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp index d68ca198..58aca0f6 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp @@ -294,7 +294,7 @@ $(document).ready(function() {
    에서 @@ -302,7 +302,7 @@ $(document).ready(function() { + >${dtItem.dt } 사이 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp index 35d61c08..bbbb0b65 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp @@ -244,12 +244,12 @@ $(document).ready(function() {
    체크 아이콘
    - -
    자료 ${totCnt}건 방문열람신청이 접수되었습니다. [${readVO.rsrvId}]
    + +
    자료 ${totCnt}건 방문열람신청이 접수되었습니다.
    (희망방문일자: ${readVO.hopeReqPridDtmFrom} ~ ${readVO.hopeReqPridDtmTo})
     - +
    처리에 실패하였습니다.
    ${readVO.resultMessage } (${readVO.resultCode })
     diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp index bd02d913..93fd993b 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp @@ -134,17 +134,19 @@ function fn_search(reqStatusDivCd) { var statusHtml1 = ""; var statusHtml2 = ""; + var statusHtml3 = ""; if(obj.reqStatusDivCd == null) { statusHtml1 = '-'; } else if(obj.reqStatusDivCd == "A0") { // 신청 statusHtml1 = '' + obj.reqStatusDivNm + ''; - statusHtml2 = ''; + statusHtml2 = ''; } else if(obj.reqStatusDivCd == "A1") { // 승인 statusHtml1 = '' + obj.reqStatusDivNm + '' + fn_formatDateStr(obj.modDd,"-") + ''; - statusHtml2 = ''; + statusHtml2 = ''; } else if(obj.reqStatusDivCd == "A2") { // 반려 statusHtml1 = '' + obj.reqStatusDivNm + '' + fn_formatDateStr(obj.modDd,"-") + ''; - statusHtml2 = ''; + statusHtml2 = ''; + statusHtml3 = ''; } else if(obj.reqStatusDivCd == "R") { // 열람완료 statusHtml1 = '' + obj.reqStatusDivNm + '' + fn_formatDateStr(obj.modDd,"-") + ''; statusHtml2 = ''; @@ -153,7 +155,7 @@ function fn_search(reqStatusDivCd) { statusHtml2 = ''; } - div.append($('
    ').attr('class', 'n-state').html(statusHtml1 + statusHtml2)); + div.append($('
    ').attr('class', 'n-state').html(statusHtml1 + statusHtml2 + statusHtml3)); $("div.list-data").append(div); @@ -166,6 +168,16 @@ function fn_search(reqStatusDivCd) { alert("조회에 실패하였습니다. 관리자에게 문의 바랍니다."); }); } + + function fn_reson(reqId) { + $("#divRejectedReasonDetail").html($("#rejected_reason_" + reqId).text()); + $("#divRejectedReason").fadeIn(); + } + + function fn_closeReason() { + $("#divRejectedReason").fadeOut(); + $("#divRejectedReasonDetail").html(""); + } function fn_cancel(title, mngOrgCd, reqId, masterId) { @@ -292,3 +304,20 @@ function fn_search(reqStatusDivCd) {
    + + diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 8457f4c5..bf9f7458 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -284,8 +284,8 @@ transition: all 0.2s ease-in-out; .sec6 .onlineSwiper .items .List a.inner {display:block;} .sec6 .onlineSwiper .items .List .inner.light-type {color:#666;background-color:#fff;} .sec6 .onlineSwiper .items .List .inner div.thumbnail {overflow:hidden;position:relative;background-color:#f8f8f8;} -.sec6 .onlineSwiper .items .List .inner div.thumbnail span.image-frame {display:block;height:100%;background:url('/images/img/img-no-image.gif') no-repeat 50% 0;background-size:contain;} -.sec6 .onlineSwiper .items .List .inner div.thumbnail span.image-frame img {width:100%;height:100%;} +.sec6 .onlineSwiper .items .List .inner div.thumbnail span.image-frame {display:block;display:flex;align-items:center;height:350px;background:url('/images/img/img-no-image.gif') no-repeat 50% 0;background-size:contain;} +.sec6 .onlineSwiper .items .List .inner div.thumbnail span.image-frame img {width:100%;vertical-align:middle;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover {position:absolute;left:0;right:0;top:0;height:100%;padding:0% 15px;border:1px solid #2e2e2e;font-size:12px;text-align:left;color:#fff;background-color:rgba(0,0,0,0.8);opacity:0;border-radius:10px;transition:opacity 0.3s ease;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover strong {display:block;margin:30px 0px 20px;font-size:18px;height:55px;overflow:hidden;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover ul li {line-height:23px;font-weight:100;} diff --git a/src/main/webapp/js/search/reference.js b/src/main/webapp/js/search/reference.js index 9c219c49..89809453 100644 --- a/src/main/webapp/js/search/reference.js +++ b/src/main/webapp/js/search/reference.js @@ -1,383 +1,383 @@ - -//filter clk evt -function reference_filterClk(){ - $(document).on("click","#referencelistForm [name=second_class],#referencelistForm [name=second_category],#referencelistForm [name=first_agency]",function(){ - //first chk - if( $(this).parents('.depth-2').find('input:checkbox[name="' + event.target.name + '"]:checked').length >= 1){ - $(this).parents('.depth-2').siblings('.depth-1').find('input').prop("checked", true); - }else{ - $(this).parents('.depth-2').siblings('.depth-1').find('input').prop("checked", false); - } - - //filter_mylist clk array - var filter_mylist = ""; - var filter_mylist_clk = ""; - var filter_agency = ""; - var filter_agency_clk = ""; - filter_agency = $('#filter_agency').val(); - filter_mylist = $('#filter_mylist').val(); - - if($(this).attr('name') == 'second_class'){ - filter_mylist_clk = 'class_'+$(this).val() +','; - }else if($(this).attr('name') == 'second_category'){ - filter_mylist_clk = 'category_'+$(this).val() +','; - }else if($(this).attr('name') == 'first_agency'){ - filter_mylist_clk = 'agency_'+$(this).val() +','; - //생산기관은 1depth 이므로 별도처리 - filter_agency_clk = $(this).val() +","; - } - - //생산기관은 1depth 이므로 별도처리 - if($(this).is(":checked")){ - filter_mylist += filter_mylist_clk; - filter_agency += filter_agency_clk; - }else{ - filter_mylist = filter_mylist.replace(filter_mylist_clk,''); - filter_agency = filter_agency.replace(filter_agency,''); - } - $('#filter_mylist').val(filter_mylist); - $('#filter_agency').val(filter_agency); - - - //depth-1 - var on_classArr = document.querySelectorAll("div.depth-1.on"); - var filter_class = "" ; - var filter_category = "" ; - for(var i=0; i= 0 ){ - filter_mylist_clk = 'class_'+ s_cate_id +','; - }else if($(this).attr('id').indexOf('j_cate_theme')>= 0 ){ - filter_mylist_clk = 'category_'+ s_cate_id +','; - }else if($(this).attr('name').indexOf('first_agency_del')>= 0 ){ - filter_mylist_clk = 'agency_'+ $(this).val() +','; - filter_agency_clk = $(this).val() +','; - } - filter_agency = filter_agency.replace(filter_agency_clk,''); - filter_mylist = filter_mylist.replace(filter_mylist_clk,''); - $('#filter_agency').val(filter_agency); - $('#filter_mylist').val(filter_mylist); - - - //depth-1 - var on_classArr = document.querySelectorAll("div.depth-1.on"); - var filter_class = "" ; - var filter_category = "" ; - for(var i=0; i= 0){ - var checked = document.querySelectorAll("#referencelistForm [name='second_class']:checked"); - - for(var i=0; i= 0 ){ - var second_cate_id = "c_cate_"+ $(checked[i]).attr('id') +"_id_" +checkVal ; - var first_cate_nm =$(checked[i]).parents('.depth-2').siblings('.depth-1').find('label').text(); - var second_cate_nm = $(checked[i]).next().text(); - - first_cate_nm = first_cate_nm.substring(0,first_cate_nm.indexOf("(",-1)); - second_cate_nm = second_cate_nm.substring(0,second_cate_nm.lastIndexOf("(")); - - if(comparisonData != second_cate_id){ - first_cate_nm = util.xssCheck(first_cate_nm); - second_cate_nm = util.xssCheck(second_cate_nm); - second_cate_id = util.xssCheck(second_cate_id); - $("#reference_fillter_append").append("
  • "+ first_cate_nm + " > "+ second_cate_nm + "
    • ").text(); - comparisonData = second_cate_id; - } - - } - } - } - else if(mylist_arr[j].indexOf("category") >= 0){ - var checked = document.querySelectorAll("#referencelistForm [name='second_category']:checked"); - var comparisonData; - //필터라벨 - for(var i=0; i= 0 ){ - var second_cate_id = "j_cate_"+ $(checked[i]).attr('id') +"_id_" +checkVal ; - var first_cate_nm =$(checked[i]).parents('.depth-2').siblings('.depth-1').find('input').next().text(); - var second_cate_nm = $(checked[i]).next().text(); - - first_cate_nm = first_cate_nm.substring(0,first_cate_nm.indexOf("(",-1)); - second_cate_nm = second_cate_nm.substring(0,second_cate_nm.indexOf("(",-1)); - - if(comparisonData != second_cate_id){ - first_cate_nm = util.xssCheck(first_cate_nm); - second_cate_nm = util.xssCheck(second_cate_nm); - second_cate_id = util.xssCheck(second_cate_id); - $("#reference_fillter_append").append("
  • "+ first_cate_nm + " > "+ second_cate_nm + "
    • ").text(); - comparisonData = second_cate_id; - } - - } - } - } - else if(mylist_arr[j].indexOf("creat_all") >= 0){ - $("#reference_fillter_append").append("
  • 생산년도 > 전체
    • ").text(); - } - else if(mylist_arr[j].indexOf("creat_date") >= 0){ - $("#reference_fillter_append").append("
  • 생산년도 > " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"
    • ").text(); - }else if(mylist_arr[j].indexOf("agency") >= 0){ - var second_cate_nm = mylist_arr[j].substring(mylist_arr[j].indexOf("_")+1); - $("#reference_fillter_append").append("
  • 생산기관 > "+ second_cate_nm + "
    • ").text(); - }else if(mylist_arr[j].indexOf("search_query") >= 0){ - $("#reference_fillter_append").append("
  • 검색어 > "+ $("#realQuery").val() + "
    • ").text(); - }else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){ - $("#reference_fillter_append").append("
  • 목차 > "+ $("#bookIndex").val() + "
    • ").text(); - }else if(mylist_arr[j].indexOf("search_mngtNo") >= 0){ - $("#reference_fillter_append").append("
  • 관리번호 > "+ $("#mngtNo").val() + "
    • ").text(); - }else if(mylist_arr[j].indexOf("search_era") >= 0){ - $("#reference_fillter_append").append("
  • 연대 > "+ $("#createStartDate").val() + "~" + $("#createEndDate").val() + "
    • ").text(); - }else if(mylist_arr[j].indexOf("search_ageCode") >= 0){ - var ageCode_arr = $("#referencelistForm [name=ageCode]").val().split(","); - for(var i=0; i < ageCode_arr.length ; i++) - { - $("#reference_fillter_append").append("
  • 시대 > "+ ageCodeNm(ageCode_arr[i]) + "
    • ").text(); - } - }else if(mylist_arr[j].indexOf("search_collectionList") >= 0){ - var collectionList_arr = $("#referencelistForm [name=collectionList]").val().split(","); - for(var i=0; i < collectionList_arr.length ; i++) - { - $("#reference_fillter_append").append("
  • 이용구분 > "+ collectionNm(collectionList_arr[i]) + "
    • ").text(); - } - } - - } //for end -} - -function ageCodeNm(ageCode){ - if(ageCode == null) - { - return ageCode; - } - if(ageCode == "03") return "선사"; - if(ageCode == "04|05|06") return "고대"; - if(ageCode == "07") return "고려"; - if(ageCode == "08") return "조선"; - if(ageCode == "11|12") return "근대"; - if(ageCode == "13|14") return "현대"; - if(ageCode == "02") return "시대미상"; - - return ageCode; -} - -function collectionNm(collection){ - if(collection == null) - { - return collection; - } - if(collection == "lib_online") return "온라인열람"; - if(collection == "lib_loan") return "대출"; - if(collection == "lib_offline") return "열람"; - if(collection == "lib_etc") return "기타"; - - return collection; -} -function fnLabel_reference_detail(){ - $('#referencelistForm input[name=sojang_council]').prop("checked",false); - $('#referencelistForm input[name=sido_name]').prop("checked",false); - - $("#referencelistForm .cmm-list-chk").each(function (index, item) { - $(this).prop("checked",true); - }); - - $("#reference_council_append").empty(); - - var mylist_arr = $("#referencelistForm [name=filter_mylist]").val().split(","); - - for(var j=0; j < mylist_arr.length ; j++){ - if(mylist_arr[j].indexOf("council") >= 0){ - var checked = document.querySelectorAll("#referencelistForm [name='sojang_council']:checked"); - - for(var i=0; i= 0 ){ - var second_cate_id = $(checked[i]).attr('id')+"_id"; - var second_cate_id_del = $(checked[i]).attr('id')+"_id_del"; - var first_cate_nm =$(checked[i]).parents('.depth-2').siblings('.depth-1').find('input').next().text(); - var second_cate_nm = $(checked[i]).next().text(); - - first_cate_nm = first_cate_nm.substring(0,first_cate_nm.indexOf("(",-1)); - second_cate_nm = second_cate_nm.substring(0,second_cate_nm.indexOf("(",-1)); - - second_cate_id = util.xssCheck(second_cate_id); - second_cate_id_del = util.xssCheck(second_cate_id_del); - first_cate_nm = util.xssCheck(first_cate_nm); - second_cate_nm = util.xssCheck(second_cate_nm); - $("#reference_council_append").append("
    • "); - } - } - }//if end - }//for end - - var checked2 = document.querySelectorAll("#referencelistForm [name='sido_name']:checked"); - for(var i=0; i= 1){ + $(this).parents('.depth-2').siblings('.depth-1').find('input').prop("checked", true); + }else{ + $(this).parents('.depth-2').siblings('.depth-1').find('input').prop("checked", false); + } + + //filter_mylist clk array + var filter_mylist = ""; + var filter_mylist_clk = ""; + var filter_agency = ""; + var filter_agency_clk = ""; + filter_agency = $('#filter_agency').val(); + filter_mylist = $('#filter_mylist').val(); + + if($(this).attr('name') == 'second_class'){ + filter_mylist_clk = 'class_'+$(this).val() +','; + }else if($(this).attr('name') == 'second_category'){ + filter_mylist_clk = 'category_'+$(this).val() +','; + }else if($(this).attr('name') == 'first_agency'){ + filter_mylist_clk = 'agency_'+$(this).val() +','; + //생산기관은 1depth 이므로 별도처리 + filter_agency_clk = $(this).val() +","; + } + + //생산기관은 1depth 이므로 별도처리 + if($(this).is(":checked")){ + filter_mylist += filter_mylist_clk; + filter_agency += filter_agency_clk; + }else{ + filter_mylist = filter_mylist.replace(filter_mylist_clk,''); + filter_agency = filter_agency.replace(filter_agency,''); + } + $('#filter_mylist').val(filter_mylist); + $('#filter_agency').val(filter_agency); + + + //depth-1 + var on_classArr = document.querySelectorAll("div.depth-1.on"); + var filter_class = "" ; + var filter_category = "" ; + for(var i=0; i= 0 ){ + filter_mylist_clk = 'class_'+ s_cate_id +','; + }else if($(this).attr('id').indexOf('j_cate_theme')>= 0 ){ + filter_mylist_clk = 'category_'+ s_cate_id +','; + }else if($(this).attr('name').indexOf('first_agency_del')>= 0 ){ + filter_mylist_clk = 'agency_'+ $(this).val() +','; + filter_agency_clk = $(this).val() +','; + } + filter_agency = filter_agency.replace(filter_agency_clk,''); + filter_mylist = filter_mylist.replace(filter_mylist_clk,''); + $('#filter_agency').val(filter_agency); + $('#filter_mylist').val(filter_mylist); + + + //depth-1 + var on_classArr = document.querySelectorAll("div.depth-1.on"); + var filter_class = "" ; + var filter_category = "" ; + for(var i=0; i= 0){ + var checked = document.querySelectorAll("#referencelistForm [name='second_class']:checked"); + + for(var i=0; i= 0 ){ + var second_cate_id = "c_cate_"+ $(checked[i]).attr('id') +"_id_" +checkVal ; + var first_cate_nm =$(checked[i]).parents('.depth-2').siblings('.depth-1').find('label').text(); + var second_cate_nm = $(checked[i]).next().text(); + + first_cate_nm = first_cate_nm.substring(0,first_cate_nm.indexOf("(",-1)); + second_cate_nm = second_cate_nm.substring(0,second_cate_nm.lastIndexOf("(")); + + if(comparisonData != second_cate_id){ + first_cate_nm = util.xssCheck(first_cate_nm); + second_cate_nm = util.xssCheck(second_cate_nm); + second_cate_id = util.xssCheck(second_cate_id); + $("#reference_fillter_append").append("
  • "+ first_cate_nm + " > "+ second_cate_nm + "
    • ").text(); + comparisonData = second_cate_id; + } + + } + } + } + else if(mylist_arr[j].indexOf("category") >= 0){ + var checked = document.querySelectorAll("#referencelistForm [name='second_category']:checked"); + var comparisonData; + //필터라벨 + for(var i=0; i= 0 ){ + var second_cate_id = "j_cate_"+ $(checked[i]).attr('id') +"_id_" +checkVal ; + var first_cate_nm =$(checked[i]).parents('.depth-2').siblings('.depth-1').find('input').next().text(); + var second_cate_nm = $(checked[i]).next().text(); + + first_cate_nm = first_cate_nm.substring(0,first_cate_nm.indexOf("(",-1)); + second_cate_nm = second_cate_nm.substring(0,second_cate_nm.indexOf("(",-1)); + + if(comparisonData != second_cate_id){ + first_cate_nm = util.xssCheck(first_cate_nm); + second_cate_nm = util.xssCheck(second_cate_nm); + second_cate_id = util.xssCheck(second_cate_id); + $("#reference_fillter_append").append("
  • "+ first_cate_nm + " > "+ second_cate_nm + "
    • ").text(); + comparisonData = second_cate_id; + } + + } + } + } + else if(mylist_arr[j].indexOf("creat_all") >= 0){ + $("#reference_fillter_append").append("
  • 생산년도 > 전체
    • ").text(); + } + else if(mylist_arr[j].indexOf("creat_date") >= 0){ + $("#reference_fillter_append").append("
  • 생산년도 > " + $("#creatYyyyStart").val() + "~" + $("#creatYyyyEnd").val() +"
    • ").text(); + }else if(mylist_arr[j].indexOf("agency") >= 0){ + var second_cate_nm = mylist_arr[j].substring(mylist_arr[j].indexOf("_")+1); + $("#reference_fillter_append").append("
  • 생산기관 > "+ second_cate_nm + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_query") >= 0){ + $("#reference_fillter_append").append("
  • 검색어 > "+ $("#realQuery").val() + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){ + $("#reference_fillter_append").append("
  • 목차 > "+ $("#bookIndex").val() + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_mngtNo") >= 0){ + $("#reference_fillter_append").append("
  • 관리번호 > "+ $("#mngtNo").val() + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_era") >= 0){ + $("#reference_fillter_append").append("
  • 연대 > "+ $("#createStartDate").val() + "~" + $("#createEndDate").val() + "
    • ").text(); + }else if(mylist_arr[j].indexOf("search_ageCode") >= 0){ + var ageCode_arr = $("#referencelistForm [name=ageCode]").val().split(","); + for(var i=0; i < ageCode_arr.length ; i++) + { + $("#reference_fillter_append").append("
  • 시대 > "+ ageCodeNm(ageCode_arr[i]) + "
    • ").text(); + } + }else if(mylist_arr[j].indexOf("search_collectionList") >= 0){ + var collectionList_arr = $("#referencelistForm [name=collectionList]").val().split(","); + for(var i=0; i < collectionList_arr.length ; i++) + { + $("#reference_fillter_append").append("
  • 이용구분 > "+ collectionNm(collectionList_arr[i]) + "
    • ").text(); + } + } + + } //for end +} + +function ageCodeNm(ageCode){ + if(ageCode == null) + { + return ageCode; + } + if(ageCode == "03") return "선사"; + if(ageCode == "04|05|06") return "고대"; + if(ageCode == "07") return "고려"; + if(ageCode == "08") return "조선"; + if(ageCode == "11|12") return "근대"; + if(ageCode == "13|14") return "현대"; + if(ageCode == "02") return "시대미상"; + + return ageCode; +} + +function collectionNm(collection){ + if(collection == null) + { + return collection; + } + if(collection == "lib_online") return "온라인열람"; + if(collection == "lib_loan") return "대출"; + if(collection == "lib_offline") return "열람"; + if(collection == "lib_etc") return "기타"; + + return collection; +} +function fnLabel_reference_detail(){ + $('#referencelistForm input[name=sojang_council]').prop("checked",false); + $('#referencelistForm input[name=sido_name]').prop("checked",false); + + $("#referencelistForm .cmm-list-chk").each(function (index, item) { + $(this).prop("checked",true); + }); + + $("#reference_council_append").empty(); + + var mylist_arr = $("#referencelistForm [name=filter_mylist]").val().split(","); + + for(var j=0; j < mylist_arr.length ; j++){ + if(mylist_arr[j].indexOf("council") >= 0){ + var checked = document.querySelectorAll("#referencelistForm [name='sojang_council']:checked"); + + for(var i=0; i= 0 ){ + var second_cate_id = $(checked[i]).attr('id')+"_id"; + var second_cate_id_del = $(checked[i]).attr('id')+"_id_del"; + var first_cate_nm =$(checked[i]).parents('.depth-2').siblings('.depth-1').find('input').next().text(); + var second_cate_nm = $(checked[i]).next().text(); + + first_cate_nm = first_cate_nm.substring(0,first_cate_nm.indexOf("(",-1)); + second_cate_nm = second_cate_nm.substring(0,second_cate_nm.indexOf("(",-1)); + + second_cate_id = util.xssCheck(second_cate_id); + second_cate_id_del = util.xssCheck(second_cate_id_del); + first_cate_nm = util.xssCheck(first_cate_nm); + second_cate_nm = util.xssCheck(second_cate_nm); + $("#reference_council_append").append("
    • "); + } + } + }//if end + }//for end + + var checked2 = document.querySelectorAll("#referencelistForm [name='sido_name']:checked"); + for(var i=0; i